From f99eaceb1a19fb0970a62062f1ac471056aa6c18 Mon Sep 17 00:00:00 2001
From: Marc Sabatella <marc@outsideshore.com>
Date: Sun, 17 Aug 2014 12:11:39 -0600
Subject: [PATCH] fix #29406: grace note navigation

---
 libmscore/navigate.cpp | 113 ++++++++++++++++++++++++++++-------------
 1 file changed, 78 insertions(+), 35 deletions(-)

diff --git a/libmscore/navigate.cpp b/libmscore/navigate.cpp
index 8aa6c7f0ce4bc..8a7c4e136cc66 100644
--- a/libmscore/navigate.cpp
+++ b/libmscore/navigate.cpp
@@ -40,35 +40,53 @@ ChordRest* nextChordRest(ChordRest* cr)
       {
       if (!cr)
             return 0;
+
       if (cr->isGrace()) {
+            //
             // cr is a grace note
+
             Chord* c  = static_cast<Chord*>(cr);
             Chord* pc = static_cast<Chord*>(cr->parent());
-            QList<Chord*> graceNotesBefore;
-            QList<Chord*> graceNotesAfter;
 
-            if(cr->isGraceBefore()){
+            if (cr->isGraceBefore()) {
+                  QList<Chord*> graceNotesBefore;
                   pc->getGraceNotesBefore(&graceNotesBefore);
                   auto i = std::find(graceNotesBefore.begin(), graceNotesBefore.end(), c);
                   if (i == graceNotesBefore.end())
-                        return 0;
+                        return 0;   // unable to find self?
                   ++i;
                   if (i != graceNotesBefore.end())
                         return *i;
+                  // if this was last grace note before, return parent
+                  return pc;
                   }
             else {
-                  int n = pc->getGraceNotesAfter(&graceNotesAfter);
-                  for(int i = 0; i < n; i++){
-                        if(c == graceNotesAfter[(i)]){
-                              if(i < n - 1)
-                                    return graceNotesAfter[i + 1];
-                              else
-                                    return 0;
-                              }
+                  QList<Chord*> graceNotesAfter;
+                  pc->getGraceNotesAfter(&graceNotesAfter);
+                  auto i = std::find(graceNotesAfter.begin(), graceNotesAfter.end(), c);
+                  if (i == graceNotesAfter.end())
+                        return 0;   // unable to find self?
+                  ++i;
+                  if (i != graceNotesAfter.end())
+                        return *i;
+                  // if this was last grace note after, fall through to find next main note
+                  cr = pc;
+                  }
+            }
+      else {
+            //
+            // cr is not a grace note
+            if (cr->type() == Element::Type::CHORD) {
+                  Chord* c = static_cast<Chord*>(cr);
+                  if (!c->graceNotes().empty()) {
+                        QList<Chord*> graceNotesAfter;
+                        c->getGraceNotesAfter(&graceNotesAfter);
+                        if (!graceNotesAfter.isEmpty())
+                              return graceNotesAfter.first();
                         }
                   }
-            return pc;
             }
+
       int track = cr->track();
       Segment::Type st = Segment::Type::ChordRest;
 
@@ -77,12 +95,17 @@ ChordRest* nextChordRest(ChordRest* cr)
             if (e) {
                   if (e->type() == Element::Type::CHORD) {
                         Chord* c = static_cast<Chord*>(e);
-                        if (!c->graceNotes().empty())
-                              return c->graceNotes().front();
+                        if (!c->graceNotes().empty()) {
+                              QList<Chord*> graceNotesBefore;
+                              c->getGraceNotesBefore(&graceNotesBefore);
+                              if (!graceNotesBefore.isEmpty())
+                                    return graceNotesBefore.first();
+                              }
                         }
                   return e;
                   }
             }
+
       return 0;
       }
 
@@ -95,49 +118,69 @@ ChordRest* prevChordRest(ChordRest* cr)
       {
       if (!cr)
             return 0;
+
       if (cr->isGrace()) {
+            //
             // cr is a grace note
+
             Chord* c  = static_cast<Chord*>(cr);
             Chord* pc = static_cast<Chord*>(cr->parent());
-            QList<Chord*> graceNotesBefore;
-            QList<Chord*> graceNotesAfter;
 
-            if(cr->isGraceBefore()){
+            if (cr->isGraceBefore()) {
+                  QList<Chord*> graceNotesBefore;
                   pc->getGraceNotesBefore(&graceNotesBefore);
-                  auto i = std::find(graceNotesBefore.begin(),graceNotesBefore.end(), c);
+                  auto i = std::find(graceNotesBefore.begin(), graceNotesBefore.end(), c);
                   if (i == graceNotesBefore.end())
-                        return 0;
-                  if (i == graceNotesBefore.begin())
-                        cr = pc;
-                  else
+                        return 0;   // unable to find self?
+                  if (i != graceNotesBefore.begin())
                         return *--i;
+                  // if this was first grace note before, fall through to find previous main note
+                  cr = pc;
                   }
             else {
-                  int n = pc->getGraceNotesAfter(&graceNotesAfter);
-                  for(int i = 0; i < n; i++){
-                        if(c == graceNotesAfter[(i)]){
-                              if(i > 0)
-                                    return graceNotesAfter[i - 1];
-                              else
-                                    return 0;
-                              }
-                        }
+                  QList<Chord*> graceNotesAfter;
+                  pc->getGraceNotesAfter(&graceNotesAfter);
+                  auto i = std::find(graceNotesAfter.begin(), graceNotesAfter.end(), c);
+                  if (i == graceNotesAfter.end())
+                        return 0;   // unable to find self?
+                  if (i != graceNotesAfter.begin())
+                        return *--i;
+                  // if this was first grace note after, return parent
+                  return pc;
                   }
             }
       else {
+            //
+            // cr is not a grace note
             if (cr->type() == Element::Type::CHORD) {
                   Chord* c = static_cast<Chord*>(cr);
-                  if (!c->graceNotes().empty())
-                        return c->graceNotes().back();
+                  if (!c->graceNotes().empty()) {
+                        QList<Chord*> graceNotesBefore;
+                        c->getGraceNotesBefore(&graceNotesBefore);
+                        if (!graceNotesBefore.isEmpty())
+                              return graceNotesBefore.last();
+                        }
                   }
             }
+
       int track = cr->track();
       Segment::Type st = Segment::Type::ChordRest;
       for (Segment* seg = cr->segment()->prev1(st); seg; seg = seg->prev1(st)) {
             ChordRest* e = static_cast<ChordRest*>(seg->element(track));
-            if (e)
+            if (e) {
+                  if (e->type() == Element::Type::CHORD) {
+                        Chord* c = static_cast<Chord*>(e);
+                        if (!c->graceNotes().empty()) {
+                              QList<Chord*> graceNotesAfter;
+                              c->getGraceNotesAfter(&graceNotesAfter);
+                              if (!graceNotesAfter.isEmpty())
+                                    return graceNotesAfter.last();
+                              }
+                        }
                   return e;
+                  }
             }
+
       return 0;
       }