Skip to content

Commit

Permalink
Add single stroke caesura
Browse files Browse the repository at this point in the history
it got added with SMuFL 1.4
  • Loading branch information
Jojo-Schmitz committed May 1, 2023
1 parent a76d6d3 commit a74fe55
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 15 deletions.
1 change: 1 addition & 0 deletions src/engraving/libmscore/breath.cpp
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
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
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
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
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

0 comments on commit a74fe55

Please sign in to comment.