fix #142116: order of ending/repeat in MusicXML

musescore · Nov 24, 2016 · 63f5d73 · 63f5d73
1 parent b100821
commit 63f5d73
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/mscore/exportxml.cpp b/mscore/exportxml.cpp
@@ -1433,13 +1433,12 @@ void ExportMusicXml::barlineLeft(Measure* m)
       if (!rs && !volta) return;
       attr.doAttr(xml, false);
       xml.stag(QString("barline location=\"left\""));
-      if (rs) {
+      if (rs)
             xml.tag("bar-style", QString("heavy-light"));
-            xml.tagE("repeat direction=\"forward\"");
-            }
-      if (volta) {
+      if (volta)
             ending(xml, volta, true);
-            }
+      if (rs)
+            xml.tagE("repeat direction=\"forward\"");
       xml.etag();
       }
 
@@ -4608,12 +4607,15 @@ void ExportMusicXml::findAndExportClef(Measure* m, const int staves, const int s
       Segment* seg         = 0;
 
       if (prevMeasure)
-            cs1 = prevMeasure->findSegment(Segment::Type::Clef,  tick);
+            cs1 = prevMeasure->findSegment(Segment::Type::Clef, tick);
       else
-            cs1 = 0;
+            cs1 = m->findSegment(Segment::Type::HeaderClef, tick);
 
-      if (mmR)
-            cs3 = mmR->findSegment(Segment::Type::Clef,  tick);
+      if (mmR) {
+            cs3 = mmR->findSegment(Segment::Type::HeaderClef, tick);
+            if (!cs3)
+                  cs3 = mmR->findSegment(Segment::Type::Clef, tick);
+            }
       else
             cs3 = 0;
 

diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
@@ -199,7 +199,7 @@ subdirs (
         importmidi
         capella
         biab
-#        musicxml
+        musicxml
         guitarpro
         scripting
         testoves

diff --git a/mtest/musicxml/io/testNoteheads.xml b/mtest/musicxml/io/testNoteheads.xml
@@ -159,7 +159,7 @@
         <voice>1</voice>
         <type>quarter</type>
         <stem>up</stem>
-        <notehead>fa</notehead>
+        <notehead>fa up</notehead>
         </note>
       <note>
         <pitch>