From dc5957bd5330f5325b612545950d8a04c1398e11 Mon Sep 17 00:00:00 2001 From: RMRattray Date: Wed, 10 Sep 2025 20:13:17 -0400 Subject: [PATCH 1/3] Move symbols over rests in type enumerating for layering --- src/engraving/types/types.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h index 9fcc88087cace..2192519e6110d 100644 --- a/src/engraving/types/types.h +++ b/src/engraving/types/types.h @@ -89,13 +89,13 @@ enum class ElementType : unsigned char { STEM, // list STEM before NOTE: notes in TAB might 'break' stems HOOK, // and this requires stems to be drawn before notes NOTE, // elements from CLEF to TIMESIG need to be in the order - SYMBOL, // in which they appear in a measure - CLEF, + CLEF, // in which they appear in a measure KEYSIG, AMBITUS, TIMESIG, REST, MMREST, + SYMBOL, DEAD_SLAPPED, BREATH, MEASURE_REPEAT, From 43cccb99b26e280ed8644b6949f02fc817eedd22 Mon Sep 17 00:00:00 2001 From: RMRattray Date: Wed, 10 Sep 2025 20:13:42 -0400 Subject: [PATCH 2/3] Move symbols over rests in array per comment in types.h --- src/engraving/types/typesconv.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engraving/types/typesconv.cpp b/src/engraving/types/typesconv.cpp index c1868e51032d8..59c93d6c44b4d 100644 --- a/src/engraving/types/typesconv.cpp +++ b/src/engraving/types/typesconv.cpp @@ -196,9 +196,6 @@ static const std::array ELEMENT_TYPES { Item{ ElementType::SCORE, "Score", TranslatableString("engraving", "score(s)", nullptr, 1), TranslatableString("engraving", "Score(s)", nullptr, 1) }, - Item{ ElementType::SYMBOL, "Symbol", - TranslatableString("engraving", "symbol(s)", nullptr, 1), - TranslatableString("engraving", "Symbol(s)", nullptr, 1) }, Item{ ElementType::TEXT, "Text", TranslatableString("engraving", "text", nullptr, 1), TranslatableString("engraving", "Text", nullptr, 1) }, @@ -271,6 +268,9 @@ static const std::array ELEMENT_TYPES { Item{ ElementType::MMREST, "MMRest", TranslatableString("engraving", "multimeasure rest(s)", nullptr, 1), TranslatableString("engraving", "Multimeasure rest(s)", nullptr, 1) }, + Item{ ElementType::SYMBOL, "Symbol", + TranslatableString("engraving", "symbol(s)", nullptr, 1), + TranslatableString("engraving", "Symbol(s)", nullptr, 1) }, Item{ ElementType::DEAD_SLAPPED, "DeadSlapped", TranslatableString("engraving", "dead slapped", nullptr, 1), TranslatableString("engraving", "Dead slapped", nullptr, 1) }, From 7e104c616a1656c93bcb9750496fc59509d5abf6 Mon Sep 17 00:00:00 2001 From: RMRattray Date: Wed, 10 Sep 2025 20:37:59 -0400 Subject: [PATCH 3/3] Move symbol after dead slapped as well as rests --- src/engraving/types/types.h | 2 +- src/engraving/types/typesconv.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h index 2192519e6110d..647213356ca75 100644 --- a/src/engraving/types/types.h +++ b/src/engraving/types/types.h @@ -95,8 +95,8 @@ enum class ElementType : unsigned char { TIMESIG, REST, MMREST, - SYMBOL, DEAD_SLAPPED, + SYMBOL, BREATH, MEASURE_REPEAT, TIE, diff --git a/src/engraving/types/typesconv.cpp b/src/engraving/types/typesconv.cpp index 59c93d6c44b4d..2a5b042b6376d 100644 --- a/src/engraving/types/typesconv.cpp +++ b/src/engraving/types/typesconv.cpp @@ -268,12 +268,12 @@ static const std::array ELEMENT_TYPES { Item{ ElementType::MMREST, "MMRest", TranslatableString("engraving", "multimeasure rest(s)", nullptr, 1), TranslatableString("engraving", "Multimeasure rest(s)", nullptr, 1) }, - Item{ ElementType::SYMBOL, "Symbol", - TranslatableString("engraving", "symbol(s)", nullptr, 1), - TranslatableString("engraving", "Symbol(s)", nullptr, 1) }, Item{ ElementType::DEAD_SLAPPED, "DeadSlapped", TranslatableString("engraving", "dead slapped", nullptr, 1), TranslatableString("engraving", "Dead slapped", nullptr, 1) }, + Item{ ElementType::SYMBOL, "Symbol", + TranslatableString("engraving", "symbol(s)", nullptr, 1), + TranslatableString("engraving", "Symbol(s)", nullptr, 1) }, Item{ ElementType::BREATH, "Breath", TranslatableString("engraving", "breath(s)", nullptr, 1), TranslatableString("engraving", "Breath(s)", nullptr, 1) },