diff --git a/importexport/musicxml/importmxmlpass1.cpp b/importexport/musicxml/importmxmlpass1.cpp
index 279e54b491aae..509f3386bbb01 100644
--- a/importexport/musicxml/importmxmlpass1.cpp
+++ b/importexport/musicxml/importmxmlpass1.cpp
@@ -1650,6 +1650,7 @@ static void createPart(Score* score, const QString& id, PartMap& pm)
score->appendPart(part);
Staff* staff = new Staff(score);
staff->setPart(part);
+ staff->setHideWhenEmpty(Staff::HideMode::INSTRUMENT);
part->staves()->push_back(staff);
score->staves().push_back(staff);
// TODO TBD tuplets.resize(VOICES); // part now contains one staff, thus VOICES voices
@@ -2018,13 +2019,27 @@ void MusicXMLParserPass1::midiInstrument(const QString& partId)
/**
Set number of staves for part \a partId to the max value
of the current value \a staves.
+ Also handle HideMode.
*/
static void setNumberOfStavesForPart(Part* const part, const int staves)
{
Q_ASSERT(part);
- if (staves > part->nstaves())
+ int prevnstaves = part->nstaves();
+ if (staves > part->nstaves()) {
part->setStaves(staves);
+ // New staves default to INSTRUMENT hide mode
+ for (int i = prevnstaves; i < staves; ++i)
+ part->staff(i)->setHideWhenEmpty(Staff::HideMode::INSTRUMENT);
+ }
+ if (staves != 0 && prevnstaves != 1 && prevnstaves != staves ) {
+ for (int i = 0; i < part->nstaves(); ++i) {
+ // A "staves" value different from the existing nstaves means
+ // staves in a part will sometimes be hidden.
+ // We can approximate this with the AUTO hide mode.
+ part->staff(i)->setHideWhenEmpty(Staff::HideMode::AUTO);
+ }
+ }
}
//---------------------------------------------------------
diff --git a/mtest/musicxml/io/testArticulationsCombined_ref.mscx b/mtest/musicxml/io/testArticulationsCombined_ref.mscx
index 1163f6e4365ed..eadd01432e1c8 100644
--- a/mtest/musicxml/io/testArticulationsCombined_ref.mscx
+++ b/mtest/musicxml/io/testArticulationsCombined_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testBarlinesGrandStaff_ref.mscx b/mtest/musicxml/io/testBarlinesGrandStaff_ref.mscx
index da5215573a6f2..ae8c02449402e 100644
--- a/mtest/musicxml/io/testBarlinesGrandStaff_ref.mscx
+++ b/mtest/musicxml/io/testBarlinesGrandStaff_ref.mscx
@@ -27,6 +27,7 @@
stdNormal
+ 3
2
@@ -34,6 +35,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testCueNotes3_ref.mscx b/mtest/musicxml/io/testCueNotes3_ref.mscx
index 9499f076c8431..95a949571a5a6 100644
--- a/mtest/musicxml/io/testCueNotes3_ref.mscx
+++ b/mtest/musicxml/io/testCueNotes3_ref.mscx
@@ -57,6 +57,7 @@
stdNormal
+ 3
Voice
diff --git a/mtest/musicxml/io/testFretDiagramLayoutOrder_ref.mscx b/mtest/musicxml/io/testFretDiagramLayoutOrder_ref.mscx
index 6eaae4e047128..53e7c3a0e63cf 100644
--- a/mtest/musicxml/io/testFretDiagramLayoutOrder_ref.mscx
+++ b/mtest/musicxml/io/testFretDiagramLayoutOrder_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testFretboardDiagrams_ref.mscx b/mtest/musicxml/io/testFretboardDiagrams_ref.mscx
index 05b5d5e8de607..e1df540b14dc1 100644
--- a/mtest/musicxml/io/testFretboardDiagrams_ref.mscx
+++ b/mtest/musicxml/io/testFretboardDiagrams_ref.mscx
@@ -57,6 +57,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testLyricExtensions_ref.mscx b/mtest/musicxml/io/testLyricExtensions_ref.mscx
index a7f9bd3a34901..65306a1840b37 100644
--- a/mtest/musicxml/io/testLyricExtensions_ref.mscx
+++ b/mtest/musicxml/io/testLyricExtensions_ref.mscx
@@ -27,6 +27,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testNegativeOffset_ref.mscx b/mtest/musicxml/io/testNegativeOffset_ref.mscx
index e69a07b6a991d..75cebbedcb23a 100644
--- a/mtest/musicxml/io/testNegativeOffset_ref.mscx
+++ b/mtest/musicxml/io/testNegativeOffset_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
2
@@ -63,6 +64,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testPartNames_ref.mscx b/mtest/musicxml/io/testPartNames_ref.mscx
index 34ff83cbad3ac..fc9c0266dae46 100644
--- a/mtest/musicxml/io/testPartNames_ref.mscx
+++ b/mtest/musicxml/io/testPartNames_ref.mscx
@@ -57,6 +57,7 @@
stdNormal
+ 3
2
@@ -64,6 +65,7 @@
stdNormal
+ 3
Piano
@@ -126,6 +128,7 @@
stdNormal
+ 3
Voice
@@ -187,6 +190,7 @@
stdNormal
+ 3
P3
diff --git a/mtest/musicxml/io/testPedalChangesBroken_ref.mscx b/mtest/musicxml/io/testPedalChangesBroken_ref.mscx
index e39eaa20fb568..d1e9b24e177ac 100644
--- a/mtest/musicxml/io/testPedalChangesBroken_ref.mscx
+++ b/mtest/musicxml/io/testPedalChangesBroken_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testPedalChanges_ref.mscx b/mtest/musicxml/io/testPedalChanges_ref.mscx
index 81e576c5ec2e2..8313c2bdb8f39 100644
--- a/mtest/musicxml/io/testPedalChanges_ref.mscx
+++ b/mtest/musicxml/io/testPedalChanges_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testStaffEmptiness.xml b/mtest/musicxml/io/testStaffEmptiness.xml
new file mode 100644
index 0000000000000..ee30668c6cb58
--- /dev/null
+++ b/mtest/musicxml/io/testStaffEmptiness.xml
@@ -0,0 +1,1918 @@
+
+
+
+
+ Spanner Emptiness
+
+
+ Henry Ives
+
+ MuseScore 0.7.0
+ 2007-09-10
+
+
+
+
+
+
+
+
+
+ 7
+ 40
+
+
+ 1697.14
+ 1200
+
+ 85.7143
+ 85.7143
+ 85.7143
+ 85.7143
+
+
+ 85.7143
+ 85.7143
+ 85.7143
+ 85.7143
+
+
+
+
+
+
+ title
+ Staff Emptiness
+
+
+ subtitle
+ MuseScore Testcase
+
+
+ composer
+ Henry Ives
+
+
+
+ Piano
+ Pno.
+
+ Piano
+
+
+
+ 1
+ 1
+ 78.7402
+ 0
+
+
+
+
+
+
+
+
+ 65.90
+ 0.00
+
+ 170.00
+
+
+ 38.89
+
+
+
+ 1
+
+ 0
+
+
+ 2
+
+ G
+ 2
+
+
+ F
+ 4
+
+
+
+
+ E
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ D
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ F
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ B
+ 2
+
+ 1
+ 5
+ quarter
+ up
+ 2
+
+
+
+ 1
+ 5
+ quarter
+ 2
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ B
+ 2
+
+ 1
+ 5
+ quarter
+ up
+ 2
+
+
+
+
+
+
+
+
+ Hanging Slur
+
+ 1
+
+
+
+ F
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 1
+ 5
+ quarter
+ 2
+
+
+
+
+
+
+ 1
+ 5
+ quarter
+ 2
+
+
+
+ 2
+ 5
+ half
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ F
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ E
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ E
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ G
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ G
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ G
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ E
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ B
+ 4
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+
+ G
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ G
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ G
+ 4
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+
+ F
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ D
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ C
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ D
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ F
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ B
+ 4
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ E
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ Pedal Line
+
+ 1
+
+
+
+ E
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ E
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+
+
+ 2
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 2
+
+
+
+
+
+ G
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ A
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+
+ D
+ 6
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ E
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ F
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ D
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ F
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ E
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ C
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+
+ D
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ G
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ D
+ 5
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+
+
+ 2
+
+
+
+ G
+ 1
+
+ 1
+ 5
+ quarter
+ up
+ 2
+
+
+
+ 1
+ 5
+ quarter
+ 2
+
+
+
+ 2
+ 5
+ half
+ 2
+
+
+
+
+
+ Ottava Line
+
+ 1
+
+
+
+ G
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ B
+ 4
+
+ 1
+ 1
+ quarter
+ down
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ 2
+ 1
+ half
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ A
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+
+ G
+ 4
+
+ 1
+ 1
+ quarter
+ up
+ 1
+
+
+
+ 1
+ 1
+ quarter
+ 1
+
+
+ 4
+
+
+
+ 4
+ 5
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ B
+ 1
+
+ 1
+ 5
+ quarter
+ up
+ 2
+
+
+
+ 1
+ 5
+ quarter
+ 2
+
+
+
+ E
+ 2
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+
+ F
+ 2
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ A
+ 2
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+
+
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+
+ A
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ C
+ 3
+
+ 1
+ 5
+ quarter
+ up
+ 2
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+
+ G
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ 1
+ 5
+ quarter
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+
+ F
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ 1
+ 5
+ quarter
+ 2
+
+
+
+
+
+ 4
+ 1
+ 1
+
+
+ 4
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ G
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+
+ E
+ 3
+
+ 1
+ 5
+ quarter
+ down
+ 2
+
+
+ light-heavy
+
+
+
+
diff --git a/mtest/musicxml/io/testStaffEmptiness_ref.mscx b/mtest/musicxml/io/testStaffEmptiness_ref.mscx
new file mode 100644
index 0000000000000..279cb22134b7b
--- /dev/null
+++ b/mtest/musicxml/io/testStaffEmptiness_ref.mscx
@@ -0,0 +1,1496 @@
+
+
+
+
+ 0
+ 480
+
+ 1
+ 1
+ 1
+ 0
+
+ Henry Ives
+
+
+
+
+
+
+
+
+ Spanner Emptiness
+
+
+
+ stdNormal
+
+ 3
+
+ 2
+
+
+
+ stdNormal
+
+ 3
+
+ Piano
+
+ Piano
+ Pno.
+ Piano
+ 21
+ 108
+ 21
+ 108
+ keyboard.piano
+ F
+
+ 100
+ 95
+
+
+ 100
+ 33
+
+
+ 100
+ 50
+
+
+ 100
+ 67
+
+
+ 100
+ 100
+
+
+ 120
+ 67
+
+
+ 150
+ 100
+
+
+ 150
+ 50
+
+
+ 120
+ 50
+
+
+ 120
+ 100
+
+
+
+
+
+
+
+
+
+ 12.5
+
+
+
+ Staff Emptiness
+
+
+
+
+ MuseScore Testcase
+
+
+
+ right,top
+
+ Henry Ives
+
+
+
+
+
+ G
+ G
+
+
+ 4
+ 4
+
+
+ quarter
+ down
+
+ 76
+ 18
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 62
+ 16
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 65
+ 13
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ Hanging Slur
+
+
+ quarter
+ up
+
+ 65
+ 13
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 65
+ 13
+
+
+
+ quarter
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 64
+ 18
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 76
+ 18
+
+
+
+ quarter
+ down
+
+ 79
+ 15
+
+
+
+
+
+
+
+ quarter
+ down
+
+ 79
+ 15
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ quarter
+ up
+
+ 67
+ 15
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ quarter
+ up
+
+ 64
+ 18
+
+
+ 72
+ 14
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 71
+ 19
+
+
+ 79
+ 15
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ down
+
+ 79
+ 15
+
+
+
+ quarter
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ down
+
+ 67
+ 15
+
+
+ 77
+ 13
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ quarter
+ down
+
+ 74
+ 16
+
+
+
+ quarter
+ up
+
+ 60
+ 14
+
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ up
+
+ 62
+ 16
+
+
+
+ quarter
+
+
+ quarter
+ up
+
+ 65
+ 13
+
+
+ 72
+ 14
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ down
+
+ 72
+ 14
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ quarter
+ down
+
+ 72
+ 14
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 71
+ 19
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ up
+
+ 64
+ 18
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ Pedal Line
+
+
+ quarter
+ up
+
+ 64
+ 18
+
+
+ 72
+ 14
+
+
+
+ quarter
+ up
+
+ 64
+ 18
+
+
+
+ quarter
+ down
+
+ 72
+ 14
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ up
+
+ 67
+ 15
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 72
+ 14
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ down
+
+ 81
+ 17
+
+
+ 86
+ 16
+
+
+
+ quarter
+ down
+
+ 76
+ 18
+
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ quarter
+ down
+
+ 77
+ 13
+
+
+
+
+
+
+
+ quarter
+ up
+
+ 62
+ 16
+
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+ quarter
+ up
+
+ 65
+ 13
+
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ up
+
+ 64
+ 18
+
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ half
+
+
+
+
+
+
+ quarter
+ down
+
+ 72
+ 14
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 72
+ 14
+
+
+ 74
+ 16
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ down
+
+ 79
+ 15
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 74
+ 16
+
+
+
+ quarter
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ Ottava Line
+
+
+ quarter
+ up
+
+ 67
+ 15
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 71
+ 19
+
+
+
+ quarter
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ quarter
+ up
+
+ 69
+ 17
+
+
+
+ quarter
+
+
+ quarter
+ up
+
+ 67
+ 15
+
+
+
+ quarter
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+ end
+ 1
+
+
+
+
+
+
+
+
+ F
+ F
+
+
+ 4
+ 4
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 47
+ 19
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+
+ quarter
+
+
+ down
+
+
+
+ 1
+ -3/4
+
+
+
+ up
+
+ 47
+ 19
+
+
+
+
+
+
+
+ quarter
+
+
+
+ -1
+ 3/4
+
+
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+
+ 1
+ 1
+
+
+
+ 1
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+
+
+ -1
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+
+ 8vb
+
+
+
+ 8
+
+
+
+
+ quarter
+ up
+
+ 43
+ 15
+
+
+
+ quarter
+
+
+ half
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ measure
+ 1/1
+
+
+
+
+
+
+ quarter
+ up
+
+ 47
+ 19
+
+
+
+ quarter
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+ 53
+ 13
+
+
+
+ quarter
+ down
+
+ 57
+ 17
+
+
+
+
+
+
+
+
+
+ -8
+
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+ 57
+ 17
+
+
+
+ quarter
+ up
+
+ 48
+ 14
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+ 55
+ 15
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+ 53
+ 13
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+
+ quarter
+
+
+
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+
+ quarter
+ down
+
+ 55
+ 15
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+
+ quarter
+ down
+
+ 52
+ 18
+
+
+
+
+
+
+
diff --git a/mtest/musicxml/io/testSystemBrackets3_ref.mscx b/mtest/musicxml/io/testSystemBrackets3_ref.mscx
index 4b8efe7593306..a73a0930eb9d6 100644
--- a/mtest/musicxml/io/testSystemBrackets3_ref.mscx
+++ b/mtest/musicxml/io/testSystemBrackets3_ref.mscx
@@ -27,6 +27,7 @@
stdNormal
+ 3
1
@@ -95,6 +96,7 @@ Vocals
stdNormal
+ 3
2
@@ -121,6 +123,7 @@ Vocals
0
1
+ 3
Electric
Guitar 1
@@ -223,6 +226,7 @@ Gtr. 1
stdNormal
+ 3
1
@@ -248,6 +252,7 @@ Gtr. 1
0
1
+ 3
Electric
Guitar 2
@@ -350,6 +355,7 @@ Gtr. 2
stdNormal
+ 3
1
@@ -374,6 +380,7 @@ Gtr. 2
0
1
+ 3
Acoustic
Guitar
@@ -462,6 +469,7 @@ Gtr.
stdNormal
+ 3
1
@@ -469,6 +477,7 @@ Gtr.
stdNormal
+ 3
Piano 2
diff --git a/mtest/musicxml/io/testTempoTextSpace1_ref.mscx b/mtest/musicxml/io/testTempoTextSpace1_ref.mscx
index 8f5b30d5eda6a..8ce4883f971d6 100644
--- a/mtest/musicxml/io/testTempoTextSpace1_ref.mscx
+++ b/mtest/musicxml/io/testTempoTextSpace1_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
2
@@ -63,6 +64,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testTempoTextSpace2_ref.mscx b/mtest/musicxml/io/testTempoTextSpace2_ref.mscx
index 9b0f2abbcb65a..524a848977b72 100644
--- a/mtest/musicxml/io/testTempoTextSpace2_ref.mscx
+++ b/mtest/musicxml/io/testTempoTextSpace2_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
2
@@ -63,6 +64,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testTextOrder_ref.mscx b/mtest/musicxml/io/testTextOrder_ref.mscx
index 3ca35e52e82c4..d0e22a4232b03 100644
--- a/mtest/musicxml/io/testTextOrder_ref.mscx
+++ b/mtest/musicxml/io/testTextOrder_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/testinferredFingerings_ref.mscx b/mtest/musicxml/io/testinferredFingerings_ref.mscx
index 22a90932eabec..3a90dd15d5eda 100644
--- a/mtest/musicxml/io/testinferredFingerings_ref.mscx
+++ b/mtest/musicxml/io/testinferredFingerings_ref.mscx
@@ -56,6 +56,7 @@
stdNormal
+ 3
2
@@ -63,6 +64,7 @@
stdNormal
+ 3
Piano
diff --git a/mtest/musicxml/io/tst_mxml_io.cpp b/mtest/musicxml/io/tst_mxml_io.cpp
index 03de21c6e2113..b73ac2ddfbf69 100644
--- a/mtest/musicxml/io/tst_mxml_io.cpp
+++ b/mtest/musicxml/io/tst_mxml_io.cpp
@@ -189,6 +189,7 @@ private slots:
void sound1() { mxmlIoTest("testSound1"); }
void sound2() { mxmlIoTestRef("testSound2"); }
// void specialCharacters() { mxmlIoTest("testSpecialCharacters"); }
+ void staffEmptiness() { mxmlImportTestRef("testStaffEmptiness"); }
void staffTwoKeySigs() { mxmlIoTest("testStaffTwoKeySigs"); }
void stringVoiceName() { mxmlIoTestRef("testStringVoiceName"); }
void systemBrackets1() { mxmlIoTest("testSystemBrackets1"); }