fix musescore#16519

AGindinson · Dec 26, 2012 · dd5ae87 · dd5ae87
1 parent ddb0eba
commit dd5ae87
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/mscore/importxml.cpp b/mscore/importxml.cpp
@@ -4487,7 +4487,7 @@ void MusicXml::xmlNotations(Note* note, ChordRest* cr, int trk, int ticks, QDomE
 
       if (tremolo) {
             qDebug("tremolo=%d tremoloType='%s'", tremolo, qPrintable(tremoloType));
-            if (tremolo == 1 || tremolo == 2 || tremolo == 3) {
+            if (tremolo == 1 || tremolo == 2 || tremolo == 3 || tremolo == 4) {
                   if (tremoloType == "" || tremoloType == "single") {
                         Tremolo* t = new Tremolo(score);
                         switch (tremolo) {

diff --git a/mtest/musicxml/io/testTremolo.xml b/mtest/musicxml/io/testTremolo.xml
@@ -61,6 +61,22 @@
         </note>
       </measure>
     <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <notations>
+          <ornaments>
+            <tremolo type="single">4</tremolo>
+            </ornaments>
+          </notations>
+        </note>
+      </measure>
+    <measure number="3">
       <note>
         <pitch>
           <step>A</step>
@@ -158,7 +174,7 @@
         <type>64th</type>
         </note>
       </measure>
-    <measure number="3">
+    <measure number="4">
       <note>
         <pitch>
           <step>G</step>
@@ -220,7 +236,7 @@
           </notations>
         </note>
       </measure>
-    <measure number="4">
+    <measure number="5">
       <note>
         <pitch>
           <step>B</step>

diff --git a/test/musicxml/testTremolo.xml b/test/musicxml/testTremolo.xml
@@ -61,6 +61,22 @@
         </note>
       </measure>
     <measure number="2">
+      <note>
+        <pitch>
+          <step>G</step>
+          <octave>4</octave>
+          </pitch>
+        <duration>64</duration>
+        <voice>1</voice>
+        <type>whole</type>
+        <notations>
+          <ornaments>
+            <tremolo type="single">4</tremolo>
+            </ornaments>
+          </notations>
+        </note>
+      </measure>
+    <measure number="3">
       <note>
         <pitch>
           <step>A</step>
@@ -158,7 +174,7 @@
         <type>64th</type>
         </note>
       </measure>
-    <measure number="3">
+    <measure number="4">
       <note>
         <pitch>
           <step>G</step>
@@ -220,7 +236,7 @@
           </notations>
         </note>
       </measure>
-    <measure number="4">
+    <measure number="5">
       <note>
         <pitch>
           <step>B</step>