Skip to content

Commit 27f567e

Browse files
miiizenmiiizen
committed
Migrate old scores
1 parent 2f82fa6 commit 27f567e

File tree

59 files changed

+376
-5
lines changed

Some content is hidden

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

59 files changed

+376
-5
lines changed

‎src/engraving/data/styles/legacy-style-defaults-v1.mss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,5 +1127,8 @@
11271127
<bracketedAccidentalPadding>0</bracketedAccidentalPadding>
11281128
<alignAccidentalsLeft>true</alignAccidentalsLeft>
11291129
<Spatium>1.76389</Spatium>
1130+
<lyricsEvenMusicalSymbolSize>11.0</lyricsEvenMusicalSymbolSize>
1131+
<lyricsOddMusicalSymbolSize>11.0</lyricsOddMusicalSymbolSize>
1132+
<pageNumberMusicalSymbolSize>9.0</pageNumberMusicalSymbolSize>
11301133
</Style>
11311134
</museScore>

‎src/engraving/data/styles/legacy-style-defaults-v2.mss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,5 +1127,8 @@
11271127
<bracketedAccidentalPadding>0</bracketedAccidentalPadding>
11281128
<alignAccidentalsLeft>true</alignAccidentalsLeft>
11291129
<Spatium>1.76389</Spatium>
1130+
<lyricsEvenMusicalSymbolSize>11.0</lyricsEvenMusicalSymbolSize>
1131+
<lyricsOddMusicalSymbolSize>11.0</lyricsOddMusicalSymbolSize>
1132+
<pageNumberMusicalSymbolSize>9.0</pageNumberMusicalSymbolSize>
11301133
</Style>
11311134
</museScore>

‎src/engraving/data/styles/legacy-style-defaults-v3.mss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,5 +1127,8 @@
11271127
<bracketedAccidentalPadding>0</bracketedAccidentalPadding>
11281128
<alignAccidentalsLeft>true</alignAccidentalsLeft>
11291129
<Spatium>1.76389</Spatium>
1130+
<lyricsEvenMusicalSymbolSize>11.0</lyricsEvenMusicalSymbolSize>
1131+
<lyricsOddMusicalSymbolSize>11.0</lyricsOddMusicalSymbolSize>
1132+
<pageNumberMusicalSymbolSize>9.0</pageNumberMusicalSymbolSize>
11301133
</Style>
11311134
</museScore>

‎src/engraving/data/styles/legacy-style-defaults-v302.mss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1290,6 +1290,9 @@
12901290
<autoplaceEnabled>1</autoplaceEnabled>
12911291
<usePre_3_6_defaults>0</usePre_3_6_defaults>
12921292
<defaultsVersion>302</defaultsVersion>
1293+
<lyricsEvenMusicalSymbolSize>11.0</lyricsEvenMusicalSymbolSize>
1294+
<lyricsOddMusicalSymbolSize>11.0</lyricsOddMusicalSymbolSize>
1295+
<pageNumberMusicalSymbolSize>9.0</pageNumberMusicalSymbolSize>sion>
12931296
<Spatium>1.74978</Spatium>
12941297
</Style>
12951298
</museScore>

‎src/engraving/data/styles/migration-306-style-Edwin.mss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,5 +97,8 @@
9797
<user12FontFace>Edwin</user12FontFace>
9898
<letRingFontFace>Edwin</letRingFontFace>
9999
<palmMuteFontFace>Edwin</palmMuteFontFace>
100+
<lyricsEvenMusicalSymbolSize>11.0</lyricsEvenMusicalSymbolSize>
101+
<lyricsOddMusicalSymbolSize>11.0</lyricsOddMusicalSymbolSize>
102+
<pageNumberMusicalSymbolSize>9.0</pageNumberMusicalSymbolSize>
100103
</Style>
101104
</museScore>

