From 1b28357ccb22d3522334ad5960b621b4500a9ee8 Mon Sep 17 00:00:00 2001 From: James Mizen Date: Wed, 25 Sep 2024 09:10:20 +0100 Subject: [PATCH 1/2] Revert "'Musical Symbols Scale' for markers" This reverts commit 8f285680bdc4b8637425ac11c74380e2cfb7ec5a. --- .../01-General/01-Treble_Clef/score_style.mss | 2 +- .../01-General/02-Bass_Clef/score_style.mss | 2 +- .../01-General/03-Grand_Staff/score_style.mss | 2 +- .../02-Choral/01-SATB/score_style.mss | 2 +- .../02-Choral/02-SATB_+_Organ/score_style.mss | 2 +- .../02-Choral/03-SATB_+_Piano/score_style.mss | 2 +- .../04-SATB_Closed_Score/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../07-Voice_+_Piano/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../10-Liturgical_Unmetrical/score_style.mss | 2 +- .../score_style.mss | 2 +- .../01-String_Quartet/score_style.mss | 2 +- .../02-Wind_Quartet/score_style.mss | 2 +- .../03-Wind_Quintet/score_style.mss | 2 +- .../04-Saxophone_Quartet/score_style.mss | 2 +- .../05-Brass_Quartet/score_style.mss | 2 +- .../06-Brass_Quintet/score_style.mss | 2 +- .../04-Solo/01-Guitar/score_style.mss | 2 +- .../02-Guitar_+_Tablature/score_style.mss | 2 +- .../03-Guitar_Tablature/score_style.mss | 2 +- .../04-Solo/04-Piano/score_style.mss | 2 +- .../01-Jazz_Lead_Sheet/score_style.mss | 2 +- .../05-Jazz/02-Big_Band/score_style.mss | 2 +- .../05-Jazz/03-Jazz_Combo/score_style.mss | 2 +- .../06-Popular/01-Rock_Band/score_style.mss | 2 +- .../02-Bluegrass_Band/score_style.mss | 2 +- .../01-Concert_Band/score_style.mss | 2 +- .../02-Small_Concert_Band/score_style.mss | 2 +- .../03-Brass_Band/score_style.mss | 2 +- .../04-Marching_Band/score_style.mss | 2 +- .../05-Small_Marching_Band/score_style.mss | 2 +- .../06-Battery_Percussion/score_style.mss | 2 +- .../07-Large_Pit_Percussion/score_style.mss | 2 +- .../08-Small_Pit_Percussion/score_style.mss | 2 +- .../09-European_Concert_Band/score_style.mss | 2 +- .../01-Classical_Orchestra/score_style.mss | 2 +- .../02-Symphony_Orchestra/score_style.mss | 2 +- .../03-String_Orchestra/score_style.mss | 2 +- .../styles/legacy-style-defaults-v302.mss | 2 +- .../data/styles/migration-306-style-Edwin.mss | 2 +- src/engraving/dom/textbase.cpp | 2 - src/engraving/style/styledef.cpp | 4 +- src/engraving/style/styledef.h | 2 - src/engraving/style/textstyle.cpp | 4 +- .../score_style.mss | 2 +- .../chord_arpeggio/score_style.mss | 2 +- .../chord_arpeggio_bracket/score_style.mss | 2 +- .../chord_arpeggio_down/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../chord_arpeggio_up/score_style.mss | 2 +- .../single_chord_tremolo/score_style.mss | 2 +- .../single_note_acciaccatura/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../single_note_inverted_turn/score_style.mss | 2 +- .../score_style.mss | 2 +- .../single_note_lower_mordent/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../single_note_regular_turn/score_style.mss | 2 +- .../single_note_tenuto_accent/score_style.mss | 2 +- .../single_note_tremolo/score_style.mss | 2 +- .../single_note_trill_baroque/score_style.mss | 2 +- .../single_note_trill_baroque.mscx | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../single_note_upper_mordent/score_style.mss | 2 +- .../two_chords_tremolo/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../whole_measure_rest/score_style.mss | 2 +- .../da_capo_al_coda/score_style.mss | 2 +- .../da_capo_al_fine/score_style.mss | 2 +- .../dal_segno_al_coda/score_style.mss | 2 +- .../dal_segno_al_fine/score_style.mss | 2 +- .../dynamics/score_style.mss | 2 +- .../metronome_4_4/score_style.mss | 2 +- .../metronome_6_4_with_repeat/score_style.mss | 2 +- .../multi_measure_repeat/score_style.mss | 2 +- .../note_entry_playback_chord/score_style.mss | 2 +- .../note_entry_playback_note/score_style.mss | 2 +- .../pizz_to_arco/score_style.mss | 2 +- .../score_style.mss | 2 +- .../repeat_and_tremolo/score_style.mss | 2 +- .../repeat_range/score_style.mss | 2 +- .../repeat_with_2_voltas/score_style.mss | 2 +- .../single_measure_repeat/score_style.mss | 2 +- .../spanners/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../custom_tempo_80_bpm/score_style.mss | 2 +- .../default_tempo/score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- .../score_style.mss | 2 +- vtest/scores/articulation-2.mscz | Bin 93736 -> 93736 bytes vtest/scores/beams-20.mscz | Bin 79915 -> 79915 bytes vtest/scores/beams-manual-adjust.mscz | Bin 79863 -> 79863 bytes vtest/scores/bravura-12.mscx | 159 -------- vtest/scores/bravura-text-2.mscx | 375 ++++------------- vtest/scores/bravura-text-3.mscx | 376 ++++++++++++++++++ vtest/scores/chord-layout-18.mscz | Bin 81338 -> 81338 bytes vtest/scores/chord-layout-19.mscz | Bin 83953 -> 83953 bytes vtest/scores/chord-layout-20.mscz | Bin 90762 -> 90762 bytes vtest/scores/cross-5.mscz | Bin 103862 -> 103862 bytes vtest/scores/customCrossStaffBeams.mscz | Bin 83686 -> 83686 bytes vtest/scores/emmentaler-12.mscx | 157 -------- vtest/scores/emmentaler-text-2.mscx | 375 ++++------------- vtest/scores/emmentaler-text-3.mscx | 374 +++++++++++++++++ vtest/scores/fingeringSpacing.mscz | Bin 82372 -> 82372 bytes vtest/scores/grace-9.mscz | Bin 88928 -> 88928 bytes vtest/scores/hideEmptyStaves.mscz | Bin 78371 -> 78371 bytes vtest/scores/invisible.mscz | Bin 77782 -> 77782 bytes vtest/scores/kerning-3.mscz | Bin 106632 -> 106632 bytes vtest/scores/musejazz-12.mscx | 158 -------- vtest/scores/musejazz-text-2.mscx | 375 ++++------------- vtest/scores/musejazz-text-3.mscx | 375 +++++++++++++++++ vtest/scores/polyrythm-1.mscz | Bin 136959 -> 136959 bytes vtest/scores/slur-adjust-for-tie.mscz | Bin 86550 -> 86550 bytes vtest/scores/slurs-11.mscz | Bin 97165 -> 97165 bytes vtest/scores/slurs-13.mscz | Bin 82092 -> 82092 bytes vtest/scores/slurs-16.mscz | Bin 88923 -> 88923 bytes vtest/scores/slurs-18.mscz | Bin 85570 -> 85570 bytes vtest/scores/slurs-19.mscz | Bin 85208 -> 85208 bytes vtest/scores/slurs-tremside.mscz | Bin 87969 -> 87969 bytes vtest/scores/stemSlash-2-bravura.mscz | Bin 86738 -> 86738 bytes vtest/scores/stemSlash-2-gonville.mscz | Bin 86670 -> 86670 bytes vtest/scores/stemSlash-2-maestro.mscz | Bin 86439 -> 86439 bytes vtest/scores/stemSlash-2.mscz | Bin 86652 -> 86652 bytes vtest/scores/stemSlash-3.mscz | Bin 90612 -> 90612 bytes vtest/scores/tempoChangeLines.mscz | Bin 82205 -> 82205 bytes vtest/scores/tremolo-hooks-flat.mscz | Bin 85651 -> 85651 bytes vtest/scores/tremolo-hooks-trad.mscz | Bin 86080 -> 86080 bytes vtest/scores/tremolo-min-size.mscz | Bin 83549 -> 83549 bytes 141 files changed, 1463 insertions(+), 1469 deletions(-) delete mode 100644 vtest/scores/bravura-12.mscx create mode 100644 vtest/scores/bravura-text-3.mscx delete mode 100644 vtest/scores/emmentaler-12.mscx create mode 100644 vtest/scores/emmentaler-text-3.mscx delete mode 100644 vtest/scores/musejazz-12.mscx create mode 100644 vtest/scores/musejazz-text-3.mscx diff --git a/share/templates/01-General/01-Treble_Clef/score_style.mss b/share/templates/01-General/01-Treble_Clef/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/01-General/01-Treble_Clef/score_style.mss +++ b/share/templates/01-General/01-Treble_Clef/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/01-General/02-Bass_Clef/score_style.mss b/share/templates/01-General/02-Bass_Clef/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/01-General/02-Bass_Clef/score_style.mss +++ b/share/templates/01-General/02-Bass_Clef/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/01-General/03-Grand_Staff/score_style.mss b/share/templates/01-General/03-Grand_Staff/score_style.mss index 6dd6141edda22..b5fc398ce7489 100644 --- a/share/templates/01-General/03-Grand_Staff/score_style.mss +++ b/share/templates/01-General/03-Grand_Staff/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/01-SATB/score_style.mss b/share/templates/02-Choral/01-SATB/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/02-Choral/01-SATB/score_style.mss +++ b/share/templates/02-Choral/01-SATB/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/02-SATB_+_Organ/score_style.mss b/share/templates/02-Choral/02-SATB_+_Organ/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/02-Choral/02-SATB_+_Organ/score_style.mss +++ b/share/templates/02-Choral/02-SATB_+_Organ/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/03-SATB_+_Piano/score_style.mss b/share/templates/02-Choral/03-SATB_+_Piano/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/02-Choral/03-SATB_+_Piano/score_style.mss +++ b/share/templates/02-Choral/03-SATB_+_Piano/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/04-SATB_Closed_Score/score_style.mss b/share/templates/02-Choral/04-SATB_Closed_Score/score_style.mss index 24e969d481941..7a32ec31dd132 100644 --- a/share/templates/02-Choral/04-SATB_Closed_Score/score_style.mss +++ b/share/templates/02-Choral/04-SATB_Closed_Score/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ/score_style.mss b/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ/score_style.mss index 24e969d481941..7a32ec31dd132 100644 --- a/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ/score_style.mss +++ b/share/templates/02-Choral/05-SATB_Closed_Score_+_Organ/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano/score_style.mss b/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano/score_style.mss index 34a4379d435dc..75a498b075649 100644 --- a/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano/score_style.mss +++ b/share/templates/02-Choral/06-SATB_Closed_Score_+_Piano/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/07-Voice_+_Piano/score_style.mss b/share/templates/02-Choral/07-Voice_+_Piano/score_style.mss index 9170ecb88e043..8779e072deeba 100644 --- a/share/templates/02-Choral/07-Voice_+_Piano/score_style.mss +++ b/share/templates/02-Choral/07-Voice_+_Piano/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/08-Barbershop_Quartet_(Men)/score_style.mss b/share/templates/02-Choral/08-Barbershop_Quartet_(Men)/score_style.mss index 24e969d481941..7a32ec31dd132 100644 --- a/share/templates/02-Choral/08-Barbershop_Quartet_(Men)/score_style.mss +++ b/share/templates/02-Choral/08-Barbershop_Quartet_(Men)/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/09-Barbershop_Quartet_(Women)/score_style.mss b/share/templates/02-Choral/09-Barbershop_Quartet_(Women)/score_style.mss index 24e969d481941..7a32ec31dd132 100644 --- a/share/templates/02-Choral/09-Barbershop_Quartet_(Women)/score_style.mss +++ b/share/templates/02-Choral/09-Barbershop_Quartet_(Women)/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/10-Liturgical_Unmetrical/score_style.mss b/share/templates/02-Choral/10-Liturgical_Unmetrical/score_style.mss index 0bef9e6a3a3c6..a853d9a9b2663 100644 --- a/share/templates/02-Choral/10-Liturgical_Unmetrical/score_style.mss +++ b/share/templates/02-Choral/10-Liturgical_Unmetrical/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ/score_style.mss b/share/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ/score_style.mss index ffe8052e64719..247110135291a 100644 --- a/share/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ/score_style.mss +++ b/share/templates/02-Choral/11-Liturgical_Unmetrical_+_Organ/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/03-Chamber_Music/01-String_Quartet/score_style.mss b/share/templates/03-Chamber_Music/01-String_Quartet/score_style.mss index c8c22411b5981..3038f61ece0b1 100644 --- a/share/templates/03-Chamber_Music/01-String_Quartet/score_style.mss +++ b/share/templates/03-Chamber_Music/01-String_Quartet/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/03-Chamber_Music/02-Wind_Quartet/score_style.mss b/share/templates/03-Chamber_Music/02-Wind_Quartet/score_style.mss index c8c22411b5981..3038f61ece0b1 100644 --- a/share/templates/03-Chamber_Music/02-Wind_Quartet/score_style.mss +++ b/share/templates/03-Chamber_Music/02-Wind_Quartet/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/03-Chamber_Music/03-Wind_Quintet/score_style.mss b/share/templates/03-Chamber_Music/03-Wind_Quintet/score_style.mss index c8c22411b5981..3038f61ece0b1 100644 --- a/share/templates/03-Chamber_Music/03-Wind_Quintet/score_style.mss +++ b/share/templates/03-Chamber_Music/03-Wind_Quintet/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/03-Chamber_Music/04-Saxophone_Quartet/score_style.mss b/share/templates/03-Chamber_Music/04-Saxophone_Quartet/score_style.mss index c8c22411b5981..3038f61ece0b1 100644 --- a/share/templates/03-Chamber_Music/04-Saxophone_Quartet/score_style.mss +++ b/share/templates/03-Chamber_Music/04-Saxophone_Quartet/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/03-Chamber_Music/05-Brass_Quartet/score_style.mss b/share/templates/03-Chamber_Music/05-Brass_Quartet/score_style.mss index c8c22411b5981..3038f61ece0b1 100644 --- a/share/templates/03-Chamber_Music/05-Brass_Quartet/score_style.mss +++ b/share/templates/03-Chamber_Music/05-Brass_Quartet/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/03-Chamber_Music/06-Brass_Quintet/score_style.mss b/share/templates/03-Chamber_Music/06-Brass_Quintet/score_style.mss index 5d24b18dd4858..8a2b7ec9fd587 100644 --- a/share/templates/03-Chamber_Music/06-Brass_Quintet/score_style.mss +++ b/share/templates/03-Chamber_Music/06-Brass_Quintet/score_style.mss @@ -874,7 +874,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/04-Solo/01-Guitar/score_style.mss b/share/templates/04-Solo/01-Guitar/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/04-Solo/01-Guitar/score_style.mss +++ b/share/templates/04-Solo/01-Guitar/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/04-Solo/02-Guitar_+_Tablature/score_style.mss b/share/templates/04-Solo/02-Guitar_+_Tablature/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/04-Solo/02-Guitar_+_Tablature/score_style.mss +++ b/share/templates/04-Solo/02-Guitar_+_Tablature/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/04-Solo/03-Guitar_Tablature/score_style.mss b/share/templates/04-Solo/03-Guitar_Tablature/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/04-Solo/03-Guitar_Tablature/score_style.mss +++ b/share/templates/04-Solo/03-Guitar_Tablature/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/04-Solo/04-Piano/score_style.mss b/share/templates/04-Solo/04-Piano/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/04-Solo/04-Piano/score_style.mss +++ b/share/templates/04-Solo/04-Piano/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/05-Jazz/01-Jazz_Lead_Sheet/score_style.mss b/share/templates/05-Jazz/01-Jazz_Lead_Sheet/score_style.mss index 72744d1270bf5..d5df509f9d055 100644 --- a/share/templates/05-Jazz/01-Jazz_Lead_Sheet/score_style.mss +++ b/share/templates/05-Jazz/01-Jazz_Lead_Sheet/score_style.mss @@ -872,7 +872,7 @@ 0.5 MuseJazz Text - 11 + 18 1 1 0 diff --git a/share/templates/05-Jazz/02-Big_Band/score_style.mss b/share/templates/05-Jazz/02-Big_Band/score_style.mss index f8de9f1828f9a..8629179250e9c 100644 --- a/share/templates/05-Jazz/02-Big_Band/score_style.mss +++ b/share/templates/05-Jazz/02-Big_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 MuseJazz Text - 11 + 18 1 1 0 diff --git a/share/templates/05-Jazz/03-Jazz_Combo/score_style.mss b/share/templates/05-Jazz/03-Jazz_Combo/score_style.mss index cef28a85ec85e..b0a19ffeda006 100644 --- a/share/templates/05-Jazz/03-Jazz_Combo/score_style.mss +++ b/share/templates/05-Jazz/03-Jazz_Combo/score_style.mss @@ -872,7 +872,7 @@ 0.5 MuseJazz Text - 11 + 18 1 1 0 diff --git a/share/templates/06-Popular/01-Rock_Band/score_style.mss b/share/templates/06-Popular/01-Rock_Band/score_style.mss index 84ed9881c78d2..1b237957c47d5 100644 --- a/share/templates/06-Popular/01-Rock_Band/score_style.mss +++ b/share/templates/06-Popular/01-Rock_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/06-Popular/02-Bluegrass_Band/score_style.mss b/share/templates/06-Popular/02-Bluegrass_Band/score_style.mss index fdd457a980b2d..8cf7269fb153d 100644 --- a/share/templates/06-Popular/02-Bluegrass_Band/score_style.mss +++ b/share/templates/06-Popular/02-Bluegrass_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/01-Concert_Band/score_style.mss b/share/templates/07-Band_and_Percussion/01-Concert_Band/score_style.mss index bd17c9ac274d8..c1640daf4d1c8 100644 --- a/share/templates/07-Band_and_Percussion/01-Concert_Band/score_style.mss +++ b/share/templates/07-Band_and_Percussion/01-Concert_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/02-Small_Concert_Band/score_style.mss b/share/templates/07-Band_and_Percussion/02-Small_Concert_Band/score_style.mss index aa6c9f7d60154..ad1c0c74b13f7 100644 --- a/share/templates/07-Band_and_Percussion/02-Small_Concert_Band/score_style.mss +++ b/share/templates/07-Band_and_Percussion/02-Small_Concert_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/03-Brass_Band/score_style.mss b/share/templates/07-Band_and_Percussion/03-Brass_Band/score_style.mss index d4ca81a91e2d2..33ecfd3f2366b 100644 --- a/share/templates/07-Band_and_Percussion/03-Brass_Band/score_style.mss +++ b/share/templates/07-Band_and_Percussion/03-Brass_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/04-Marching_Band/score_style.mss b/share/templates/07-Band_and_Percussion/04-Marching_Band/score_style.mss index 8b9f1dfb54263..e3dc1bc8809c8 100644 --- a/share/templates/07-Band_and_Percussion/04-Marching_Band/score_style.mss +++ b/share/templates/07-Band_and_Percussion/04-Marching_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/05-Small_Marching_Band/score_style.mss b/share/templates/07-Band_and_Percussion/05-Small_Marching_Band/score_style.mss index a9707a2075d1d..08e32a4c6a48d 100644 --- a/share/templates/07-Band_and_Percussion/05-Small_Marching_Band/score_style.mss +++ b/share/templates/07-Band_and_Percussion/05-Small_Marching_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/06-Battery_Percussion/score_style.mss b/share/templates/07-Band_and_Percussion/06-Battery_Percussion/score_style.mss index cc0e34f0fd312..ae9c191a43a7a 100644 --- a/share/templates/07-Band_and_Percussion/06-Battery_Percussion/score_style.mss +++ b/share/templates/07-Band_and_Percussion/06-Battery_Percussion/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/07-Large_Pit_Percussion/score_style.mss b/share/templates/07-Band_and_Percussion/07-Large_Pit_Percussion/score_style.mss index 558569cea6d8a..a930d6b89044e 100644 --- a/share/templates/07-Band_and_Percussion/07-Large_Pit_Percussion/score_style.mss +++ b/share/templates/07-Band_and_Percussion/07-Large_Pit_Percussion/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/08-Small_Pit_Percussion/score_style.mss b/share/templates/07-Band_and_Percussion/08-Small_Pit_Percussion/score_style.mss index e9a4e33233070..52728ffd809ff 100644 --- a/share/templates/07-Band_and_Percussion/08-Small_Pit_Percussion/score_style.mss +++ b/share/templates/07-Band_and_Percussion/08-Small_Pit_Percussion/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/07-Band_and_Percussion/09-European_Concert_Band/score_style.mss b/share/templates/07-Band_and_Percussion/09-European_Concert_Band/score_style.mss index b9fd910978351..a6a3314dfb373 100644 --- a/share/templates/07-Band_and_Percussion/09-European_Concert_Band/score_style.mss +++ b/share/templates/07-Band_and_Percussion/09-European_Concert_Band/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/08-Orchestral/01-Classical_Orchestra/score_style.mss b/share/templates/08-Orchestral/01-Classical_Orchestra/score_style.mss index 1c6598fedf840..be9eb2cc46a1a 100644 --- a/share/templates/08-Orchestral/01-Classical_Orchestra/score_style.mss +++ b/share/templates/08-Orchestral/01-Classical_Orchestra/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/08-Orchestral/02-Symphony_Orchestra/score_style.mss b/share/templates/08-Orchestral/02-Symphony_Orchestra/score_style.mss index f70741e9aee96..5d4107c111ae6 100644 --- a/share/templates/08-Orchestral/02-Symphony_Orchestra/score_style.mss +++ b/share/templates/08-Orchestral/02-Symphony_Orchestra/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/share/templates/08-Orchestral/03-String_Orchestra/score_style.mss b/share/templates/08-Orchestral/03-String_Orchestra/score_style.mss index 3f0f8f783bb43..7f2e63396f931 100644 --- a/share/templates/08-Orchestral/03-String_Orchestra/score_style.mss +++ b/share/templates/08-Orchestral/03-String_Orchestra/score_style.mss @@ -872,7 +872,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/data/styles/legacy-style-defaults-v302.mss b/src/engraving/data/styles/legacy-style-defaults-v302.mss index 78d65bedd6e73..90f0f3c3594e9 100644 --- a/src/engraving/data/styles/legacy-style-defaults-v302.mss +++ b/src/engraving/data/styles/legacy-style-defaults-v302.mss @@ -847,7 +847,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/data/styles/migration-306-style-Edwin.mss b/src/engraving/data/styles/migration-306-style-Edwin.mss index 7f6a8e7ca1f20..131191d6bd1a5 100644 --- a/src/engraving/data/styles/migration-306-style-Edwin.mss +++ b/src/engraving/data/styles/migration-306-style-Edwin.mss @@ -66,7 +66,7 @@ 0.16 0 Edwin - 11 + 18 Edwin 11 Edwin diff --git a/src/engraving/dom/textbase.cpp b/src/engraving/dom/textbase.cpp index 76fe87440cf8b..da8761735a1fd 100644 --- a/src/engraving/dom/textbase.cpp +++ b/src/engraving/dom/textbase.cpp @@ -888,8 +888,6 @@ Font TextFragment::font(const TextBase* t) const || t->textStyleType() == TextStyleType::HARP_PEDAL_DIAGRAM || t->textStyleType() == TextStyleType::TUPLET || t->textStyleType() == TextStyleType::PEDAL - || t->textStyleType() == TextStyleType::REPEAT_LEFT - || t->textStyleType() == TextStyleType::REPEAT_RIGHT ) { std::string fontName = engravingFonts()->fontByName(t->style().styleSt(Sid::musicalSymbolFont).toStdString())->family(); family = String::fromStdString(fontName); diff --git a/src/engraving/style/styledef.cpp b/src/engraving/style/styledef.cpp index bae4cc3939c5b..9999ab8b77b6d 100644 --- a/src/engraving/style/styledef.cpp +++ b/src/engraving/style/styledef.cpp @@ -1180,7 +1180,7 @@ const std::array StyleDef::styleValue styleDef(rehearsalMarkMinDistance, Spatium(0.5)), styleDef(repeatLeftFontFace, "Edwin"), - styleDef(repeatLeftFontSize, 11.0), + styleDef(repeatLeftFontSize, 18.0), styleDef(repeatLeftLineSpacing, 1.0), styleDef(repeatLeftFontSpatiumDependent, true), styleDef(repeatLeftFontStyle, int(FontStyle::Normal)), @@ -1194,8 +1194,6 @@ const std::array StyleDef::styleValue styleDef(repeatLeftFrameFgColor, PropertyValue::fromValue(Color::BLACK)), styleDef(repeatLeftFrameBgColor, PropertyValue::fromValue(Color::transparent)), - styleDef(repeatsMusicalSymbolsScale, 1.0), // percentage of the standard size - styleDef(repeatRightFontFace, "Edwin"), styleDef(repeatRightFontSize, 11.0), styleDef(repeatRightLineSpacing, 1.0), diff --git a/src/engraving/style/styledef.h b/src/engraving/style/styledef.h index dcc97cba4bf31..fa393c47ee6e2 100644 --- a/src/engraving/style/styledef.h +++ b/src/engraving/style/styledef.h @@ -1206,8 +1206,6 @@ enum class Sid { repeatLeftFrameFgColor, repeatLeftFrameBgColor, - repeatsMusicalSymbolsScale, - repeatRightFontFace, repeatRightFontSize, repeatRightLineSpacing, diff --git a/src/engraving/style/textstyle.cpp b/src/engraving/style/textstyle.cpp index 9289304accc68..cc130b2c3b8a7 100644 --- a/src/engraving/style/textstyle.cpp +++ b/src/engraving/style/textstyle.cpp @@ -672,7 +672,7 @@ const TextStyle repeatLeftTextStyle { { { TextStylePropertyType::FrameRound, Sid::repeatLeftFrameRound, Pid::FRAME_ROUND }, { TextStylePropertyType::FrameBorderColor, Sid::repeatLeftFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::repeatLeftFrameBgColor, Pid::FRAME_BG_COLOR }, - { TextStylePropertyType::MusicalSymbolsScale, Sid::repeatsMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, } }; const TextStyle repeatRightTextStyle { { @@ -690,7 +690,7 @@ const TextStyle repeatRightTextStyle { { { TextStylePropertyType::FrameRound, Sid::repeatRightFrameRound, Pid::FRAME_ROUND }, { TextStylePropertyType::FrameBorderColor, Sid::repeatRightFrameFgColor, Pid::FRAME_FG_COLOR }, { TextStylePropertyType::FrameFillColor, Sid::repeatRightFrameBgColor, Pid::FRAME_BG_COLOR }, - { TextStylePropertyType::MusicalSymbolsScale, Sid::repeatsMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, + { TextStylePropertyType::MusicalSymbolsScale, Sid::dummyMusicalSymbolsScale, Pid::MUSICAL_SYMBOLS_SCALE }, } }; const TextStyle frameTextStyle { { diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/TwoNotes_Discrete_Harp_Glissando/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/TwoNotes_Discrete_Harp_Glissando/score_style.mss index e84d00864b6ad..245510775eb3b 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/TwoNotes_Discrete_Harp_Glissando/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/TwoNotes_Discrete_Harp_Glissando/score_style.mss @@ -969,7 +969,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_bracket/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_bracket/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_bracket/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_bracket/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_down/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_down/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_down/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_down/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_down/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_down/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_down/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_down/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_up/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_up/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_up/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_straight_up/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_up/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_up/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_up/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/chord_arpeggio_up/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_chord_tremolo/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_chord_tremolo/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_chord_tremolo/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_chord_tremolo/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura_chord/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura_chord/score_style.mss index 101cac367e77e..33440c64cefb3 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura_chord/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_acciaccatura_chord/score_style.mss @@ -918,7 +918,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_chord_post/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_chord_post/score_style.mss index 101cac367e77e..33440c64cefb3 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_chord_post/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_chord_post/score_style.mss @@ -918,7 +918,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_post/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_post/score_style.mss index eb4231800a6c5..142ba04881061 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_post/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_appoggiatura_post/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn/score_style.mss index 2766b9ca8f94d..5e5ce826e0398 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn_slash_variation/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn_slash_variation/score_style.mss index 2766b9ca8f94d..5e5ce826e0398 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn_slash_variation/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_inverted_turn_slash_variation/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_lower_mordent/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_lower_mordent/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_lower_mordent/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_lower_mordent/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_acciaccatura/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_acciaccatura/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_acciaccatura/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_acciaccatura/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_appoggiatura_post/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_appoggiatura_post/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_appoggiatura_post/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_multi_appoggiatura_post/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_no_articulations/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_no_articulations/score_style.mss index 2766b9ca8f94d..5e5ce826e0398 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_no_articulations/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_no_articulations/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_regular_turn/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_regular_turn/score_style.mss index 2766b9ca8f94d..5e5ce826e0398 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_regular_turn/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_regular_turn/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tenuto_accent/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tenuto_accent/score_style.mss index 88e15e8229c57..b9bc2060cc0d8 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tenuto_accent/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tenuto_accent/score_style.mss @@ -871,7 +871,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tremolo/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tremolo/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tremolo/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_tremolo/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/score_style.mss index 53dd4c84d7ef7..b0ac999eb0d4b 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/single_note_trill_baroque.mscx b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/single_note_trill_baroque.mscx index 19bd726f61039..36c538dcd1f89 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/single_note_trill_baroque.mscx +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_baroque/single_note_trill_baroque.mscx @@ -79,7 +79,7 @@ 0.16 0 Edwin - 11 + 18 Edwin 11 Edwin diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_default_tempo/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_default_tempo/score_style.mss index 2766b9ca8f94d..5e5ce826e0398 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_default_tempo/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_trill_default_tempo/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_unexpandable_trill/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_unexpandable_trill/score_style.mss index 2766b9ca8f94d..5e5ce826e0398 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_unexpandable_trill/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_unexpandable_trill/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_upper_mordent/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_upper_mordent/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_upper_mordent/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/single_note_upper_mordent/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/two_chords_tremolo/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/two_chords_tremolo/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/two_chords_tremolo/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/two_chords_tremolo/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando/score_style.mss index 13662de8a6f1a..1286cdfe4be41 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_continuous_glissando_no_play/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_discrete_glissando/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_discrete_glissando/score_style.mss index 2530ff99f6302..e978efa71ead9 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_discrete_glissando/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/two_notes_discrete_glissando/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackeventsrenderer_data/whole_measure_rest/score_style.mss b/src/engraving/tests/playback/playbackeventsrenderer_data/whole_measure_rest/score_style.mss index 2766b9ca8f94d..5e5ce826e0398 100644 --- a/src/engraving/tests/playback/playbackeventsrenderer_data/whole_measure_rest/score_style.mss +++ b/src/engraving/tests/playback/playbackeventsrenderer_data/whole_measure_rest/score_style.mss @@ -873,7 +873,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/da_capo_al_coda/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/da_capo_al_coda/score_style.mss index aff3d3a640edc..dfe166e12ce99 100644 --- a/src/engraving/tests/playback/playbackmodel_data/da_capo_al_coda/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/da_capo_al_coda/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/da_capo_al_fine/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/da_capo_al_fine/score_style.mss index aff3d3a640edc..dfe166e12ce99 100644 --- a/src/engraving/tests/playback/playbackmodel_data/da_capo_al_fine/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/da_capo_al_fine/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_coda/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_coda/score_style.mss index aff3d3a640edc..dfe166e12ce99 100644 --- a/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_coda/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_coda/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_fine/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_fine/score_style.mss index aff3d3a640edc..dfe166e12ce99 100644 --- a/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_fine/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/dal_segno_al_fine/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/dynamics/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/dynamics/score_style.mss index 894629d4549df..387a3cc7cdd91 100644 --- a/src/engraving/tests/playback/playbackmodel_data/dynamics/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/dynamics/score_style.mss @@ -973,7 +973,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/metronome_4_4/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/metronome_4_4/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/playback/playbackmodel_data/metronome_4_4/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/metronome_4_4/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/metronome_6_4_with_repeat/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/metronome_6_4_with_repeat/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/playback/playbackmodel_data/metronome_6_4_with_repeat/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/metronome_6_4_with_repeat/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/multi_measure_repeat/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/multi_measure_repeat/score_style.mss index 9a870e62a74da..3c401e76de237 100644 --- a/src/engraving/tests/playback/playbackmodel_data/multi_measure_repeat/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/multi_measure_repeat/score_style.mss @@ -899,7 +899,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_chord/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_chord/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_chord/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_chord/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_note/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_note/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_note/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/note_entry_playback_note/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/pizz_to_arco/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/pizz_to_arco/score_style.mss index aff3d3a640edc..dfe166e12ce99 100644 --- a/src/engraving/tests/playback/playbackmodel_data/pizz_to_arco/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/pizz_to_arco/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/playback_setup_instruments/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/playback_setup_instruments/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/playback/playbackmodel_data/playback_setup_instruments/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/playback_setup_instruments/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/repeat_and_tremolo/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/repeat_and_tremolo/score_style.mss index 848de2ceab8b8..a995ce7d1fe06 100644 --- a/src/engraving/tests/playback/playbackmodel_data/repeat_and_tremolo/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/repeat_and_tremolo/score_style.mss @@ -977,7 +977,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/repeat_range/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/repeat_range/score_style.mss index aff3d3a640edc..dfe166e12ce99 100644 --- a/src/engraving/tests/playback/playbackmodel_data/repeat_range/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/repeat_range/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/repeat_with_2_voltas/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/repeat_with_2_voltas/score_style.mss index aff3d3a640edc..dfe166e12ce99 100644 --- a/src/engraving/tests/playback/playbackmodel_data/repeat_with_2_voltas/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/repeat_with_2_voltas/score_style.mss @@ -875,7 +875,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/single_measure_repeat/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/single_measure_repeat/score_style.mss index 6e6d0809509b8..ead6a7a646de8 100644 --- a/src/engraving/tests/playback/playbackmodel_data/single_measure_repeat/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/single_measure_repeat/score_style.mss @@ -897,7 +897,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/spanners/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/spanners/score_style.mss index 4e18598ae4064..9f499987d052d 100644 --- a/src/engraving/tests/playback/playbackmodel_data/spanners/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/spanners/score_style.mss @@ -973,7 +973,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/playback/playbackmodel_data/tempo_changes_during_notes/score_style.mss b/src/engraving/tests/playback/playbackmodel_data/tempo_changes_during_notes/score_style.mss index ef5fa3ac0cc07..9b2342f80c3ce 100644 --- a/src/engraving/tests/playback/playbackmodel_data/tempo_changes_during_notes/score_style.mss +++ b/src/engraving/tests/playback/playbackmodel_data/tempo_changes_during_notes/score_style.mss @@ -977,7 +977,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/tempomap_data/absolute_tempo_80_to_120_bpm/score_style.mss b/src/engraving/tests/tempomap_data/absolute_tempo_80_to_120_bpm/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/tempomap_data/absolute_tempo_80_to_120_bpm/score_style.mss +++ b/src/engraving/tests/tempomap_data/absolute_tempo_80_to_120_bpm/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/tempomap_data/custom_tempo_80_bpm/score_style.mss b/src/engraving/tests/tempomap_data/custom_tempo_80_bpm/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/tempomap_data/custom_tempo_80_bpm/score_style.mss +++ b/src/engraving/tests/tempomap_data/custom_tempo_80_bpm/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/tempomap_data/default_tempo/score_style.mss b/src/engraving/tests/tempomap_data/default_tempo/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/tempomap_data/default_tempo/score_style.mss +++ b/src/engraving/tests/tempomap_data/default_tempo/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/tempomap_data/gradual_tempo_change_accelerando/score_style.mss b/src/engraving/tests/tempomap_data/gradual_tempo_change_accelerando/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/tempomap_data/gradual_tempo_change_accelerando/score_style.mss +++ b/src/engraving/tests/tempomap_data/gradual_tempo_change_accelerando/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/tempomap_data/gradual_tempo_change_doesnt_overwrite_other_tempo/score_style.mss b/src/engraving/tests/tempomap_data/gradual_tempo_change_doesnt_overwrite_other_tempo/score_style.mss index 414dddfd63306..bbc96e89a9cbc 100644 --- a/src/engraving/tests/tempomap_data/gradual_tempo_change_doesnt_overwrite_other_tempo/score_style.mss +++ b/src/engraving/tests/tempomap_data/gradual_tempo_change_doesnt_overwrite_other_tempo/score_style.mss @@ -894,7 +894,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/src/engraving/tests/tempomap_data/gradual_tempo_change_rallentando/score_style.mss b/src/engraving/tests/tempomap_data/gradual_tempo_change_rallentando/score_style.mss index d41f8c5c7caf3..983da6746333b 100644 --- a/src/engraving/tests/tempomap_data/gradual_tempo_change_rallentando/score_style.mss +++ b/src/engraving/tests/tempomap_data/gradual_tempo_change_rallentando/score_style.mss @@ -877,7 +877,7 @@ 0.5 Edwin - 11 + 18 1 1 0 diff --git a/vtest/scores/articulation-2.mscz b/vtest/scores/articulation-2.mscz index ed1537e6c6e8cd6fd2c5a0e41e9aa049b730008b..9733af7ff3437c3d9d539b711276f318a812ba36 100644 GIT binary patch delta 31 ncmZ2+hjqmr)(s*Xcr0x6i&6_x6H9zj(% delta 15 XcmZ4efo1gvmIWIa4L37x(CPpHJfH^G diff --git a/vtest/scores/beams-manual-adjust.mscz b/vtest/scores/beams-manual-adjust.mscz index 6f61fcd512dbb2f0f23ffc64fe12440d58ace9b1..c0473d5fd5045688c1eb4627eb8b83d7d14fd551 100644 GIT binary patch delta 31 ncmezVp5^;{mJP`pcr0x6i&6_x6H9zj( - - 3.0.0 - c07ed54 - - - 0 - - - 480 - - 1 - 1 - 1 - 0 - - - - 2013-09-17 - - - - X11 - - - - - - - - stdNormal - - - Piano - - Pno. - Piano - 21 - 108 - 21 - 108 - - 100 - 70 - - - 100 - 40 - - - 100 - 100 - - - 120 - 100 - - - - Fluid - - - - - - 0.8 - - - Bravura: Repeats - - - measure - 4/4 - - - - - 0.8 - - - segno - - - - - 4/4 - - - - - 0.8 - - - segnoSerpent1 - - - - - measure - 4/4 - - - - - 0.8 - - - coda - - - - - measure - 4/4 - - - - - 0.8 - - - codaSquare - - - - - measure - 4/4 - - - - - - - - diff --git a/vtest/scores/bravura-text-2.mscx b/vtest/scores/bravura-text-2.mscx index 9db6cec5bfa8a..3400bbaf255c4 100644 --- a/vtest/scores/bravura-text-2.mscx +++ b/vtest/scores/bravura-text-2.mscx @@ -1,7 +1,7 @@ - - 2.1.0 - 3543170 + + 3.0.0 + c07ed54 0 @@ -9,20 +9,27 @@ 480 1 @@ -41,20 +48,11 @@ - - - - - - - - stdNormal - Piano @@ -87,289 +85,74 @@ - + 0.8 - - G - G - - - Bravura-Text: Dynamics - - - ppp - 16 - - - quarter - - 67 - 15 - - - - pp - 33 - - - quarter - - 67 - 15 - - - - p - 49 - - - quarter - - 67 - 15 - - - - mp - 64 - - - quarter - - 67 - 15 - - + + + Bravura-Text: Repeats + + + measure + 4/4 + + - + 0.8 - - mf - 80 - - - quarter - - 67 - 15 - - - - f - 96 - - - quarter - - 67 - 15 - - - - ff - 112 - - - quarter - - 67 - 15 - - - - fff - 126 - - - quarter - - 67 - 15 - - + + + segno + + + + + 4/4 + + - + 0.8 - - line - - - fp - 0 - - - quarter - - 67 - 15 - - - - sf - 0 - - - quarter - - 67 - 15 - - - - sfz - 0 - - - quarter - - 67 - 15 - - - - sff - 0 - - - quarter - - 67 - 15 - - + + + segnoSerpent1 + + + + + measure + 4/4 + + - - - sffz - 0 - - - quarter - - 67 - 15 - - - - sfp - 0 - - - quarter - - 67 - 15 - - - - sfpp - 0 - - - quarter - - 67 - 15 - - - - rfz - 0 - - - quarter - - 67 - 15 - - - - + 0.8 - - rf - 0 - - - quarter - - 67 - 15 - - - - fz - 0 - - - quarter - - 67 - 15 - - - - m - 0 - - - quarter - - 67 - 15 - - - - r - 0 - - - quarter - - 67 - 15 - - + + + coda + + + + + measure + 4/4 + + - + 0.8 - - s - 0 - - - quarter - - 67 - 15 - - - - z - 0 - - - quarter - - 67 - 15 - - - - n - 0 - - - half - - 67 - 15 - - - - end - 1 - + + + codaSquare + + + + + measure + 4/4 + + + + diff --git a/vtest/scores/bravura-text-3.mscx b/vtest/scores/bravura-text-3.mscx new file mode 100644 index 0000000000000..9db6cec5bfa8a --- /dev/null +++ b/vtest/scores/bravura-text-3.mscx @@ -0,0 +1,376 @@ + + + 2.1.0 + 3543170 + + + 0 + + + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + + + + + + + + stdNormal + + + + Piano + + Pno. + Piano + 21 + 108 + 21 + 108 + + 100 + 70 + + + 100 + 40 + + + 100 + 100 + + + 120 + 100 + + + + Fluid + + + + + + 0.8 + + G + G + + + Bravura-Text: Dynamics + + + ppp + 16 + + + quarter + + 67 + 15 + + + + pp + 33 + + + quarter + + 67 + 15 + + + + p + 49 + + + quarter + + 67 + 15 + + + + mp + 64 + + + quarter + + 67 + 15 + + + + + 0.8 + + mf + 80 + + + quarter + + 67 + 15 + + + + f + 96 + + + quarter + + 67 + 15 + + + + ff + 112 + + + quarter + + 67 + 15 + + + + fff + 126 + + + quarter + + 67 + 15 + + + + + 0.8 + + line + + + fp + 0 + + + quarter + + 67 + 15 + + + + sf + 0 + + + quarter + + 67 + 15 + + + + sfz + 0 + + + quarter + + 67 + 15 + + + + sff + 0 + + + quarter + + 67 + 15 + + + + + + sffz + 0 + + + quarter + + 67 + 15 + + + + sfp + 0 + + + quarter + + 67 + 15 + + + + sfpp + 0 + + + quarter + + 67 + 15 + + + + rfz + 0 + + + quarter + + 67 + 15 + + + + + 0.8 + + rf + 0 + + + quarter + + 67 + 15 + + + + fz + 0 + + + quarter + + 67 + 15 + + + + m + 0 + + + quarter + + 67 + 15 + + + + r + 0 + + + quarter + + 67 + 15 + + + + + 0.8 + + s + 0 + + + quarter + + 67 + 15 + + + + z + 0 + + + quarter + + 67 + 15 + + + + n + 0 + + + half + + 67 + 15 + + + + end + 1 + + + + + diff --git a/vtest/scores/chord-layout-18.mscz b/vtest/scores/chord-layout-18.mscz index e5b7437c7431ddb3cd59856ee9b0ed62c938677a..aa24ab5867fd0180339e852ed8b67c9bb87efb65 100644 GIT binary patch delta 16 Ycmdn>n`PH;mJQ+?7%etSY*^F_07gXz%>V!Z delta 16 Ycmdn>n`PH;mJQ+?7!5Z|Y*^F_07e@J#sB~S diff --git a/vtest/scores/chord-layout-19.mscz b/vtest/scores/chord-layout-19.mscz index 4b9a711628392ae2238b7f861bfc1b5257a139ac..cfe50f7eb4fd513e5f1fbc87ddbda6c156502b7b 100644 GIT binary patch delta 16 Ycmey^&-$^Sbwlk2MvKjL8;Yj`07ef83;+NC delta 16 Ycmey^&-$^Sbwlk2M#If@8;Yj`07c~p1poj5 diff --git a/vtest/scores/chord-layout-20.mscz b/vtest/scores/chord-layout-20.mscz index 3a0863bc3c751d031299550d19896fa200afb8fa..e11eef4c96aa192629836b36d7d8203254b5cfbd 100644 GIT binary patch delta 16 YcmeA=%G!05bwk4jMvKjj8#p%s06&BWVE_OC delta 16 YcmeA=%G!05bwk4jM#IgG8#p%s06$s>S^xk5 diff --git a/vtest/scores/cross-5.mscz b/vtest/scores/cross-5.mscz index 103b59ca13faa9871dbda52cb5b4ec42a740b967..986babef9423ad58f76ad76a1e9b00f2c225838f 100644 GIT binary patch delta 31 ncmdnCnr+)^whh7?cr0x6i&6_x6H9zj(w8;XS#WtI6*fw8;XS#WtI6*f - - 3.0.0 - c07ed54 - - - 0 - - - 480 - - 1 - 1 - 1 - 0 - - - - 2013-09-17 - - - - X11 - - - - - - - - stdNormal - - - Piano - - Pno. - Piano - 21 - 108 - 21 - 108 - - 100 - 70 - - - 100 - 40 - - - 100 - 100 - - - 120 - 100 - - - - Fluid - - - - - - 0.8 - - - Emmentaler: Repeats - - - measure - 4/4 - - - - - 0.8 - - - segno - - - - - 4/4 - - - - - 0.8 - - - segnoSerpent1 - - - - - measure - 4/4 - - - - - 0.8 - - - coda - - - - - measure - 4/4 - - - - - 0.8 - - - codaSquare - - - - - measure - 4/4 - - - - - - - - diff --git a/vtest/scores/emmentaler-text-2.mscx b/vtest/scores/emmentaler-text-2.mscx index 20e62ea726516..2bf1c55008d20 100644 --- a/vtest/scores/emmentaler-text-2.mscx +++ b/vtest/scores/emmentaler-text-2.mscx @@ -1,7 +1,7 @@ - - 2.1.0 - 3543170 + + 3.0.0 + c07ed54 0 @@ -9,18 +9,25 @@ 480 1 @@ -39,20 +46,11 @@ - - - - - - - - stdNormal - Piano @@ -85,289 +83,74 @@ - + 0.8 - - G - G - - - Emmentaler-Text: Dynamics - - - ppp - 16 - - - quarter - - 67 - 15 - - - - pp - 33 - - - quarter - - 67 - 15 - - - - p - 49 - - - quarter - - 67 - 15 - - - - mp - 64 - - - quarter - - 67 - 15 - - + + + Emmentaler-Text: Repeats + + + measure + 4/4 + + - + 0.8 - - mf - 80 - - - quarter - - 67 - 15 - - - - f - 96 - - - quarter - - 67 - 15 - - - - ff - 112 - - - quarter - - 67 - 15 - - - - fff - 126 - - - quarter - - 67 - 15 - - + + + segno + + + + + 4/4 + + - + 0.8 - - line - - - fp - 0 - - - quarter - - 67 - 15 - - - - sf - 0 - - - quarter - - 67 - 15 - - - - sfz - 0 - - - quarter - - 67 - 15 - - - - sff - 0 - - - quarter - - 67 - 15 - - + + + segnoSerpent1 + + + + + measure + 4/4 + + - - - sffz - 0 - - - quarter - - 67 - 15 - - - - sfp - 0 - - - quarter - - 67 - 15 - - - - sfpp - 0 - - - quarter - - 67 - 15 - - - - rfz - 0 - - - quarter - - 67 - 15 - - - - + 0.8 - - rf - 0 - - - quarter - - 67 - 15 - - - - fz - 0 - - - quarter - - 67 - 15 - - - - m - 0 - - - quarter - - 67 - 15 - - - - r - 0 - - - quarter - - 67 - 15 - - + + + coda + + + + + measure + 4/4 + + - + 0.8 - - s - 0 - - - quarter - - 67 - 15 - - - - z - 0 - - - quarter - - 67 - 15 - - - - n - 0 - - - half - - 67 - 15 - - - - end - 1 - + + + codaSquare + + + + + measure + 4/4 + + + + diff --git a/vtest/scores/emmentaler-text-3.mscx b/vtest/scores/emmentaler-text-3.mscx new file mode 100644 index 0000000000000..20e62ea726516 --- /dev/null +++ b/vtest/scores/emmentaler-text-3.mscx @@ -0,0 +1,374 @@ + + + 2.1.0 + 3543170 + + + 0 + + + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + + + + + + + + stdNormal + + + + Piano + + Pno. + Piano + 21 + 108 + 21 + 108 + + 100 + 70 + + + 100 + 40 + + + 100 + 100 + + + 120 + 100 + + + + Fluid + + + + + + 0.8 + + G + G + + + Emmentaler-Text: Dynamics + + + ppp + 16 + + + quarter + + 67 + 15 + + + + pp + 33 + + + quarter + + 67 + 15 + + + + p + 49 + + + quarter + + 67 + 15 + + + + mp + 64 + + + quarter + + 67 + 15 + + + + + 0.8 + + mf + 80 + + + quarter + + 67 + 15 + + + + f + 96 + + + quarter + + 67 + 15 + + + + ff + 112 + + + quarter + + 67 + 15 + + + + fff + 126 + + + quarter + + 67 + 15 + + + + + 0.8 + + line + + + fp + 0 + + + quarter + + 67 + 15 + + + + sf + 0 + + + quarter + + 67 + 15 + + + + sfz + 0 + + + quarter + + 67 + 15 + + + + sff + 0 + + + quarter + + 67 + 15 + + + + + + sffz + 0 + + + quarter + + 67 + 15 + + + + sfp + 0 + + + quarter + + 67 + 15 + + + + sfpp + 0 + + + quarter + + 67 + 15 + + + + rfz + 0 + + + quarter + + 67 + 15 + + + + + 0.8 + + rf + 0 + + + quarter + + 67 + 15 + + + + fz + 0 + + + quarter + + 67 + 15 + + + + m + 0 + + + quarter + + 67 + 15 + + + + r + 0 + + + quarter + + 67 + 15 + + + + + 0.8 + + s + 0 + + + quarter + + 67 + 15 + + + + z + 0 + + + quarter + + 67 + 15 + + + + n + 0 + + + half + + 67 + 15 + + + + end + 1 + + + + + diff --git a/vtest/scores/fingeringSpacing.mscz b/vtest/scores/fingeringSpacing.mscz index f8c0bc8aef498af94b198916d20d3754f0e12187..bb5096c458549b9f12b7d149471ced11c5a666f3 100644 GIT binary patch delta 31 ncmX@o%zC7mb%W3b9t#`&qSS)a#1fy>w8{LN#WtI4m@p9l!P^XV delta 31 ncmX@o%zC7mb%W3b9zz@bqSS)a#1fy>w8{LN#WtI4m@p9l!AJ~l diff --git a/vtest/scores/grace-9.mscz b/vtest/scores/grace-9.mscz index ec9c7758aa4bb50222c8c6c219882cb3ba1aa6a9..30cdf77f42dc4c7acb6c388f55ed682cc1814c94 100644 GIT binary patch delta 31 ncmaE`jrGAc)(s*Xcr0x6i&6_x6H9zj( diff --git a/vtest/scores/kerning-3.mscz b/vtest/scores/kerning-3.mscz index a0cf7f20b31eeb14c5a036d868d8837cfddc7a02..86950e8b722f20a6ff909cd26d3f785ba787cb61 100644 GIT binary patch delta 16 YcmeA;$kuU?ZNvNxj24?0Yb%7 delta 16 YcmeA;$kuU?ZNvNxjE0*RY`ssI20 diff --git a/vtest/scores/musejazz-12.mscx b/vtest/scores/musejazz-12.mscx deleted file mode 100644 index 6bbeed78dc39e..0000000000000 --- a/vtest/scores/musejazz-12.mscx +++ /dev/null @@ -1,158 +0,0 @@ - - - 3.0.0 - c07ed54 - - - 0 - - - 480 - - 1 - 1 - 1 - 0 - - - - 2013-09-17 - - - - X11 - - - - - - - - stdNormal - - - Piano - - Pno. - Piano - 21 - 108 - 21 - 108 - - 100 - 70 - - - 100 - 40 - - - 100 - 100 - - - 120 - 100 - - - - Fluid - - - - - - 0.8 - - - MuseJazz: Repeats - - - measure - 4/4 - - - - - 0.8 - - - segno - - - - - 4/4 - - - - - 0.8 - - - segnoSerpent1 - - - - - measure - 4/4 - - - - - 0.8 - - - coda - - - - - measure - 4/4 - - - - - 0.8 - - - codaSquare - - - - - measure - 4/4 - - - - - - - - diff --git a/vtest/scores/musejazz-text-2.mscx b/vtest/scores/musejazz-text-2.mscx index ea5977130550b..6bbeed78dc39e 100644 --- a/vtest/scores/musejazz-text-2.mscx +++ b/vtest/scores/musejazz-text-2.mscx @@ -1,7 +1,7 @@ - - 2.1.0 - 3543170 + + 3.0.0 + c07ed54 0 @@ -9,19 +9,26 @@ 480 1 @@ -40,20 +47,11 @@ - - - - - - - - stdNormal - Piano @@ -86,289 +84,74 @@ - + 0.8 - - G - G - - - MuseJazz: Dynamics - - - ppp - 16 - - - quarter - - 67 - 15 - - - - pp - 33 - - - quarter - - 67 - 15 - - - - p - 49 - - - quarter - - 67 - 15 - - - - mp - 64 - - - quarter - - 67 - 15 - - + + + MuseJazz: Repeats + + + measure + 4/4 + + - + 0.8 - - mf - 80 - - - quarter - - 67 - 15 - - - - f - 96 - - - quarter - - 67 - 15 - - - - ff - 112 - - - quarter - - 67 - 15 - - - - fff - 126 - - - quarter - - 67 - 15 - - + + + segno + + + + + 4/4 + + - + 0.8 - - line - - - fp - 0 - - - quarter - - 67 - 15 - - - - sf - 0 - - - quarter - - 67 - 15 - - - - sfz - 0 - - - quarter - - 67 - 15 - - - - sff - 0 - - - quarter - - 67 - 15 - - + + + segnoSerpent1 + + + + + measure + 4/4 + + - - - sffz - 0 - - - quarter - - 67 - 15 - - - - sfp - 0 - - - quarter - - 67 - 15 - - - - sfpp - 0 - - - quarter - - 67 - 15 - - - - rfz - 0 - - - quarter - - 67 - 15 - - - - + 0.8 - - rf - 0 - - - quarter - - 67 - 15 - - - - fz - 0 - - - quarter - - 67 - 15 - - - - m - 0 - - - quarter - - 67 - 15 - - - - r - 0 - - - quarter - - 67 - 15 - - + + + coda + + + + + measure + 4/4 + + - + 0.8 - - s - 0 - - - quarter - - 67 - 15 - - - - z - 0 - - - quarter - - 67 - 15 - - - - n - 0 - - - half - - 67 - 15 - - - - end - 1 - + + + codaSquare + + + + + measure + 4/4 + + + + diff --git a/vtest/scores/musejazz-text-3.mscx b/vtest/scores/musejazz-text-3.mscx new file mode 100644 index 0000000000000..ea5977130550b --- /dev/null +++ b/vtest/scores/musejazz-text-3.mscx @@ -0,0 +1,375 @@ + + + 2.1.0 + 3543170 + + + 0 + + + 480 + + 1 + 1 + 1 + 0 + + + + 2013-09-17 + + + + X11 + + + + + + + + + + + + + + + + stdNormal + + + + Piano + + Pno. + Piano + 21 + 108 + 21 + 108 + + 100 + 70 + + + 100 + 40 + + + 100 + 100 + + + 120 + 100 + + + + Fluid + + + + + + 0.8 + + G + G + + + MuseJazz: Dynamics + + + ppp + 16 + + + quarter + + 67 + 15 + + + + pp + 33 + + + quarter + + 67 + 15 + + + + p + 49 + + + quarter + + 67 + 15 + + + + mp + 64 + + + quarter + + 67 + 15 + + + + + 0.8 + + mf + 80 + + + quarter + + 67 + 15 + + + + f + 96 + + + quarter + + 67 + 15 + + + + ff + 112 + + + quarter + + 67 + 15 + + + + fff + 126 + + + quarter + + 67 + 15 + + + + + 0.8 + + line + + + fp + 0 + + + quarter + + 67 + 15 + + + + sf + 0 + + + quarter + + 67 + 15 + + + + sfz + 0 + + + quarter + + 67 + 15 + + + + sff + 0 + + + quarter + + 67 + 15 + + + + + + sffz + 0 + + + quarter + + 67 + 15 + + + + sfp + 0 + + + quarter + + 67 + 15 + + + + sfpp + 0 + + + quarter + + 67 + 15 + + + + rfz + 0 + + + quarter + + 67 + 15 + + + + + 0.8 + + rf + 0 + + + quarter + + 67 + 15 + + + + fz + 0 + + + quarter + + 67 + 15 + + + + m + 0 + + + quarter + + 67 + 15 + + + + r + 0 + + + quarter + + 67 + 15 + + + + + 0.8 + + s + 0 + + + quarter + + 67 + 15 + + + + z + 0 + + + quarter + + 67 + 15 + + + + n + 0 + + + half + + 67 + 15 + + + + end + 1 + + + + + diff --git a/vtest/scores/polyrythm-1.mscz b/vtest/scores/polyrythm-1.mscz index 593024b1a960a6b388622d14827d35d2dfdc6358..d2e815e392edab092f08f176e00d0f08177ecd7b 100644 GIT binary patch delta 20 ccmeyrmgE0gjtvw8@N{#Wt&LNIwk#%<>G@ delta 31 ncmeDE&f5E(bpy)=9zz@bqSS)a#1fy>w8@N{#Wt&LNIwk#%wG)8 diff --git a/vtest/scores/slurs-13.mscz b/vtest/scores/slurs-13.mscz index 66b8544f3972af9d6ba3ad6a0de7f08102671659..8fe8bc9575773f92452bb974911f32b9880b2f9d 100644 GIT binary patch delta 31 ncmZ3}$hxMHbpz7|9t#`&qSS)a#1fy>w8{TBiEUQd&@ll3!HEqA delta 31 ncmZ3}$hxMHbpz7|9zz@bqSS)a#1fy>w8{TBiEUQd&@ll3!1fIQ diff --git a/vtest/scores/slurs-16.mscz b/vtest/scores/slurs-16.mscz index 05eae066987b531e904a1a778966fecf48899c73..d3c2e1f9aafcb3f044fdb745e24f4b9d81da806c 100644 GIT binary patch delta 16 Ycmcb;jrI06)(uq~7%eteZ+Nf@07!HQr~m)} delta 16 Ycmcb;jrI06)(uq~7!5a9Z+Nf@07yy*p#T5? diff --git a/vtest/scores/slurs-18.mscz b/vtest/scores/slurs-18.mscz index ef715a47d2b6df101dd4fee900bb042459bf78bd..c8f363b43206cfd8b7d0036ce456af26482ad0ef 100644 GIT binary patch delta 16 YcmX>!hxO1L)(v$V7%eu}Z#X;`07A|PAOHXW delta 16 YcmX>!hxO1L)(v$V7!5bqZ#X;`079e)82|tP diff --git a/vtest/scores/slurs-19.mscz b/vtest/scores/slurs-19.mscz index 90d02f2b841758d9d4b390a16a5ec77820dc6ce0..e1aeb5c99c113f3753cfb214c55a0a0ea27292e3 100644 GIT binary patch delta 16 YcmcaHll8_-)(v$V7%eu}Z-|@&07NDS+W-In delta 16 YcmcaHll8_-)(v$V7!5bqZ-|@&07Lu-)Bpeg diff --git a/vtest/scores/slurs-tremside.mscz b/vtest/scores/slurs-tremside.mscz index d869173a57babc7842575dea9a17e95a8a9694e1..7ed5470b530b05bc8a71ced3e56b99b41573ca24 100644 GIT binary patch delta 31 ncmZ3uo^|1R)(t5ecr0x6i&6_x6H9zj( delta 18 acmcb#l=ae5)(t%yCf97{+&p!I?IHkM`3Z*r diff --git a/vtest/scores/stemSlash-2-gonville.mscz b/vtest/scores/stemSlash-2-gonville.mscz index d6bf05936b0ab52600a0cac966542ba40ef2ba77..044f24083934d598e410500f3ba7b52097a27496 100644 GIT binary patch delta 16 YcmeBM%G$S-bwmFKMvKi8HvC%%06#PcD*ylh delta 16 YcmeBM%G$S-bwmFKM#Ie$HvC%%06z){Bme*a diff --git a/vtest/scores/stemSlash-2-maestro.mscz b/vtest/scores/stemSlash-2-maestro.mscz index 9fa14db1713bac6401036ef65f0fb849da900b6f..56be52cd9e1cff366b0d1bb466c228f43fa8eff2 100644 GIT binary patch delta 16 YcmZ3!n05JL)(z7)Fj{P$v4MXf06<*_dH?_b delta 16 YcmZ3!n05JL)(z7)FdA;2v4MXf06;Sba{vGU diff --git a/vtest/scores/stemSlash-2.mscz b/vtest/scores/stemSlash-2.mscz index d4f337c253e7b8a51978b29aefa3f829b4836c5b..ae0d3b38d6fdc84dbda113ad7ae4c3a91bd84ced 100644 GIT binary patch delta 16 Ycmeyfg!Ru7)(!m|7%etW*zjf{0848K^8f$< delta 16 Ycmeyfg!Ru7)(!m|7!5a1*zjf{082p#>;M1& diff --git a/vtest/scores/stemSlash-3.mscz b/vtest/scores/stemSlash-3.mscz index b380af3a03bb547aa7e743811e83840969868c07..952e99e74a487e06680856a2be34bcab549ca5d9 100644 GIT binary patch delta 16 YcmexznDxtH)(yQI7%evUZAjY)08Fw7rvLx| delta 16 YcmexznDxtH)(yQI7!5b~ZAjY)08EGopa1{> diff --git a/vtest/scores/tempoChangeLines.mscz b/vtest/scores/tempoChangeLines.mscz index 58e86d4cc7e03c4e74f531409199d9b2c04633f0..7fac4d254a71beb02da001183b53be64d6096545 100644 GIT binary patch delta 16 YcmbQ+#5%W$bwk4jMvKjj8|F*^06U%sasU7T delta 16 YcmbQ+#5%W$bwk4jM#IgG8|F*^06TOCYXATM diff --git a/vtest/scores/tremolo-hooks-flat.mscz b/vtest/scores/tremolo-hooks-flat.mscz index 6cc81ed9ae35363e635bc97f301ab9883e43e143..a7bf46dd4f364e52aa0b0124a294cf3178933d31 100644 GIT binary patch delta 31 ncmbO{mv!=7)(t5ecr0x6i&6_x6H9zj(B(@qW5 delta 31 ncmX@Gfc3xv)(t5ecnodyi&6_x6H9zj(B(z^}L diff --git a/vtest/scores/tremolo-min-size.mscz b/vtest/scores/tremolo-min-size.mscz index 1c3016f0304de99de4a843b4669f36e5d697d37c..ad6186c4f13f75571ac1101bbb627b7a86ca7c0a 100644 GIT binary patch delta 16 YcmccH!+N)ebwl(9MvKic8yKen06^OZCjbBd delta 18 acmccH!+N)ebwl)q$=;heH>Yg)ITZj`VF`x- From caf29337b5e57dbd7728d67c7b843a095042c4db Mon Sep 17 00:00:00 2001 From: James Mizen Date: Wed, 25 Sep 2024 11:13:21 +0100 Subject: [PATCH 2/2] Fix file reading --- src/engraving/compat/engravingcompat.cpp | 33 +++++++++++++++++++ src/engraving/compat/engravingcompat.h | 1 + .../part-visible-tracks-part-ref.mscx | 1 - .../part-visible-tracks-score-ref.mscx | 1 - 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/engraving/compat/engravingcompat.cpp b/src/engraving/compat/engravingcompat.cpp index a052a64780bde..5c907a0082240 100644 --- a/src/engraving/compat/engravingcompat.cpp +++ b/src/engraving/compat/engravingcompat.cpp @@ -22,6 +22,7 @@ #include "engravingcompat.h" +#include "dom/marker.h" #include "engraving/dom/beam.h" #include "engraving/dom/chord.h" #include "engraving/dom/instrument.h" @@ -37,6 +38,7 @@ namespace mu::engraving::compat { void EngravingCompat::doPreLayoutCompatIfNeeded(MasterScore* score) { if (score->mscVersion() >= 440) { + resetMarkerLeftFontSize(score); return; } @@ -144,6 +146,37 @@ void EngravingCompat::migrateDynamicPosOnVocalStaves(MasterScore* masterScore) } } +void EngravingCompat::resetMarkerLeftFontSize(MasterScore* masterScore) +{ + // Reset the new incorrect 4.4.0 - 4.4.2 default size of 11 to the previous correct size of 18 + const double INCORRECT_DEFAULT_SIZE = 11.0; + const double CORRECT_DEFAULT_SIZE = 18.0; + bool needsAdjustMarkerSize = masterScore->mscoreVersion().contains(u"4.4") && masterScore->mscoreVersion() != u"4.4.3"; + if (!needsAdjustMarkerSize || masterScore->style().styleD(Sid::repeatLeftFontSize) != INCORRECT_DEFAULT_SIZE) { + return; + } + masterScore->style().set(Sid::repeatLeftFontSize, CORRECT_DEFAULT_SIZE); + + for (Score* score : masterScore->scoreList()) { + for (MeasureBase* mb = score->first(); mb; mb = mb->next()) { + if (!mb->isMeasure()) { + continue; + } + Measure* meas = toMeasure(mb); + for (EngravingItem* item : meas->el()) { + if (!item->isMarker()) { + continue; + } + Marker* marker = toMarker(item); + if (marker->textStyleType() != TextStyleType::REPEAT_LEFT || marker->size() != INCORRECT_DEFAULT_SIZE) { + continue; + } + marker->setSize(CORRECT_DEFAULT_SIZE); + } + } + } +} + void EngravingCompat::doPostLayoutCompatIfNeeded(MasterScore* score) { if (score->mscVersion() >= 440) { diff --git a/src/engraving/compat/engravingcompat.h b/src/engraving/compat/engravingcompat.h index 20af83b539835..13187922dbea1 100644 --- a/src/engraving/compat/engravingcompat.h +++ b/src/engraving/compat/engravingcompat.h @@ -38,6 +38,7 @@ class EngravingCompat static void correctPedalEndPoints(MasterScore* score); static void undoStaffTextExcludeFromPart(MasterScore* masterScore); static void migrateDynamicPosOnVocalStaves(MasterScore* masterScore); + static void resetMarkerLeftFontSize(MasterScore* masterScore); static bool relayoutUserModifiedCrossStaffBeams(MasterScore* score); }; diff --git a/src/engraving/tests/parts_data/part-visible-tracks-part-ref.mscx b/src/engraving/tests/parts_data/part-visible-tracks-part-ref.mscx index a8c245300c0ad..e688e4139ada5 100644 --- a/src/engraving/tests/parts_data/part-visible-tracks-part-ref.mscx +++ b/src/engraving/tests/parts_data/part-visible-tracks-part-ref.mscx @@ -41,7 +41,6 @@ - 18 12 410 1.74978 diff --git a/src/engraving/tests/parts_data/part-visible-tracks-score-ref.mscx b/src/engraving/tests/parts_data/part-visible-tracks-score-ref.mscx index fa0bc86bbbfb1..a1141f03dc5dc 100644 --- a/src/engraving/tests/parts_data/part-visible-tracks-score-ref.mscx +++ b/src/engraving/tests/parts_data/part-visible-tracks-score-ref.mscx @@ -234,7 +234,6 @@ - 18 12 410 1.74978