Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MU3] Fix typo in a the name of a style setting #7711

Merged
merged 1 commit into from
Mar 9, 2021
Merged

[MU3] Fix typo in a the name of a style setting #7711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion libmscore/style.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ static const StyleType styleTypes[] {
{ Sid::mmRestNumberPos, "mmRestNumberPos", Spatium(-1.5) },
{ Sid::hideEmptyStaves, "hideEmptyStaves", QVariant(false) },
{ Sid::dontHideStavesInFirstSystem,
"dontHidStavesInFirstSystm", QVariant(true) },
"dontHideStavesInFirstSystem", QVariant(true) },
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this name change cause compatibility issues with existing scores?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that's what the 2nd chunk of this change is about.

It may (read: will) cause downrev issues though, like when a score created woith this PR merged is read in a version before that, but that is for lyricsDashMaxLegth vs. lyricsDashMaxLength too.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I missed that one.

{ Sid::enableIndentationOnFirstSystem,
"enableIndentationOnFirstSystem", QVariant(true) },
{ Sid::firstSystemIndentationValue, "firstSystemIndentationValue", Spatium(5.0) },
Expand Down Expand Up @@ -3022,6 +3022,8 @@ void MStyle::load(XmlReader& e)
}
else if (tag == "lyricsDashMaxLegth") // pre-3.6 typo
set(Sid::lyricsDashMaxLength, e.readDouble());
else if (tag == "dontHidStavesInFirstSystm") // pre-3.6.3/4.0 typo
set(Sid::dontHideStavesInFirstSystem, e.readBool());
else if (!readProperties(e))
e.unknown();
}
Expand Down
2 changes: 1 addition & 1 deletion mtest/libmscore/compat114/style-ref.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<minEmptyMeasures>3</minEmptyMeasures>
<minMMRestWidth>3</minMMRestWidth>
<hideEmptyStaves>1</hideEmptyStaves>
<dontHidStavesInFirstSystm>0</dontHidStavesInFirstSystm>
<dontHideStavesInFirstSystem>0</dontHideStavesInFirstSystem>
<ArpeggioNoteDistance>0.7</ArpeggioNoteDistance>
<ArpeggioLineWidth>0.19</ArpeggioLineWidth>
<ArpeggioHookLen>0.9</ArpeggioHookLen>
Expand Down
2 changes: 1 addition & 1 deletion vtest/system-1.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Style>
<showMeasureNumber>0</showMeasureNumber>
<hideEmptyStaves>1</hideEmptyStaves>
<dontHidStavesInFirstSystm>0</dontHidStavesInFirstSystm>
<dontHideStavesInFirstSystem>0</dontHideStavesInFirstSystem>
<showFooter>0</showFooter>
<page-layout>
<page-height>283.465</page-height>
Expand Down
2 changes: 1 addition & 1 deletion vtest/system-2.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Style>
<showMeasureNumber>0</showMeasureNumber>
<hideEmptyStaves>1</hideEmptyStaves>
<dontHidStavesInFirstSystm>0</dontHidStavesInFirstSystm>
<dontHideStavesInFirstSystem>0</dontHideStavesInFirstSystem>
<showFooter>0</showFooter>
<page-layout>
<page-height>283.465</page-height>
Expand Down
2 changes: 1 addition & 1 deletion vtest/system-7.mscx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<maxSystemDistance>8</maxSystemDistance>
<showMeasureNumber>0</showMeasureNumber>
<hideEmptyStaves>1</hideEmptyStaves>
<dontHidStavesInFirstSystm>0</dontHidStavesInFirstSystm>
<dontHideStavesInFirstSystem>0</dontHideStavesInFirstSystem>
<showFooter>0</showFooter>
<page-layout>
<page-height>680.315</page-height>
Expand Down