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

Merge pull request #5795 from Jojo-Schmitz/256th-1024th

Browse source 
Fix #43906: Completing support for 256th, 512th and 1024th durations
This commit is contained in:
anatoly-os 2020-04-21 22:23:53 +03:00 committed by GitHub
commit 4c317ac6c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 604 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fonttools/genft.cpp
View file

@ -81,6 +81,9 @@ QMap<QString, QString> nmap {
{ "rests.5", "rest32nd" },
{ "rests.6", "rest64th" },
{ "rests.7", "rest128th" },
// { "rests.8", "rest256th" },
// { "rests.9", "rest512th" },
// { "rests.10", "rest1024th" },
{ "accidentals.sharp", "accidentalSharp" },
{ "accidentals.sharp.slashslash.stem", "accidentalQuarterSharp4" },
@ -251,12 +254,20 @@ QMap<QString, QString> nmap {
{ "flags.u4", "flag16thUp" },
{ "flags.u5", "flag32ndUp" },
{ "flags.u6", "flag64thUp" },
// { "flags.u7", "flag128thUp" },
// { "flags.u8", "flag256thUp" },
// { "flags.u9", "flag512thUp" },
// { "flags.u10", "flag1024thUp" },
{ "flags.d3", "flag8thDown" },
// { "flags.ugrace", "flags.ugrace" },
// { "flags.dgrace", "flags.dgrace" },
{ "flags.d4", "flag16thDown" },
{ "flags.d5", "flag32ndDown" },
{ "flags.d6", "flag64thDown" },
// { "flags.d7", "flag128thDown" },
// { "flags.d8", "flag256thDown" },
// { "flags.d9", "flag512thDown" },
// { "flags.d10", "flag1024thDown" },
{ "clefs.C", "cClef" },
// { "clefs.C_change", "clefs.C_change" },

6
importexport/midiimport/importmidi_operation.h
View file

@ -19,7 +19,11 @@ enum class QuantValue {
Q_16,
Q_32,
Q_64,
Q_128
Q_128,
Q_256,
Q_512,
Q_1024,
Q_INVALID = -1
};
enum class VoiceCount {

9
importexport/midiimport/importmidi_operations.cpp
View file

@ -74,6 +74,15 @@ static void setOperationsFromFile(const QString &fileName, Opers &opers)
case 5:
opers.quantValue.setDefaultValue(QuantValue::Q_128, false);
break;
case 6:
opers.quantValue.setDefaultValue(QuantValue::Q_256, false);
break;
case 7:
opers.quantValue.setDefaultValue(QuantValue::Q_512, false);
break;
case 8:
opers.quantValue.setDefaultValue(QuantValue::Q_1024, false);
break;
default:
qDebug("Load MIDI import operations from file: "
"unknown max quantization value");

32
importexport/midiimport/importmidi_quant.cpp
View file

@ -44,6 +44,15 @@ ReducedFraction quantValueToFraction(MidiOperations::QuantValue quantValue)
case MidiOperations::QuantValue::Q_128:
fraction = division / 32;
break;
case MidiOperations::QuantValue::Q_256:
fraction = division / 64;
break;
case MidiOperations::QuantValue::Q_512:
fraction = division / 128;
break;
case MidiOperations::QuantValue::Q_1024:
fraction = division / 256;
break;
default:
Q_ASSERT_X(false, "Quantize::quantValueToFraction", "Unknown quant value");
break;
@ -55,7 +64,7 @@ ReducedFraction quantValueToFraction(MidiOperations::QuantValue quantValue)
MidiOperations::QuantValue fractionToQuantValue(const ReducedFraction &fraction)
{
const auto division = ReducedFraction::fromTicks(MScore::division);
MidiOperations::QuantValue quantValue = MidiOperations::QuantValue::Q_4;
MidiOperations::QuantValue quantValue = MidiOperations::QuantValue::Q_4;
if (fraction == division)
quantValue = MidiOperations::QuantValue::Q_4;
@ -69,10 +78,17 @@ MidiOperations::QuantValue fractionToQuantValue(const ReducedFraction &fraction)
quantValue = MidiOperations::QuantValue::Q_64;
else if (fraction == division / 32)
quantValue = MidiOperations::QuantValue::Q_128;
else if (fraction == division / 64)
quantValue = MidiOperations::QuantValue::Q_256;
else if (fraction == division / 128)
quantValue = MidiOperations::QuantValue::Q_512;
else if (fraction == division / 256)
quantValue = MidiOperations::QuantValue::Q_1024;
else {
qDebug("unknown quant fraction %d/%d division %d/%d", fraction.numerator(), fraction.denominator(),
division.numerator(), division.denominator());
Q_ASSERT_X(false, "Quantize::fractionToQuantValue", "Unknown quant fraction");
qDebug("Unknown quant fraction %d/%d in division %d/%d.",
fraction.numerator(), fraction.denominator(),
division.numerator(), division.denominator());
quantValue = MidiOperations::QuantValue::Q_INVALID;
}
return quantValue;
@ -81,7 +97,13 @@ MidiOperations::QuantValue fractionToQuantValue(const ReducedFraction &fraction)
MidiOperations::QuantValue defaultQuantValueFromPreferences()
{
const auto fraction = ReducedFraction::fromTicks(preferences.getInt(PREF_IO_MIDI_SHORTESTNOTE));
return fractionToQuantValue(fraction);
MidiOperations::QuantValue quantValue = fractionToQuantValue(fraction);
if (quantValue == MidiOperations::QuantValue::Q_INVALID) {
qDebug("Unknown shortestNote value %d in preferences, defaulting to 16th.",
preferences.getInt(PREF_IO_MIDI_SHORTESTNOTE));
quantValue = MidiOperations::QuantValue::Q_16;
}
return quantValue;
}
ReducedFraction shortestQuantizedNoteInRange(

5
importexport/midiimport/importmidi_simplify.cpp
View file

@ -22,7 +22,10 @@ bool hasComplexBeamedDurations(const QList<std::pair<ReducedFraction, TDuration>
if (d.second == TDuration::DurationType::V_16TH
|| d.second == TDuration::DurationType::V_32ND
|| d.second == TDuration::DurationType::V_64TH
|| d.second == TDuration::DurationType::V_128TH) {
|| d.second == TDuration::DurationType::V_128TH
|| d.second == TDuration::DurationType::V_256TH
|| d.second == TDuration::DurationType::V_512TH
|| d.second == TDuration::DurationType::V_1024TH) {
return true;
}
}

2
importexport/musicxml/importxml.cpp
View file

@ -48,6 +48,8 @@ static void tupletAssert()
&& int(TDuration::DurationType::V_64TH) == int(TDuration::DurationType::V_32ND) + 1
&& int(TDuration::DurationType::V_128TH) == int(TDuration::DurationType::V_64TH) + 1
&& int(TDuration::DurationType::V_256TH) == int(TDuration::DurationType::V_128TH) + 1
&& int(TDuration::DurationType::V_512TH) == int(TDuration::DurationType::V_256TH) + 1
&& int(TDuration::DurationType::V_1024TH) == int(TDuration::DurationType::V_512TH) + 1
)) {
qFatal("tupletAssert() failed");
}

8
importexport/ove/importove.cpp
View file

@ -988,6 +988,14 @@ TDuration OveNoteType_To_Duration(OVE::NoteType noteType){
d.setType(TDuration::DurationType::V_256TH);
break;
}
// case OVE::NoteType::Note_512: {
// d.setType(TDuration::DurationType::V_512TH);
// break;
// }
// case OVE::NoteType::Note_1024: {
// d.setType(TDuration::DurationType::V_1024TH);
// break;
// }
default:
d.setType(TDuration::DurationType::V_QUARTER);
break;

10
importexport/ove/ove.cpp
View file

@ -1776,6 +1776,8 @@ void NoteContainer::setNoteType(NoteType type) {
case NoteType::Note_64:
case NoteType::Note_128:
case NoteType::Note_256: {
// case NoteType::Note_512:
// case NoteType::Note_1024: {
noteType_ = type;
break;
}
@ -1935,6 +1937,14 @@ int NoteContainer::getDuration() const {
duration = static_cast<int>(NoteDuration::D_256);
break;
}
// case NoteType::Note_512: {
// duration = static_cast<int>(NoteDuration::D_512);
// break;
// }
// case NoteType::Note_1024: {
// duration = static_cast<int>(NoteDuration::D_1024);
// break;
// }
default:
break;
}

2
importexport/ove/ove.h
View file

@ -351,6 +351,8 @@ enum class NoteType : char {
Note_64 = 0x7,
Note_128 = 0x8,
Note_256 = 0x9,
// Note_512 = 0xa,
// Note_1024 = 0xb,
Note_None
};

17
libmscore/cmd.cpp
View file

@ -3589,8 +3589,17 @@ void Score::cmdPadNoteDecreaseTAB(const EditData& ed)
case TDuration::DurationType::V_64TH:
padToggle(Pad::NOTE128, ed);
break;
case TDuration::DurationType::V_128TH:
padToggle(Pad::NOTE256, ed);
break;
case TDuration::DurationType::V_256TH:
padToggle(Pad::NOTE512, ed);
break;
case TDuration::DurationType::V_512TH:
padToggle(Pad::NOTE1024, ed);
break;
// cycle back from shortest to longest?
// case TDuration::DurationType::V_128TH:
// case TDuration::DurationType::V_1024TH:
// padToggle(Pad::NOTE00, ed);
// break;
default:
@ -4057,6 +4066,12 @@ void Score::cmd(const QAction* a, EditData& ed)
{ "pad-note-64-TAB", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE64, ed); }},
{ "pad-note-128", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE128, ed); }},
{ "pad-note-128-TAB", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE128, ed); }},
{ "pad-note-256", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE256, ed); }},
{ "pad-note-256-TAB", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE256, ed); }},
{ "pad-note-512", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE512, ed); }},
{ "pad-note-512-TAB", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE512, ed); }},
{ "pad-note-1024", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE1024, ed); }},
{ "pad-note-1024-TAB", [](Score* cs, EditData& ed){ cs->padToggle(Pad::NOTE1024, ed); }},
{ "reset-style", [](Score* cs, EditData&){ cs->cmdResetStyle(); }},
{ "reset-beammode", [](Score* cs, EditData&){ cs->cmdResetBeamMode(); }},
{ "reset-groupings", [](Score* cs, EditData&){ cs->cmdResetNoteAndRestGroupings(); }},

