Skip to content

Commit 533836f

Browse files
miiizenmiiizen
committed
Fix tempo text migration
1 parent deb5d73 commit 533836f

14 files changed

+10
-164
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#include "dom/textline.h"
4848
#include "editing/transpose.h"
4949
#include "style/styledef.h"
50+
#include "dom/tempotext.h"
5051

5152
#include "engraving/style/textstyle.h"
5253

@@ -1005,6 +1006,11 @@ void mu::engraving::compat::CompatUtils::setMusicSymbolSize470(MStyle& style)
10051006
continue;
10061007
}
10071008

1008-
style.set(musicSymbolSizeSid, style.value(fontSizeSid));
1009+
double size = style.value(fontSizeSid).toDouble();
1010+
if (textStyleType == TextStyleType::TEMPO) {
1011+
size *= TempoText::DEFAULT_SYM_SIZE_RATIO;
1012+
}
1013+
1014+
style.set(musicSymbolSizeSid, size);
10091015
}
10101016
}

‎src/engraving/style/styledef.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2033,7 +2033,7 @@ const std::array<StyleDef::StyleValue, size_t(Sid::STYLES)> StyleDef::styleValue
20332033
styleDef(systemTextMusicalSymbolSize, 10.0),
20342034
styleDef(tabFretNumberMusicalSymbolSize, 9.0),
20352035
styleDef(tempoChangeMusicalSymbolSize, 12.0),
2036-
styleDef(tempoMusicalSymbolSize, 12.0),
2036+
styleDef(tempoMusicalSymbolSize, 20.0),
20372037
styleDef(textLineMusicalSymbolSize, 10.0),
20382038
styleDef(titleMusicalSymbolSize, 22.0),
20392039
styleDef(translatorMusicalSymbolSize, 10.0),

‎src/engraving/tests/split_data/split184061-keep-tie-ref.mscx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<partInstrumentMusicalSymbolSize>10</partInstrumentMusicalSymbolSize>
4242
<shortInstrumentMusicalSymbolSize>10</shortInstrumentMusicalSymbolSize>
4343
<subTitleMusicalSymbolSize>10</subTitleMusicalSymbolSize>
44-
<tempoMusicalSymbolSize>10</tempoMusicalSymbolSize>
44+
<tempoMusicalSymbolSize>16.6667</tempoMusicalSymbolSize>
4545
<titleMusicalSymbolSize>10</titleMusicalSymbolSize>
4646
<translatorMusicalSymbolSize>10</translatorMusicalSymbolSize>
4747
<defaultsVersion>301</defaultsVersion>

‎src/engraving/tests/split_data/split184061-no-tie-ref.mscx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<partInstrumentMusicalSymbolSize>10</partInstrumentMusicalSymbolSize>
4242
<shortInstrumentMusicalSymbolSize>10</shortInstrumentMusicalSymbolSize>
4343
<subTitleMusicalSymbolSize>10</subTitleMusicalSymbolSize>
44-
<tempoMusicalSymbolSize>10</tempoMusicalSymbolSize>
44+
<tempoMusicalSymbolSize>16.6667</tempoMusicalSymbolSize>
4545
<titleMusicalSymbolSize>10</titleMusicalSymbolSize>
4646
<translatorMusicalSymbolSize>10</translatorMusicalSymbolSize>
4747
<defaultsVersion>301</defaultsVersion>

‎src/engraving/tests/tools_data/change-enharmonic-both-01-ref.mscx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@
66
<Style>
77
<pageWidth>8.27</pageWidth>
88
<pageHeight>11.69</pageHeight>
9-
<maskBarlinesForText>0</maskBarlinesForText>
10-
<dividerLeftAlignToSystemBarline>0</dividerLeftAlignToSystemBarline>
11-
<dividerRightAlignToSystemBarline>0</dividerRightAlignToSystemBarline>
12-
<scaleRythmicSpacingForSmallNotes>0</scaleRythmicSpacingForSmallNotes>
13-
<verticallyAlignChordSymbols>0</verticallyAlignChordSymbols>
14-
<pageNumberFontSize>9</pageNumberFontSize>
15-
<pageNumberFontStyle>0</pageNumberFontStyle>
16-
<pageNumberMusicalSymbolSize>9</pageNumberMusicalSymbolSize>
17-
<defaultsVersion>302</defaultsVersion>
18-
<changesBeforeBarlineRepeats>0</changesBeforeBarlineRepeats>
19-
<changesBeforeBarlineOtherJumps>0</changesBeforeBarlineOtherJumps>
20-
<showCourtesiesRepeats>0</showCourtesiesRepeats>
21-
<showCourtesiesOtherJumps>0</showCourtesiesOtherJumps>
22-
<showCourtesiesAfterCancellingRepeats>0</showCourtesiesAfterCancellingRepeats>
23-
<showCourtesiesAfterCancellingOtherJumps>0</showCourtesiesAfterCancellingOtherJumps>
24-
<repeatPlayCountShow>0</repeatPlayCountShow>
259
<spatium>1.74978</spatium>
2610
</Style>
2711
<showInvisible>1</showInvisible>