‎src/engraving/data/styles/migration-306-style-Leland.mss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,8 @@
2626
<voltaLineWidth>0.11</voltaLineWidth>
2727
<lyricsLineThickness>0.1</lyricsLineThickness>
2828
<tupletBracketWidth>0.1</tupletBracketWidth>
29+
<lyricsEvenMusicalSymbolSize>11.0</lyricsEvenMusicalSymbolSize>
30+
<lyricsOddMusicalSymbolSize>11.0</lyricsOddMusicalSymbolSize>
31+
<pageNumberMusicalSymbolSize>9.0</pageNumberMusicalSymbolSize>
2932
</Style>
3033
</museScore>

‎src/engraving/rw/compat/compatutils.cpp‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,3 +976,34 @@ void CompatUtils::setTextLineTextPositionFromAlign(TextLineBase* tl)
976976
tl->setPropertyFlags(Pid::END_TEXT_POSITION, PropertyFlags::UNSTYLED);
977977
}
978978
}
979+
980+
void mu::engraving::compat::CompatUtils::setMusicSymbolSize470(MStyle& style)
981+
{
982+
// Music symbols have their own point size in 4.7
983+
// Initialize this to the text type's default font size
984+
for (TextStyleType textStyleType : allTextStyles()) {
985+
if (textStyleType == TextStyleType::REPEAT_LEFT || textStyleType == TextStyleType::REPEAT_RIGHT) {
986+
continue;
987+
}
988+
989+
const TextStyle* ts = textStyle(textStyleType);
990+
Sid musicSymbolSizeSid = Sid::NOSTYLE;
991+
Sid fontSizeSid = Sid::NOSTYLE;
992+
993+
for (size_t i = 0; i < TEXT_STYLE_SIZE; ++i) {
994+
if (ts->at(i).pid == Pid::MUSIC_SYMBOL_SIZE) {
995+
musicSymbolSizeSid = ts->at(i).sid;
996+
}
997+
998+
if (ts->at(i).pid == Pid::FONT_SIZE) {
999+
fontSizeSid = ts->at(i).sid;
1000+
}
1001+
}
1002+
1003+
if (musicSymbolSizeSid == Sid::NOSTYLE || fontSizeSid == Sid::NOSTYLE) {
1004+
continue;
1005+
}
1006+
1007+
style.set(musicSymbolSizeSid, style.value(fontSizeSid));
1008+
}
1009+
}

‎src/engraving/rw/compat/compatutils.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class CompatUtils
4949
static const std::map<Sid, Sid> ALIGN_VALS_TO_CONVERT;
5050
static Sid positionStyleFromAlign(Sid align);
5151
static void setTextLineTextPositionFromAlign(TextLineBase* tl);
52+
static void setMusicSymbolSize470(MStyle& style);
5253

5354
private:
5455
static void replaceStaffTextWithPlayTechniqueAnnotation(MasterScore* score);

‎src/engraving/rw/write/twrite.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,9 +1282,6 @@ void TWrite::writeProperties(const TextBase* item, XmlWriter& xml, WriteContext&
12821282
writeProperty(item, xml, spp.pid);
12831283
}
12841284
}
1285-
if (item->hasSymbolSize()) {
1286-
writeProperty(item, xml, Pid::MUSIC_SYMBOL_SIZE);
1287-
}
12881285
for (const auto& spp : *textStyle(item->textStyleType())) {
12891286
if (item->isStyled(spp.pid)
12901287
|| (spp.pid == Pid::FONT_SIZE && item->getProperty(spp.pid).toDouble() == TextBase::UNDEFINED_FONT_SIZE)

‎src/engraving/style/style.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,9 @@ void MStyle::read(XmlReader& e, compat::ReadChordListHook* readChordListHook, in
628628
if (mscVersion < 470) {
629629
set(Sid::dividerLeftAlignToSystemBarline, false);
630630
set(Sid::dividerRightAlignToSystemBarline, false);
631+
632+
// Musical symbol size
633+
compat::CompatUtils::setMusicSymbolSize470(*this);
631634
}
632635

633636
if (mscVersion < 460) {

0 commit comments

Comments
 (0)