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

Jump to bottom

[MU3] Fix #277279: Lack of Capabilities in the Custom Time Signature Creator #6550

Closed
wants to merge 1 commit into from
Closed

[MU3] Fix #277279: Lack of Capabilities in the Custom Time Signature Creator #6550

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
2 changes: 2 additions & 0 deletions libmscore/edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,7 @@ void Score::cmdAddTimeSig(Measure* fm, int staffIdx, TimeSig* ts, bool local)
nsig->undoChangeProperty(Pid::TIMESIG_TYPE, int(ts->timeSigType()));
nsig->undoChangeProperty(Pid::NUMERATOR_STRING, ts->numeratorString());
nsig->undoChangeProperty(Pid::DENOMINATOR_STRING, ts->denominatorString());
nsig->undoChangeProperty(Pid::PARSER_STRING, ts->parserString());
nsig->undoChangeProperty(Pid::TIMESIG_STRETCH, QVariant::fromValue(ts->stretch()));
nsig->undoChangeProperty(Pid::GROUPS, QVariant::fromValue(ts->groups()));
nsig->setSelected(false);
Expand Down Expand Up @@ -894,6 +895,7 @@ void Score::cmdAddTimeSig(Measure* fm, int staffIdx, TimeSig* ts, bool local)
nsig->undoChangeProperty(Pid::TIMESIG, QVariant::fromValue(ts->sig()));
nsig->undoChangeProperty(Pid::NUMERATOR_STRING, ts->numeratorString());
nsig->undoChangeProperty(Pid::DENOMINATOR_STRING, ts->denominatorString());
nsig->undoChangeProperty(Pid::PARSER_STRING, ts->parserString());