‎src/engraving/tests/tools_data/change-enharmonic-both-02-ref.mscx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@
66
<Style>
77
<pageWidth>8.27</pageWidth>
88
<pageHeight>11.69</pageHeight>
9-
<maskBarlinesForText>0</maskBarlinesForText>
10-
<dividerLeftAlignToSystemBarline>0</dividerLeftAlignToSystemBarline>
11-
<dividerRightAlignToSystemBarline>0</dividerRightAlignToSystemBarline>
12-
<scaleRythmicSpacingForSmallNotes>0</scaleRythmicSpacingForSmallNotes>
13-
<verticallyAlignChordSymbols>0</verticallyAlignChordSymbols>
14-
<pageNumberFontSize>9</pageNumberFontSize>
15-
<pageNumberFontStyle>0</pageNumberFontStyle>
16-
<pageNumberMusicalSymbolSize>9</pageNumberMusicalSymbolSize>
17-
<defaultsVersion>302</defaultsVersion>
18-
<changesBeforeBarlineRepeats>0</changesBeforeBarlineRepeats>
19-
<changesBeforeBarlineOtherJumps>0</changesBeforeBarlineOtherJumps>
20-
<showCourtesiesRepeats>0</showCourtesiesRepeats>
21-
<showCourtesiesOtherJumps>0</showCourtesiesOtherJumps>
22-
<showCourtesiesAfterCancellingRepeats>0</showCourtesiesAfterCancellingRepeats>
23-
<showCourtesiesAfterCancellingOtherJumps>0</showCourtesiesAfterCancellingOtherJumps>
24-
<repeatPlayCountShow>0</repeatPlayCountShow>
259
<spatium>1.74978</spatium>
2610
</Style>
2711
<showInvisible>1</showInvisible>

‎src/engraving/tests/tools_data/change-enharmonic-both-03-ref.mscx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@
66
<Style>
77
<pageWidth>8.27</pageWidth>
88
<pageHeight>11.69</pageHeight>
9-
<maskBarlinesForText>0</maskBarlinesForText>
10-
<dividerLeftAlignToSystemBarline>0</dividerLeftAlignToSystemBarline>
11-
<dividerRightAlignToSystemBarline>0</dividerRightAlignToSystemBarline>
12-
<scaleRythmicSpacingForSmallNotes>0</scaleRythmicSpacingForSmallNotes>
13-
<verticallyAlignChordSymbols>0</verticallyAlignChordSymbols>
14-
<pageNumberFontSize>9</pageNumberFontSize>
15-
<pageNumberFontStyle>0</pageNumberFontStyle>
16-
<pageNumberMusicalSymbolSize>9</pageNumberMusicalSymbolSize>
17-
<defaultsVersion>302</defaultsVersion>
18-
<changesBeforeBarlineRepeats>0</changesBeforeBarlineRepeats>
19-
<changesBeforeBarlineOtherJumps>0</changesBeforeBarlineOtherJumps>
20-
<showCourtesiesRepeats>0</showCourtesiesRepeats>
21-
<showCourtesiesOtherJumps>0</showCourtesiesOtherJumps>
22-
<showCourtesiesAfterCancellingRepeats>0</showCourtesiesAfterCancellingRepeats>
23-
<showCourtesiesAfterCancellingOtherJumps>0</showCourtesiesAfterCancellingOtherJumps>
24-
<repeatPlayCountShow>0</repeatPlayCountShow>
259
<spatium>1.74978</spatium>
2610
</Style>
2711
<showInvisible>1</showInvisible>

