Fix inferring measure rests & read the measure attribute

Backport of musescore#25040
Jojo-Schmitz · Oct 17, 2024 · e964a52 · e964a52
1 parent 089ef5b
commit e964a52
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 27 deletions.
diff --git a/importexport/musicxml/importmxmlpass2.cpp b/importexport/musicxml/importmxmlpass2.cpp
@@ -5641,19 +5641,16 @@ void MusicXMLParserPass2::divisions()
 // the type for all rests.
 // Sibelius calls all whole-measure rests "whole", even if the duration != 4/4
 
-static bool isWholeMeasureRest(const bool rest, const QString& type, const Fraction dura, const Fraction mDura)
+static bool isWholeMeasureRest(const QString& type, const Fraction dura, const Fraction mDura)
       {
-      if (!rest)
-            return false;
-
       if (!dura.isValid())
             return false;
 
       if (!mDura.isValid())
             return false;
 
-      return ((type.isEmpty() && dura == mDura)
-              || (type == "whole" && dura == mDura && dura != Fraction(1, 1)));
+      return (type.isEmpty() && dura == mDura)
+              || (type == "whole" && dura == mDura);
       }
 
 //---------------------------------------------------------
@@ -5665,14 +5662,14 @@ static bool isWholeMeasureRest(const bool rest, const QString& type, const Fract
  * This includes whole measure rest detection.
  */
 
-static TDuration determineDuration(const bool rest, const QString& type, const int dots, const Fraction dura, const Fraction mDura)
+static TDuration determineDuration(const bool rest, const bool measureRest, const QString& type, const int dots, const Fraction dura, const Fraction mDura)
       {
       //qDebug("determineDuration rest %d type '%s' dots %d dura %s mDura %s",
       //       rest, qPrintable(type), dots, qPrintable(dura.print()), qPrintable(mDura.print()));
 
       TDuration res;
       if (rest) {
-            if (isWholeMeasureRest(rest, type, dura, mDura))
+            if (measureRest  || isWholeMeasureRest(type, dura, mDura))
                   res.setType(TDuration::DurationType::V_MEASURE);
             else if (type.isEmpty()) {
                   // If no type, set duration type based on duration.
@@ -6098,6 +6095,7 @@ Note* MusicXMLParserPass2::note(const QString& partId,
       bool isSmall = false;
       bool grace = false;
       bool rest = false;
+      bool measureRest = false;
       int staff = 0;
       QString type;
       QString voice;
@@ -6173,6 +6171,7 @@ Note* MusicXMLParserPass2::note(const QString& partId,
                   }
             else if (_e.name() == "rest") {
                   rest = true;
+                  measureRest = _e.attributes().value("measure") == "yes";
                   mnp.displayStepOctave(_e);
                   }
             else if (_e.name() == "staff") {
@@ -6282,7 +6281,7 @@ Note* MusicXMLParserPass2::note(const QString& partId,
       ChordRest* cr { nullptr };
       Note* note { nullptr };
 
-      TDuration duration = determineDuration(rest, type, mnd.dots(), dura, measure->ticks());
+      TDuration duration = determineDuration(rest, measureRest, type, mnd.dots(), dura, measure->ticks());
 
       // begin allocation
       if (rest) {

diff --git a/mtest/musicxml/io/testIncompleteTuplet_ref.xml b/mtest/musicxml/io/testIncompleteTuplet_ref.xml
@@ -54,20 +54,18 @@
           </clef>
         </attributes>
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>36</duration>
         <voice>1</voice>
-        <type>whole</type>
         <staff>1</staff>
         </note>
       <backup>
         <duration>36</duration>
         </backup>
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>36</duration>
         <voice>5</voice>
-        <type>whole</type>
         <staff>2</staff>
         </note>
       </measure>
@@ -243,10 +241,9 @@
         <duration>36</duration>
         </backup>
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>36</duration>
         <voice>5</voice>
-        <type>whole</type>
         <staff>2</staff>
         </note>
       <barline location="right">

diff --git a/mtest/musicxml/io/testNoteAttributes1.xml b/mtest/musicxml/io/testNoteAttributes1.xml
@@ -169,10 +169,9 @@
       </measure>
     <measure number="3">
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>4</duration>
         <voice>1</voice>
-        <type>whole</type>
         <notations>
           <fermata type="upright"/>
           </notations>

diff --git a/mtest/musicxml/io/testNotesRests1.xml b/mtest/musicxml/io/testNotesRests1.xml
@@ -232,10 +232,9 @@
       </measure>
     <measure number="3">
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>64</duration>
         <voice>1</voice>
-        <type>whole</type>
         </note>
       <backup>
         <duration>64</duration>

diff --git a/mtest/musicxml/io/testRestNotations_ref.xml b/mtest/musicxml/io/testRestNotations_ref.xml
@@ -49,26 +49,23 @@
           </clef>
         </attributes>
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>4</duration>
         <voice>1</voice>
-        <type>whole</type>
         </note>
       </measure>
     <measure number="2">
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>4</duration>
         <voice>1</voice>
-        <type>whole</type>
         </note>
       </measure>
     <measure number="3">
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>4</duration>
         <voice>1</voice>
-        <type>whole</type>
         </note>
       </measure>
     <measure number="4">
@@ -87,10 +84,9 @@
       </measure>
     <measure number="5">
       <note>
-        <rest/>
+        <rest measure="yes"/>
         <duration>4</duration>
         <voice>1</voice>
-        <type>whole</type>
         </note>
       <barline location="right">
         <bar-style>light-heavy</bar-style>