Skip to content

Add missing mensural prolations to time signature properties dialog #31557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cbjeukendrup wants to merge 1 commit into
base: master
Choose a base branch
from
+58 −41
Open

Add missing mensural prolations to time signature properties dialog #31557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/engraving/api/v1/apitypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2203,8 +2203,8 @@ enum class SymId {
analyticsTheme = int(mu::engraving::SymId::analyticsTheme),
analyticsTheme1 = int(mu::engraving::SymId::analyticsTheme1),
analyticsThemeInversion = int(mu::engraving::SymId::analyticsThemeInversion),
analyticsThemerograde = int(mu::engraving::SymId::analyticsThemerograde),
analyticsThemerogradeInversion = int(mu::engraving::SymId::analyticsThemerogradeInversion),
analyticsThemeRetrograde = int(mu::engraving::SymId::analyticsThemeRetrograde),
analyticsThemeRetrogradeInversion = int(mu::engraving::SymId::analyticsThemeRetrogradeInversion),
arpeggiato = int(mu::engraving::SymId::arpeggiato),
arpeggiatoDown = int(mu::engraving::SymId::arpeggiatoDown),
arpeggiatoUp = int(mu::engraving::SymId::arpeggiatoUp),
Expand Down
2 changes: 2 additions & 0 deletions src/engraving/dom/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,8 +984,10 @@ SymIdList timeSigSymIdsFromString(const String& string, TimeSigStyle timeSigStyl
{ 59666, SymId::mensuralProlation3 },
{ 59667, SymId::mensuralProlation4 },
{ 59668, SymId::mensuralProlation5 },
{ 59669, SymId::mensuralProlation6 },
{ 59670, SymId::mensuralProlation7 },
{ 59671, SymId::mensuralProlation8 },
{ 59672, SymId::mensuralProlation9 },
{ 59673, SymId::mensuralProlation10 },
{ 59674, SymId::mensuralProlation11 },
};
Expand Down
4 changes: 2 additions & 2 deletions src/engraving/types/symid_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,8 +578,8 @@ enum class SymId {
analyticsTheme,
analyticsTheme1,
analyticsThemeInversion,
analyticsThemerograde,
analyticsThemerogradeInversion,
analyticsThemeRetrograde,
analyticsThemeRetrogradeInversion,
arpeggiato,
arpeggiatoDown,
arpeggiatoUp,
Expand Down
30 changes: 15 additions & 15 deletions src/engraving/types/symnames.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3213,15 +3213,15 @@ const std::array<muse::TranslatableString, size_t(SymId::lastSym) + 1> SymNames:
muse::TranslatableString::untranslatable("23 small diesis down"),
muse::TranslatableString::untranslatable("23 small diesis up, (23S)"),
muse::TranslatableString("engraving/sym", "25 small diesis down, 2° down [53 EDO]"),
muse::TranslatableString("engraving/sym", "25 small diesis up, (25S, ~5:13S, ~37S, 5C plus 5C), 2° up [53 EDO]"),
muse::TranslatableString("engraving/sym", "25 small diesis up, (25S, ~5:13S, ~37S, 5C plus 5C), 2° up [53 EDO]"),
muse::TranslatableString::untranslatable("2 minas down, 65/77-schismina down, 0.83 cents down"),
muse::TranslatableString::untranslatable("2 minas up, 65/77-schismina up, 0.83 cents up"),
muse::TranslatableString::untranslatable("2 tinas down, 1/(7³⋅17)-schismina down, 0.30 cents down"),
muse::TranslatableString::untranslatable("2 tinas up, 1/(7³⋅17)-schismina up, 0.30 cents up"),
muse::TranslatableString("engraving/sym", "35 large diesis down, 2° down [50 EDO], 5/18-tone down"),
muse::TranslatableString("engraving/sym", "35 large diesis up, (35L, ~13L, ~125L, sharp less 35M), 2°50 up"),
muse::TranslatableString("engraving/sym", "35 medium diesis down, 1°[50] 2°[27] down, 2/9-tone down"),
muse::TranslatableString("engraving/sym", "35 medium diesis up, (35M, ~13M, ~125M, 5C plus 7C), 2/9-tone up"),
muse::TranslatableString("engraving/sym", "35 medium diesis up, (35M, ~13M, ~125M, 5C plus 7C), 2/9-tone up"),
muse::TranslatableString::untranslatable("3 tinas down, 1 mina down, 1/(5⋅7⋅13)-schismina down, 0.42 cents down"),
muse::TranslatableString::untranslatable("3 tinas up, 1 mina up, 1/(5⋅7⋅13)-schismina up, 0.42 cents up"),
muse::TranslatableString::untranslatable("49 large diesis down"),
Expand Down Expand Up @@ -3251,7 +3251,7 @@ const std::array<muse::TranslatableString, size_t(SymId::lastSym) + 1> SymNames:
muse::TranslatableString::untranslatable("5:49 medium diesis down"),
muse::TranslatableString::untranslatable("5:49 medium diesis up, (5:49M, half apotome)"),
muse::TranslatableString("engraving/sym", "5:7 kleisma down"),
muse::TranslatableString("engraving/sym", "5:7 kleisma up, (5:7k, ~11:13k, 7C less 5C)"),
muse::TranslatableString("engraving/sym", "5:7 kleisma up, (5:7k, ~11:13k, 7C less 5C)"),
muse::TranslatableString::untranslatable("6 tinas down, 2 minas down, 65/77-schismina down, 0.83 cents down"),
muse::TranslatableString::untranslatable("6 tinas up, 2 minas up, 65/77-schismina up, 0.83 cents up"),
muse::TranslatableString("engraving/sym", "7 comma down, 1° down [43 EDO], 2° down [72 EDO], 1/6-tone down"),
Expand Down Expand Up @@ -4795,17 +4795,17 @@ const std::array<muse::TranslatableString, size_t(SymId::lastSym) + 1> SymNames:
muse::TranslatableString::untranslatable("Oblique form, descending 5th, black and void"),
muse::TranslatableString::untranslatable("Oblique form, descending 5th, void"),
muse::TranslatableString::untranslatable("Oblique form, descending 5th, white"),
muse::TranslatableString::untranslatable("Tempus perfectum cum prolatione perfecta (9/8)"),
muse::TranslatableString::untranslatable("Tempus imperfectum cum prolatione imperfecta diminution 4"),
muse::TranslatableString::untranslatable("Tempus imperfectum cum prolatione imperfecta diminution 5"),
muse::TranslatableString::untranslatable("Tempus perfectum cum prolatione imperfecta (3/4)"),
muse::TranslatableString::untranslatable("Tempus perfectum cum prolatione imperfecta diminution 1 (3/8)"),
muse::TranslatableString::untranslatable("Tempus perfectum cum prolatione perfecta diminution 2 (9/16)"),
muse::TranslatableString::untranslatable("Tempus imperfectum cum prolatione perfecta (6/8)"),
muse::TranslatableString::untranslatable("Tempus imperfectum cum prolatione imperfecta (2/4)"),
muse::TranslatableString::untranslatable("Tempus imperfectum cum prolatione imperfecta diminution 1 (2/2)"),
muse::TranslatableString::untranslatable("Tempus imperfectum cum prolatione imperfecta diminution 2 (6/16)"),
muse::TranslatableString::untranslatable("Tempus imperfectum cum prolatione imperfecta diminution 3 (2/2)"),
muse::TranslatableString("engraving/sym", "Tempus perfectum cum prolatione perfecta (9/8)"),
muse::TranslatableString("engraving/sym", "Tempus imperfectum cum prolatione imperfecta diminution 4"),
muse::TranslatableString("engraving/sym", "Tempus imperfectum cum prolatione imperfecta diminution 5"),
muse::TranslatableString("engraving/sym", "Tempus perfectum cum prolatione imperfecta (3/4)"),
muse::TranslatableString("engraving/sym", "Tempus perfectum cum prolatione imperfecta diminution 1 (3/8)"),
muse::TranslatableString("engraving/sym", "Tempus perfectum cum prolatione perfecta diminution 2 (9/16)"),
muse::TranslatableString("engraving/sym", "Tempus imperfectum cum prolatione perfecta (6/8)"),
muse::TranslatableString("engraving/sym", "Tempus imperfectum cum prolatione imperfecta (2/4)"),
muse::TranslatableString("engraving/sym", "Tempus imperfectum cum prolatione imperfecta diminution 1 (2/2)"),
muse::TranslatableString("engraving/sym", "Tempus imperfectum cum prolatione imperfecta diminution 2 (6/16)"),
muse::TranslatableString("engraving/sym", "Tempus imperfectum cum prolatione imperfecta diminution 3 (2/2)"),
muse::TranslatableString::untranslatable("Combining dot"),
muse::TranslatableString::untranslatable("Combining void dot"),
muse::TranslatableString::untranslatable("Combining vertical stroke"),
Expand Down Expand Up @@ -5827,7 +5827,7 @@ const std::array<muse::TranslatableString, size_t(SymId::lastSym) + 1> SymNames:
muse::TranslatableString::untranslatable("Combining sussurando stem"),
muse::TranslatableString::untranslatable("Combining swished stem"),
muse::TranslatableString::untranslatable("Combining vibrato pulse accent (Saunders) stem"),
muse::TranslatableString::untranslatable("Stockhausen irregular tremolo (\"Morsen\"), like Morse code)"),
muse::TranslatableString::untranslatable("Stockhausen irregular tremolo (\"Morsen\", like Morse code)"),
muse::TranslatableString::untranslatable("Bow behind bridge (sul ponticello)"),
muse::TranslatableString::untranslatable("Bow behind bridge on four strings"),
muse::TranslatableString::untranslatable("Bow behind bridge on one string"),
Expand Down
2 changes: 2 additions & 0 deletions src/framework/ui/view/musicalsymbolcodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,10 @@ enum class Code : char16_t {
MENSURAL_PROLATION_3 = 0xE912,
MENSURAL_PROLATION_4 = 0xE913,
MENSURAL_PROLATION_5 = 0xE914,
MENSURAL_PROLATION_6 = 0xE915,
MENSURAL_PROLATION_7 = 0xE916,
MENSURAL_PROLATION_8 = 0xE917,
MENSURAL_PROLATION_9 = 0xE918,
MENSURAL_PROLATION_10 = 0xE919,
MENSURAL_PROLATION_11 = 0xE91A,

Expand Down
12 changes: 7 additions & 5 deletions src/palette/widgets/timesignaturepropertiesdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,13 @@ TimeSignaturePropertiesDialog::TimeSignaturePropertiesDialog(QWidget* parent)
SymId::mensuralProlation2, // tempus perfectum, prol. imperfecta
SymId::mensuralProlation3, // tempus perfectum, prol. imperfecta, dimin.
SymId::mensuralProlation4, // tempus perfectum, prol. perfecta, dimin.
SymId::mensuralProlation5, // tempus imperf. prol. perfecta
SymId::mensuralProlation7, // tempus imperf., prol. imperfecta, reversed
SymId::mensuralProlation8, // tempus imperf., prol. perfecta, dimin.
SymId::mensuralProlation10, // tempus imperf., prol imperfecta, dimin., reversed
SymId::mensuralProlation11, // tempus inperf., prol. perfecta, reversed
SymId::mensuralProlation5, // tempus imperf., prol. perfecta
SymId::mensuralProlation6, // tempus imperf., prol. imperfecta
SymId::mensuralProlation7, // tempus imperf., prol. imperfecta, dimin. 1
SymId::mensuralProlation8, // tempus imperf., prol. imperfecta, dimin. 2
SymId::mensuralProlation9, // tempus imperf., prol. imperfecta, dimin. 3
SymId::mensuralProlation10, // tempus imperf., prol. imperfecta, dimin. 4
SymId::mensuralProlation11, // tempus imperf., prol. imperfecta, dimin. 5
};

IEngravingFontPtr symbolFont = gpaletteScore->engravingFont();
Expand Down
45 changes: 28 additions & 17 deletions tools/fonttools/smufl2sym-in-trans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,22 +287,22 @@
"fermataVeryLongBelow": null,
"fermataVeryShortAbove": null,
"fermataVeryShortBelow": null,
"flag1024Down": null,
"flag1024Up": null,
"flag512Down": null,
"flag512Up": null,
"flag256Down": null,
"flag256Up": null,
"flag128Down": null,
"flag128Up": null,
"flag64Down": null,
"flag64DUp": null,
"flag32Down": null,
"flag32Up": null,
"flag16Down": null,
"flag16Up": null,
"flag8Down": null,
"flag8Up": null,
"flag1024thDown": null,
"flag1024thUp": null,
"flag128thDown": null,
"flag128thUp": null,
"flag16thDown": null,
"flag16thUp": null,
"flag256thDown": null,
"flag256thUp": null,
"flag32ndDown": null,
"flag32ndUp": null,
"flag512thDown": null,
"flag512thUp": null,
"flag64thDown": null,
"flag64thUp": null,
"flag8thDown": null,
"flag8thUp": null,
"gClef": null,
"guitarFadeIn": null,
"guitarFadeOut": null,
Expand All @@ -323,6 +323,17 @@
"lyricsElision": null,
"lyricsElisionNarrow": null,
"lyricsElisionWide": null,
"mensuralProlation1": null,
"mensuralProlation2": null,
"mensuralProlation3": null,
"mensuralProlation4": null,
"mensuralProlation5": null,
"mensuralProlation6": null,
"mensuralProlation7": null,
"mensuralProlation8": null,
"mensuralProlation9": null,
"mensuralProlation10": null,
"mensuralProlation11": null,
"metAugmentationDot": null,
"metNote1024thUp": null,
"metNote128thUp": null,
Expand Down Expand Up @@ -395,7 +406,7 @@
"tremoloDivisiDots3": null,
"tremoloDivisiDots4": null,
"tremoloDivisiDots6": null,
"triplet3": null,
"tuplet3": null,
"wiggleSawtooth": null,
"wiggleSawtoothWide": null,
"wiggleVibratoLargeFaster": null,
Expand Down
Loading