fix #29736

musescore · Aug 18, 2014 · 01ebb2e · 01ebb2e
1 parent cf9a633
commit 01ebb2e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 2 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -229,7 +229,9 @@ void Score::cmdAddSpanner(Spanner* spanner, const QPointF& pos)
             return;
             }
 
+      // all spanners live in voice 0 (except slurs/ties)
       int track = staffIdx == -1 ? -1 : staffIdx * VOICES;
+
       spanner->setTrack(track);
       spanner->setTrack2(track);
 

diff --git a/libmscore/ottava.cpp b/libmscore/ottava.cpp
@@ -415,6 +415,9 @@ QVariant Ottava::propertyDefault(P_ID propertyId) const
             case P_ID::END_TEXT_STYLE:
                   return QVariant::fromValue(score()->textStyle(TextStyleType::OTTAVA));
 
+            case P_ID::END_HOOK:
+                  return true;
+
             default:
                   return TextLine::propertyDefault(propertyId);
             }

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -3468,5 +3468,41 @@ ChordRest* Score::findCR(int tick, int track) const
       return nullptr;
       }
 
+//---------------------------------------------------------
+//   findCRinStaff
+//    find chord/rest <= tick in staff
+//---------------------------------------------------------
+
+ChordRest* Score::findCRinStaff(int tick, int track) const
+      {
+      Measure* m = tick2measureMM(tick);
+      if (!m) {
+            qDebug("findCR: no measure for tick %d", tick);
+            return nullptr;
+            }
+      // attach to first rest all spanner when mmRest
+      if (m->isMMRest())
+            tick = m->tick();
+      Segment* s = m->first(Segment::Type::ChordRest);
+      int strack = (track / VOICES) * VOICES;
+      int etrack = strack + VOICES;
+      int actualTrack = strack;
+
+      for (Segment* ns = s; ; ns = ns->next(Segment::Type::ChordRest)) {
+            if (ns == 0 || ns->tick() > tick)
+                  break;
+            for (int t = strack; t < etrack; ++t) {
+                  if (ns->element(t)) {
+                        s = ns;
+                        actualTrack = t;
+                        break;
+                        }
+                  }
+            }
+      if (s)
+            return static_cast<ChordRest*>(s->element(actualTrack));
+      return nullptr;
+      }
+
 }
 
diff --git a/libmscore/score.h b/libmscore/score.h
@@ -965,6 +965,7 @@ class Score : public QObject {
       void addSpanner(Spanner*);
 
       ChordRest* findCR(int tick, int track) const;
+      ChordRest* findCRinStaff(int tick, int track) const;
       void layoutSpanner();
       void insertTime(int tickPos, int tickLen);
 

diff --git a/libmscore/spanner.cpp b/libmscore/spanner.cpp
@@ -389,7 +389,10 @@ void Spanner::computeStartElement()
       {
       switch (_anchor) {
             case Anchor::SEGMENT:
-                  _startElement = score()->findCR(tick(), track());
+                  if (type() == Element::Type::SLUR)
+                        _startElement = score()->findCR(tick(), track());
+                  else
+                        _startElement = score()->findCRinStaff(tick(), track());
                   break;
 
             case Anchor::MEASURE:
@@ -415,7 +418,7 @@ void Spanner::computeEndElement()
                         _endElement = s ? static_cast<ChordRest*>(s->element(track2())) : nullptr;
                         }
                   else
-                        _endElement = score()->findCR(tick2() - 1, track2());
+                        _endElement = score()->findCRinStaff(tick2() - 1, track2());
                   break;
 
             case Anchor::MEASURE: