Allow more flexibility for Spanners to compute start and end segment

Start segment: if a segment is not found to the right of this tick, allow looking to the left. End segment: system-line spanners should be allowed to terminate on segments that aren't necessarily ChordRest (for example, they can terminate on bar lines).
musescore · Aug 16, 2023 · 0b5131f · 0b5131f
1 parent a31e3ca
commit 0b5131f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/engraving/libmscore/score.h b/src/engraving/libmscore/score.h
@@ -565,7 +565,7 @@ class Score : public EngravingObject
     Segment* tick2segmentMM(const Fraction& tick, bool first, SegmentType st) const;
     Segment* tick2segmentMM(const Fraction& tick) const;
     Segment* tick2segmentMM(const Fraction& tick, bool first) const;
-    Segment* tick2leftSegment(const Fraction& tick, bool useMMrest = false) const;
+    Segment* tick2leftSegment(const Fraction& tick, bool useMMrest = false, bool anySegmentType = false) const;
     Segment* tick2rightSegment(const Fraction& tick, bool useMMrest = false) const;
     Segment* tick2leftSegmentMM(const Fraction& tick) { return tick2leftSegment(tick, /* useMMRest */ true); }
 

diff --git a/src/engraving/libmscore/spanner.cpp b/src/engraving/libmscore/spanner.cpp
@@ -987,7 +987,11 @@ ChordRest* Spanner::findEndCR() const
 Segment* Spanner::startSegment() const
 {
     assert(score() != NULL);
-    return score()->tick2rightSegment(tick(), style().styleB(Sid::createMultiMeasureRests));
+    Segment* rightSegment = score()->tick2rightSegment(tick(), style().styleB(Sid::createMultiMeasureRests));
+    if (rightSegment) {
+        return rightSegment;
+    }
+    return score()->tick2leftSegment(tick(), style().styleB(Sid::createMultiMeasureRests));
 }
 
 //---------------------------------------------------------
@@ -996,7 +1000,7 @@ Segment* Spanner::startSegment() const
 
 Segment* Spanner::endSegment() const
 {
-    return score()->tick2leftSegment(tick2(), style().styleB(Sid::createMultiMeasureRests));
+    return score()->tick2leftSegment(tick2(), style().styleB(Sid::createMultiMeasureRests), systemFlag());
 }
 
 //---------------------------------------------------------

diff --git a/src/engraving/libmscore/utils.cpp b/src/engraving/libmscore/utils.cpp
@@ -205,16 +205,18 @@ Segment* Score::tick2segment(const Fraction& tick, bool first) const
 /// the first segment *before* this tick position
 //---------------------------------------------------------
 
-Segment* Score::tick2leftSegment(const Fraction& tick, bool useMMrest) const
+Segment* Score::tick2leftSegment(const Fraction& tick, bool useMMrest, bool anySegmentType) const
 {
     Measure* m = useMMrest ? tick2measureMM(tick) : tick2measure(tick);
     if (m == 0) {
         LOGD("tick2leftSegment(): not found tick %d", tick.ticks());
         return 0;
     }
+
     // loop over all segments
+    SegmentType segmentType = anySegmentType ? SegmentType::All : SegmentType::ChordRest;
     Segment* ps = 0;
-    for (Segment* s = m->first(SegmentType::ChordRest); s; s = s->next(SegmentType::ChordRest)) {
+    for (Segment* s = m->first(segmentType); s; s = s->next(segmentType)) {
         if (tick < s->tick()) {
             return ps;
         } else if (tick == s->tick()) {