fix #12: Wrong MusicXML output for scores starting with a repeat barline

musescore · May 1, 2016 · 08800d9 · 08800d9
1 parent 12f79ae
commit 08800d9
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/fr/lasconic/nwc2musicxml/convert/Nwc2MusicXML.java b/src/fr/lasconic/nwc2musicxml/convert/Nwc2MusicXML.java
@@ -485,8 +485,21 @@ private int processLine(String line) {
 				} else if (type.compareTo("Bar") == 0) {
 					Measure newMeasure;
 					if (!init()) {
-						newMeasure = new Measure();
-						staff.addMeasure(newMeasure);
+						if (staff.measures.size() == 1) {
+							// maybe it's first barline
+							Measure m = staff.measures.get(0);
+							if (m.notesCount > 0) {
+								// we already have some notes, let's create a new measure
+								newMeasure = new Measure();
+								staff.addMeasure(newMeasure);
+							} else {
+								// could be a left barline, let's use the same measure
+								newMeasure = measure;
+							}
+						} else {
+							newMeasure = new Measure();
+							staff.addMeasure(newMeasure);
+						}
 					} else {
 						newMeasure = measure;
 					}