Skip to content

Commit

Permalink
Remove parentheses after cut and common time from MuseJazz and add th…
Browse files Browse the repository at this point in the history
…em programmatically in older scores.
  • Loading branch information
ecstrema committed Nov 25, 2020
1 parent 1c2bd7c commit ab1806d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
Binary file modified fonts/musejazz/MuseJazz.otf
Binary file not shown.
16 changes: 15 additions & 1 deletion libmscore/timesig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void TimeSig::write(XmlWriter& xml) const

void TimeSig::read(XmlReader& e)
{
int n=0, z1=0, z2=0, z3=0, z4=0;
int n = 0, z1 = 0, z2 = 0, z3 = 0, z4 = 0;
bool old = false;

while (e.readNextStartElement()) {
Expand Down Expand Up @@ -203,6 +203,20 @@ void TimeSig::read(XmlReader& e)
}
else
_timeSigType = TimeSigType(i);

// Musejazz had by default a closing parenthesis after cut and common time signatures
if (score()->mscVersion() <= 301) {
if (masterScore()->scoreFont()->name() == "MuseJazz") {
if (_timeSigType == TimeSigType::ALLA_BREVE) {
_timeSigType = TimeSigType::NORMAL;
setParserString("C)");
}
else if (_timeSigType == TimeSigType::FOUR_FOUR) {
_timeSigType = TimeSigType::NORMAL;
setParserString("¢)");
}
}
}
}
else if (tag == "showCourtesySig")
_showCourtesySig = e.readInt();
Expand Down

0 comments on commit ab1806d

Please sign in to comment.