[MU4] fix #290694 - ensure that final barline created automatically (e.g. during musicxml import) spans to next staff if on a multi-stave part

Author: Dylan Nicholson

src/importexport/musicxml/tests/tst_mxml_io.cpp

@@ -30,6 +30,8 @@
 #include "libmscore/measure.h"
 #include "libmscore/staff.h"
 #include "libmscore/keysig.h"
+#include "libmscore/part.h"
+#include "libmscore/barline.h"
 // end includes required for fixupScore()
 
 #include "settings.h"
@@ -262,6 +264,17 @@ static void fixupScore(Score* score)
     score->setSaved(false);
 }
 
+static void checkScore(Score* score)
+{
+    if (score->parts().first()->nstaves() > 1) {
+        Measure* measure = score->lastMeasure();
+        Segment* segment = measure->findSegment(SegmentType::EndBarLine, measure->endTick());
+        BarLine* barline = (BarLine*)(segment->element(0));
+        bool span = barline->spanStaff();
+        QVERIFY(barline->spanStaff());
+    }
+}
+
 void TestMxmlIO::setValue(const std::string& key, const Val& value)
 {
     settings()->setValue(Settings::Key(MODULE_NAME, key), value);
@@ -283,6 +296,7 @@ void TestMxmlIO::mxmlIoTest(const char* file)
     MasterScore* score = readScore(XML_IO_DATA_DIR + file + ".xml");
     QVERIFY(score);
     fixupScore(score);
+    checkScore(score);
     score->doLayout();
     QVERIFY(saveMusicXml(score, QString(file) + ".xml"));
     QVERIFY(saveCompareMusicXmlScore(score, QString(file) + ".xml", XML_IO_DATA_DIR + file + ".xml"));
@@ -304,6 +318,7 @@ void TestMxmlIO::mxmlIoTestRef(const char* file)
     MasterScore* score = readScore(XML_IO_DATA_DIR + file + ".xml");
     QVERIFY(score);
     fixupScore(score);
+    checkScore(score);
     score->doLayout();
     QVERIFY(saveMusicXml(score, QString(file) + ".xml"));
     QVERIFY(saveCompareMusicXmlScore(score, QString(file) + ".xml", XML_IO_DATA_DIR + file + "_ref.xml"));

src/libmscore/measure.cpp

@@ -3927,6 +3927,11 @@ void Measure::setEndBarLineType(BarLineType val, int track, bool visible, QColor
         bl = new BarLine(score());
         bl->setParent(seg);
         bl->setTrack(track);
+        Part* part = score()->staff(track / VOICES)->part();
+        // by default, barlines for multi-staff parts should span across staves
+        if (part && part->nstaves() > 1) {
+            bl->setSpanStaff(true);
+        }
         score()->addElement(bl);
     }
     bl->setGenerated(false);