Skip to content

Commit 6c60559

Browse files
miiizenmiiizen
committed
Add music symbol size to text styles
1 parent 577a07b commit 6c60559

File tree

5 files changed

+231
-17
lines changed

5 files changed

+231
-17
lines changed

‎src/engraving/dom/textbase.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2751,8 +2751,6 @@ PropertyValue TextBase::propertyDefault(Pid id) const
27512751
return AutoOnOff::AUTO;
27522752
case Pid::VOICE_ASSIGNMENT:
27532753
return VoiceAssignment::ALL_VOICE_IN_INSTRUMENT;
2754-
case Pid::MUSIC_SYMBOL_SIZE:
2755-
return styleValue(Pid::FONT_SIZE, getPropertyStyle(Pid::FONT_SIZE));
27562754
default:
27572755
for (const auto& p : *textStyle(TextStyleType::DEFAULT)) {
27582756
if (p.pid == id) {
@@ -3070,8 +3068,6 @@ void TextBase::initTextStyleType(TextStyleType tid)
30703068
for (const auto& p : *textStyle(tid)) {
30713069
setProperty(getTextPID(p.pid), styleValue(p.pid, p.sid));
30723070
}
3073-
3074-
resetProperty(Pid::MUSIC_SYMBOL_SIZE);
30753071
}
30763072

30773073
RectF TextBase::drag(EditData& ed)

‎src/engraving/style/styledef.cpp‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
132132

133133
styleDef(figuredBassFontFamily, String(u"MScoreBC")),
134134

135-
//styleDef(figuredBassFontSize, PropertyValue(8.0)),
136135
styleDef(figuredBassYOffset, 6.0),
137136
styleDef(figuredBassLineHeight, 1.0),
138137
styleDef(figuredBassAlignment, 0),
@@ -1977,6 +1976,81 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
19771976
styleDef(chordlineThickness, 0.16_sp),
19781977

19791978
styleDef(dummyMusicalSymbolsScale, 1.0),
1979+
styleDef(dummyMusicalSymbolSize, 12.0),
1980+
1981+
styleDef(articulationMusicalSymbolSize, 8.0),
1982+
styleDef(bendMusicalSymbolSize, 8.0),
1983+
styleDef(chordSymbolAMusicalSymbolSize, 10.0),
1984+
styleDef(chordSymbolBMusicalSymbolSize, 10.0),
1985+
styleDef(composerMusicalSymbolSize, 10.0),
1986+
styleDef(copyrightMusicalSymbolSize, 9.0),
1987+
styleDef(defaultMusicalSymbolSize, 10.0),
1988+
styleDef(dynamicsMusicalSymbolSize, 10.0),
1989+
styleDef(expressionMusicalSymbolSize, 10.0),
1990+
styleDef(figuredBassMusicalSymbolSize, 8.0),
1991+
styleDef(fingeringMusicalSymbolSize, 8.0),
1992+
styleDef(footerMusicalSymbolSize, 9.0),
1993+
styleDef(frameMusicalSymbolSize, 10.0),
1994+
styleDef(fretDiagramFingeringMusicalSymbolSize, 6.0),
1995+
styleDef(fretDiagramFretNumberMusicalSymbolSize, 6.0),
1996+
styleDef(glissandoMusicalSymbolSize, 8.0),
1997+
styleDef(hairpinMusicalSymbolSize, 10.0),
1998+
styleDef(hammerOnPullOffTappingMusicalSymbolSize, 8.0),
1999+
styleDef(harpPedalDiagramMusicalSymbolSize, 10.0),
2000+
styleDef(harpPedalTextDiagramMusicalSymbolSize, 8.0),
2001+
styleDef(headerMusicalSymbolSize, 9.0),
2002+
styleDef(instrumentChangeMusicalSymbolSize, 10.0),
2003+
styleDef(letRingMusicalSymbolSize, 10.0),
2004+
styleDef(lhGuitarFingeringMusicalSymbolSize, 8.0),
2005+
styleDef(longInstrumentMusicalSymbolSize, 10.0),
2006+
styleDef(lyricistMusicalSymbolSize, 10.0),
2007+
styleDef(lyricsEvenMusicalSymbolSize, 10.0),
2008+
styleDef(lyricsOddMusicalSymbolSize, 10.0),
2009+
styleDef(measureNumberAlternateMusicalSymbolSize, 10.0),
2010+
styleDef(measureNumberMusicalSymbolSize, 8.0),
2011+
styleDef(metronomeMusicalSymbolSize, 12.0),
2012+
styleDef(mmRestRangeMusicalSymbolSize, 8.0),
2013+
styleDef(nashvilleNumberMusicalSymbolSize, 12.0),
2014+
styleDef(noteLineMusicalSymbolSize, 10.0),
2015+
styleDef(ottavaMusicalSymbolSize, 10.0),
2016+
styleDef(pageNumberMusicalSymbolSize, 11.0),
2017+
styleDef(palmMuteMusicalSymbolSize, 10.0),
2018+
styleDef(partInstrumentMusicalSymbolSize, 14.0),
2019+
styleDef(pedalMusicalSymbolSize, 10.0),
2020+
styleDef(rehearsalMarkMusicalSymbolSize, 14.0),
2021+
styleDef(repeatLeftMusicalSymbolSize, 18.0),
2022+
styleDef(repeatPlayCountMusicalSymbolSize, 10.0),
2023+
styleDef(repeatRightMusicalSymbolSize, 18.0),
2024+
styleDef(rhGuitarFingeringMusicalSymbolSize, 8.0),
2025+
styleDef(romanNumeralMusicalSymbolSize, 12.0),
2026+
styleDef(shortInstrumentMusicalSymbolSize, 10.0),
2027+
styleDef(staffTextMusicalSymbolSize, 10.0),
2028+
styleDef(stickingMusicalSymbolSize, 10.0),
2029+
styleDef(stringNumberMusicalSymbolSize, 8.0),
2030+
styleDef(stringTuningsMusicalSymbolSize, 9.0),
2031+
styleDef(subTitleMusicalSymbolSize, 14.0),
2032+
styleDef(systemTextLineMusicalSymbolSize, 10.0),
2033+
styleDef(systemTextMusicalSymbolSize, 10.0),
2034+
styleDef(tabFretNumberMusicalSymbolSize, 9.0),
2035+
styleDef(tempoChangeMusicalSymbolSize, 12.0),
2036+
styleDef(tempoMusicalSymbolSize, 12.0),
2037+
styleDef(textLineMusicalSymbolSize, 10.0),
2038+
styleDef(titleMusicalSymbolSize, 22.0),
2039+
styleDef(translatorMusicalSymbolSize, 10.0),
2040+
styleDef(tupletMusicalSymbolSize, 9.0),
2041+
styleDef(user1MusicalSymbolSize, 10.0),
2042+
styleDef(user2MusicalSymbolSize, 10.0),
2043+
styleDef(user3MusicalSymbolSize, 10.0),
2044+
styleDef(user4MusicalSymbolSize, 10.0),
2045+
styleDef(user5MusicalSymbolSize, 10.0),
2046+
styleDef(user6MusicalSymbolSize, 10.0),
2047+
styleDef(user7MusicalSymbolSize, 10.0),
2048+
styleDef(user8MusicalSymbolSize, 10.0),
2049+
styleDef(user9MusicalSymbolSize, 10.0),
2050+
styleDef(user10MusicalSymbolSize, 10.0),
2051+
styleDef(user11MusicalSymbolSize, 10.0),
2052+
styleDef(user12MusicalSymbolSize, 10.0),
2053+
styleDef(voltaMusicalSymbolSize, 11.0),
19802054

19812055
styleDef(autoplaceEnabled, true),
19822056
styleDef(defaultsVersion, Constants::MSC_VERSION),

‎src/engraving/style/styledef.h‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ enum class Sid : short {
149149
lyricsEvenPosition,
150150

151151
figuredBassFontFamily,
152-
// figuredBassFontSize,
153152
figuredBassYOffset,
154153
figuredBassLineHeight,
155154
figuredBassAlignment,
@@ -1994,6 +1993,81 @@ enum class Sid : short {
19941993
chordlineThickness,
19951994

19961995
dummyMusicalSymbolsScale,
1996+
dummyMusicalSymbolSize,
1997+
1998+
articulationMusicalSymbolSize,
1999+
bendMusicalSymbolSize,
2000+
chordSymbolAMusicalSymbolSize,
2001+
chordSymbolBMusicalSymbolSize,
2002+
composerMusicalSymbolSize,
2003+
copyrightMusicalSymbolSize,
2004+
defaultMusicalSymbolSize,
2005+
dynamicsMusicalSymbolSize,
2006+
expressionMusicalSymbolSize,
2007+
figuredBassMusicalSymbolSize,
2008+
fingeringMusicalSymbolSize,
2009+
footerMusicalSymbolSize,
2010+
frameMusicalSymbolSize,
2011+
fretDiagramFingeringMusicalSymbolSize,
2012+
fretDiagramFretNumberMusicalSymbolSize,
2013+
glissandoMusicalSymbolSize,
2014+
hairpinMusicalSymbolSize,
2015+
hammerOnPullOffTappingMusicalSymbolSize,
2016+
harpPedalDiagramMusicalSymbolSize,
2017+
harpPedalTextDiagramMusicalSymbolSize,
2018+
headerMusicalSymbolSize,
2019+
instrumentChangeMusicalSymbolSize,
2020+
letRingMusicalSymbolSize,
2021+
lhGuitarFingeringMusicalSymbolSize,
2022+
longInstrumentMusicalSymbolSize,
2023+
lyricistMusicalSymbolSize,
2024+
lyricsEvenMusicalSymbolSize,
2025+
lyricsOddMusicalSymbolSize,
2026+
measureNumberAlternateMusicalSymbolSize,
2027+
measureNumberMusicalSymbolSize,
2028+
metronomeMusicalSymbolSize,
2029+
mmRestRangeMusicalSymbolSize,
2030+
nashvilleNumberMusicalSymbolSize,
2031+
noteLineMusicalSymbolSize,
2032+
ottavaMusicalSymbolSize,
2033+
pageNumberMusicalSymbolSize,
2034+
palmMuteMusicalSymbolSize,
2035+
partInstrumentMusicalSymbolSize,
2036+
pedalMusicalSymbolSize,
2037+
rehearsalMarkMusicalSymbolSize,
2038+
repeatLeftMusicalSymbolSize,
2039+
repeatPlayCountMusicalSymbolSize,
2040+
repeatRightMusicalSymbolSize,
2041+
rhGuitarFingeringMusicalSymbolSize,
2042+
romanNumeralMusicalSymbolSize,
2043+
shortInstrumentMusicalSymbolSize,
2044+
staffTextMusicalSymbolSize,
2045+
stickingMusicalSymbolSize,
2046+
stringNumberMusicalSymbolSize,
2047+
stringTuningsMusicalSymbolSize,
2048+
subTitleMusicalSymbolSize,
2049+
systemTextLineMusicalSymbolSize,
2050+
systemTextMusicalSymbolSize,
2051+
tabFretNumberMusicalSymbolSize,
2052+
tempoChangeMusicalSymbolSize,
2053+
tempoMusicalSymbolSize,
2054+
textLineMusicalSymbolSize,
2055+
titleMusicalSymbolSize,
2056+
translatorMusicalSymbolSize,
2057+
tupletMusicalSymbolSize,
2058+
user1MusicalSymbolSize,
2059+
user2MusicalSymbolSize,
2060+
user3MusicalSymbolSize,
2061+
user4MusicalSymbolSize,
2062+
user5MusicalSymbolSize,
2063+
user6MusicalSymbolSize,
2064+
user7MusicalSymbolSize,
2065+
user8MusicalSymbolSize,
2066+
user9MusicalSymbolSize,
2067+
user10MusicalSymbolSize,
2068+
user11MusicalSymbolSize,
2069+
user12MusicalSymbolSize,
2070+
voltaMusicalSymbolSize,
19972071

19982072
autoplaceEnabled,
19992073
defaultsVersion,

0 commit comments

Comments
 (0)