Skip to content

Commit 36fab40

Browse files
EismEism
committed
Fixed version change when saving to file
1 parent d0fc8e9 commit 36fab40

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+52
-46
lines changed

‎libmscore/read302.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@ Score::FileError MasterScore::read302(XmlReader& e)
412412
else {
413413
score = new MasterScore();
414414
score->setMscVersion(mscVersion());
415+
score->setMscoreVersionName(mscVersionName());
415416
addMovement(score);
416417
}
417418
if (!score->read(e)) {

‎libmscore/score.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@ class Score : public QObject, public ScoreElement {
476476
ScoreOrder* _scoreOrder { nullptr }; ///< used for score ordering
477477

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

480481
QMap<QString, QString> _metaTags;
481482

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

949+
QString mscVersionName() const { return _mscVersionName; }
950+
void setMscoreVersionName(const QString& v) { _mscVersionName = v; }
951+
948952
void addLyrics(const Fraction& tick, int staffIdx, const QString&);
949953

950954
void updateSwing();

‎libmscore/scorefile.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -763,11 +763,11 @@ bool Score::saveFile(QIODevice* f, bool msczFormat, bool onlySelection)
763763
xml.setWriteOmr(msczFormat);
764764
xml.header();
765765

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

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

10271028
if (!ignoreVersionError) {
10281029
if (mscVersion() > MSCVERSION)

‎mtest/libmscore/compat114/accidentals-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/articulations-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/chord_symbol-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/clef_missing_first-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/clefs-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/drumset-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/fingering-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/hairpin-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/hor_frame_and_mmrest-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/keysig-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/noteheads-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/notes-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/ottava-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/pedal-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/slurs-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/style-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/tamtam-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/text_scaling-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/textline-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/textstyles-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/title-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/tremolo2notes-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/tuplets-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/tuplets_1-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat114/tuplets_2-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="1.14">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/accidentals-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/ambitus-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/articulations-double-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.00">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/articulations-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/barlines-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/breath-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/clefs-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/drumset-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/fermata-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/frame_text2-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/hairpin-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/intrumentNameAlign-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/lidemptytext-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/markers-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/noteheads-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/textstyles-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/tuplets-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

‎mtest/libmscore/compat206/userstylesparts-ref.mscx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<museScore version="3.02">
2+
<museScore version="2.06">
33
<Score>
44
<LayerTag id="0" tag="default"></LayerTag>
55
<currentLayer>0</currentLayer>

0 commit comments

Comments
 (0)