Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libmscore/read302.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,7 @@ Score::FileError MasterScore::read302(XmlReader& e)
else {
score = new MasterScore();
score->setMscVersion(mscVersion());
score->setMscoreVersionName(mscVersionName());
addMovement(score);
}
if (!score->read(e)) {
Expand Down
4 changes: 4 additions & 0 deletions libmscore/score.h
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ class Score : public QObject, public ScoreElement {
ScoreOrder* _scoreOrder { nullptr }; ///< used for score ordering

int _mscVersion { MSCVERSION }; ///< version of current loading *.msc file
QString _mscVersionName { MSC_VERSION };

QMap<QString, QString> _metaTags;

Expand Down Expand Up @@ -945,6 +946,9 @@ class Score : public QObject, public ScoreElement {
int mscVersion() const { return _mscVersion; }
void setMscVersion(int v) { _mscVersion = v; }

QString mscVersionName() const { return _mscVersionName; }
void setMscoreVersionName(const QString& v) { _mscVersionName = v; }

void addLyrics(const Fraction& tick, int staffIdx, const QString&);

void updateSwing();
Expand Down
7 changes: 4 additions & 3 deletions libmscore/scorefile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -763,11 +763,11 @@ bool Score::saveFile(QIODevice* f, bool msczFormat, bool onlySelection)
xml.setWriteOmr(msczFormat);
xml.header();

xml.stag("museScore version=\"" MSC_VERSION "\"");
xml.stag("museScore version=\"" + mscVersionName() + "\"");

if (!MScore::testMode) {
xml.tag("programVersion", VERSION);
xml.tag("programRevision", revision);
xml.tag("programVersion", mscVersion());
xml.tag("programRevision", mscoreRevision());
}
write(xml, onlySelection);
xml.etag();
Expand Down Expand Up @@ -1023,6 +1023,7 @@ Score::FileError MasterScore::read1(XmlReader& e, bool ignoreVersionError)
const QString& version = e.attribute("version");
QStringList sl = version.split('.');
setMscVersion(sl[0].toInt() * 100 + sl[1].toInt());
setMscoreVersionName(version);

if (!ignoreVersionError) {
if (mscVersion() > MSCVERSION)
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/barline/barlinedelete-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="3.01">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/accidentals-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/articulations-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/chord_symbol-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/clef_missing_first-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/clefs-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/drumset-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/fingering-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/hairpin-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/hor_frame_and_mmrest-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/keysig-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/noteheads-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/notes-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/ottava-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/pedal-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/slurs-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/style-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/tamtam-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/text_scaling-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/textline-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/textstyles-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/title-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/tremolo2notes-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/tuplets-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/tuplets_1-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/tuplets_2-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="1.14">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/accidentals-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/ambitus-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/articulations-double-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/articulations-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/barlines-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/breath-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/clefs-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/drumset-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/fermata-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/frame_text2-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/hairpin-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/intrumentNameAlign-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/lidemptytext-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/markers-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/noteheads-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/textstyles-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/tuplets-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat206/userstylesparts-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.06">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/split/split183846-irregular-wn-wn-ref.mscx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.02">
<museScore version="2.00">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
Expand Down