From 8ceb2a4486b75696a76217965663f60c1ffff190 Mon Sep 17 00:00:00 2001
From: Marc Sabatella <marc@outsideshore.com>
Date: Wed, 11 Feb 2015 00:28:31 -0700
Subject: [PATCH] fix #46736: spanner end cannot be set to note in voice > 1

---
 libmscore/line.cpp  | 43 +++++++++++++++++++++++--------------------
 libmscore/score.cpp |  8 ++++++--
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/libmscore/line.cpp b/libmscore/line.cpp
index 8bec901e2d..4a8f5373f6 100644
--- a/libmscore/line.cpp
+++ b/libmscore/line.cpp
@@ -201,6 +201,7 @@ bool LineSegment::edit(MuseScoreView* sv, Grip curGrip, int key, Qt::KeyboardMod
       SLine* l        = line();
       SpannerSegmentType st = spannerSegmentType();
       int track   = l->track();
+      int track2  = l->track2();    // assumed to be same as track
 
       if (l->anchor() == Spanner::Anchor::SEGMENT) {
             Segment* s1 = spanner()->startSegment();
@@ -220,13 +221,13 @@ bool LineSegment::edit(MuseScoreView* sv, Grip curGrip, int key, Qt::KeyboardMod
                   if (curGrip == Grip::START)
                         s1 = prevSeg1(s1, track);
                   else if (curGrip == Grip::END || curGrip == Grip::MIDDLE)
-                        s2 = prevSeg1(s2, track);
+                        s2 = prevSeg1(s2, track2);
                   }
             else if (key == Qt::Key_Right) {
                   if (curGrip == Grip::START)
                         s1 = nextSeg1(s1, track);
                   else if (curGrip == Grip::END || curGrip == Grip::MIDDLE) {
-                        Segment* ns2 = nextSeg1(s2, track);
+                        Segment* ns2 = nextSeg1(s2, track2);
                         if (ns2)
                               s2 = ns2;
                         else
@@ -541,30 +542,32 @@ QPointF SLine::linePos(Grip grip, System** sys) const
                         else if (type() == Element::Type::HAIRPIN || type() == Element::Type::TRILL
                                     || type() == Element::Type::TEXTLINE || type() == Element::Type::LYRICSLINE) {
                               // (for LYRICSLINE, this is hyphen; melisma line is handled above)
-                              // lay out to just before next CR or barline
+                              // lay out to just before next chordrest on this staff, or barline
+                              // tick2 actually tells us the right chordrest to look for
                               if (cr && endElement()->parent() && endElement()->parent()->type() == Element::Type::SEGMENT) {
                                     qreal x2 = cr->x() + cr->space().rw();
-                                    int t = track2();
-                                    Segment* seg = static_cast<Segment*>(endElement()->parent())->next();
-                                    for ( ; seg; seg = seg->next()) {
-                                          if (seg->segmentType() == Segment::Type::ChordRest) {
-                                                if (t != -1 && !seg->element(t)) {
-                                                      continue;
-                                                      }
-                                                x2 = qMax(x2, seg->x() - sp);
-                                                break;
-                                                }
-                                          else if (seg->segmentType() == Segment::Type::EndBarLine) {
-                                                // allow lyrics hyphen to extend to barline; other lines stop 1sp short
-                                                qreal gap = (type() == Element::Type::LYRICSLINE) ? 0.0 : sp;
-                                                x2 = qMax(x2, seg->x() - gap);
-                                                break;
-                                                }
-                                          }
+                                    Segment* currentSeg = static_cast<Segment*>(endElement()->parent());
+                                    Segment* seg = score()->tick2segmentMM(tick2(), false, Segment::Type::ChordRest);
                                     if (!seg) {
                                           // no end segment found, use measure width
                                           x2 = endElement()->parent()->parent()->width() - sp;
                                           }
+                                    else if (currentSeg->measure() == seg->measure()) {
+                                          // next chordrest found in same measure;
+                                          // end line 1sp to left
+                                          x2 = qMax(x2, seg->x() - sp);
+                                          }
+                                    else {
+                                          // next chordrest is in next measure
+                                          // lay out to end (barline) of current measure instead
+                                          seg = currentSeg->next(Segment::Type::EndBarLine);
+                                          if (!seg)
+                                                seg = currentSeg->measure()->last();
+                                          // allow lyrics hyphen to extend to barline
+                                          // other lines stop 1sp short
+                                          qreal gap = (type() == Element::Type::LYRICSLINE) ? 0.0 : sp;
+                                          x2 = qMax(x2, seg->x() - gap);
+                                          }
                                     x = x2 - endElement()->parent()->x();
                                     }
                               }
diff --git a/libmscore/score.cpp b/libmscore/score.cpp
index 1467fefe44..6fbc6bd8a4 100644
--- a/libmscore/score.cpp
+++ b/libmscore/score.cpp
@@ -3582,6 +3582,7 @@ ChordRest* Score::findCR(int tick, int track) const
 //---------------------------------------------------------
 //   findCRinStaff
 //    find chord/rest <= tick in staff
+//    prefer shortest duration (so it does not overlap next chordrest segment)
 //---------------------------------------------------------
 
 ChordRest* Score::findCRinStaff(int tick, int track) const
@@ -3602,11 +3603,14 @@ ChordRest* Score::findCRinStaff(int tick, int track) const
       for (Segment* ns = s; ; ns = ns->next(Segment::Type::ChordRest)) {
             if (ns == 0 || ns->tick() > tick)
                   break;
+            // found a segment; now find shortest chordrest on this staff (if any)
+            ChordRest* shortestCR = 0;
             for (int t = strack; t < etrack; ++t) {
-                  if (ns->element(t)) {
+                  ChordRest* cr = static_cast<ChordRest*>(ns->element(t));
+                  if (cr && (!shortestCR || cr->actualTicks() < shortestCR->actualTicks())) {
+                        shortestCR = cr;
                         s = ns;
                         actualTrack = t;
-                        break;
                         }
                   }
             }