smufl: more trill line fixes
This commit is contained in:
ws
parent
b62b8a4081
commit
cd655c5197
8 changed files with 251 additions and 393 deletions
|
|
@ -1,10 +1,6 @@
|
|||
SplineFontDB: 3.0
|
||||
FontName: MScore
|
||||
FullName: MScore
|
||||
FamilyName: MScore
|
||||
Weight: Regular
|
||||
Copyright:
|
||||
Version:
|
||||
ItalicAngle: 0
|
||||
UnderlinePosition: -51
|
||||
UnderlineWidth: 51
|
||||
|
|
@ -14,8 +10,7 @@ LayerCount: 2
|
|||
Layer: 0 1 "Back" 1
|
||||
Layer: 1 1 "Fore" 0
|
||||
XUID: [1021 577 2134738168 4915929]
|
||||
FSType: 0
|
||||
OS2Version: 3
|
||||
OS2Version: 0
|
||||
OS2_WeightWidthSlopeOnly: 0
|
||||
OS2_UseTypoMetrics: 0
|
||||
CreationTime: 1384442002
|
||||
|
|
@ -71,24 +66,28 @@ ShortTable: maxp 16
|
|||
0
|
||||
0
|
||||
EndShort
|
||||
LangName: 1033
|
||||
LangName: 1033
|
||||
GaspTable: 2 8 2 65535 3 0
|
||||
Encoding: UnicodeBmp
|
||||
Compacted: 1
|
||||
UnicodeInterp: none
|
||||
NameList: Adobe Glyph List
|
||||
DisplaySize: -72
|
||||
DisplaySize: -128
|
||||
AntiAlias: 1
|
||||
FitToEm: 1
|
||||
ExtremaBound: 10
|
||||
<<<<<<< HEAD
|
||||
WinInfo: 0 8 10
|
||||
=======
|
||||
WinInfo: 96 8 6
|
||||
>>>>>>> smufl: more trill line fixes
|
||||
BeginPrivate: 0
|
||||
EndPrivate
|
||||
Grid
|
||||
0 142 m 25
|
||||
337.333 142.333 l 25
|
||||
337 -141.001 l 25
|
||||
0 -140.666 l 29
|
||||
0 -140.666 l 1053
|
||||
EndSplineSet
|
||||
TeXData: 1 0 0 360448 180224 120149 0 1048576 120149 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
|
||||
BeginChars: 65539 246
|
||||
|
|
@ -2354,7 +2353,7 @@ SplineSet
|
|||
467 485 l 257,0,-1
|
||||
EndSplineSet
|
||||
Validated: 16385
|
||||
Kerns2: 18 -70 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
|
||||
Kerns2: 18 -70 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
|
||||
EndChar
|
||||
|
||||
StartChar: m
|
||||
|
|
@ -2652,7 +2651,7 @@ SplineSet
|
|||
-50 250 -50 250 -50 260 c 256,0,1
|
||||
EndSplineSet
|
||||
Validated: 16417
|
||||
Kerns2: 20 106 "'kern' Horizontal Kerning in Latin lookup 0 subtable" 18 -53 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
|
||||
Kerns2: 20 106 "'kern' Horizontal Kerning in Latin lookup 0 subtable" 18 -53 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
|
||||
EndChar
|
||||
|
||||
StartChar: p
|
||||
|
|
@ -3016,7 +3015,7 @@ SplineSet
|
|||
473 387 473 387 443 387 c 256,0,1
|
||||
EndSplineSet
|
||||
Validated: 16417
|
||||
Kerns2: 18 53 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
|
||||
Kerns2: 18 53 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
|
||||
EndChar
|
||||
|
||||
StartChar: s
|
||||
|
|
@ -9117,10 +9116,11 @@ EndChar
|
|||
|
||||
StartChar: arrowheads.close.11
|
||||
Encoding: 57637 57637 61
|
||||
Width: 128
|
||||
Width: 256
|
||||
VWidth: 1280
|
||||
Flags: W
|
||||
HStem: -256 266
|
||||
VStem: -10 20<-54.875 9.99756>
|
||||
HStem: 512 266
|
||||
VStem: 246 20<713.125 777.998>
|
||||
TtInstrs:
|
||||
SVTCA[y-axis]
|
||||
PUSHB_1
|
||||
|
|
@ -9193,37 +9193,37 @@ EndTTInstrs
|
|||
LayerCount: 2
|
||||
Fore
|
||||
SplineSet
|
||||
0 10 m 256,0,1
|
||||
10 10 10 10 10 0 c 256,2,3
|
||||
10 -46 10 -46 49 -127.5 c 256,4,5
|
||||
88 -209 88 -209 124 -238 c 256,6,7
|
||||
128 -242 128 -242 128 -246 c 256,8,9
|
||||
128 -256 128 -256 118 -256 c 256,10,11
|
||||
117 -256 117 -256 110.5 -254.5 c 256,12,13
|
||||
104 -253 104 -253 93 -251.5 c 256,14,15
|
||||
82 -250 82 -250 68 -248 c 256,16,17
|
||||
54 -246 54 -246 35.5 -244.5 c 256,18,19
|
||||
17 -243 17 -243 0 -243 c 256,20,21
|
||||
-17 -243 -17 -243 -35.5 -244.5 c 256,22,23
|
||||
-54 -246 -54 -246 -68 -248 c 256,24,25
|
||||
-82 -250 -82 -250 -93 -251.5 c 256,26,27
|
||||
-104 -253 -104 -253 -110.5 -254.5 c 256,28,29
|
||||
-117 -256 -117 -256 -118 -256 c 256,30,31
|
||||
-128 -256 -128 -256 -128 -246 c 256,32,33
|
||||
-128 -242 -128 -242 -124 -238 c 256,34,35
|
||||
-88 -209 -88 -209 -49 -127.5 c 256,36,37
|
||||
-10 -46 -10 -46 -10 0 c 256,38,39
|
||||
-10 10 -10 10 0 10 c 256,0,1
|
||||
128 266 m 256,0,1
|
||||
138 266 138 266 138 256 c 256,2,3
|
||||
138 210 138 210 177 128.5 c 256,4,5
|
||||
216 47 216 47 252 18 c 256,6,7
|
||||
256 14 256 14 256 10 c 256,8,9
|
||||
256 0 256 0 246 0 c 256,10,11
|
||||
245 0 245 0 238.5 1.5 c 256,12,13
|
||||
232 3 232 3 221 4.5 c 256,14,15
|
||||
210 6 210 6 196 8 c 256,16,17
|
||||
182 10 182 10 163.5 11.5 c 256,18,19
|
||||
145 13 145 13 128 13 c 256,20,21
|
||||
111 13 111 13 92.5 11.5 c 256,22,23
|
||||
74 10 74 10 60 8 c 256,24,25
|
||||
46 6 46 6 35 4.5 c 256,26,27
|
||||
24 3 24 3 17.5 1.5 c 256,28,29
|
||||
11 0 11 0 10 0 c 256,30,31
|
||||
0 0 0 0 0 10 c 256,32,33
|
||||
0 14 0 14 4 18 c 256,34,35
|
||||
40 47 40 47 79 128.5 c 256,36,37
|
||||
118 210 118 210 118 256 c 256,38,39
|
||||
118 266 118 266 128 266 c 256,0,1
|
||||
EndSplineSet
|
||||
Validated: 16385
|
||||
EndChar
|
||||
|
||||
StartChar: arrowheads.close.1M1
|
||||
Encoding: 57638 57638 62
|
||||
Width: 128
|
||||
Width: 256
|
||||
VWidth: 1034
|
||||
Flags: W
|
||||
HStem: -10 266
|
||||
VStem: -10 20<-9.99756 54.875>
|
||||
HStem: 50 266
|
||||
VStem: 622 20<50.0024 114.875>
|
||||
TtInstrs:
|
||||
SVTCA[y-axis]
|
||||
PUSHB_1
|
||||
|
|
@ -9296,29 +9296,28 @@ EndTTInstrs
|
|||
LayerCount: 2
|
||||
Fore
|
||||
SplineSet
|
||||
0 -10 m 256,0,1
|
||||
-10 -10 -10 -10 -10 0 c 256,2,3
|
||||
-10 46 -10 46 -49 127.5 c 256,4,5
|
||||
-88 209 -88 209 -124 238 c 256,6,7
|
||||
-128 242 -128 242 -128 246 c 256,8,9
|
||||
-128 256 -128 256 -118 256 c 256,10,11
|
||||
-117 256 -117 256 -110.5 254.5 c 256,12,13
|
||||
-104 253 -104 253 -93 251.5 c 256,14,15
|
||||
-82 250 -82 250 -68 248 c 256,16,17
|
||||
-54 246 -54 246 -35.5 244.5 c 256,18,19
|
||||
-17 243 -17 243 0 243 c 256,20,21
|
||||
17 243 17 243 35.5 244.5 c 256,22,23
|
||||
54 246 54 246 68 248 c 256,24,25
|
||||
82 250 82 250 93 251.5 c 256,26,27
|
||||
104 253 104 253 110.5 254.5 c 256,28,29
|
||||
117 256 117 256 118 256 c 256,30,31
|
||||
128 256 128 256 128 246 c 256,32,33
|
||||
128 242 128 242 124 238 c 256,34,35
|
||||
88 209 88 209 49 127.5 c 256,36,37
|
||||
10 46 10 46 10 0 c 256,38,39
|
||||
10 -10 10 -10 0 -10 c 256,0,1
|
||||
128 0 m 256,0,1
|
||||
118 0 118 0 118 10 c 256,2,3
|
||||
118 56 118 56 79 137.5 c 256,4,5
|
||||
40 219 40 219 4 248 c 256,6,7
|
||||
0 252 0 252 0 256 c 256,8,9
|
||||
0 266 0 266 10 266 c 256,10,11
|
||||
11 266 11 266 17.5 264.5 c 256,12,13
|
||||
24 263 24 263 35 261.5 c 256,14,15
|
||||
46 260 46 260 60 258 c 256,16,17
|
||||
74 256 74 256 92.5 254.5 c 256,18,19
|
||||
111 253 111 253 128 253 c 256,20,21
|
||||
145 253 145 253 163.5 254.5 c 256,22,23
|
||||
182 256 182 256 196 258 c 256,24,25
|
||||
210 260 210 260 221 261.5 c 256,26,27
|
||||
232 263 232 263 238.5 264.5 c 256,28,29
|
||||
245 266 245 266 246 266 c 256,30,31
|
||||
256 266 256 266 256 256 c 256,32,33
|
||||
256 252 256 252 252 248 c 256,34,35
|
||||
216 219 216 219 177 137.5 c 256,36,37
|
||||
138 56 138 56 138 10 c 256,38,39
|
||||
138 0 138 0 128 0 c 256,0,1
|
||||
EndSplineSet
|
||||
Validated: 16385
|
||||
EndChar
|
||||
|
||||
StartChar: dots.dot
|
||||
|
|
@ -18925,11 +18924,11 @@ EndChar
|
|||
|
||||
StartChar: scripts.trill
|
||||
Encoding: 57713 57713 137
|
||||
Width: 217
|
||||
Width: 681
|
||||
Flags: W
|
||||
HStem: -11 51<-141.5 -70.4736> 176 26<-299.24 -199.688> 285 25<-282.606 -183.198> 302 36<7.20312 101> 312 28<166.078 238.477>
|
||||
VStem: -330 26<207.811 264.114> -184 81<40.4622 181.43> -52 25<55.7998 149.298> 178 106<201.609 276.011>
|
||||
DStem2: -180 124 -90 155 0.197063 0.980391<-36.9923 75.5837 94.4871 141.999 176.584 405> -65 281 -71 250 0.874157 0.485643<0 97.3392> 65 268 147 268 0.198847 0.980031<-261.995 6.86021>
|
||||
HStem: -11 51<848.5 919.526> 176 26<690.76 790.312> 285 25<707.394 806.802> 302 36<997.203 1091> 312 28<1156.08 1228.48>
|
||||
VStem: 660 26<207.811 264.114> 806 81<40.4622 181.43> 938 25<55.7998 149.298> 1168 106<201.609 276.011>
|
||||
DStem2: 810 124 900 155 0.197063 0.980391<-36.9923 75.5837 94.4871 141.999 176.584 405> 925 281 919 250 0.874157 0.485643<0 97.3392> 1055 268 1137 268 0.198847 0.980031<-261.995 6.86021>
|
||||
TtInstrs:
|
||||
SVTCA[y-axis]
|
||||
PUSHB_1
|
||||
|
|
@ -19353,65 +19352,64 @@ EndTTInstrs
|
|||
LayerCount: 2
|
||||
Fore
|
||||
SplineSet
|
||||
-330 228 m 256,0,1
|
||||
-330 262 -330 262 -302.5 286 c 256,2,3
|
||||
-275 310 -275 310 -231 310 c 256,4,5
|
||||
-188 310 -188 310 -147 285 c 257,6,-1
|
||||
-100 522 l 257,7,8
|
||||
-90 517 -90 517 -80 517 c 256,9,10
|
||||
-48 517 -48 517 -10 553 c 257,11,-1
|
||||
-65 281 l 257,12,-1
|
||||
1 317 l 258,13,14
|
||||
39 337 39 337 77 338 c 257,15,16
|
||||
125 338 125 338 142 309 c 257,17,18
|
||||
170 340 170 340 213 340 c 256,19,20
|
||||
243 340 243 340 263.5 321.5 c 256,21,22
|
||||
284 303 284 303 284 269 c 256,23,24
|
||||
284 233 284 233 264.5 205 c 256,25,26
|
||||
245 177 245 177 217 177 c 256,27,28
|
||||
199 177 199 177 188.5 191 c 256,29,30
|
||||
178 205 178 205 178 226 c 256,31,32
|
||||
178 261 178 261 198 276.5 c 256,33,34
|
||||
218 292 218 292 240 292 c 258,35,-1
|
||||
243 292 l 257,36,37
|
||||
232 312 232 312 204 312 c 256,38,39
|
||||
185 312 185 312 168.5 300 c 256,40,41
|
||||
152 288 152 288 147 268 c 258,42,-1
|
||||
92 -8 l 257,43,44
|
||||
75 3 75 3 53.5 3 c 256,45,46
|
||||
32 3 32 3 9 -8 c 257,47,-1
|
||||
65 268 l 257,48,-1
|
||||
65 275 l 258,49,50
|
||||
65 302 65 302 35 302 c 256,51,52
|
||||
25 302 25 302 10 295 c 257,53,-1
|
||||
-71 250 l 257,54,-1
|
||||
-78 218 l 257,55,56
|
||||
-27 160 -27 160 -27 106 c 256,57,58
|
||||
-27 61 -27 61 -57 25 c 256,59,60
|
||||
-87 -11 -87 -11 -127 -11 c 256,61,62
|
||||
-156 -11 -156 -11 -170 16 c 256,63,64
|
||||
-184 43 -184 43 -184 82 c 256,65,66
|
||||
-184 107 -184 107 -180 124 c 258,67,-1
|
||||
-165 202 l 257,68,69
|
||||
-226 176 -226 176 -268 176 c 256,70,71
|
||||
-302 176 -302 176 -316 192 c 256,72,73
|
||||
-330 208 -330 208 -330 228 c 256,0,1
|
||||
-304 232 m 256,74,75
|
||||
-304 202 -304 202 -264 202 c 257,76,77
|
||||
-222 202 -222 202 -159 230 c 257,78,-1
|
||||
-154 255 l 257,79,80
|
||||
-194 285 -194 285 -237 285 c 256,81,82
|
||||
-272 285 -272 285 -288 268 c 256,83,84
|
||||
-304 251 -304 251 -304 232 c 256,74,75
|
||||
-88 40 m 256,85,86
|
||||
-72 40 -72 40 -62 60 c 256,87,88
|
||||
-52 80 -52 80 -52 102 c 256,89,90
|
||||
-52 140 -52 140 -85 182 c 257,91,-1
|
||||
-90 155 l 257,92,93
|
||||
-103 95 -103 95 -103 70 c 256,94,95
|
||||
-103 40 -103 40 -88 40 c 256,85,86
|
||||
0 228 m 256,0,1
|
||||
0 262 0 262 27.5 286 c 256,2,3
|
||||
55 310 55 310 99 310 c 256,4,5
|
||||
142 310 142 310 183 285 c 257,6,-1
|
||||
230 522 l 257,7,8
|
||||
240 517 240 517 250 517 c 256,9,10
|
||||
282 517 282 517 320 553 c 257,11,-1
|
||||
265 281 l 257,12,-1
|
||||
331 317 l 258,13,14
|
||||
369 337 369 337 407 338 c 257,15,16
|
||||
455 338 455 338 472 309 c 257,17,18
|
||||
500 340 500 340 543 340 c 256,19,20
|
||||
573 340 573 340 593.5 321.5 c 256,21,22
|
||||
614 303 614 303 614 269 c 256,23,24
|
||||
614 233 614 233 594.5 205 c 256,25,26
|
||||
575 177 575 177 547 177 c 256,27,28
|
||||
529 177 529 177 518.5 191 c 256,29,30
|
||||
508 205 508 205 508 226 c 256,31,32
|
||||
508 261 508 261 528 276.5 c 256,33,34
|
||||
548 292 548 292 570 292 c 258,35,-1
|
||||
573 292 l 257,36,37
|
||||
562 312 562 312 534 312 c 256,38,39
|
||||
515 312 515 312 498.5 300 c 256,40,41
|
||||
482 288 482 288 477 268 c 258,42,-1
|
||||
422 -8 l 257,43,44
|
||||
405 3 405 3 383.5 3 c 256,45,46
|
||||
362 3 362 3 339 -8 c 257,47,-1
|
||||
395 268 l 257,48,-1
|
||||
395 275 l 258,49,50
|
||||
395 302 395 302 365 302 c 256,51,52
|
||||
355 302 355 302 340 295 c 257,53,-1
|
||||
259 250 l 257,54,-1
|
||||
252 218 l 257,55,56
|
||||
303 160 303 160 303 106 c 256,57,58
|
||||
303 61 303 61 273 25 c 256,59,60
|
||||
243 -11 243 -11 203 -11 c 256,61,62
|
||||
174 -11 174 -11 160 16 c 256,63,64
|
||||
146 43 146 43 146 82 c 256,65,66
|
||||
146 107 146 107 150 124 c 258,67,-1
|
||||
165 202 l 257,68,69
|
||||
104 176 104 176 62 176 c 256,70,71
|
||||
28 176 28 176 14 192 c 256,72,73
|
||||
0 208 0 208 0 228 c 256,0,1
|
||||
26 232 m 256,74,75
|
||||
26 202 26 202 66 202 c 257,76,77
|
||||
108 202 108 202 171 230 c 257,78,-1
|
||||
176 255 l 257,79,80
|
||||
136 285 136 285 93 285 c 256,81,82
|
||||
58 285 58 285 42 268 c 256,83,84
|
||||
26 251 26 251 26 232 c 256,74,75
|
||||
242 40 m 256,85,86
|
||||
258 40 258 40 268 60 c 256,87,88
|
||||
278 80 278 80 278 102 c 256,89,90
|
||||
278 140 278 140 245 182 c 257,91,-1
|
||||
240 155 l 257,92,93
|
||||
227 95 227 95 227 70 c 256,94,95
|
||||
227 40 227 40 242 40 c 256,85,86
|
||||
EndSplineSet
|
||||
Validated: 16385
|
||||
EndChar
|
||||
|
||||
StartChar: scripts.upedalheel
|
||||
|
|
@ -21092,187 +21090,46 @@ EndChar
|
|||
|
||||
StartChar: scripts.arpeggio
|
||||
Encoding: 57726 57726 150
|
||||
Width: 203
|
||||
Width: 256
|
||||
Flags: W
|
||||
VStem: -1 114<31 96.9402> 92 114<159.06 225>
|
||||
DStem2: 63 309 75 259 0.771086 -0.63673<-10.113 74.0986> 130 -3 141 -53 0.768702 -0.639607<-33.0663 51.3057>
|
||||
TtInstrs:
|
||||
SVTCA[y-axis]
|
||||
SVTCA[x-axis]
|
||||
PUSHB_1
|
||||
40
|
||||
MDAP[rnd]
|
||||
PUSHB_1
|
||||
6
|
||||
MDRP[rp0,rnd,white]
|
||||
PUSHB_1
|
||||
20
|
||||
MDRP[min,rnd,black]
|
||||
PUSHB_3
|
||||
6
|
||||
20
|
||||
10
|
||||
CALL
|
||||
PUSHB_4
|
||||
0
|
||||
6
|
||||
11
|
||||
9
|
||||
CALL
|
||||
PUSHB_4
|
||||
26
|
||||
20
|
||||
6
|
||||
8
|
||||
CALL
|
||||
PUSHB_1
|
||||
0
|
||||
MDRP[min,rnd,black]
|
||||
PUSHB_1
|
||||
0
|
||||
MDAP[rnd]
|
||||
PUSHB_1
|
||||
26
|
||||
MDRP[min,rnd,black]
|
||||
PUSHB_3
|
||||
26
|
||||
0
|
||||
10
|
||||
CALL
|
||||
PUSHB_4
|
||||
0
|
||||
26
|
||||
31
|
||||
9
|
||||
CALL
|
||||
PUSHB_1
|
||||
20
|
||||
SRP0
|
||||
PUSHB_1
|
||||
41
|
||||
MDRP[rp0,rnd,white]
|
||||
PUSHB_1
|
||||
54
|
||||
SMD
|
||||
PUSHW_3
|
||||
-10432
|
||||
-12633
|
||||
21
|
||||
CALL
|
||||
SPVFS
|
||||
SFVTPV
|
||||
PUSHB_1
|
||||
9
|
||||
SRP0
|
||||
PUSHB_1
|
||||
8
|
||||
MDRP[grey]
|
||||
PUSHB_2
|
||||
17
|
||||
4
|
||||
MIRP[rp0,min,black]
|
||||
PUSHB_1
|
||||
18
|
||||
MDRP[grey]
|
||||
PUSHW_3
|
||||
-10479
|
||||
-12594
|
||||
21
|
||||
CALL
|
||||
SPVFS
|
||||
PUSHB_1
|
||||
38
|
||||
SRP0
|
||||
PUSHB_1
|
||||
37
|
||||
MDRP[grey]
|
||||
PUSHB_2
|
||||
28
|
||||
10
|
||||
MIRP[rp0,min,black]
|
||||
PUSHB_1
|
||||
29
|
||||
MDRP[grey]
|
||||
SVTCA[y-axis]
|
||||
PUSHB_8
|
||||
8
|
||||
9
|
||||
17
|
||||
18
|
||||
28
|
||||
29
|
||||
37
|
||||
38
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
SVTCA[x-axis]
|
||||
PUSHB_8
|
||||
8
|
||||
9
|
||||
17
|
||||
18
|
||||
28
|
||||
29
|
||||
37
|
||||
38
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
MDAP[no-rnd]
|
||||
PUSHB_1
|
||||
64
|
||||
SMD
|
||||
SVTCA[x-axis]
|
||||
SVTCA[y-axis]
|
||||
IUP[y]
|
||||
IUP[x]
|
||||
EndTTInstrs
|
||||
HStem: -1 114<159.06 225> 92 114<31 96.9402>
|
||||
DStem2: -53 63 -3 75 0.63673 0.771086<-10.113 74.0986> 259 130 309 141 0.639607 0.768702<-33.0663 51.3057>
|
||||
LayerCount: 2
|
||||
Fore
|
||||
SplineSet
|
||||
-1 77 m 256,0,1
|
||||
-1 94 -1 94 22 113.5 c 256,2,3
|
||||
45 133 45 133 68.5 157.5 c 256,4,5
|
||||
92 182 92 182 92 211 c 256,6,7
|
||||
92 239 92 239 75 259 c 257,8,-1
|
||||
43 285 l 258,9,10
|
||||
37 289 37 289 37 297 c 256,11,12
|
||||
37 303 37 303 41.5 308 c 256,13,14
|
||||
46 313 46 313 53 313 c 256,15,16
|
||||
59 313 59 313 63 309 c 258,17,-1
|
||||
195 200 l 258,18,19
|
||||
206 192 206 192 206 179 c 256,20,21
|
||||
206 162 206 162 183 142.5 c 256,22,23
|
||||
160 123 160 123 136.5 98.5 c 256,24,25
|
||||
113 74 113 74 113 45 c 256,26,27
|
||||
113 17 113 17 130 -3 c 257,28,-1
|
||||
162 -29 l 258,29,30
|
||||
168 -33 168 -33 168 -41 c 256,31,32
|
||||
168 -47 168 -47 163.5 -52 c 256,33,34
|
||||
159 -57 159 -57 152 -57 c 256,35,36
|
||||
146 -57 146 -57 141 -53 c 258,37,-1
|
||||
10 56 l 258,38,39
|
||||
-1 65 -1 65 -1 77 c 256,0,1
|
||||
179 -1 m 256,0,1
|
||||
162 -1 162 -1 142.5 22 c 256,2,3
|
||||
123 45 123 45 98.5 68.5 c 256,4,5
|
||||
74 92 74 92 45 92 c 256,6,7
|
||||
17 92 17 92 -3 75 c 257,8,-1
|
||||
-29 43 l 258,9,10
|
||||
-33 37 -33 37 -41 37 c 256,11,12
|
||||
-47 37 -47 37 -52 41.5 c 256,13,14
|
||||
-57 46 -57 46 -57 53 c 256,15,16
|
||||
-57 59 -57 59 -53 63 c 258,17,-1
|
||||
56 195 l 258,18,19
|
||||
64 206 64 206 77 206 c 256,20,21
|
||||
94 206 94 206 113.5 183 c 256,22,23
|
||||
133 160 133 160 157.5 136.5 c 256,24,25
|
||||
182 113 182 113 211 113 c 256,26,27
|
||||
239 113 239 113 259 130 c 257,28,-1
|
||||
285 162 l 258,29,30
|
||||
289 168 289 168 297 168 c 256,31,32
|
||||
303 168 303 168 308 163.5 c 256,33,34
|
||||
313 159 313 159 313 152 c 256,35,36
|
||||
313 146 313 146 309 141 c 258,37,-1
|
||||
200 10 l 258,38,39
|
||||
191 -1 191 -1 179 -1 c 256,0,1
|
||||
EndSplineSet
|
||||
Validated: 16385
|
||||
EndChar
|
||||
|
||||
StartChar: scripts.trill_element
|
||||
Encoding: 57727 57727 151
|
||||
Width: 256
|
||||
VWidth: 1224
|
||||
Flags: W
|
||||
HStem: -1 114<159.06 225> 92 114<31 96.9402>
|
||||
DStem2: -53 63 -3 75 0.63673 0.771086<-10.113 74.0986> 259 130 309 141 0.639607 0.768702<-33.0663 51.3057>
|
||||
HStem: 449 114<159.06 225> 542 114<31 96.9402>
|
||||
DStem2: -53 513 -3 525 0.63673 0.771086<-10.113 74.0986> 259 580 309 591 0.639607 0.768702<-33.0663 51.3057>
|
||||
TtInstrs:
|
||||
SVTCA[y-axis]
|
||||
PUSHB_3
|
||||
|
|
@ -21410,111 +21267,110 @@ EndTTInstrs
|
|||
LayerCount: 2
|
||||
Fore
|
||||
SplineSet
|
||||
179 -1 m 256,0,1
|
||||
162 -1 162 -1 142.5 22 c 256,2,3
|
||||
123 45 123 45 98.5 68.5 c 256,4,5
|
||||
74 92 74 92 45 92 c 256,6,7
|
||||
17 92 17 92 -3 75 c 257,8,-1
|
||||
-29 43 l 258,9,10
|
||||
-33 37 -33 37 -41 37 c 256,11,12
|
||||
-47 37 -47 37 -52 41.5 c 256,13,14
|
||||
-57 46 -57 46 -57 53 c 256,15,16
|
||||
-57 59 -57 59 -53 63 c 258,17,-1
|
||||
56 195 l 258,18,19
|
||||
64 206 64 206 77 206 c 256,20,21
|
||||
94 206 94 206 113.5 183 c 256,22,23
|
||||
133 160 133 160 157.5 136.5 c 256,24,25
|
||||
182 113 182 113 211 113 c 256,26,27
|
||||
239 113 239 113 259 130 c 257,28,-1
|
||||
285 162 l 258,29,30
|
||||
289 168 289 168 297 168 c 256,31,32
|
||||
303 168 303 168 308 163.5 c 256,33,34
|
||||
313 159 313 159 313 152 c 256,35,36
|
||||
313 146 313 146 309 141 c 258,37,-1
|
||||
200 10 l 258,38,39
|
||||
191 -1 191 -1 179 -1 c 256,0,1
|
||||
179 199 m 256,0,1
|
||||
162 199 162 199 142.5 222 c 256,2,3
|
||||
123 245 123 245 98.5 268.5 c 256,4,5
|
||||
74 292 74 292 45 292 c 256,6,7
|
||||
17 292 17 292 -3 275 c 257,8,-1
|
||||
-29 243 l 258,9,10
|
||||
-33 237 -33 237 -41 237 c 256,11,12
|
||||
-47 237 -47 237 -52 241.5 c 256,13,14
|
||||
-57 246 -57 246 -57 253 c 256,15,16
|
||||
-57 259 -57 259 -53 263 c 258,17,-1
|
||||
56 395 l 258,18,19
|
||||
64 406 64 406 77 406 c 256,20,21
|
||||
94 406 94 406 113.5 383 c 256,22,23
|
||||
133 360 133 360 157.5 336.5 c 256,24,25
|
||||
182 313 182 313 211 313 c 256,26,27
|
||||
239 313 239 313 259 330 c 257,28,-1
|
||||
285 362 l 258,29,30
|
||||
289 368 289 368 297 368 c 256,31,32
|
||||
303 368 303 368 308 363.5 c 256,33,34
|
||||
313 359 313 359 313 352 c 256,35,36
|
||||
313 346 313 346 309 341 c 258,37,-1
|
||||
200 210 l 258,38,39
|
||||
191 199 191 199 179 199 c 256,0,1
|
||||
EndSplineSet
|
||||
Validated: 16385
|
||||
EndChar
|
||||
|
||||
StartChar: scripts.arpeggio.arrow.M1
|
||||
Encoding: 57728 57728 152
|
||||
Width: 203
|
||||
Width: 238
|
||||
VWidth: 969
|
||||
Flags: W
|
||||
HStem: 0 314
|
||||
VStem: -61 327
|
||||
HStem: 48 314
|
||||
VStem: 9 327
|
||||
LayerCount: 2
|
||||
Fore
|
||||
SplineSet
|
||||
43 285 m 258,0,1
|
||||
37 290 37 290 37 298 c 256,2,3
|
||||
37 305 37 305 42 310 c 256,4,5
|
||||
47 314 47 314 53 314 c 256,6,7
|
||||
58 314 58 314 63 309 c 258,8,-1
|
||||
152 215 l 258,9,10
|
||||
167 198 167 198 172 172 c 257,11,-1
|
||||
252 210 l 258,12,13
|
||||
257.158 212.579 257.158 212.579 260.416 212.579 c 0,14,15
|
||||
266 212.579 266 212.579 266 205 c 256,16,17
|
||||
266 200 266 200 234 168 c 256,18,19
|
||||
203 137 203 137 164 90 c 256,20,21
|
||||
124 44 124 44 109 3 c 257,22,23
|
||||
109 0 109 0 101 0 c 256,24,25
|
||||
98 0 98 0 97 2 c 256,26,27
|
||||
81 45 81 45 42 90 c 256,28,29
|
||||
2 136 2 136 -30 167 c 256,30,31
|
||||
-61 198 -61 198 -61 205 c 256,32,33
|
||||
-61 210 -61 210 -57 212 c 256,34,35
|
||||
-53 213 -53 213 -48 211 c 258,36,-1
|
||||
46 166 l 257,37,38
|
||||
50 172 50 172 60 182 c 256,39,40
|
||||
69 193 69 193 74 200 c 256,41,42
|
||||
80 206 80 206 84 215 c 256,43,44
|
||||
89 224 89 224 89 231 c 256,45,46
|
||||
89 247 89 247 75 259 c 258,47,-1
|
||||
43 285 l 258,0,1
|
||||
265.5 161.5 m 258,0,1
|
||||
270.5 167.5 270.5 167.5 278.5 167.5 c 256,2,3
|
||||
285.5 167.5 285.5 167.5 290.5 162.5 c 256,4,5
|
||||
294.5 157.5 294.5 157.5 294.5 151.5 c 256,6,7
|
||||
294.5 146.5 294.5 146.5 289.5 141.5 c 258,8,-1
|
||||
195.5 52.5 l 258,9,10
|
||||
178.5 37.5 178.5 37.5 152.5 32.5 c 257,11,-1
|
||||
190.5 -47.5 l 258,12,13
|
||||
193.079101562 -52.658203125 193.079101562 -52.658203125 193.079101562 -55.916015625 c 0,14,15
|
||||
193.079101562 -61.5 193.079101562 -61.5 185.5 -61.5 c 256,16,17
|
||||
180.5 -61.5 180.5 -61.5 148.5 -29.5 c 256,18,19
|
||||
117.5 1.5 117.5 1.5 70.5 40.5 c 256,20,21
|
||||
24.5 80.5 24.5 80.5 -16.5 95.5 c 257,22,23
|
||||
-19.5 95.5 -19.5 95.5 -19.5 103.5 c 256,24,25
|
||||
-19.5 106.5 -19.5 106.5 -17.5 107.5 c 256,26,27
|
||||
25.5 123.5 25.5 123.5 70.5 162.5 c 256,28,29
|
||||
116.5 202.5 116.5 202.5 147.5 234.5 c 256,30,31
|
||||
178.5 265.5 178.5 265.5 185.5 265.5 c 256,32,33
|
||||
190.5 265.5 190.5 265.5 192.5 261.5 c 256,34,35
|
||||
193.5 257.5 193.5 257.5 191.5 252.5 c 258,36,-1
|
||||
146.5 158.5 l 257,37,38
|
||||
152.5 154.5 152.5 154.5 162.5 144.5 c 256,39,40
|
||||
173.5 135.5 173.5 135.5 180.5 130.5 c 256,41,42
|
||||
186.5 124.5 186.5 124.5 195.5 120.5 c 256,43,44
|
||||
204.5 115.5 204.5 115.5 211.5 115.5 c 256,45,46
|
||||
227.5 115.5 227.5 115.5 239.5 129.5 c 258,47,-1
|
||||
265.5 161.5 l 258,0,1
|
||||
EndSplineSet
|
||||
Validated: 1
|
||||
EndChar
|
||||
|
||||
StartChar: scripts.arpeggio.arrow.1
|
||||
Encoding: 57729 57729 153
|
||||
Width: 203
|
||||
Width: 200
|
||||
VWidth: 1027
|
||||
Flags: W
|
||||
HStem: -58 314
|
||||
VStem: -61 327
|
||||
HStem: 154 314
|
||||
VStem: -70 327
|
||||
LayerCount: 2
|
||||
Fore
|
||||
SplineSet
|
||||
162 -29 m 258,0,1
|
||||
168 -34 168 -34 168 -42 c 256,2,3
|
||||
168 -49 168 -49 163 -54 c 256,4,5
|
||||
158 -58 158 -58 152 -58 c 256,6,7
|
||||
147 -58 147 -58 141 -53 c 258,8,-1
|
||||
53 41 l 258,9,10
|
||||
38 58 38 58 33 84 c 257,11,-1
|
||||
-47 46 l 258,12,13
|
||||
-52.1579 43.4211 -52.1579 43.4211 -55.4155 43.4211 c 0,14,15
|
||||
-61 43.4211 -61 43.4211 -61 51 c 256,16,17
|
||||
-61 58 -61 58 -30 88 c 256,18,19
|
||||
2 119 2 119 42 166 c 256,20,21
|
||||
81 212 81 212 96 253 c 257,22,23
|
||||
96 256 96 256 103 256 c 256,24,25
|
||||
106 256 106 256 108 254 c 257,26,27
|
||||
123 213 123 213 163 166 c 256,28,29
|
||||
203 119 203 119 234 88 c 256,30,31
|
||||
266 58 266 58 266 51 c 256,32,33
|
||||
266 46 266 46 262 44 c 256,34,35
|
||||
258 43 258 43 253 45 c 258,36,-1
|
||||
159 90 l 257,37,38
|
||||
155 84 155 84 146 74 c 256,39,40
|
||||
134 61 134 61 130 56 c 256,41,42
|
||||
125 50 125 50 120 41 c 256,43,44
|
||||
116 32 116 32 116 25 c 256,45,46
|
||||
116 9 116 9 130 -3 c 258,47,-1
|
||||
162 -29 l 258,0,1
|
||||
-28.5 42.5 m 258,0,1
|
||||
-33.5 36.5 -33.5 36.5 -41.5 36.5 c 256,2,3
|
||||
-48.5 36.5 -48.5 36.5 -53.5 41.5 c 256,4,5
|
||||
-57.5 46.5 -57.5 46.5 -57.5 52.5 c 256,6,7
|
||||
-57.5 57.5 -57.5 57.5 -52.5 63.5 c 258,8,-1
|
||||
41.5 151.5 l 258,9,10
|
||||
58.5 166.5 58.5 166.5 84.5 171.5 c 257,11,-1
|
||||
46.5 251.5 l 258,12,13
|
||||
43.9208984375 256.658203125 43.9208984375 256.658203125 43.9208984375 259.915039062 c 0,14,15
|
||||
43.9208984375 265.5 43.9208984375 265.5 51.5 265.5 c 256,16,17
|
||||
58.5 265.5 58.5 265.5 88.5 234.5 c 256,18,19
|
||||
119.5 202.5 119.5 202.5 166.5 162.5 c 256,20,21
|
||||
212.5 123.5 212.5 123.5 253.5 108.5 c 257,22,23
|
||||
256.5 108.5 256.5 108.5 256.5 101.5 c 256,24,25
|
||||
256.5 98.5 256.5 98.5 254.5 96.5 c 257,26,27
|
||||
213.5 81.5 213.5 81.5 166.5 41.5 c 256,28,29
|
||||
119.5 1.5 119.5 1.5 88.5 -29.5 c 256,30,31
|
||||
58.5 -61.5 58.5 -61.5 51.5 -61.5 c 256,32,33
|
||||
46.5 -61.5 46.5 -61.5 44.5 -57.5 c 256,34,35
|
||||
43.5 -53.5 43.5 -53.5 45.5 -48.5 c 258,36,-1
|
||||
90.5 45.5 l 257,37,38
|
||||
84.5 49.5 84.5 49.5 74.5 58.5 c 256,39,40
|
||||
61.5 70.5 61.5 70.5 56.5 74.5 c 256,41,42
|
||||
50.5 79.5 50.5 79.5 41.5 84.5 c 256,43,44
|
||||
32.5 88.5 32.5 88.5 25.5 88.5 c 256,45,46
|
||||
9.5 88.5 9.5 88.5 -2.5 74.5 c 258,47,-1
|
||||
-28.5 42.5 l 258,0,1
|
||||
EndSplineSet
|
||||
Validated: 1
|
||||
EndChar
|
||||
|
||||
StartChar: scripts.trilelement
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -437,11 +437,20 @@ Staff* Element::staff() const
|
|||
//---------------------------------------------------------
|
||||
|
||||
QColor Element::curColor() const
|
||||
{
|
||||
return curColor(this);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
// curColor
|
||||
//---------------------------------------------------------
|
||||
|
||||
QColor Element::curColor(const Element* proxy) const
|
||||
{
|
||||
// the default element color is always interpreted as black in
|
||||
// printing
|
||||
if (score() && score()->printing())
|
||||
return (_color == MScore::defaultColor) ? Qt::black : _color;
|
||||
return (proxy->color() == MScore::defaultColor) ? Qt::black : proxy->color();
|
||||
|
||||
if (flag(ELEMENT_DROP_TARGET))
|
||||
return MScore::dropColor;
|
||||
|
|
@ -458,7 +467,7 @@ QColor Element::curColor() const
|
|||
}
|
||||
if (!_visible)
|
||||
return Qt::gray;
|
||||
return _color;
|
||||
return proxy->color();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -463,6 +463,7 @@ class Element : public QObject {
|
|||
|
||||
QColor color() const { return _color; }
|
||||
QColor curColor() const;
|
||||
QColor curColor(const Element* proxy) const;
|
||||
void setColor(const QColor& c) { _color = c; }
|
||||
void undoSetColor(const QColor& c);
|
||||
|
||||
|
|
|
|||
|
|
@ -29,16 +29,7 @@ namespace Ms {
|
|||
|
||||
void TrillSegment::draw(QPainter* painter) const
|
||||
{
|
||||
QColor color;
|
||||
if (flag(ELEMENT_DROP_TARGET))
|
||||
color = MScore::dropColor;
|
||||
else if (selected() && !(score() && score()->printing()))
|
||||
color = MScore::selectColor[0];
|
||||
else if (!visible())
|
||||
color = Qt::gray;
|
||||
else
|
||||
color = trill()->curColor();
|
||||
painter->setPen(color);
|
||||
painter->setPen(curColor(trill()));
|
||||
drawSymbols(_symbols, painter);
|
||||
}
|
||||
|
||||
|
|
@ -125,7 +116,7 @@ void TrillSegment::layout()
|
|||
a->layout();
|
||||
a->setMag(a->mag() * .6);
|
||||
qreal _spatium = spatium();
|
||||
a->setPos(_spatium*1.3, -2.2*_spatium);
|
||||
a->setPos(_spatium * 1.3, -2.2 * _spatium);
|
||||
a->adjustReadPos();
|
||||
}
|
||||
switch (trill()->trillType()) {
|
||||
|
|
|
|||
BIN
vtest/emmentaler-8-ref.png
Normal file
BIN
vtest/emmentaler-8-ref.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
|
@ -9,6 +9,7 @@ SRC="mmrest-1 bravura-mmrest mmrest-2 mmrest-4 mmrest-5 mmrest-6 mmrest-7 mmrest
|
|||
emmentaler-3 bravura-3 emmentaler-4 bravura-4 emmentaler-5 bravura-5\
|
||||
emmentaler-6 bravura-6 emmentaler-7 bravura-7\
|
||||
emmentaler-8 bravura-8"
|
||||
# SRC="emmentaler-8 bravura-8"
|
||||
|
||||
MSCORE=../build.debug/mscore/mscore
|
||||
DPI=130
|
||||
|
|
|
|||
Loading…
Reference in a new issue