Manually merge libmscore part of #4220 to master

Remaining changes have to be migrated to the ew inspector
musescore · Aug 20, 2020 · f30bec6 · f30bec6
1 parent c83c0db
commit f30bec6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/libmscore/breath.cpp b/libmscore/breath.cpp
@@ -65,12 +65,13 @@ void Breath::layout()
 {
     bool palette = (track() == -1);
     if (!palette) {
+        int voiceOffset = placeBelow() * (staff()->lines(tick()) - 1) * spatium();
         if (isCaesura()) {
-            setPos(rxpos(), spatium());
+            setPos(rxpos(), spatium() + voiceOffset);
         } else if ((score()->styleSt(Sid::MusicalSymbolFont) == "Emmentaler") && (symId() == SymId::breathMarkComma)) {
-            setPos(rxpos(), 0.5 * spatium());
+            setPos(rxpos(), 0.5 * spatium() + voiceOffset);
         } else {
-            setPos(rxpos(), -0.5 * spatium());
+            setPos(rxpos(), -0.5 * spatium() + voiceOffset);
         }
     }
     setbbox(symBbox(_symId));
@@ -209,6 +210,8 @@ QVariant Breath::propertyDefault(Pid id) const
     switch (id) {
     case Pid::PAUSE:
         return 0.0;
+    case Pid::PLACEMENT:
+        return track() & 1 ? int(Placement::BELOW) : int(Placement::ABOVE);
     default:
         return Element::propertyDefault(id);
     }

diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -408,16 +408,11 @@ Element* ChordRest::drop(EditData& data)
     {
         Breath* b = toBreath(e);
         b->setPos(QPointF());
-        int track = staffIdx() * VOICES;
-        b->setTrack(track);
-
-        // find start tick of next note in staff
-#if 0
-        int bt = tick() + actualTicks();              // this could make sense if we allowed breath marks in voice > 1
-#else
-        Segment* next = segment()->nextCR(track);
-        Fraction bt = next ? next->tick() : score()->lastSegment()->tick();
-#endif
+        // allow breath marks in voice > 1
+        b->setTrack(this->track());
+        b->setPlacement(b->track() & 1 ? Placement::BELOW : Placement::ABOVE);
+        Fraction bt = tick() + actualTicks();
+        bt = tick() + actualTicks();
 
         // TODO: insert automatically in all staves?
 

diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -2188,6 +2188,7 @@ void Measure::readVoice(XmlReader& e, int staffIdx, bool irregular)
         } else if (tag == "Breath") {
             Breath* breath = new Breath(score());
             breath->setTrack(e.track());
+            breath->setPlacement(breath->track() & 1 ? Placement::BELOW : Placement::ABOVE);
             breath->read(e);
             segment = getSegment(SegmentType::Breath, e.tick());
             segment->add(breath);

diff --git a/libmscore/read114.cpp b/libmscore/read114.cpp
@@ -1795,6 +1795,7 @@ static void readMeasure(Measure* m, int staffIdx, XmlReader& e)
             Breath* breath = new Breath(m->score());
             breath->setTrack(e.track());
             Fraction tick = e.tick();
+            breath->setPlacement(breath->track() & 1 ? Placement::BELOW : Placement::ABOVE);
             breath->read(e);
             // older scores placed the breath segment right after the chord to which it applies
             // rather than before the next chordrest segment with an element for the staff

diff --git a/libmscore/read206.cpp b/libmscore/read206.cpp
@@ -2995,6 +2995,7 @@ static void readMeasure(Measure* m, int staffIdx, XmlReader& e)
             Breath* breath = new Breath(score);
             breath->setTrack(e.track());
             Fraction tick = e.tick();
+            breath->setPlacement(Placement::ABOVE);
             breath->read(e);
             // older scores placed the breath segment right after the chord to which it applies
             // rather than before the next chordrest segment with an element for the staff