Skip to content
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

[MU4] Add single stroke caesura #12863

Merged
merged 1 commit into from
May 10, 2023
Merged

[MU4] Add single stroke caesura #12863

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
1 change: 1 addition & 0 deletions src/engraving/libmscore/breath.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ const std::vector<BreathType> Breath::breathList {
{ SymId::caesuraShort, true, 2.0 },
{ SymId::caesuraThick, true, 2.0 },
{ SymId::chantCaesura, true, 2.0 },
{ SymId::caesuraSingleStroke, true, 2.0 },
};

//---------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/types/symnames.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3809,7 +3809,7 @@ constexpr const std::array<const char*, size_t(SymId::lastSym) + 1> SymNames::s_
QT_TRANSLATE_NOOP("engraving/sym", "Caesura"),
QT_TRANSLATE_NOOP("engraving/sym", "Curved caesura"),
QT_TRANSLATE_NOOP("engraving/sym", "Short caesura"),
"Single stroke caesura",
QT_TRANSLATE_NOOP("engraving/sym", "Single stroke caesura"),
QT_TRANSLATE_NOOP("engraving/sym", "Thick caesura"),
"Accentus above",
"Accentus below",
Expand Down
16 changes: 3 additions & 13 deletions src/importexport/braille/internal/exportbraille.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,21 +991,11 @@ QString ExportBrailleImpl::brailleBreath(Breath* breath)
return QString();
}

switch (breath->symId()) {
case SymId::breathMarkTick:
case SymId::breathMarkComma:
case SymId::breathMarkUpbow:
case SymId::breathMarkSalzedo:
return BRAILLE_BREATH;
case SymId::caesura:
case SymId::caesuraShort:
case SymId::caesuraThick:
case SymId::caesuraCurved:
if (breath->isCaesura()) {
return BRAILLE_CAESURA;
default:
break;
} else {
return BRAILLE_BREATH;
}
return QString();
}

BarLine* ExportBrailleImpl::lastBarline(Measure* measure, track_idx_t track)
Expand Down
2 changes: 1 addition & 1 deletion src/palette/internal/palettecreator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -971,7 +971,7 @@ PalettePtr PaletteCreator::newBreathPalette(bool defaultPalette)
}

for (BreathType breath : Breath::breathList) {
if (breath.id == SymId::chantCaesura && defaultPalette) {
if ((breath.id == SymId::chantCaesura || breath.id == SymId::caesuraSingleStroke) && defaultPalette) {
continue;
}
auto a = Factory::makeBreath(gpaletteScore->dummy()->segment());
Expand Down
1 change: 1 addition & 0 deletions tools/fonttools/smufl2sym-in-trans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@
"caesura": null,
"caesuraCurved": null,
"caesuraShort": null,
"caesuraSingleStroke": null,
"caesuraThick": null,
"chantCaesura": null,
"coda": null,
Expand Down