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

fix note parenthesis SMuFL way, use proper accidental parenthesis from SMuFL font

Browse source
This commit is contained in:
lasconic 2014-11-25 18:01:41 +01:00
parent 557a4e49c6
commit fc7188b329
6 changed files with 60 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fonts/mscore/glyphnames.json
View file

@ -83,6 +83,12 @@
"accidentalQuarterToneFlatNaturalArrowDown": { "accidentalQuarterToneFlatNaturalArrowDown": {
"codepoint": "U+e1bf" "codepoint": "U+e1bf"
}, },
"accidentalParensLeft": {
"codepoint": "U+E26A"
},
"accidentalParensRight": {
"codepoint": "U+E26B"
},
"arrowheadBlackDown": { "arrowheadBlackDown": {
"codepoint": "U+E126" "codepoint": "U+E126"
}, },

BIN
fonts/mscore/mscore.otf
View file

Binary file not shown.

42
fonts/mscore/mscore.sfd
View file

@ -20,7 +20,7 @@ OS2Version: 3
OS2_WeightWidthSlopeOnly: 0 OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1 OS2_UseTypoMetrics: 1
CreationTime: 1403170689 CreationTime: 1403170689
ModificationTime: 1413789183 ModificationTime: 1416931484
PfmFamily: 17 PfmFamily: 17
TTFWeight: 400 TTFWeight: 400
TTFWidth: 5 TTFWidth: 5
@ -63,7 +63,7 @@ NameList: Adobe Glyph List
DisplaySize: -72 DisplaySize: -72
AntiAlias: 1 AntiAlias: 1
FitToEm: 1 FitToEm: 1
WinInfo: 59640 10 8 WinInfo: 57930 10 8
BeginPrivate: 7 BeginPrivate: 7
BlueValues 21 [0 0 256 257 478 478] BlueValues 21 [0 0 256 257 478 478]
OtherBlues 11 [-141 -141] OtherBlues 11 [-141 -141]
@ -73,7 +73,7 @@ StdVW 4 [38]
StemSnapH 26 [24 30 34 40 44 55 80 102] StemSnapH 26 [24 30 34 40 44 55 80 102]
StemSnapV 20 [32 38 44 50 59 100] StemSnapV 20 [32 38 44 50 59 100]
EndPrivate EndPrivate
BeginChars: 65539 282 BeginChars: 65539 284
StartChar: .notdef StartChar: .notdef
Encoding: 65536 -1 0 Encoding: 65536 -1 0
@ -2768,26 +2768,24 @@ EndChar
StartChar: uniE11D StartChar: uniE11D
Encoding: 57629 57629 57 Encoding: 57629 57629 57
Width: 152 Width: 116
GlyphClass: 2 GlyphClass: 2
Flags: W Flags: W
VStem: 102 52<-126.266 128.29> VStem: 64 52<-126.266 128.29>
LayerCount: 2 LayerCount: 2
Fore Fore
Refer: 27 57507 N 1 0 0 1 0 0 2 Refer: 27 57507 N 1 0 0 1 -38 0 2
Validated: 1
EndChar EndChar
StartChar: uniE11E StartChar: uniE11E
Encoding: 57630 57630 58 Encoding: 57630 57630 58
Width: 0 Width: 116
GlyphClass: 2 GlyphClass: 2
Flags: W Flags: W
VStem: -154 52<-126.266 128.29> VStem: 0 52<-126.266 128.29>
LayerCount: 2 LayerCount: 2
Fore Fore
Refer: 26 57506 N 1 0 0 1 -180 0 2 Refer: 26 57506 N 1 0 0 1 -26 0 2
Validated: 1
EndChar EndChar
StartChar: uniE11F StartChar: uniE11F
@ -12936,5 +12934,27 @@ SplineSet
EndSplineSet EndSplineSet
Validated: 1 Validated: 1
EndChar EndChar
StartChar: uniE26A
Encoding: 57962 57962 282
Width: 116
Flags: W
VStem: 0 52<-126.266 128.29>
LayerCount: 2
Fore
Refer: 26 57506 N 1 0 0 1 -26 0 2
Validated: 1
EndChar
StartChar: uniE26B
Encoding: 57963 57963 283
Width: 116
Flags: W
VStem: 64 52<-126.266 128.29>
LayerCount: 2
Fore
Refer: 27 57507 N 1 0 0 1 -38 0 2
Validated: 1
EndChar
EndChars EndChars
EndSplineFont EndSplineFont

BIN
fonts/mscore/mscore.ttf
View file

Binary file not shown.

8
libmscore/accidental.cpp
View file

@ -310,9 +310,9 @@ void Accidental::layout()
m = magS(); m = magS();
if (_hasBracket) { if (_hasBracket) {
SymElement e(SymId::noteheadParenthesisLeft, 0.0); SymElement e(SymId::accidentalParensLeft, 0.0);
el.append(e); el.append(e);
r |= symBbox(SymId::noteheadParenthesisLeft); r |= symBbox(SymId::accidentalParensLeft);
} }
SymId s = symbol(); SymId s = symbol();
@ -323,9 +323,9 @@ void Accidental::layout()
if (_hasBracket) { if (_hasBracket) {
x = r.x()+r.width(); x = r.x()+r.width();
SymElement e(SymId::noteheadParenthesisRight, x); SymElement e(SymId::accidentalParensRight, x);
el.append(e); el.append(e);
r |= symBbox(SymId::noteheadParenthesisRight).translated(x, 0.0); r |= symBbox(SymId::accidentalParensRight).translated(x, 0.0);
} }
setbbox(r); setbbox(r);
} }

14
libmscore/note.cpp
View file

@ -1641,15 +1641,22 @@ void Note::layout2()
if (!score()->tagIsValid(e->tag())) if (!score()->tagIsValid(e->tag()))
continue; continue;
e->setMag(mag()); e->setMag(mag());
if (e->type() == Element::Type::SYMBOL && static_cast<Symbol*>(e)->sym() == SymId::noteheadParenthesisRight) { if (e->type() == Element::Type::SYMBOL) {
qreal w = headWidth(); qreal w = headWidth();
Symbol* sym = static_cast<Symbol*>(e);
QPointF rp = e->readPos();
e->layout();
if (sym->sym() == SymId::noteheadParenthesisRight) {
if (staff()->isTabStaff()) { if (staff()->isTabStaff()) {
StaffType* tab = staff()->staffType(); StaffType* tab = staff()->staffType();
w = tabHeadWidth(tab); w = tabHeadWidth(tab);
} }
QPointF rp = e->readPos();
e->layout();
e->rxpos() += w; e->rxpos() += w;
}
else if (sym->sym() == SymId::noteheadParenthesisLeft) {
e->rxpos() -= symWidth(SymId::noteheadParenthesisLeft);
}
if (sym->sym() == SymId::noteheadParenthesisLeft || sym->sym() == SymId::noteheadParenthesisRight) {
// adjustReadPos() was called too early in layout(), adjust: // adjustReadPos() was called too early in layout(), adjust:
if (!rp.isNull()) { if (!rp.isNull()) {
e->setUserOff(QPointF()); e->setUserOff(QPointF());
@ -1657,6 +1664,7 @@ void Note::layout2()
e->adjustReadPos(); e->adjustReadPos();
} }
} }
}
else else
e->layout(); e->layout();
} }