LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12863 from Jojo-Schmitz/caesura-single-stroke

Browse source 
[MU4] Add single stroke caesura
This commit is contained in:
RomanPudashkin 2023-05-10 14:54:55 +03:00 committed by GitHub
commit ffe2053adf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engraving/libmscore/breath.cpp
View file

@ -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 },
};
//---------------------------------------------------------

2
src/engraving/types/symnames.cpp
View file

@ -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",

16
src/importexport/braille/internal/exportbraille.cpp
View file

@ -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)

2
src/palette/internal/palettecreator.cpp
View file

@ -969,7 +969,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());

1
tools/fonttools/smufl2sym-in-trans.json
View file

@ -256,6 +256,7 @@
"caesura": null,
"caesuraCurved": null,
"caesuraShort": null,
"caesuraSingleStroke": null,
"caesuraThick": null,
"chantCaesura": null,
"coda": null,