// HACK do it twice to accommodate undo
nsig->undoChangeProperty(Pid::TIMESIG_TYPE, int(ts->timeSigType()));
Expand Down
1 change: 1 addition & 0 deletions libmscore/property.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ static constexpr PropertyMetaData propertyList[] = {
{ Pid::ACCIDENTAL_TYPE, true, "subtype", P_TYPE::INT, DUMMY_QT_TRANSLATE_NOOP("propertyName", "type") },
{ Pid::NUMERATOR_STRING, false, "textN", P_TYPE::STRING, DUMMY_QT_TRANSLATE_NOOP("propertyName", "numerator string") },
{ Pid::DENOMINATOR_STRING, false, "textD", P_TYPE::STRING, DUMMY_QT_TRANSLATE_NOOP("propertyName", "denominator string") },
{ Pid::PARSER_STRING, false, "textP", P_TYPE::STRING, DUMMY_QT_TRANSLATE_NOOP("propertyName", "parser string") },
{ Pid::FBPREFIX, false, "prefix", P_TYPE::INT, DUMMY_QT_TRANSLATE_NOOP("propertyName", "prefix") },
{ Pid::FBDIGIT, false, "digit", P_TYPE::INT, DUMMY_QT_TRANSLATE_NOOP("propertyName", "digit") },
{ Pid::FBSUFFIX, false, "suffix", P_TYPE::INT, DUMMY_QT_TRANSLATE_NOOP("propertyName", "suffix") },
Expand Down
1 change: 1 addition & 0 deletions libmscore/property.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ enum class Pid {
ACCIDENTAL_TYPE,
NUMERATOR_STRING,
DENOMINATOR_STRING,
PARSER_STRING,
FBPREFIX, // used for FiguredBassItem
FBDIGIT, // " "
FBSUFFIX, // " "
Expand Down
150 changes: 149 additions & 1 deletion libmscore/sym.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2865,7 +2865,39 @@ const std::array<const char*, int(SymId::lastSym)+1> Sym::symNames = { {
"braceLarge",
"braceLarger",

// MuseScore-local symbols, precomposed symbols to mimic some Emmentaler glyphs
// SMuFL stylistic alternates for Large Time Signatures

"timeSig0Large",
"timeSig1Large",
"timeSig2Large",
"timeSig3Large",
"timeSig4Large",
"timeSig5Large",
"timeSig6Large",
"timeSig7Large",
"timeSig8Large",
"timeSig9Large",
"timeSigCommonLarge",
"timeSigCutCommonLarge",
"timeSigFractionHalfLarge",
"timeSigFractionOneThirdLarge",
"timeSigFractionQuarterLarge",
"timeSigFractionThreeQuartersLarge",
"timeSigFractionTwoThirdsLarge",
"timeSigOpenPendereckiLarge",
"timeSigParensLeftLarge",
"timeSigParensLeftSmallLarge",
"timeSigParensRightLarge",
"timeSigParensRightSmallLarge",
"timeSigPlusLarge",
"timeSigPlusSmallLarge",
"timeSigEqualsLarge",
"timeSigMultiplyLarge",
"timeSigMinusLarge",
"timeSigCommaLarge",
"timeSigXLarge",

// MuseScore local symbols, precomposed symbols to mimic some emmentaler glyphs

"ornamentPrallMordent", // ornamentPrecompTrillWithMordent ?
"ornamentUpPrall", // ornamentPrecompSlideTrillDAnglebert ?
Expand Down Expand Up @@ -6638,6 +6670,122 @@ void ScoreFont::load()
{ QString("brace"),
QString("braceLarger"),
SymId::braceLarger
},
{ QString("timeSig0"),
QString("timeSig0Large"),
SymId::timeSig0Large
},
{ QString("timeSig1"),
QString("timeSig1Large"),
SymId::timeSig1Large
},
{ QString("timeSig2"),
QString("timeSig2Large"),
SymId::timeSig2Large
},
{ QString("timeSig3"),
QString("timeSig3Large"),
SymId::timeSig3Large
},
{ QString("timeSig4"),
QString("timeSig4Large"),
SymId::timeSig4Large
},
{ QString("timeSig5"),
QString("timeSig5Large"),
SymId::timeSig5Large
},
{ QString("timeSig6"),
QString("timeSig6Large"),
SymId::timeSig6Large
},
{ QString("timeSig7"),
QString("timeSig7Large"),
SymId::timeSig7Large
},
{ QString("timeSig8"),
QString("timeSig8Large"),
SymId::timeSig8Large
},
{ QString("timeSig9"),
QString("timeSig9Large"),
SymId::timeSig9Large
},
{ QString("timeSigCommon"),
QString("timeSigCommonLarge"),
SymId::timeSigCommonLarge
},
{ QString("timeSigCutCommon"),
QString("timeSigCutCommonLarge"),
SymId::timeSigCutCommonLarge
},
{ QString("timeSigFractionHalf"),
QString("timeSigFractionHalfLarge"),
SymId::timeSigFractionHalfLarge
},
{ QString("timeSigFractionOneThird"),
QString("timeSigFractionOneThirdLarge"),
SymId::timeSigFractionOneThirdLarge
},
{ QString("timeSigFractionQuarter"),
QString("timeSigFractionQuarterLarge"),
SymId::timeSigFractionQuarterLarge
},
{ QString("timeSigFractionThreeQuarters"),
QString("timeSigFractionThreeQuartersLarge"),
SymId::timeSigFractionThreeQuartersLarge
},
{ QString("timeSigFractionTwoThirds"),
QString("timeSigFractionTwoThirdsLarge"),
SymId::timeSigFractionTwoThirdsLarge
},
{ QString("timeSigOpenPenderecki"),
QString("timeSigOpenPendereckiLarge"),
SymId::timeSigOpenPendereckiLarge
},
{ QString("timeSigParensLeft"),
QString("timeSigParensLeftLarge"),
SymId::timeSigParensLeftLarge
},
{ QString("timeSigParensLeftSmall"),
QString("timeSigParensLeftSmallLarge"),
SymId::timeSigParensLeftSmallLarge
},
{ QString("timeSigParensRight"),
QString("timeSigParensRightLarge"),
SymId::timeSigParensRightLarge
},
{ QString("timeSigParensRightSmall"),
QString("timeSigParensRightSmallLarge"),
SymId::timeSigParensRightSmallLarge
},
{ QString("timeSigPlus"),
QString("timeSigPlusLarge"),
SymId::timeSigPlusLarge
},
{ QString("timeSigPlusSmall"),
QString("timeSigPlusSmallLarge"),
SymId::timeSigPlusSmallLarge
},
{ QString("timeSigEquals"),
QString("timeSigEqualsLarge"),
SymId::timeSigEqualsLarge
},
{ QString("timeSigMultiply"),
QString("timeSigMultiplyLarge"),
SymId::timeSigMultiplyLarge
},
{ QString("timeSigMinus"),
QString("timeSigMinusLarge"),
SymId::timeSigMinusLarge
},
{ QString("timeSigComma"),
QString("timeSigCommaLarge"),
SymId::timeSigCommaLarge
},
{ QString("timeSigX"),
QString("timeSigXLarge"),
SymId::timeSigXLarge
}
};

Expand Down
34 changes: 33 additions & 1 deletion libmscore/sym.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2858,7 +2858,39 @@ enum class SymId {
braceLarge,
braceLarger,

// MuseScore-local symbols, precomposed symbols to mimic some Emmentaler glyphs
// SMuFL stylistic alternates for Large Time Signatures

timeSig0Large,
timeSig1Large,
timeSig2Large,
timeSig3Large,
timeSig4Large,
timeSig5Large,
timeSig6Large,
timeSig7Large,
timeSig8Large,
timeSig9Large,
timeSigCommonLarge,
timeSigCutCommonLarge,
timeSigFractionHalfLarge,
timeSigFractionOneThirdLarge,
timeSigFractionQuarterLarge,
timeSigFractionThreeQuartersLarge,
timeSigFractionTwoThirdsLarge,
timeSigOpenPendereckiLarge,
timeSigParensLeftLarge,
timeSigParensLeftSmallLarge,
timeSigParensRightLarge,
timeSigParensRightSmallLarge,
timeSigPlusLarge,
timeSigPlusSmallLarge,
timeSigEqualsLarge,
timeSigMultiplyLarge,
timeSigMinusLarge,
timeSigCommaLarge,
timeSigXLarge,

// MuseScore local symbols, precomposed symbols to mimic some emmentaler glyphs

ornamentPrallMordent,
ornamentUpPrall,
Expand Down
Loading