11
libmscore/score.cpp
View file

@ -2726,6 +2726,15 @@ void Score::padToggle(Pad n, const EditData& ed)
case Pad::NOTE128:
_is.setDuration(TDuration::DurationType::V_128TH);
break;
case Pad::NOTE256:
_is.setDuration(TDuration::DurationType::V_256TH);
break;
case Pad::NOTE512:
_is.setDuration(TDuration::DurationType::V_512TH);
break;
case Pad::NOTE1024:
_is.setDuration(TDuration::DurationType::V_1024TH);
break;
case Pad::REST:
if (noteEntryMode()) {
_is.setRest(!_is.rest());
@ -2777,7 +2786,7 @@ void Score::padToggle(Pad n, const EditData& ed)
_is.setDots(4);
break;
}
if (n >= Pad::NOTE00 && n <= Pad::NOTE128) {
if (n >= Pad::NOTE00 && n <= Pad::NOTE1024) {
_is.setDots(0);
//
// if in "note enter" mode, reset

3
libmscore/score.h
View file

@ -116,6 +116,9 @@ enum class Pad : char {
NOTE32,
NOTE64,
NOTE128,
NOTE256,
NOTE512,
NOTE1024,
//--------------------
REST,
DOT,

18
libmscore/shadownote.cpp
View file

@ -55,7 +55,7 @@ SymId ShadowNote::getNoteFlag() const
if (_rest)
return flag;
TDuration::DurationType type = _duration.type();
switch(type) {
switch (type) {
case TDuration::DurationType::V_LONG:
flag = SymId::lastSym;
break;
@ -86,6 +86,15 @@ SymId ShadowNote::getNoteFlag() const
case TDuration::DurationType::V_128TH:
flag = computeUp() ? SymId::flag128thUp : SymId::flag128thDown;
break;
case TDuration::DurationType::V_256TH:
flag = computeUp() ? SymId::flag256thUp : SymId::flag256thDown;
break;
case TDuration::DurationType::V_512TH:
flag = computeUp() ? SymId::flag512thUp : SymId::flag512thDown;
break;
case TDuration::DurationType::V_1024TH:
flag = computeUp() ? SymId::flag1024thUp : SymId::flag1024thDown;
break;
default:
flag = SymId::noSym;
}
@ -151,9 +160,10 @@ void ShadowNote::draw(QPainter* painter) const
QPointF pos;
pos.rx() = up == 1 ? (noteheadWidth - (lw / 2)) : lw / 2;
qreal yOffset = up == 1 ? symStemUpSE(_notehead).y() * magS() : symStemDownNW(_notehead).y() * magS();
if(flag != SymId::lastSym) {
pos.ry() -= up * (symHeight(flag) + (posDot.y() != 0 ? posDot.y() + spatium() : 0) + 0.5*spatium());
painter->drawLine(QLineF(pos.x(), yOffset, pos.x(), pos.y() - up * (yOffset + lw/2)));
if (flag != SymId::lastSym) {
qreal flagHeight = (_duration.type() < TDuration::DurationType::V_256TH) ? symHeight(flag) : symHeight(flag) / 2;
pos.ry() -= up * (flagHeight + (posDot.y() != 0 ? posDot.y() + spatium() : 0) + 0.5 * spatium());
painter->drawLine(QLineF(pos.x(), yOffset, pos.x(), pos.y() - up * (yOffset + lw / 2)));
pos.rx() -= (lw / 2); // flag offset?
drawSymbol(flag, painter, pos, 1);
}

8
libmscore/stafftype.cpp
View file

@ -1108,6 +1108,10 @@ bool TablatureDurationFont::read(XmlReader& e)
zeroBeamLevel = TDuration::DurationType::V_128TH;
else if (val == "256")
zeroBeamLevel = TDuration::DurationType::V_256TH;
else if (val == "512")
zeroBeamLevel = TDuration::DurationType::V_512TH;
else if (val == "1024")
zeroBeamLevel = TDuration::DurationType::V_1024TH;
else
e.unknown();
}
@ -1137,6 +1141,10 @@ bool TablatureDurationFont::read(XmlReader& e)
displayValue[int(TabVal::VAL_128)] = chr;
else if (val == "256")
displayValue[int(TabVal::VAL_256)] = chr;
else if (val == "512")
displayValue[int(TabVal::VAL_512)] = chr;
else if (val == "1024")
displayValue[int(TabVal::VAL_1024)] = chr;
else if (val == "dot")
displayDot = chr;
else

2
libmscore/stafftype.h
View file

@ -116,6 +116,8 @@ enum class TabVal : char {
VAL_64,
VAL_128,
VAL_256,
VAL_512,
VAL_1024,
NUM_OF
};

9
libmscore/sym.cpp
View file

@ -5344,6 +5344,9 @@ QVector<oldName> oldNames = {
{"32' rest", SymId::rest32nd }, // rests.5
{"64' rest", SymId::rest64th }, // rests.6
{"128' rest", SymId::rest128th }, // rests.7
// {"256' rest", SymId::rest256th }, // rests.8
// {"512' rest", SymId::rest512th }, // rests.9
// {"1024' rest", SymId::rest1024th }, // rests.10
{"sharp", SymId::accidentalSharp }, // accidentals.sharp
{"sharp arrow up", SymId::accidentalThreeQuarterTonesSharpArrowUp }, // accidentals.sharp.arrowup - typo in 1.3
@ -5513,6 +5516,9 @@ QVector<oldName> oldNames = {
{"thirtysecond flag", SymId::flag32ndUp }, // flags.u5
{"sixtyfour flag", SymId::flag64thUp }, // flags.u6
{"128flag", SymId::flag128thUp }, // flags.u7
// {"256flag", SymId::flag256thUp }, // flags.u8
// {"512flag", SymId::flag512thUp }, // flags.u9
// {"1024flag", SymId::flag1024thUp }, // flags.u10
{"deight flag", SymId::flag8thDown }, // flags.d3
{"grace dash", SymId::graceNoteSlashStemUp }, // flags.ugrace
{"dgrace dash", SymId::graceNoteSlashStemDown }, // flags.dgrace
@ -5520,6 +5526,9 @@ QVector<oldName> oldNames = {
{"dthirtysecond flag", SymId::flag32ndDown }, // flags.d5
{"dsixtyfourth flag", SymId::flag16thDown }, // flags.d6
{"d128flag", SymId::flag128thDown }, // flags.d7
// {"d256flag", SymId::flag256thDown }, // flags.d8
// {"d512flag", SymId::flag512thDown }, // flags.d9
// {"d1024flag", SymId::flag1024thDown }, // flags.d10
{"alto clef", SymId::cClef }, // clefs.C
{"calto clef", SymId::cClefChange }, // clefs.C_change

8
libmscore/tempotext.cpp
View file

@ -120,6 +120,9 @@ static const TempoPattern tp[] = {
TempoPattern("\uECA0", 1.0/7.5, TDuration::DurationType::V_BREVE), // double whole
TempoPattern("\uECAD", 1.0/960.0, TDuration::DurationType::V_64TH), // 1/64
TempoPattern("\uECAF", 1.0/1920.0, TDuration::DurationType::V_128TH), // 1/128
TempoPattern("\uECB1", 1.0/1920.0, TDuration::DurationType::V_256TH), // 1/256
TempoPattern("\uECB3", 1.0/1920.0, TDuration::DurationType::V_512TH), // 1/512
TempoPattern("\uECB5", 1.0/1920.0, TDuration::DurationType::V_1024TH), // 1/1024
};
//---------------------------------------------------------
@ -155,7 +158,7 @@ static const TempoPattern tpSym[] = {
TempoPattern("<sym>metNote8thUp</sym>\\s*<sym>metAugmentationDot</sym>\\s*<sym>metAugmentationDot</sym>", 1.75/120.0, TDuration::DurationType::V_EIGHTH, 2), // double dotted 1/8
TempoPattern("<sym>metNote8thUp</sym>\\s*<sym>metAugmentationDot</sym>", 1.5/120.0, TDuration::DurationType::V_EIGHTH, 1), // dotted 1/8
TempoPattern("<sym>metNote8thUp</sym>", 1.0/120.0, TDuration::DurationType::V_EIGHTH), // 1/8
TempoPattern("<sym>metNoteWhole</sym>\\s*<sym>metAugmentationDot</sym>", 1.5/15.0, TDuration::DurationType::V_WHOLE, 1), // dotted whole
TempoPattern("<sym>metNoteWhole</sym>\\s*<sym>metAugmentationDot</sym>", 1.5/15.0, TDuration::DurationType::V_WHOLE, 1), // dotted whole
TempoPattern("<sym>metNoteWhole</sym>", 1.0/15.0, TDuration::DurationType::V_WHOLE), // whole
TempoPattern("<sym>metNote16thUp</sym>\\s*<sym>metAugmentationDot</sym>", 1.5/240.0, TDuration::DurationType::V_16TH, 1), // dotted 1/16
TempoPattern("<sym>metNote16thUp</sym>", 1.0/240.0, TDuration::DurationType::V_16TH), // 1/16
@ -165,6 +168,9 @@ static const TempoPattern tpSym[] = {
TempoPattern("<sym>metNoteDoubleWhole</sym>", 1.0/7.5, TDuration::DurationType::V_BREVE), // double whole
TempoPattern("<sym>metNote64thUp</sym>", 1.0/960.0, TDuration::DurationType::V_64TH), // 1/64
TempoPattern("<sym>metNote128thUp</sym>", 1.0/1920.0,TDuration::DurationType::V_128TH), // 1/128
TempoPattern("<sym>metNote256thUp</sym>", 1.0/3840.0,TDuration::DurationType::V_256TH), // 1/256
TempoPattern("<sym>metNote512thUp</sym>", 1.0/7680.0,TDuration::DurationType::V_512TH), // 1/512
TempoPattern("<sym>metNote1024thUp</sym>", 1.0/15360.0,TDuration::DurationType::V_1024TH), // 1/1024
};
//---------------------------------------------------------

106
mscore/data/icons/note-1024.svg Normal file
View file

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="33"
height="33"
viewBox="-4.5 0 33 33"
version="1.1"
id="svg17"
sodipodi:docname="note-1024.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata21">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>note-1024</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1479"
inkscape:window-height="968"
id="namedview19"
showgrid="false"
inkscape:zoom="27.812867"
inkscape:cx="11.627177"
inkscape:cy="12.454991"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="note-1024" />
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title
id="title2">note-1024</title>
<desc
id="desc4">Created with Sketch.</desc>
<defs
id="defs6" />
<g
id="Original-24"
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
transform="translate(0,9)">
<g
id="note-1024"
style="fill:#3b3f45">
<path
d="m 11.999415,-6.6528681 c 0,0 0.99999,-1.5155853 2.000355,-1.5155853 2.55e-4,0.015914 0,26.9504384 0,26.9504384 h -2.00073 z"
id="rect7032-8"
inkscape:connector-curvature="0"
style="stroke-width:1.23109722" />
<path
d="m 11.506414,16.717681 c -1.217042,0 -2.3561264,0.445562 -3.4173055,1.336664 -1.0611792,0.891104 -1.5917689,1.849039 -1.5917676,2.873807 -7e-7,0.623772 0.230045,1.125017 0.6901385,1.503737 0.4600914,0.378715 1.0611765,0.568081 1.8032608,0.568081 1.2170248,0 2.3560988,-0.445556 3.4172858,-1.336658 1.061188,-0.891102 1.591781,-1.849038 1.591781,-2.873807 0,-0.623773 -0.230047,-1.125017 -0.690141,-1.503734 -0.460094,-0.378723 -1.061187,-0.56809 -1.803252,-0.56809"
id="path44-6-7"
inkscape:connector-curvature="0" />
<path
d="M 13.999815,1.010015 V 4.07252 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 C 18.10206,5.578895 17.7051,5.167205 17.218515,4.76006 L 15.812265,3.572555 C 15.355995,3.186185 14.917125,2.774345 14.593515,2.32256 14.352075,1.86452 14.24214,1.883375 13.99977,1.01006 Z"
id="path3434"
inkscape:connector-curvature="0" />
<path
d="m 13.999755,13.67258 v 3.05817 c 0.60279,0.333435 1.12818,0.66003 1.53126,0.90918 0.44325,0.27396 0.93057,0.718725 1.37499,1.17366 0.43503,0.445365 0.65622,0.89577 0.65625,1.25634 -3e-5,0.72834 -0.30552,1.53501 -0.9375,2.31429 -0.1464,0.22533 -0.398175,0.41559 -0.628905,0.61575 0,0 0.336915,-0.06195 0.378915,-0.0702 0.63921,-0.126 1.093065,-0.22842 1.40625,-0.396735 0.33378,-0.179385 0.548445,-0.423465 0.75,-0.776955 0.283515,-0.55896 0.43749,-1.09809 0.43749,-1.63653 0,-0.45531 -0.19221,-0.93738 -0.53124,-1.40508 -0.335205,-0.46242 -0.732165,-0.88224 -1.21875,-1.2894 l -1.40625,-1.19019 c -0.45627,-0.386385 -0.89514,-0.788025 -1.21875,-1.23981 -0.24144,-0.458025 -0.35139,-0.449115 -0.59376,-1.322445 z"
id="path3484"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,10.519325 v 3.062505 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 -0.335205,-0.46242 -0.732165,-0.87411 -1.21875,-1.281255 l -1.40625,-1.187505 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.45804 -0.351375,-0.439185 -0.593745,-1.3125 z"
id="path4282"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,4.16813 v 3.06249 c 0.60279,0.33345 1.12818,0.657105 1.53126,0.906255 0.44325,0.273975 0.93057,0.70131 1.37499,1.156245 0.19782,0.2025 0.36006,0.398085 0.46875,0.59376 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.31341 0.70416,0.65076 1.000005,1.000005 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.718755 0,-0.45531 -0.192225,-0.938535 -0.531255,-1.40625 C 18.10206,8.737025 17.7051,8.32532 17.218515,7.91819 L 15.812265,6.730685 C 15.355995,6.3443 14.917125,5.93246 14.593515,5.48069 14.352075,5.02265 14.24214,5.041505 13.99977,4.16819 Z"
id="path4287"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,7.33628 v 3.06249 c 0.60279,0.33345 1.12818,0.657105 1.53126,0.906255 0.44325,0.273975 0.93057,0.70131 1.37499,1.156245 0.19782,0.2025 0.36006,0.398085 0.46875,0.59376 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.31341 0.70416,0.65076 1.000005,1.000005 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.718755 0,-0.45531 -0.192225,-0.938535 -0.531255,-1.40625 C 18.10206,11.905175 17.7051,11.49347 17.218515,11.08634 L 15.812265,9.898835 C 15.355995,9.51245 14.917125,9.10061 14.593515,8.64884 14.352075,8.1908 14.24214,8.209655 13.99977,7.33634 Z"
id="path4289"
inkscape:connector-curvature="0" />
<path
d="M 13.999725,-8.187505 V -5.125 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 -0.335205,-0.46242 -0.732165,-0.87411 -1.21875,-1.281255 l -1.40625,-1.187505 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.45804 -0.351375,-0.439185 -0.593745,-1.3125 z"
id="path3434-9"
inkscape:connector-curvature="0" />
<path
d="m 13.999725,-5.125 v 3.062505 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 -0.335205,-0.46242 -0.732165,-0.87411 -1.21875,-1.281255 l -1.40625,-1.187505 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.45804 -0.351375,-0.439185 -0.593745,-1.3125 z"
id="path3434-7"
inkscape:connector-curvature="0" />
<path
d="m 13.99977,-2.06254 v 3.062505 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 C 18.102015,2.50634 17.705055,2.09465 17.21847,1.687505 L 15.81222,0.5 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.45804 -0.351375,-0.439185 -0.593745,-1.3125 z"
id="path3434-3"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 8 KiB

102
mscore/data/icons/note-256.svg Normal file
View file

@ -0,0 +1,102 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="27"
height="27"
viewBox="-1.5 0 27 27"
version="1.1"
id="svg17"
sodipodi:docname="note-256.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata21">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>note-256</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1341"
inkscape:window-height="1020"
id="namedview19"
showgrid="false"
inkscape:zoom="19.666667"
inkscape:cx="11.62871"
inkscape:cy="13.271848"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="note-256"
scale-x="1"
viewbox-width="27"
viewbox-x="-1.5"
units="in" />
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title
id="title2">note-256</title>
<desc
id="desc4">Created with Sketch.</desc>
<defs
id="defs6" />
<g
id="Original-24"
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
transform="translate(0,3)">
<g
id="note-256"
style="fill:#3b3f45">
<path
d="m 11.999415,-0.79056634 c 0,0 0.99999,-1.16626866 2.000355,-1.16626866 2.55e-4,0.012246 0,20.73882 0,20.73882 h -2.00073 z"
id="rect7032-8"
inkscape:connector-curvature="0"
style="stroke-width:1.07994461" />
<path
d="m 11.506414,16.717681 c -1.217042,0 -2.3561264,0.445562 -3.4173055,1.336664 -1.0611792,0.891104 -1.5917689,1.849039 -1.5917676,2.873807 -7e-7,0.623772 0.230045,1.125017 0.6901385,1.503737 0.4600914,0.378715 1.0611765,0.568081 1.8032608,0.568081 1.2170248,0 2.3560988,-0.445556 3.4172858,-1.336658 1.061188,-0.891102 1.591781,-1.849038 1.591781,-2.873807 0,-0.623773 -0.230047,-1.125017 -0.690141,-1.503734 -0.460094,-0.378723 -1.061187,-0.56809 -1.803252,-0.56809"
id="path44-6-7"
inkscape:connector-curvature="0" />
<path
d="M 13.999815,1.105625 V 4.16813 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 C 18.10206,5.674505 17.7051,5.262815 17.218515,4.85567 L 15.812265,3.668165 C 15.355995,3.281795 14.917125,2.869955 14.593515,2.41817 14.352075,1.96013 14.24214,1.978985 13.99977,1.10567 Z"
id="path3434"
inkscape:connector-curvature="0" />
<path
d="m 13.999755,13.67258 v 3.05817 c 0.60279,0.333435 1.12818,0.66003 1.53126,0.90918 0.44325,0.27396 0.93057,0.718725 1.37499,1.17366 0.43503,0.445365 0.65622,0.89577 0.65625,1.25634 -3e-5,0.72834 -0.30552,1.53501 -0.9375,2.31429 -0.1464,0.22533 -0.398175,0.41559 -0.628905,0.61575 0,0 0.336915,-0.06195 0.378915,-0.0702 0.63921,-0.126 1.093065,-0.22842 1.40625,-0.396735 0.33378,-0.179385 0.548445,-0.423465 0.75,-0.776955 0.283515,-0.55896 0.43749,-1.09809 0.43749,-1.63653 0,-0.45531 -0.19221,-0.93738 -0.53124,-1.40508 -0.335205,-0.46242 -0.732165,-0.88224 -1.21875,-1.2894 l -1.40625,-1.19019 c -0.45627,-0.386385 -0.89514,-0.788025 -1.21875,-1.23981 -0.24144,-0.458025 -0.35139,-0.449115 -0.59376,-1.322445 z"
id="path3484"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,10.519325 v 3.062505 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 -0.335205,-0.46242 -0.732165,-0.87411 -1.21875,-1.281255 l -1.40625,-1.187505 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.45804 -0.351375,-0.439185 -0.593745,-1.3125 z"
id="path4282"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,4.16813 v 3.06249 c 0.60279,0.33345 1.12818,0.657105 1.53126,0.906255 0.44325,0.273975 0.93057,0.70131 1.37499,1.156245 0.19782,0.2025 0.36006,0.398085 0.46875,0.59376 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.31341 0.70416,0.65076 1.000005,1.000005 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.718755 0,-0.45531 -0.192225,-0.938535 -0.531255,-1.40625 C 18.10206,8.737025 17.7051,8.32532 17.218515,7.91819 L 15.812265,6.730685 C 15.355995,6.3443 14.917125,5.93246 14.593515,5.48069 14.352075,5.02265 14.24214,5.041505 13.99977,4.16819 Z"
id="path4287"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,7.33628 v 3.06249 c 0.60279,0.33345 1.12818,0.657105 1.53126,0.906255 0.44325,0.273975 0.93057,0.70131 1.37499,1.156245 0.19782,0.2025 0.36006,0.398085 0.46875,0.59376 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.31341 0.70416,0.65076 1.000005,1.000005 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.718755 0,-0.45531 -0.192225,-0.938535 -0.531255,-1.40625 C 18.10206,11.905175 17.7051,11.49347 17.218515,11.08634 L 15.812265,9.898835 C 15.355995,9.51245 14.917125,9.10061 14.593515,8.64884 14.352075,8.1908 14.24214,8.209655 13.99977,7.33634 Z"
id="path4289"
inkscape:connector-curvature="0" />
<path
d="M 13.99977,-1.956835 V 1.10567 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.9999901 0.05775,-0.2393701 0.09375,-0.4812901 0.09375,-0.7187401 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 C 18.102015,2.612045 17.705055,2.200355 17.21847,1.79321 L 15.81222,0.605705 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.45804 -0.351375,-0.439185 -0.593745,-1.3125 z"
id="path3434-0"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 6.8 KiB

106
mscore/data/icons/note-512.svg Normal file
View file

@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="30"
height="30"
viewBox="-3 0 30 30"
version="1.1"
id="svg17"
sodipodi:docname="note-512.svg"
inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
<metadata
id="metadata21">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>note-512</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1598"
inkscape:window-height="1030"
id="namedview19"
showgrid="false"
inkscape:zoom="19.666667"
inkscape:cx="14.597166"
inkscape:cy="10.866156"
inkscape:window-x="31"
inkscape:window-y="93"
inkscape:window-maximized="0"
inkscape:current-layer="note-512"
viewbox-width="30"
viewbox-height="30"
viewbox-y="-6"
viewbox-x="-3" />
<!-- Generator: Sketch 41.2 (35397) - http://www.bohemiancoding.com/sketch -->
<title
id="title2">note-512</title>
<desc
id="desc4">Created with Sketch.</desc>
<defs
id="defs6" />
<g
id="Original-24"
style="fill:none;fill-rule:evenodd;stroke:none;stroke-width:1"
transform="translate(0,6)">
<g
id="note-512"
style="fill:#3b3f45">
<path
d="m 11.999415,-3.7176948 c 0,0 0.99999,-1.3406873 2.000355,-1.3406873 2.55e-4,0.014077 0,23.8403671 0,23.8403671 h -2.00073 z"
id="rect7032-8"
inkscape:connector-curvature="0"
style="stroke-width:1.15788627" />
<path
d="m 11.506414,16.717681 c -1.217042,0 -2.3561264,0.445562 -3.4173055,1.336664 -1.0611792,0.891104 -1.5917689,1.849039 -1.5917676,2.873807 -7e-7,0.623772 0.230045,1.125017 0.6901385,1.503737 0.4600914,0.378715 1.0611765,0.568081 1.8032608,0.568081 1.2170248,0 2.3560988,-0.445556 3.4172858,-1.336658 1.061188,-0.891102 1.591781,-1.849038 1.591781,-2.873807 0,-0.623773 -0.230047,-1.125017 -0.690141,-1.503734 -0.460094,-0.378723 -1.061187,-0.56809 -1.803252,-0.56809"
id="path44-6-7"
inkscape:connector-curvature="0" />
<path
d="M 13.999815,1.010015 V 4.07252 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 C 18.10206,5.578895 17.7051,5.167205 17.218515,4.76006 L 15.812265,3.572555 C 15.355995,3.186185 14.917125,2.774345 14.593515,2.32256 14.352075,1.86452 14.24214,1.883375 13.99977,1.01006 Z"
id="path3434"
inkscape:connector-curvature="0" />
<path
d="m 13.999755,13.67258 v 3.05817 c 0.60279,0.333435 1.12818,0.66003 1.53126,0.90918 0.44325,0.27396 0.93057,0.718725 1.37499,1.17366 0.43503,0.445365 0.65622,0.89577 0.65625,1.25634 -3e-5,0.72834 -0.30552,1.53501 -0.9375,2.31429 -0.1464,0.22533 -0.398175,0.41559 -0.628905,0.61575 0,0 0.336915,-0.06195 0.378915,-0.0702 0.63921,-0.126 1.093065,-0.22842 1.40625,-0.396735 0.33378,-0.179385 0.548445,-0.423465 0.75,-0.776955 0.283515,-0.55896 0.43749,-1.09809 0.43749,-1.63653 0,-0.45531 -0.19221,-0.93738 -0.53124,-1.40508 -0.335205,-0.46242 -0.732165,-0.88224 -1.21875,-1.2894 l -1.40625,-1.19019 c -0.45627,-0.386385 -0.89514,-0.788025 -1.21875,-1.23981 -0.24144,-0.458025 -0.35139,-0.449115 -0.59376,-1.322445 z"
id="path3484"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,10.519325 v 3.062505 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 -0.335205,-0.46242 -0.732165,-0.87411 -1.21875,-1.281255 l -1.40625,-1.187505 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.45804 -0.351375,-0.439185 -0.593745,-1.3125 z"
id="path4282"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,4.16813 v 3.06249 c 0.60279,0.33345 1.12818,0.657105 1.53126,0.906255 0.44325,0.273975 0.93057,0.70131 1.37499,1.156245 0.19782,0.2025 0.36006,0.398085 0.46875,0.59376 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.31341 0.70416,0.65076 1.000005,1.000005 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.718755 0,-0.45531 -0.192225,-0.938535 -0.531255,-1.40625 C 18.10206,8.737025 17.7051,8.32532 17.218515,7.91819 L 15.812265,6.730685 C 15.355995,6.3443 14.917125,5.93246 14.593515,5.48069 14.352075,5.02265 14.24214,5.041505 13.99977,4.16819 Z"
id="path4287"
inkscape:connector-curvature="0" />
<path
d="m 13.999815,7.33628 v 3.06249 c 0.60279,0.33345 1.12818,0.657105 1.53126,0.906255 0.44325,0.273975 0.93057,0.70131 1.37499,1.156245 0.19782,0.2025 0.36006,0.398085 0.46875,0.59376 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.31341 0.70416,0.65076 1.000005,1.000005 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.718755 0,-0.45531 -0.192225,-0.938535 -0.531255,-1.40625 C 18.10206,11.905175 17.7051,11.49347 17.218515,11.08634 L 15.812265,9.898835 C 15.355995,9.51245 14.917125,9.10061 14.593515,8.64884 14.352075,8.1908 14.24214,8.209655 13.99977,7.33634 Z"
id="path4289"
inkscape:connector-curvature="0" />
<path
d="m 13.99977,-2.06254 v 3.062505 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 C 18.102015,2.50634 17.705055,2.09465 17.21847,1.687505 L 15.81222,0.5 C 15.35595,0.11363 14.91708,-0.29820996 14.59347,-0.74999496 14.35203,-1.208035 14.242095,-1.18918 13.999725,-2.062495 Z"
id="path3434-2"
inkscape:connector-curvature="0" />
<path
d="m 13.999725,-5.125 v 3.062505 c 0.60279,0.333435 1.12818,0.65709 1.53126,0.90624 0.44325,0.27399 0.93057,0.70131 1.37499,1.15626 0.19782,0.2025 0.36006,0.39807 0.46875,0.593745 0.0105,0.0195 0.0213,0.0432 0.0312,0.06255 l 0.46875,0.375 c 0.374565,0.313395 0.70416,0.65076 1.000005,0.99999 0.05775,-0.23937 0.09375,-0.48129 0.09375,-0.71874 0,-0.455325 -0.192225,-0.93855 -0.531255,-1.40625 -0.335205,-0.46242 -0.732165,-0.87411 -1.21875,-1.281255 l -1.40625,-1.187505 c -0.45627,-0.38637 -0.89514,-0.79821 -1.21875,-1.249995 -0.24144,-0.4580401 -0.351375,-0.4391851 -0.593745,-1.3125 z"
id="path3434-6"
inkscape:connector-curvature="0" />
</g>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 7.5 KiB

3
mscore/icons.cpp
View file

@ -47,6 +47,9 @@ static const char* iconNames[] = {
"note-32.svg",
"note-64.svg",
"note-128.svg",
"note-256.svg",
"note-512.svg",
"note-1024.svg",
"note-natural.svg",
"note-sharp.svg",
"note-double-sharp.svg",

4
mscore/icons.h
View file

@ -24,9 +24,9 @@ namespace Ms {
extern void genIcons();
enum class Icons : signed int { Invalid_ICON = -1,
enum class Icons : short { Invalid_ICON = -1,
longaUp_ICON, brevis_ICON, note_ICON, note2_ICON, note4_ICON, note8_ICON, note16_ICON,
note32_ICON, note64_ICON, note128_ICON,
note32_ICON, note64_ICON, note128_ICON, note256_ICON, note512_ICON, note1024_ICON,
natural_ICON, sharp_ICON, sharpsharp_ICON, flat_ICON, flatflat_ICON,
quartrest_ICON, dot_ICON, dotdot_ICON, dot3_ICON, dot4_ICON,
flip_ICON,

3
mscore/keyb.cpp
View file

@ -131,6 +131,9 @@ void MuseScore::updateInputState(Score* score)
getAction("pad-note-32")->setChecked(is.duration() == TDuration::DurationType::V_32ND);
getAction("pad-note-64")->setChecked(is.duration() == TDuration::DurationType::V_64TH);
getAction("pad-note-128")->setChecked(is.duration() == TDuration::DurationType::V_128TH);
getAction("pad-note-256")->setChecked(is.duration() == TDuration::DurationType::V_256TH);
getAction("pad-note-512")->setChecked(is.duration() == TDuration::DurationType::V_512TH);
getAction("pad-note-1024")->setChecked(is.duration() == TDuration::DurationType::V_1024TH);
getAction("sharp2")->setChecked(is.accidentalType() == AccidentalType::SHARP2);
getAction("sharp")->setChecked(is.accidentalType() == AccidentalType::SHARP);

9
mscore/musescore.cpp
View file

@ -228,6 +228,9 @@ bool mscoreFirstStart = false;
const std::list<const char*> MuseScore::_allNoteInputMenuEntries {
"note-input",
"pad-note-1024",
"pad-note-512",
"pad-note-256",
"pad-note-128",
"pad-note-64",
"pad-note-32",
@ -4242,10 +4245,12 @@ void MuseScore::changeState(ScoreState val)
static const char* stdNames[] = {
"note-longa", "note-breve", "pad-note-1", "pad-note-2", "pad-note-4",
"pad-note-8", "pad-note-16", "pad-note-32", "pad-note-64", "pad-note-128", "pad-rest", "rest"};
"pad-note-8", "pad-note-16", "pad-note-32", "pad-note-64", "pad-note-128",
"pad-note-256","pad-note-512","pad-note-1024","pad-rest", "rest"};
static const char* tabNames[] = {
"note-longa-TAB", "note-breve-TAB", "pad-note-1-TAB", "pad-note-2-TAB", "pad-note-4-TAB",
"pad-note-8-TAB", "pad-note-16-TAB", "pad-note-32-TAB", "pad-note-64-TAB", "pad-note-128-TAB", "pad-rest-TAB", "rest-TAB"};
"pad-note-8-TAB", "pad-note-16-TAB", "pad-note-32-TAB", "pad-note-64-TAB", "pad-note-128-TAB",
"pad-note-256-TAB", "pad-note-512-TAB", "pad-note-1024-TAB", "pad-rest-TAB", "rest-TAB"};
bool intoTAB = (_sstate != STATE_NOTE_ENTRY_STAFF_TAB) && (val == STATE_NOTE_ENTRY_STAFF_TAB);
bool fromTAB = (_sstate == STATE_NOTE_ENTRY_STAFF_TAB) && (val != STATE_NOTE_ENTRY_STAFF_TAB);
// if activating TAB note entry, swap "pad-note-...-TAB" shorctuts into "pad-note-..." actions

3
mscore/musescore.qrc
View file

@ -109,6 +109,9 @@
<file>data/icons/note-32.svg</file>
<file>data/icons/note-64.svg</file>
<file>data/icons/note-128.svg</file>
<file>data/icons/note-256.svg</file>
<file>data/icons/note-512.svg</file>
<file>data/icons/note-1024.svg</file>
<file>data/icons/note-breve.svg</file>
<file>data/icons/note-dot.svg</file>
<file>data/icons/note-dot3.svg</file>

54
mscore/prefsdialog.cpp
View file

@ -544,14 +544,29 @@ void PreferenceDialog::updateValues(bool useDefaultValues)
defaultPlayDuration->setValue(preferences.getInt(PREF_SCORE_NOTE_DEFAULTPLAYDURATION));
int shortestNoteIndex = 2;
int nn = (preferences.getInt(PREF_IO_MIDI_SHORTESTNOTE) * 16)/MScore::division;
switch(nn) {
case 16: shortestNoteIndex = 0; break;
case 8: shortestNoteIndex = 1; break;
case 4: shortestNoteIndex = 2; break;
case 2: shortestNoteIndex = 3; break;
case 1: shortestNoteIndex = 4; break;
int shortestNoteIndex;
int nn = preferences.getInt(PREF_IO_MIDI_SHORTESTNOTE);
if (nn == MScore::division)
shortestNoteIndex = 0; // Quarter
else if (nn == MScore::division / 2)
shortestNoteIndex = 1; // Eighth
else if (nn == MScore::division / 4)
shortestNoteIndex = 2; // etc.
else if (nn == MScore::division / 8)
shortestNoteIndex = 3;
else if (nn == MScore::division / 16)
shortestNoteIndex = 4;
else if (nn == MScore::division / 32)
shortestNoteIndex = 5;
else if (nn == MScore::division / 64)
shortestNoteIndex = 6;
else if (nn == MScore::division / 128)
shortestNoteIndex = 7;
else if (nn == MScore::division / 256)
shortestNoteIndex = 8;
else {
qDebug("Unknown shortestNote value of %d, defaulting to 16th", nn);
shortestNoteIndex = 2;
}
shortestNote->setCurrentIndex(shortestNoteIndex);
@ -1144,13 +1159,22 @@ void PreferenceDialog::apply()
else
preferences.setPreference(PREF_IMPORT_STYLE_STYLEFILE, "");
int ticks = MScore::division/4;
switch(shortestNote->currentIndex()) {
case 0: ticks = MScore::division; break;
case 1: ticks = MScore::division/2; break;
case 2: ticks = MScore::division/4; break;
case 3: ticks = MScore::division/8; break;
case 4: ticks = MScore::division/16; break;
int ticks = MScore::division / 4;
switch (shortestNote->currentIndex()) {
case 0: ticks = MScore::division; break;
case 1: ticks = MScore::division / 2; break;
case 2: ticks = MScore::division / 4; break;
case 3: ticks = MScore::division / 8; break;
case 4: ticks = MScore::division / 16; break;
case 5: ticks = MScore::division / 32; break;
case 6: ticks = MScore::division / 64; break;
case 7: ticks = MScore::division / 128; break;
case 8: ticks = MScore::division / 256; break;
default: {
qDebug("Unknown index for shortestNote: %d, defaulting to 16th",
shortestNote->currentIndex());
ticks = MScore::division / 4;
}
}
preferences.setPreference(PREF_IO_MIDI_SHORTESTNOTE, ticks);

22
mscore/prefsdialog.ui
View file

@ -3455,7 +3455,7 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
<string>Choose the shortest note value</string>
</property>
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<item>
<property name="text">
@ -3482,6 +3482,26 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
<string>64th</string>
</property>
</item>
<item>
<property name="text">
<string>128th</string>
</property>
</item>
<item>
<property name="text">
<string>256th</string>
</property>
</item>
<item>
<property name="text">
<string>512th</string>
</property>
</item>
<item>
<property name="text">
<string>1024th</string>
</property>
</item>
</widget>
</item>
<item>

2
mscore/scoreview.cpp
View file

@ -3962,7 +3962,7 @@ void ScoreView::setCursorVisible(bool v)
void ScoreView::cmdTuplet(int n, ChordRest* cr)
{
if (cr->durationType() < TDuration(TDuration::DurationType::V_128TH) && cr->durationType() != TDuration(TDuration::DurationType::V_MEASURE)) {
if (cr->durationType() < TDuration(TDuration::DurationType::V_512TH) && cr->durationType() != TDuration(TDuration::DurationType::V_MEASURE)) {
mscore->noteTooShortForTupletDialog();
return;
}

63
mscore/shortcut.cpp
View file

@ -1499,6 +1499,39 @@ Shortcut Shortcut::_sc[] = {
Qt::WindowShortcut,
ShortcutFlags::A_CHECKABLE
},
{
MsWidget::SCORE_TAB,
STATE_NORMAL | STATE_NOTE_ENTRY,
"pad-note-256",
QT_TRANSLATE_NOOP("action","256th Note"),
QT_TRANSLATE_NOOP("action","Note duration: 256th"),
QT_TRANSLATE_NOOP("action","256th note"),
Icons::note256_ICON,
Qt::WindowShortcut,
ShortcutFlags::A_CHECKABLE
},
{
MsWidget::SCORE_TAB,
STATE_NORMAL | STATE_NOTE_ENTRY,
"pad-note-512",
QT_TRANSLATE_NOOP("action","512th Note"),
QT_TRANSLATE_NOOP("action","Note duration: 512th"),
QT_TRANSLATE_NOOP("action","512th note"),
Icons::note512_ICON,
Qt::WindowShortcut,
ShortcutFlags::A_CHECKABLE
},
{
MsWidget::SCORE_TAB,
STATE_NORMAL | STATE_NOTE_ENTRY,
"pad-note-1024",
QT_TRANSLATE_NOOP("action","1024th Note"),
QT_TRANSLATE_NOOP("action","Note duration: 1024th"),
QT_TRANSLATE_NOOP("action","1024th note"),
Icons::note1024_ICON,
Qt::WindowShortcut,
ShortcutFlags::A_CHECKABLE
},
{
MsWidget::SCORE_TAB,
STATE_NOTE_ENTRY,
@ -3227,6 +3260,36 @@ Shortcut Shortcut::_sc[] = {
Icons::note128_ICON,
Qt::WindowShortcut
},
{
MsWidget::SCORE_TAB,
STATE_NEVER,
"pad-note-256-TAB",
QT_TRANSLATE_NOOP("action","256th Note (TAB)"),
QT_TRANSLATE_NOOP("action","Note duration: 256th (TAB)"),
QT_TRANSLATE_NOOP("action","256th note"),
Icons::note256_ICON,
Qt::WindowShortcut
},
{
MsWidget::SCORE_TAB,
STATE_NEVER,
"pad-note-512-TAB",
QT_TRANSLATE_NOOP("action","512th Note (TAB)"),
QT_TRANSLATE_NOOP("action","Note duration: 512th (TAB)"),
QT_TRANSLATE_NOOP("action","512th note"),
Icons::note512_ICON,
Qt::WindowShortcut
},
{
MsWidget::SCORE_TAB,
STATE_NEVER,
"pad-note-1024-TAB",
QT_TRANSLATE_NOOP("action","1024th Note (TAB)"),
QT_TRANSLATE_NOOP("action","Note duration: 1024th (TAB)"),
QT_TRANSLATE_NOOP("action","1024th note"),
Icons::note1024_ICON,
Qt::WindowShortcut
},
{
MsWidget::SCORE_TAB,
STATE_NOTE_ENTRY_STAFF_TAB,

2
mscore/tupletdialog.cpp
View file

@ -116,7 +116,7 @@ Tuplet* MuseScore::tupletDialog()
cr = cs->getSelectedChordRest();
if (cr == 0)
return 0;
if (cr->durationType() < TDuration(TDuration::DurationType::V_128TH) && cr->durationType() != TDuration(TDuration::DurationType::V_MEASURE)) {
if (cr->durationType() < TDuration(TDuration::DurationType::V_512TH) && cr->durationType() != TDuration(TDuration::DurationType::V_MEASURE)) {
noteTooShortForTupletDialog();
return 0;
}