Fix #25070: support copy-paste in local time signatures

src/engraving/CMakeLists.txt

@@ -21,9 +21,9 @@
 muse_create_module(engraving)
 
 # TODO: convert to target-based variant of qt_add_resources
-# (Not easy because of heavy use of aliases, which is much more cumbersome 
+# (Not easy because of heavy use of aliases, which is much more cumbersome
 # in CMake than in .qrc files)
-muse_module_add_qrc(engraving 
+muse_module_add_qrc(engraving
     engraving.qrc
     data/fonts/fonts_Smufl.qrc
 )
@@ -342,7 +342,7 @@ else()
     )
 endif()
 
-set_source_files_properties( 
+set_source_files_properties(
     # For these files, Unity Build does not work
     dom/excerpt.cpp
     #api/vi/excerpt.cpp
@@ -427,3 +427,7 @@ endif()
 if (QT_SUPPORT)
     add_subdirectory(qml/MuseScore/Engraving)
 endif()
+
+if (MSVC_IDE)
+    target_sources(engraving PRIVATE engraving.natvis)
+endif()

src/engraving/dom/anchors.cpp

@@ -23,6 +23,7 @@
 #include <climits>
 
 #include "anchors.h"
+#include "dom/timesig.h"
 #include "dom/utils.h"
 #include "factory.h"
 #include "figuredbass.h"
@@ -86,8 +87,12 @@ void EditTimeTickAnchors::updateAnchors(Measure* measure, staff_idx_t staffIdx,
     Fraction startTick = Fraction(0, 1);
     Fraction endTick = measure->ticks();
 
-    Fraction timeSig = measure->timesig();
-    Fraction halfDivision = Fraction(1, 2 * timeSig.denominator());
+    TimeSig* timeSig = measure->score()->staff(staffIdx)->timeSig(measure->tick());
+    Fraction timeSigFrac = timeSig ? timeSig->sig() : measure->timesig();
+    Fraction halfDivision = Fraction(1, 2 * timeSigFrac.denominator());
+    if (timeSig) {
+        halfDivision /= timeSig->stretch();
+    }
 
     std::set<Fraction> anchorTicks { additionalAnchorRelTicks };
     for (Fraction tick = startTick; tick <= endTick; tick += halfDivision) {

src/engraving/dom/check.cpp

@@ -260,27 +260,27 @@ bool Score::checkKeys()
 //   fillGap
 //---------------------------------------------------------
 
-void Measure::fillGap(const Fraction& pos, const Fraction& len, track_idx_t track, const Fraction& stretch, bool useGapRests)
+void Measure::fillGap(const Fraction& rtickStart, const Fraction& len, track_idx_t track, const Fraction& stretch, bool useGapRests)
 {
     LOGN("measure %6d pos %d, len %d/%d, stretch %d/%d track %zu",
          tick().ticks(),
-         pos.ticks(),
+         rtickStart.ticks(),
          len.numerator(), len.denominator(),
          stretch.numerator(), stretch.denominator(),
          track);
 
     // break the gap into shorter durations if necessary
-    std::vector<TDuration> durationList = toRhythmicDurationList(len, true, pos, timesig(), this, 0);
+    std::vector<TDuration> durationList = toRhythmicDurationList(len, true, rtickStart, timesig(), this, 0, stretch);
 
-    Fraction curTick = pos;
+    Fraction curTick = tick() + actualTicks(rtickStart, nullptr, stretch);
     for (TDuration d : durationList) {
         Rest* rest = Factory::createRest(score()->dummy()->segment());
-        rest->setTicks(d.isMeasure() ? ticks() : d.fraction());
+        rest->setTicks(d.isMeasure() ? ticks() * stretch : d.fraction());
         rest->setDurationType(d);
         rest->setTrack(track);
         rest->setGap(useGapRests);
-        score()->undoAddCR(rest, this, curTick + tick());
-        curTick += d.fraction() / stretch;
+        score()->undoAddCR(rest, this, curTick);
+        curTick += rest->actualTicks();
     }
 }
 

src/engraving/dom/durationtype.cpp

@@ -477,6 +477,8 @@ TDuration& TDuration::operator+=(const TDuration& t)
 
 //---------------------------------------------------------
 //   toDurationList
+//    - l is in local time
+//    - returned durations are in local time
 //---------------------------------------------------------
 
 std::vector<TDuration> toDurationList(Fraction l, bool useDots, int maxDots, bool printRestRemains)
@@ -502,17 +504,24 @@ std::vector<TDuration> toDurationList(Fraction l, bool useDots, int maxDots, boo
 
 //---------------------------------------------------------
 //   toRhythmicDurationList
+//    - l and rtickStart are in local (stretched) time
+//    - returned durations are in local time
 //---------------------------------------------------------
 
 std::vector<TDuration> toRhythmicDurationList(const Fraction& l, bool isRest, Fraction rtickStart,
-                                              const TimeSigFrac& nominal, Measure* msr, int maxDots)
+                                              const TimeSigFrac& nominal, Measure* msr, int maxDots,
+                                              const Fraction& timeStretch)
 {
+    IF_ASSERT_FAILED(l > Fraction(0, 1)) {
+        return {};
+    }
+
     std::vector<TDuration> dList;
     dList.reserve(8);
 
     if (msr->isAnacrusis()) {
-        rtickStart += msr->anacrusisOffset();
-    } else if (isRest && l == msr->ticks()) {
+        rtickStart += msr->anacrusisOffset() * timeStretch;
+    } else if (isRest && l == msr->ticks() * timeStretch) {
         TDuration d = TDuration(DurationType::V_MEASURE);
         dList.push_back(d);
         return dList;

src/engraving/dom/durationtype.h

@@ -94,7 +94,7 @@ class TDuration
 
 std::vector<TDuration> toDurationList(Fraction l, bool useDots, int maxDots = 4, bool printRestRemains = true);
 std::vector<TDuration> toRhythmicDurationList(const Fraction& l, bool isRest, Fraction rtickStart, const TimeSigFrac& nominal, Measure* msr,
-                                              int maxDots);
+                                              int maxDots, const Fraction& timeStretch = Fraction(1, 1));
 
 bool forceRhythmicSplit(bool isRest, BeatType startBeat, BeatType endBeat, int beatsCrossed, BeatType strongestBeatCrossed,
                         const TimeSigFrac& nominal);

src/engraving/dom/measure.cpp

@@ -1892,8 +1892,12 @@ void Measure::adjustToLen(Fraction nf, bool appendRestsIfNecessary)
                                                                         /*rtickStart=*/ Fraction(0, 1),
                                                                         /*nominal=*/ score()->sigmap()->timesig(tick().ticks()).nominal(),
                                                                         /*measure=*/ this,
-                                                                        /*maxDots=*/ 0);
-
+                                                                        /*maxDots=*/ 0,
+                                                                        stretch);
+                if (durList.empty()) {
+                    LOGD("Could not make durations for: %d/%d", (nf * stretch).numerator(), (nf * stretch).denominator());
+                    continue;
+                }
                 // set the existing rest to the first value of the duration list
                 TDuration firstDur = durList[0];
                 rest->undoChangeProperty(Pid::DURATION, firstDur.isMeasure() ? ticks() : firstDur.fraction());

src/engraving/dom/mscore.cpp

@@ -120,6 +120,7 @@ std::string MScore::errorToString(MsError err)
     case MsError::CANNOT_JOIN_MEASURE_STAFFTYPE_CHANGE: return "CANNOT_JOIN_MEASURE_STAFFTYPE_CHANGE";
     case MsError::CANNOT_REPEAT_SELECTION: return "CANNOT_REPEAT_SELECTION";
     case MsError::TRANSPOSE_NO_FRET_DIAGRAM: return "TRANSPOSE_NO_FRET_DIAGRAM";
+    case MsError::CANNOT_EXPLODE_IMPLODE_LOCAL_TIMESIG: return "CANNOT_EXPLODE_IMPLODE_LOCAL_TIMESIG";
     }
 
     return {};

src/engraving/dom/mscore.h

@@ -166,6 +166,7 @@ enum class MsError : unsigned char {
     CANNOT_JOIN_MEASURE_STAFFTYPE_CHANGE,
     CANNOT_REPEAT_SELECTION,
     TRANSPOSE_NO_FRET_DIAGRAM,
+    CANNOT_EXPLODE_IMPLODE_LOCAL_TIMESIG,
 };
 
 /// \cond PLUGIN_API \private \endcond