‎src/engraving/tests/tools_data/change-enharmonic-both-04-ref.mscx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@
66
<Style>
77
<pageWidth>8.27</pageWidth>
88
<pageHeight>11.69</pageHeight>
9-
<maskBarlinesForText>0</maskBarlinesForText>
10-
<dividerLeftAlignToSystemBarline>0</dividerLeftAlignToSystemBarline>
11-
<dividerRightAlignToSystemBarline>0</dividerRightAlignToSystemBarline>
12-
<scaleRythmicSpacingForSmallNotes>0</scaleRythmicSpacingForSmallNotes>
13-
<verticallyAlignChordSymbols>0</verticallyAlignChordSymbols>
14-
<pageNumberFontSize>9</pageNumberFontSize>
15-
<pageNumberFontStyle>0</pageNumberFontStyle>
16-
<pageNumberMusicalSymbolSize>9</pageNumberMusicalSymbolSize>
17-
<defaultsVersion>302</defaultsVersion>
18-
<changesBeforeBarlineRepeats>0</changesBeforeBarlineRepeats>
19-
<changesBeforeBarlineOtherJumps>0</changesBeforeBarlineOtherJumps>
20-
<showCourtesiesRepeats>0</showCourtesiesRepeats>
21-
<showCourtesiesOtherJumps>0</showCourtesiesOtherJumps>
22-
<showCourtesiesAfterCancellingRepeats>0</showCourtesiesAfterCancellingRepeats>
23-
<showCourtesiesAfterCancellingOtherJumps>0</showCourtesiesAfterCancellingOtherJumps>
24-
<repeatPlayCountShow>0</repeatPlayCountShow>
259
<spatium>1.74978</spatium>
2610
</Style>
2711
<showInvisible>1</showInvisible>

‎src/engraving/tests/tools_data/change-enharmonic-both-05-ref.mscx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@
66
<Style>
77
<pageWidth>8.27</pageWidth>
88
<pageHeight>11.69</pageHeight>
9-
<maskBarlinesForText>0</maskBarlinesForText>
10-
<dividerLeftAlignToSystemBarline>0</dividerLeftAlignToSystemBarline>
11-
<dividerRightAlignToSystemBarline>0</dividerRightAlignToSystemBarline>
12-
<scaleRythmicSpacingForSmallNotes>0</scaleRythmicSpacingForSmallNotes>
13-
<verticallyAlignChordSymbols>0</verticallyAlignChordSymbols>
14-
<pageNumberFontSize>9</pageNumberFontSize>
15-
<pageNumberFontStyle>0</pageNumberFontStyle>
16-
<pageNumberMusicalSymbolSize>9</pageNumberMusicalSymbolSize>
17-
<defaultsVersion>302</defaultsVersion>
18-
<changesBeforeBarlineRepeats>0</changesBeforeBarlineRepeats>
19-
<changesBeforeBarlineOtherJumps>0</changesBeforeBarlineOtherJumps>
20-
<showCourtesiesRepeats>0</showCourtesiesRepeats>
21-
<showCourtesiesOtherJumps>0</showCourtesiesOtherJumps>
22-
<showCourtesiesAfterCancellingRepeats>0</showCourtesiesAfterCancellingRepeats>
23-
<showCourtesiesAfterCancellingOtherJumps>0</showCourtesiesAfterCancellingOtherJumps>
24-
<repeatPlayCountShow>0</repeatPlayCountShow>
259
<spatium>1.74978</spatium>
2610
</Style>
2711
<showInvisible>1</showInvisible>

‎src/engraving/tests/tools_data/change-enharmonic-current-01-ref.mscx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,6 @@
66
<Style>
77
<pageWidth>8.27</pageWidth>
88
<pageHeight>11.69</pageHeight>
9-
<maskBarlinesForText>0</maskBarlinesForText>
10-
<dividerLeftAlignToSystemBarline>0</dividerLeftAlignToSystemBarline>
11-
<dividerRightAlignToSystemBarline>0</dividerRightAlignToSystemBarline>
12-
<scaleRythmicSpacingForSmallNotes>0</scaleRythmicSpacingForSmallNotes>
13-
<verticallyAlignChordSymbols>0</verticallyAlignChordSymbols>
14-
<pageNumberFontSize>9</pageNumberFontSize>
15-
<pageNumberFontStyle>0</pageNumberFontStyle>
16-
<pageNumberMusicalSymbolSize>9</pageNumberMusicalSymbolSize>
17-
<defaultsVersion>302</defaultsVersion>
18-
<changesBeforeBarlineRepeats>0</changesBeforeBarlineRepeats>
19-
<changesBeforeBarlineOtherJumps>0</changesBeforeBarlineOtherJumps>
20-
<showCourtesiesRepeats>0</showCourtesiesRepeats>
21-
<showCourtesiesOtherJumps>0</showCourtesiesOtherJumps>
22-
<showCourtesiesAfterCancellingRepeats>0</showCourtesiesAfterCancellingRepeats>
23-
<showCourtesiesAfterCancellingOtherJumps>0</showCourtesiesAfterCancellingOtherJumps>
24-
<repeatPlayCountShow>0</repeatPlayCountShow>
259
<spatium>1.74978</spatium>
2610
</Style>
2711
<showInvisible>1</showInvisible>

0 commit comments

Comments
 (0)