Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixes for symbols in text

  • Loading branch information...
commit 78475df5e02beebe34681cd84f8fdbe52873b03f 1 parent df58146
@wschweer wschweer authored
Showing with 194,738 additions and 216,578 deletions.
  1. +281 −287 fonts/mscore/mscore.sfd
  2. BIN  fonts/mscore/mscore.ttf
  3. +1 −1  libmscore/style.cpp
  4. +8 −8 libmscore/tempotext.h
  5. +43 −19 libmscore/text.cpp
  6. +3 −2 libmscore/text.h
  7. +2 −0  mscore/texttools.cpp
  8. +4,810 −5,266 share/locale/mscore_af.ts
  9. +4,189 −4,648 share/locale/mscore_ar.ts
  10. +4,132 −4,591 share/locale/mscore_ast.ts
  11. +4,551 −5,007 share/locale/mscore_be.ts
  12. +4,138 −4,597 share/locale/mscore_bg.ts
  13. +4,115 −4,574 share/locale/mscore_ca.ts
  14. +2,345 −2,804 share/locale/mscore_cs.ts
  15. +4,116 −4,575 share/locale/mscore_da.ts
  16. +2,338 −2,797 share/locale/mscore_de.ts
  17. +2,830 −3,287 share/locale/mscore_el.ts
  18. +2,360 −2,819 share/locale/mscore_en_GB.ts
  19. +4,845 −5,301 share/locale/mscore_en_US.ts
  20. +4,127 −4,586 share/locale/mscore_eo.ts
  21. +2,360 −2,819 share/locale/mscore_es.ts
  22. +4,262 −4,721 share/locale/mscore_et.ts
  23. +4,141 −4,600 share/locale/mscore_eu.ts
  24. +4,132 −4,591 share/locale/mscore_fa.ts
  25. +4,116 −4,575 share/locale/mscore_fi.ts
  26. +4,132 −4,591 share/locale/mscore_fo.ts
  27. +3,868 −4,327 share/locale/mscore_fr.ts
  28. +2,995 −3,451 share/locale/mscore_gl.ts
  29. +4,323 −4,779 share/locale/mscore_he.ts
  30. +4,814 −5,270 share/locale/mscore_hi_IN.ts
  31. +4,126 −4,585 share/locale/mscore_hr.ts
  32. +4,117 −4,576 share/locale/mscore_hu.ts
  33. +4,812 −5,268 share/locale/mscore_id.ts
  34. +4,062 −4,521 share/locale/mscore_it.ts
  35. +3,873 −4,323 share/locale/mscore_ja.ts
  36. +4,078 −4,537 share/locale/mscore_ko.ts
  37. +4,121 −4,580 share/locale/mscore_lt.ts
  38. +4,595 −5,051 share/locale/mscore_mn_MN.ts
  39. +4,115 −4,574 share/locale/mscore_nb.ts
  40. +4,075 −4,534 share/locale/mscore_nl.ts
  41. +2,347 −2,806 share/locale/mscore_pl.ts
  42. +4,224 −4,683 share/locale/mscore_pt.ts
  43. +4,116 −4,575 share/locale/mscore_pt_BR.ts
  44. +4,132 −4,591 share/locale/mscore_ro.ts
  45. +4,061 −4,520 share/locale/mscore_ru.ts
  46. +4,117 −4,576 share/locale/mscore_sk.ts
  47. +4,147 −4,606 share/locale/mscore_sl.ts
  48. +3,521 −3,980 share/locale/mscore_sr.ts
  49. +4,116 −4,575 share/locale/mscore_sv.ts
  50. +4,425 −4,881 share/locale/mscore_th.ts
  51. +4,415 −4,871 share/locale/mscore_tr.ts
  52. +4,156 −4,615 share/locale/mscore_uk.ts
  53. +4,286 −4,156 share/locale/mscore_uz@Latn.ts
  54. +4,117 −4,576 share/locale/mscore_vi.ts
  55. +4,046 −4,505 share/locale/mscore_zh_CN.ts
  56. +4,161 −4,620 share/locale/mscore_zh_TW.ts
View
568 fonts/mscore/mscore.sfd
@@ -19,7 +19,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 0
CreationTime: 1385043608
-ModificationTime: 1392824712
+ModificationTime: 1392991174
PfmFamily: 81
TTFWeight: 400
TTFWidth: 5
@@ -80,7 +80,7 @@ DisplaySize: -72
AntiAlias: 1
FitToEm: 1
ExtremaBound: 10
-WinInfo: 57647 17 11
+WinInfo: 17 17 11
BeginPrivate: 0
EndPrivate
Grid
@@ -2180,10 +2180,10 @@ EndChar
StartChar: f
Encoding: 102 102 18
-Width: 587
+Width: 281
Flags: W
-HStem: -295 39<-79.2169 28.6035> 485 40<105.005 234 478 617.995> 851 38<580.851 692.306>
-VStem: -186 106<-253.9 -195.038> 693 107<788.663 847.802>
+HStem: -82.8655 10.9551<24.1281 54.4148> 136.236 11.236<75.876 112.111 180.65 219.975> 239.046 10.6742<209.541 240.849>
+VStem: -5.8673 29.7754<-71.3205 -54.7862> 241.044 30.0563<221.535 238.148>
TtInstrs:
SVTCA[y-axis]
PUSHB_1
@@ -2298,70 +2298,69 @@ EndTTInstrs
LayerCount: 2
Fore
SplineSet
-467 485 m 257,0,-1
- 371 172 l 258,1,2
- 349 100 349 100 309.5 22 c 256,3,4
- 270 -56 270 -56 218.5 -129 c 256,5,6
- 167 -202 167 -202 101.5 -248.5 c 256,7,8
- 36 -295 36 -295 -27 -295 c 256,9,10
- -93 -295 -93 -295 -139.5 -271 c 256,11,12
- -186 -247 -186 -247 -186 -199 c 256,13,14
- -186 -142 -186 -142 -161 -99.5 c 256,15,16
- -136 -57 -136 -57 -91 -57 c 256,17,18
- -58 -57 -58 -57 -34 -80.5 c 256,19,20
- -10 -104 -10 -104 -10 -137 c 256,21,22
- -10 -155 -10 -155 -21 -168 c 256,23,24
- -32 -181 -32 -181 -45 -187 c 256,25,26
- -58 -193 -58 -193 -69 -205.5 c 256,27,28
- -80 -218 -80 -218 -80 -237 c 256,29,30
- -80 -256 -80 -256 -39 -256 c 258,31,-1
- -27 -256 l 258,32,33
- -3 -256 -3 -256 16 -245 c 256,34,35
- 35 -234 35 -234 46 -220.5 c 256,36,37
- 57 -207 57 -207 67.5 -180 c 256,38,39
- 78 -153 78 -153 82.5 -134 c 256,40,41
- 87 -115 87 -115 94.5 -79.5 c 256,42,43
- 102 -44 102 -44 106 -29 c 258,44,-1
- 234 485 l 257,45,-1
- 125 485 l 258,46,47
- 105 485 105 485 105 505 c 256,48,49
- 105 525 105 525 125 525 c 258,50,-1
- 245 525 l 257,51,52
- 287 668 287 668 399.5 778.5 c 256,53,54
- 512 889 512 889 640 889 c 256,55,56
- 706 889 706 889 753 865 c 256,57,58
- 800 841 800 841 800 793 c 256,59,60
- 800 736 800 736 774.5 693.5 c 256,61,62
- 749 651 749 651 703 651 c 256,63,64
- 670 651 670 651 647 674.5 c 256,65,66
- 624 698 624 698 624 731 c 256,67,68
- 624 749 624 749 634.5 762 c 256,69,70
- 645 775 645 775 658.5 781 c 256,71,72
- 673 787 673 787 682.5 800 c 256,73,74
- 693 814 693 814 693 831 c 256,75,76
- 693 851 693 851 652 851 c 258,77,-1
- 640 851 l 258,78,79
- 603 851 603 851 577 831 c 256,80,81
- 551 811 551 811 536 772 c 256,82,83
- 521 733 521 733 513 697.5 c 256,84,85
- 505 662 505 662 495 608 c 256,86,87
- 485 554 485 554 478 525 c 257,88,-1
- 598 525 l 258,89,90
- 618 525 618 525 618 505 c 256,91,92
- 618 485 618 485 598 485 c 258,93,-1
- 467 485 l 257,0,-1
-EndSplineSet
-Validated: 16385
-Kerns2: 18 -70 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
+293.89 257.05 m 257,0,-1
+ 243.01 91.1602 l 258,1,2
+ 231.35 53 231.35 53 210.415 11.6602 c 256,3,4
+ 189.48 -29.6797 189.48 -29.6797 162.186 -68.3701 c 256,5,6
+ 134.89 -107.06 134.89 -107.06 100.175 -131.705 c 256,7,8
+ 65.46 -156.35 65.46 -156.35 32.0703 -156.35 c 256,9,10
+ -2.91016 -156.35 -2.91016 -156.35 -27.5547 -143.63 c 256,11,12
+ -52.2002 -130.91 -52.2002 -130.91 -52.2002 -105.47 c 256,13,14
+ -52.2002 -75.2598 -52.2002 -75.2598 -38.9502 -52.7354 c 256,15,16
+ -25.7002 -30.21 -25.7002 -30.21 -1.85059 -30.21 c 256,17,18
+ 15.6396 -30.21 15.6396 -30.21 28.3604 -42.665 c 256,19,20
+ 41.0801 -55.1201 41.0801 -55.1201 41.0801 -72.6104 c 256,21,22
+ 41.0801 -82.1504 41.0801 -82.1504 35.25 -89.04 c 256,23,24
+ 29.4199 -95.9297 29.4199 -95.9297 22.5303 -99.1104 c 256,25,26
+ 15.6396 -102.29 15.6396 -102.29 9.80957 -108.915 c 256,27,28
+ 3.97949 -115.54 3.97949 -115.54 3.97949 -125.61 c 256,29,30
+ 3.97949 -135.68 3.97949 -135.68 25.71 -135.68 c 258,31,-1
+ 32.0703 -135.68 l 258,32,33
+ 44.79 -135.68 44.79 -135.68 54.8604 -129.85 c 256,34,35
+ 64.9297 -124.02 64.9297 -124.02 70.7598 -116.865 c 256,36,37
+ 76.5898 -109.71 76.5898 -109.71 82.1553 -95.4004 c 256,38,39
+ 87.7197 -81.0898 87.7197 -81.0898 90.1045 -71.0195 c 256,40,41
+ 92.4902 -60.9502 92.4902 -60.9502 96.4648 -42.1348 c 256,42,43
+ 100.439 -23.3203 100.439 -23.3203 102.56 -15.3701 c 258,44,-1
+ 170.4 257.05 l 257,45,-1
+ 112.63 257.05 l 258,46,47
+ 102.03 257.05 102.03 257.05 102.03 267.65 c 256,48,49
+ 102.03 278.25 102.03 278.25 112.63 278.25 c 258,50,-1
+ 176.23 278.25 l 257,51,52
+ 198.49 354.04 198.49 354.04 258.115 412.605 c 256,53,54
+ 317.74 471.17 317.74 471.17 385.58 471.17 c 256,55,56
+ 420.561 471.17 420.561 471.17 445.47 458.45 c 256,57,58
+ 470.38 445.73 470.38 445.73 470.38 420.29 c 256,59,60
+ 470.38 390.08 470.38 390.08 456.865 367.555 c 256,61,62
+ 443.35 345.03 443.35 345.03 418.97 345.03 c 256,63,64
+ 401.48 345.03 401.48 345.03 389.29 357.485 c 256,65,66
+ 377.1 369.94 377.1 369.94 377.1 387.43 c 256,67,68
+ 377.1 396.97 377.1 396.97 382.665 403.86 c 256,69,70
+ 388.23 410.75 388.23 410.75 395.385 413.93 c 256,71,72
+ 403.07 417.11 403.07 417.11 408.105 424 c 256,73,74
+ 413.67 431.42 413.67 431.42 413.67 440.43 c 256,75,76
+ 413.67 451.03 413.67 451.03 391.94 451.03 c 258,77,-1
+ 385.58 451.03 l 258,78,79
+ 365.97 451.03 365.97 451.03 352.19 440.43 c 256,80,81
+ 338.41 429.83 338.41 429.83 330.46 409.16 c 256,82,83
+ 322.51 388.49 322.51 388.49 318.271 369.675 c 256,84,85
+ 314.03 350.86 314.03 350.86 308.73 322.24 c 256,86,87
+ 303.43 293.62 303.43 293.62 299.72 278.25 c 257,88,-1
+ 363.32 278.25 l 258,89,90
+ 373.92 278.25 373.92 278.25 373.92 267.65 c 256,91,92
+ 373.92 257.05 373.92 257.05 363.32 257.05 c 258,93,-1
+ 293.89 257.05 l 257,0,-1
+EndSplineSet
+Kerns2: 18 -37 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
EndChar
StartChar: m
Encoding: 109 109 19
-Width: 801
+Width: 432
Flags: W
-HStem: 0 21G<9.5 131.5 263 385> 426 115<89 179.683 328.5 409.273 559 642.113>
-VStem: 519 167<33.8164 131.375>
-DStem2: 6 18 146 18 0.322729 0.946491<18.8264 396.929> 259 18 399 18 0.275449 0.961316<13.581 391.929> 521 67 687 121 0.230305 0.973119<81.9724 334.264>
+HStem: 0 11.13G<17.495 82.155 151.85 216.51> 225.78 60.95<59.63 107.692 186.565 229.375 308.73 352.78>
+VStem: 287.53 88.51<17.9227 69.6287>
+DStem2: 15.64 9.54 89.84 9.54 0.322729 0.946491<9.97799 210.372> 149.73 9.54 223.93 9.54 0.275449 0.961316<7.19793 207.722> 288.59 35.51 376.57 64.13 0.230305 0.973119<43.4454 177.16>
TtInstrs:
SVTCA[y-axis]
PUSHB_1
@@ -2598,68 +2597,67 @@ EndTTInstrs
LayerCount: 2
Fore
SplineSet
--50 260 m 256,0,1
- -50 262 -50 262 -40 292 c 256,2,3
- -15 366 -15 366 40 444 c 256,4,5
- 109 541 109 541 196 541 c 256,6,7
- 229 541 229 541 250 512 c 256,8,9
- 270 483 270 483 274 441 c 257,10,11
- 339 540 339 540 420 541 c 256,12,13
- 455 541 455 541 477 511 c 256,14,15
- 499 481 499 481 504 438 c 257,16,17
- 567 541 567 541 645 541 c 256,18,19
- 689 541 689 541 722 504 c 256,20,21
- 755 466 755 466 755 419 c 256,22,23
- 755 406 755 406 752 393 c 258,24,-1
- 687 121 l 258,25,26
- 686 118 686 118 686 112 c 256,27,28
- 686 97 686 97 698 97 c 256,29,30
- 718 97 718 97 758 128 c 256,31,32
- 797 160 797 160 800 160 c 256,33,34
- 811 160 811 160 811 150 c 256,35,36
- 811 144 811 144 805 137 c 256,37,38
- 720 55 720 55 685 32 c 256,39,40
- 629 -7 629 -7 580 -7 c 256,41,42
- 552 -7 552 -7 536 9 c 256,43,44
- 519 25 519 25 519 49 c 256,45,46
- 519 54 519 54 521 67 c 258,47,-1
- 592 367 l 258,48,49
- 596 385 596 385 596 393 c 256,50,51
- 596 426 596 426 574 426 c 256,52,53
- 552 426 552 426 529 408 c 256,54,55
- 506 391 506 391 499 367 c 258,56,-1
- 399 18 l 258,57,58
- 394 0 394 0 376 0 c 258,59,-1
- 272 0 l 258,60,61
- 254 0 254 0 259 18 c 258,62,-1
- 358 367 l 258,63,64
- 363 384 363 384 364 396 c 256,65,66
- 364 426 364 426 341 426 c 256,67,68
- 318 426 318 426 296 408 c 256,69,70
- 273 390 273 390 265 367 c 258,71,-1
- 146 18 l 258,72,73
- 141 0 141 0 122 0 c 258,74,-1
- 18 0 l 258,75,76
- 1 0 1 0 6 18 c 258,77,-1
- 125 367 l 258,78,79
- 131 387 131 387 131 395 c 256,80,81
- 131 426 131 426 105 426 c 256,82,83
- 69 426 69 426 37 376 c 256,84,85
- 5 327 5 327 -15 266 c 256,86,87
- -20 250 -20 250 -38 250 c 256,88,89
- -50 250 -50 250 -50 260 c 256,0,1
+-14.04 137.8 m 256,0,1
+ -14.04 138.86 -14.04 138.86 -8.74023 154.76 c 256,2,3
+ 4.50977 193.98 4.50977 193.98 33.6602 235.32 c 256,4,5
+ 70.2295 286.73 70.2295 286.73 116.34 286.73 c 256,6,7
+ 133.83 286.73 133.83 286.73 144.96 271.36 c 256,8,9
+ 155.56 255.99 155.56 255.99 157.68 233.73 c 257,10,11
+ 192.13 286.2 192.13 286.2 235.06 286.73 c 256,12,13
+ 253.61 286.73 253.61 286.73 265.27 270.83 c 256,14,15
+ 276.93 254.93 276.93 254.93 279.58 232.14 c 257,16,17
+ 312.97 286.73 312.97 286.73 354.31 286.73 c 256,18,19
+ 377.63 286.73 377.63 286.73 395.12 267.12 c 256,20,21
+ 412.61 246.98 412.61 246.98 412.61 222.07 c 256,22,23
+ 412.61 215.18 412.61 215.18 411.02 208.29 c 258,24,-1
+ 376.57 64.1299 l 258,25,26
+ 376.04 62.54 376.04 62.54 376.04 59.3604 c 256,27,28
+ 376.04 51.4102 376.04 51.4102 382.4 51.4102 c 256,29,30
+ 393 51.4102 393 51.4102 414.2 67.8398 c 256,31,32
+ 434.87 84.7998 434.87 84.7998 436.46 84.7998 c 256,33,34
+ 442.29 84.7998 442.29 84.7998 442.29 79.5 c 256,35,36
+ 442.29 76.3203 442.29 76.3203 439.11 72.6104 c 256,37,38
+ 394.06 29.1504 394.06 29.1504 375.51 16.96 c 256,39,40
+ 345.83 -3.70996 345.83 -3.70996 319.86 -3.70996 c 256,41,42
+ 305.02 -3.70996 305.02 -3.70996 296.54 4.76953 c 256,43,44
+ 287.53 13.25 287.53 13.25 287.53 25.9697 c 256,45,46
+ 287.53 28.6201 287.53 28.6201 288.59 35.5098 c 258,47,-1
+ 326.22 194.51 l 258,48,49
+ 328.34 204.05 328.34 204.05 328.34 208.29 c 256,50,51
+ 328.34 225.78 328.34 225.78 316.68 225.78 c 256,52,53
+ 305.02 225.78 305.02 225.78 292.83 216.24 c 256,54,55
+ 280.64 207.23 280.64 207.23 276.93 194.51 c 258,56,-1
+ 223.93 9.54004 l 258,57,58
+ 221.28 0 221.28 0 211.74 0 c 258,59,-1
+ 156.62 0 l 258,60,61
+ 147.08 0 147.08 0 149.73 9.54004 c 258,62,-1
+ 202.2 194.51 l 258,63,64
+ 204.85 203.52 204.85 203.52 205.38 209.88 c 256,65,66
+ 205.38 225.78 205.38 225.78 193.19 225.78 c 256,67,68
+ 181 225.78 181 225.78 169.34 216.24 c 256,69,70
+ 157.15 206.7 157.15 206.7 152.91 194.51 c 258,71,-1
+ 89.8398 9.54004 l 258,72,73
+ 87.1904 0 87.1904 0 77.1201 0 c 258,74,-1
+ 22 0 l 258,75,76
+ 12.9902 0 12.9902 0 15.6396 9.54004 c 258,77,-1
+ 78.71 194.51 l 258,78,79
+ 81.8896 205.11 81.8896 205.11 81.8896 209.35 c 256,80,81
+ 81.8896 225.78 81.8896 225.78 68.1104 225.78 c 256,82,83
+ 49.0303 225.78 49.0303 225.78 32.0703 199.28 c 256,84,85
+ 15.1104 173.31 15.1104 173.31 4.50977 140.98 c 256,86,87
+ 1.86035 132.5 1.86035 132.5 -7.67969 132.5 c 256,88,89
+ -14.04 132.5 -14.04 132.5 -14.04 137.8 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"
EndChar
StartChar: p
Encoding: 112 112 20
-Width: 667
+Width: 378
Flags: MW
-HStem: -266 30<-246.754 -81.2432 114.836 223.745> -257 23<-204.399 -80.125> 444 90<67.3439 162 367.528 464.142>
-VStem: 472 180<264.791 431.823>
-DStem2: -72 -210 109 -202 0.324365 0.945932<57.6165 317.941>
+HStem: -140.98 15.9<-69.25 18.4711 122.393 180.115> -136.21 12.19<-46.801 19.0638> 235.32 47.7<97.2223 147.39 256.32 307.525>
+VStem: 311.69 95.4<140.339 228.866>
+DStem2: 23.37 -111.3 119.3 -107.06 0.324365 0.945932<30.5367 168.509>
TtInstrs:
SVTCA[y-axis]
PUSHB_3
@@ -2802,62 +2800,61 @@ EndTTInstrs
LayerCount: 2
Fore
SplineSet
-427 444 m 256,0,1
- 377 444 377 444 332.5 386 c 256,2,3
- 288 328 288 328 265 257 c 256,4,5
- 242 186 242 186 242 136 c 256,6,7
- 242 65 242 65 297 65 c 256,8,9
- 346 65 346 65 379 100 c 257,10,11
- 415 140 415 140 443.5 240.5 c 256,12,13
- 472 341 472 341 472 383 c 256,14,15
- 472 444 472 444 427 444 c 256,0,1
-137 534 m 256,16,17
- 187 534 187 534 222.5 508 c 256,18,19
- 258 482 258 482 268 438 c 257,20,21
- 308 482 308 482 359 508 c 256,22,23
- 410 534 410 534 458 534 c 256,24,25
- 550 534 550 534 601 475.5 c 256,26,27
- 652 417 652 417 652 325 c 256,28,29
- 652 171 652 171 544 76 c 256,30,31
- 449 -8 449 -8 366 -8 c 256,32,33
- 323 -8 323 -8 290 1 c 256,34,35
- 257 10 257 10 238.5 19.5 c 256,36,37
- 220 29 220 29 212 29 c 256,38,39
- 187 29 187 29 181 10 c 258,40,-1
- 109 -202 l 258,41,42
- 108 -205 108 -205 108 -211 c 256,43,44
- 108 -228 108 -228 137 -232 c 256,45,46
- 166 -236 166 -236 195 -238 c 256,47,48
- 224 -240 224 -240 224 -253 c 256,49,50
- 224 -266 224 -266 211 -266 c 256,51,52
- 56 -257 56 -257 -11 -257 c 256,53,54
- -81 -257 -81 -257 -232 -266 c 256,55,56
- -247 -266 -247 -266 -247 -253 c 256,57,58
- -247 -241 -247 -241 -219 -236 c 256,59,60
- -203 -234 -203 -234 -120 -234 c 256,61,62
- -80 -234 -80 -234 -72 -210 c 258,63,-1
- 131 382 l 274,64,65
- 136 397 136 397 136 410 c 256,66,67
- 136 444 136 444 106 444 c 256,68,69
- 63 444 63 444 15 387 c 256,70,71
- -34 329 -34 329 -60 266 c 256,72,73
- -67 249 -67 249 -86 249 c 256,74,75
- -100 249 -100 249 -100 261 c 272,76,77
- -100 273 -100 273 -90 290 c 256,78,79
- -46 387 -46 387 -10 438 c 256,80,81
- 16 475 16 475 56 504.5 c 256,82,83
- 96 534 96 534 137 534 c 256,16,17
+287.84 235.32 m 256,0,1
+ 261.34 235.32 261.34 235.32 237.755 204.58 c 256,2,3
+ 214.17 173.84 214.17 173.84 201.98 136.21 c 256,4,5
+ 189.79 98.5801 189.79 98.5801 189.79 72.0801 c 256,6,7
+ 189.79 34.4502 189.79 34.4502 218.94 34.4502 c 256,8,9
+ 244.91 34.4502 244.91 34.4502 262.4 53 c 257,10,11
+ 281.48 74.2002 281.48 74.2002 296.585 127.465 c 256,12,13
+ 311.69 180.73 311.69 180.73 311.69 202.99 c 256,14,15
+ 311.69 235.32 311.69 235.32 287.84 235.32 c 256,0,1
+134.141 283.02 m 256,16,17
+ 160.641 283.02 160.641 283.02 179.455 269.24 c 256,18,19
+ 198.27 255.46 198.27 255.46 203.57 232.14 c 257,20,21
+ 224.77 255.46 224.77 255.46 251.8 269.24 c 256,22,23
+ 278.83 283.02 278.83 283.02 304.27 283.02 c 256,24,25
+ 353.03 283.02 353.03 283.02 380.06 252.015 c 256,26,27
+ 407.09 221.01 407.09 221.01 407.09 172.25 c 256,28,29
+ 407.09 90.6299 407.09 90.6299 349.85 40.2803 c 256,30,31
+ 299.5 -4.24023 299.5 -4.24023 255.51 -4.24023 c 256,32,33
+ 232.72 -4.24023 232.72 -4.24023 215.23 0.530273 c 256,34,35
+ 197.74 5.2998 197.74 5.2998 187.935 10.335 c 256,36,37
+ 178.13 15.3701 178.13 15.3701 173.89 15.3701 c 256,38,39
+ 160.641 15.3701 160.641 15.3701 157.46 5.2998 c 258,40,-1
+ 119.3 -107.06 l 258,41,42
+ 118.771 -108.65 118.771 -108.65 118.771 -111.83 c 256,43,44
+ 118.771 -120.84 118.771 -120.84 134.141 -122.96 c 256,45,46
+ 149.511 -125.08 149.511 -125.08 164.88 -126.14 c 256,47,48
+ 180.25 -127.2 180.25 -127.2 180.25 -134.09 c 256,49,50
+ 180.25 -140.98 180.25 -140.98 173.36 -140.98 c 256,51,52
+ 91.21 -136.21 91.21 -136.21 55.7002 -136.21 c 256,53,54
+ 18.6006 -136.21 18.6006 -136.21 -61.4297 -140.98 c 256,55,56
+ -69.3799 -140.98 -69.3799 -140.98 -69.3799 -134.09 c 256,57,58
+ -69.3799 -127.73 -69.3799 -127.73 -54.54 -125.08 c 256,59,60
+ -46.0596 -124.02 -46.0596 -124.02 -2.06934 -124.02 c 256,61,62
+ 19.1299 -124.02 19.1299 -124.02 23.3701 -111.3 c 258,63,-1
+ 130.96 202.46 l 274,64,65
+ 133.61 210.41 133.61 210.41 133.61 217.3 c 256,66,67
+ 133.61 235.32 133.61 235.32 117.71 235.32 c 256,68,69
+ 94.9199 235.32 94.9199 235.32 69.4805 205.11 c 256,70,71
+ 43.5107 174.37 43.5107 174.37 29.7305 140.98 c 256,72,73
+ 26.0205 131.97 26.0205 131.97 15.9502 131.97 c 256,74,75
+ 8.53027 131.97 8.53027 131.97 8.53027 138.33 c 272,76,77
+ 8.53027 144.69 8.53027 144.69 13.8301 153.7 c 256,78,79
+ 37.1504 205.11 37.1504 205.11 56.2305 232.14 c 256,80,81
+ 70.0107 251.75 70.0107 251.75 91.21 267.385 c 256,82,83
+ 112.41 283.02 112.41 283.02 134.141 283.02 c 256,16,17
EndSplineSet
-Validated: 16385
EndChar
StartChar: r
Encoding: 114 114 21
-Width: 400
+Width: 129
Flags: MW
-HStem: 470 79<311.087 436.5> 487 61<53.3594 155.5>
-VStem: -31 29<395.067 434.919>
-DStem2: 5 18 143 18 0.25088 0.968018<10.4665 446.135>
+HStem: 249.1 41.87<172.598 239.067> 258.11 32.33<36.0025 90.137>
+VStem: -8.70804 15.37<209.385 230.507>
+DStem2: 10.372 9.54 83.512 9.54 0.25088 0.968018<5.54724 236.451>
TtInstrs:
SVTCA[y-axis]
PUSHB_3
@@ -2985,44 +2982,43 @@ EndTTInstrs
LayerCount: 2
Fore
SplineSet
-443 387 m 256,0,1
- 416 387 416 387 402 400 c 256,2,3
- 388 413 388 413 385.5 428.5 c 256,4,5
- 383 444 383 444 374 457 c 256,6,7
- 365 470 365 470 346 470 c 256,8,9
- 315 470 315 470 280.5 443.5 c 256,10,11
- 246 417 246 417 239 386 c 257,12,-1
- 143 18 l 258,13,14
- 138 0 138 0 121 0 c 258,15,-1
- 18 0 l 258,16,17
- 0 0 0 0 5 18 c 258,18,-1
- 111 427 l 258,19,20
- 114 439 114 439 114 451 c 256,21,22
- 114 487 114 487 86 487 c 256,23,24
- 62 487 62 487 34 460 c 256,25,26
- 9 437 9 437 -2 406 c 280,27,28
- -6 395 -6 395 -18 395 c 257,29,30
- -30 395 -30 395 -31 407 c 257,31,32
- -31 444 -31 444 24 502 c 256,33,34
- 68 548 68 548 137 548 c 256,35,36
- 174 548 174 548 201.5 530.5 c 256,37,38
- 229 513 229 513 243 483 c 257,39,40
- 321 549 321 549 412 549 c 256,41,42
- 461 549 461 549 491 528.5 c 256,43,44
- 521 508 521 508 521 474 c 256,45,46
- 521 442 521 442 497 414.5 c 256,47,48
- 473 387 473 387 443 387 c 256,0,1
+242.512 205.11 m 256,0,1
+ 228.202 205.11 228.202 205.11 220.782 212 c 256,2,3
+ 213.362 218.89 213.362 218.89 212.037 227.105 c 256,4,5
+ 210.712 235.32 210.712 235.32 205.942 242.21 c 256,6,7
+ 201.172 249.1 201.172 249.1 191.102 249.1 c 256,8,9
+ 174.672 249.1 174.672 249.1 156.387 235.055 c 256,10,11
+ 138.102 221.01 138.102 221.01 134.392 204.58 c 257,12,-1
+ 83.5117 9.54004 l 258,13,14
+ 80.8613 0 80.8613 0 71.8516 0 c 258,15,-1
+ 17.2617 0 l 258,16,17
+ 7.72168 0 7.72168 0 10.3721 9.54004 c 258,18,-1
+ 66.5518 226.31 l 258,19,20
+ 68.1416 232.67 68.1416 232.67 68.1416 239.03 c 256,21,22
+ 68.1416 258.11 68.1416 258.11 53.3018 258.11 c 256,23,24
+ 40.582 258.11 40.582 258.11 25.7412 243.8 c 256,25,26
+ 12.4912 231.61 12.4912 231.61 6.66211 215.18 c 280,27,28
+ 4.54199 209.35 4.54199 209.35 -1.81836 209.35 c 257,29,30
+ -8.17871 209.35 -8.17871 209.35 -8.70801 215.71 c 257,31,32
+ -8.70801 235.32 -8.70801 235.32 20.4414 266.06 c 256,33,34
+ 43.7617 290.44 43.7617 290.44 80.332 290.44 c 256,35,36
+ 99.9414 290.44 99.9414 290.44 114.517 281.165 c 256,37,38
+ 129.092 271.89 129.092 271.89 136.512 255.99 c 257,39,40
+ 177.852 290.97 177.852 290.97 226.082 290.97 c 256,41,42
+ 252.052 290.97 252.052 290.97 267.952 280.105 c 256,43,44
+ 283.852 269.24 283.852 269.24 283.852 251.22 c 256,45,46
+ 283.852 234.26 283.852 234.26 271.132 219.685 c 256,47,48
+ 258.412 205.11 258.412 205.11 242.512 205.11 c 256,0,1
EndSplineSet
-Validated: 16417
Kerns2: 18 53 "'kern' Horizontal Kerning in Latin lookup 0 subtable"
EndChar
StartChar: s
Encoding: 115 115 22
-Width: 377
+Width: 212
Flags: W
-HStem: 0 28<129.978 241.621> 510 24<275.077 342.491>
-VStem: 35 76<47.2784 121.5> 115 109<334 437.599> 295 111<94.7729 183.927> 353 92<396.794 487.696>
+HStem: 0 14.84<60.1699 119.341> 270.3 12.72<137.073 172.802>
+VStem: 9.83159 40.28<25.0576 64.395> 52.2316 57.77<177.02 231.927> 147.632 58.83<50.2296 97.4813> 178.372 48.76<210.301 258.479>
TtInstrs:
SVTCA[y-axis]
PUSHB_3
@@ -3179,54 +3175,53 @@ EndTTInstrs
LayerCount: 2
Fore
SplineSet
-224 403 m 256,0,1
- 224 377 224 377 252.5 352 c 256,2,3
- 281 327 281 327 315 307 c 256,4,5
- 349 287 349 287 377.5 252 c 256,6,7
- 406 217 406 217 406 175 c 256,8,9
- 406 98 406 98 341 49 c 256,10,11
- 276 0 276 0 188 0 c 256,12,13
- 126 0 126 0 80.5 28.5 c 256,14,15
- 35 57 35 57 35 106 c 256,16,17
- 35 137 35 137 50.5 159.5 c 256,18,19
- 66 182 66 182 91 182 c 256,20,21
- 116 182 116 182 133 164.5 c 256,22,23
- 150 147 150 147 150 123 c 256,24,25
- 150 111 150 111 130.5 97 c 256,26,27
- 111 83 111 83 111 71 c 256,28,29
- 111 48 111 48 132.5 38 c 256,30,31
- 154 28 154 28 184 28 c 256,32,33
- 229 28 229 28 262 55 c 256,34,35
- 295 82 295 82 295 123 c 256,36,37
- 295 160 295 160 267 190.5 c 256,38,39
- 239 221 239 221 205 240 c 256,40,41
- 171 259 171 259 143 288 c 256,42,43
- 115 317 115 317 115 351 c 256,44,45
- 115 428 115 428 172.5 481 c 256,46,47
- 230 534 230 534 310 534 c 256,48,49
- 378 534 378 534 411.5 500.5 c 256,50,51
- 445 467 445 467 445 423 c 256,52,53
- 445 392 445 392 429.5 371 c 256,54,55
- 414 350 414 350 386 350 c 256,56,57
- 362 350 362 350 345 362 c 256,58,59
- 328 374 328 374 328 389 c 256,60,61
- 328 393 328 393 340.5 416.5 c 256,62,63
- 353 440 353 440 353 465 c 256,64,65
- 353 484 353 484 344 497 c 256,66,67
- 335 510 335 510 318 510 c 256,68,69
- 278 510 278 510 251 478 c 256,70,71
- 224 446 224 446 224 403 c 256,0,1
+110.002 213.59 m 256,0,1
+ 110.002 199.81 110.002 199.81 125.106 186.56 c 256,2,3
+ 140.212 173.31 140.212 173.31 158.231 162.71 c 256,4,5
+ 176.252 152.11 176.252 152.11 191.356 133.56 c 256,6,7
+ 206.462 115.01 206.462 115.01 206.462 92.75 c 256,8,9
+ 206.462 51.9404 206.462 51.9404 172.012 25.9697 c 256,10,11
+ 137.562 0 137.562 0 90.9209 0 c 256,12,13
+ 58.0615 0 58.0615 0 33.9463 15.1055 c 256,14,15
+ 9.83105 30.21 9.83105 30.21 9.83105 56.1797 c 256,16,17
+ 9.83105 72.6104 9.83105 72.6104 18.0459 84.5352 c 256,18,19
+ 26.2617 96.46 26.2617 96.46 39.5117 96.46 c 256,20,21
+ 52.7617 96.46 52.7617 96.46 61.7715 87.1846 c 256,22,23
+ 70.7812 77.9102 70.7812 77.9102 70.7812 65.1904 c 256,24,25
+ 70.7812 58.8301 70.7812 58.8301 60.4463 51.4102 c 256,26,27
+ 50.1113 43.9902 50.1113 43.9902 50.1113 37.6299 c 256,28,29
+ 50.1113 25.4404 50.1113 25.4404 61.5059 20.1396 c 256,30,31
+ 72.9014 14.8398 72.9014 14.8398 88.8008 14.8398 c 256,32,33
+ 112.651 14.8398 112.651 14.8398 130.142 29.1504 c 256,34,35
+ 147.632 43.46 147.632 43.46 147.632 65.1904 c 256,36,37
+ 147.632 84.7998 147.632 84.7998 132.792 100.965 c 256,38,39
+ 117.951 117.13 117.951 117.13 99.9316 127.2 c 256,40,41
+ 81.9111 137.27 81.9111 137.27 67.0713 152.64 c 256,42,43
+ 52.2314 168.01 52.2314 168.01 52.2314 186.03 c 256,44,45
+ 52.2314 226.84 52.2314 226.84 82.7061 254.93 c 256,46,47
+ 113.182 283.02 113.182 283.02 155.582 283.02 c 256,48,49
+ 191.621 283.02 191.621 283.02 209.377 265.265 c 256,50,51
+ 227.132 247.51 227.132 247.51 227.132 224.19 c 256,52,53
+ 227.132 207.76 227.132 207.76 218.917 196.63 c 256,54,55
+ 210.701 185.5 210.701 185.5 195.861 185.5 c 256,56,57
+ 183.142 185.5 183.142 185.5 174.132 191.86 c 256,58,59
+ 165.121 198.22 165.121 198.22 165.121 206.17 c 256,60,61
+ 165.121 208.29 165.121 208.29 171.746 220.745 c 256,62,63
+ 178.371 233.2 178.371 233.2 178.371 246.45 c 256,64,65
+ 178.371 256.52 178.371 256.52 173.602 263.41 c 256,66,67
+ 168.832 270.3 168.832 270.3 159.821 270.3 c 256,68,69
+ 138.621 270.3 138.621 270.3 124.312 253.34 c 256,70,71
+ 110.002 236.38 110.002 236.38 110.002 213.59 c 256,0,1
EndSplineSet
-Validated: 16385
EndChar
StartChar: z
Encoding: 122 122 23
-Width: 523
+Width: 276
Flags: W
-HStem: -29 137<258.661 471.715> 18 110<55.5 245.575> 329 158<106.363 198.211>
-VStem: 495 27<125.986 216.425>
-DStem2: 5 26 134 108 0.731118 0.682251<150.259 532.062>
+HStem: -15.37 72.61<137.09 250.009> 9.54 58.3<29.415 130.155> 174.37 83.74<56.3724 105.052>
+VStem: 262.35 14.31<66.7726 114.705>
+DStem2: 2.65 13.78 71.02 57.24 0.731118 0.682251<79.6373 281.993>
TtInstrs:
SVTCA[y-axis]
PUSHB_3
@@ -3365,40 +3360,39 @@ EndTTInstrs
LayerCount: 2
Fore
SplineSet
-65 18 m 256,0,1
- 46 18 46 18 31 9 c 256,2,3
- 16 0 16 0 14 0 c 256,4,5
- 0 -1 0 -1 0 13 c 256,6,7
- 0 21 0 21 5 26 c 258,8,-1
- 394 389 l 257,9,10
- 360 378 360 378 321.5 371 c 256,11,12
- 283 364 283 364 232.5 356.5 c 256,13,14
- 182 349 182 349 157 345 c 256,15,16
- 72 329 72 329 63 329 c 256,17,18
- 29 329 29 329 29 359 c 257,19,20
- 29 405 29 405 79.5 446 c 256,21,22
- 130 487 130 487 181 487 c 256,23,24
- 251 487 251 487 324 471 c 256,25,26
- 397 455 397 455 436 455 c 256,27,28
- 459 455 459 455 474 465 c 256,29,30
- 489 475 489 475 492 475 c 256,31,32
- 506 475 506 475 506 460 c 256,33,34
- 506 454 506 454 502 450 c 258,35,-1
- 134 108 l 257,36,37
- 177 128 177 128 195 128 c 256,38,39
- 244 128 244 128 310 118 c 256,40,41
- 376 108 376 108 425 108 c 256,42,43
- 495 108 495 108 495 163 c 256,44,45
- 495 177 495 177 490 194 c 256,46,47
- 485 211 485 211 485 212 c 256,48,49
- 485 225 485 225 500 225 c 256,50,51
- 522 225 522 225 522 139 c 256,52,53
- 522 72 522 72 493 20 c 256,54,55
- 465 -29 465 -29 411 -29 c 256,56,57
- 383 -29 383 -29 272 -9 c 256,58,59
- 122 18 122 18 65 18 c 256,0,1
+34.4502 9.54004 m 256,0,1
+ 24.3799 9.54004 24.3799 9.54004 16.4297 4.76953 c 256,2,3
+ 8.48047 0 8.48047 0 7.41992 0 c 256,4,5
+ 0 -0.530273 0 -0.530273 0 6.88965 c 256,6,7
+ 0 11.1299 0 11.1299 2.65039 13.7803 c 258,8,-1
+ 208.82 206.17 l 257,9,10
+ 190.8 200.34 190.8 200.34 170.395 196.63 c 256,11,12
+ 149.99 192.92 149.99 192.92 123.225 188.945 c 256,13,14
+ 96.46 184.97 96.46 184.97 83.21 182.85 c 256,15,16
+ 38.1602 174.37 38.1602 174.37 33.3896 174.37 c 256,17,18
+ 15.3701 174.37 15.3701 174.37 15.3701 190.27 c 257,19,20
+ 15.3701 214.65 15.3701 214.65 42.1348 236.38 c 256,21,22
+ 68.9004 258.11 68.9004 258.11 95.9297 258.11 c 256,23,24
+ 133.03 258.11 133.03 258.11 171.72 249.63 c 256,25,26
+ 210.41 241.15 210.41 241.15 231.08 241.15 c 256,27,28
+ 243.27 241.15 243.27 241.15 251.22 246.45 c 256,29,30
+ 259.17 251.75 259.17 251.75 260.76 251.75 c 256,31,32
+ 268.18 251.75 268.18 251.75 268.18 243.8 c 256,33,34
+ 268.18 240.62 268.18 240.62 266.06 238.5 c 258,35,-1
+ 71.0195 57.2402 l 257,36,37
+ 93.8096 67.8398 93.8096 67.8398 103.35 67.8398 c 256,38,39
+ 129.32 67.8398 129.32 67.8398 164.3 62.54 c 256,40,41
+ 199.28 57.2402 199.28 57.2402 225.25 57.2402 c 256,42,43
+ 262.35 57.2402 262.35 57.2402 262.35 86.3896 c 256,44,45
+ 262.35 93.8096 262.35 93.8096 259.7 102.82 c 256,46,47
+ 257.05 111.83 257.05 111.83 257.05 112.36 c 256,48,49
+ 257.05 119.25 257.05 119.25 265 119.25 c 256,50,51
+ 276.66 119.25 276.66 119.25 276.66 73.6699 c 256,52,53
+ 276.66 38.1602 276.66 38.1602 261.29 10.5996 c 256,54,55
+ 246.45 -15.3701 246.45 -15.3701 217.83 -15.3701 c 256,56,57
+ 202.99 -15.3701 202.99 -15.3701 144.16 -4.76953 c 256,58,59
+ 64.6602 9.54004 64.6602 9.54004 34.4502 9.54004 c 256,0,1
EndSplineSet
-Validated: 16417
EndChar
StartChar: rests.0
@@ -3505,7 +3499,7 @@ StartChar: rests.0o
Encoding: 57602 57602 26
Width: 384
Flags: W
-HStem: -160 186<1e-007 383.998> -26 52<-159.736 0 384 543.719>
+HStem: -160 186<1e-07 383.998> -26 52<-159.736 0 384 543.719>
TtInstrs:
SVTCA[y-axis]
PUSHB_1
@@ -3565,7 +3559,7 @@ StartChar: rests.1o
Encoding: 57603 57603 27
Width: 384
Flags: W
-HStem: -26 186<1e-007 383.998> -26 52<-159.736 0 384 543.719>
+HStem: -26 186<1e-07 383.998> -26 52<-159.736 0 384 543.719>
TtInstrs:
SVTCA[y-axis]
PUSHB_1
@@ -14714,7 +14708,7 @@ StartChar: noteheads.s2la
Encoding: 57682 57682 106
Width: 336
Flags: W
-HStem: -115 230<7e-008 330.296>
+HStem: -115 230<7e-08 330.296>
VStem: 0 337<-108.296 114.994>
TtInstrs:
SVTCA[y-axis]
@@ -22333,7 +22327,7 @@ SplineSet
81 -307 81 -307 32 -256 c 257,30,-1
0 -256 l 257,0,-1
EndSplineSet
-Validated: 524289
+Validated: 1
EndChar
StartChar: flags.u4
@@ -22378,7 +22372,7 @@ SplineSet
105 -410 105 -410 140 -457 c 256,54,55
174 -504 174 -504 189 -529 c 257,38,39
EndSplineSet
-Validated: 524289
+Validated: 1
EndChar
StartChar: flags.u5
@@ -22433,7 +22427,7 @@ SplineSet
138 -543 138 -543 108 -512 c 256,70,71
78 -481 78 -481 32 -440 c 257,55,-1
EndSplineSet
-Validated: 8912897
+Validated: 1
EndChar
StartChar: flags.u6
@@ -22501,7 +22495,7 @@ SplineSet
196 -868 196 -868 150 -806 c 256,93,94
104 -744 104 -744 32 -678 c 257,80,-1
EndSplineSet
-Validated: 8912897
+Validated: 1
EndChar
StartChar: flags.d3
@@ -22533,7 +22527,7 @@ SplineSet
208.6 726.6 208.6 726.6 215 733 c 256,31,32
223 741 223 741 233 741 c 256,0,1
EndSplineSet
-Validated: 524289
+Validated: 1
EndChar
StartChar: flags.ugrace
@@ -22754,7 +22748,7 @@ SplineSet
305 709 305 709 306 698 c 256,53,54
307 687 307 687 307 679 c 256,19,20
EndSplineSet
-Validated: 8912897
+Validated: 1
EndChar
StartChar: flags.d5
@@ -22806,7 +22800,7 @@ SplineSet
32 505 32 505 32 461 c 258,65,-1
32 445 l 257,53,54
EndSplineSet
-Validated: 8912897
+Validated: 1
EndChar
StartChar: flags.d6
@@ -22998,7 +22992,7 @@ SplineSet
32 733 32 733 32 691 c 258,94,-1
32 666 l 257,82,83
EndSplineSet
-Validated: 8929281
+Validated: 16385
EndChar
StartChar: clefs.C
@@ -33023,7 +33017,7 @@ SplineSet
149 68.8854 l 257,58,-1
149 -68.8854 l 257,55,-1
279 -16.9279 m 257,59,-1
- 321.754 -4.05231e-015 l 257,60,-1
+ 321.754 -4.05231e-15 l 257,60,-1
279 16.9279 l 257,61,-1
279 -16.9279 l 257,59,-1
EndSplineSet
View
BIN  fonts/mscore/mscore.ttf
Binary file not shown
View
2  libmscore/style.cpp
@@ -288,7 +288,7 @@ void initStyle(MStyle* s)
ALIGN_LEFT | ALIGN_TOP, QPointF(), OA, QPointF()));
AS(TextStyle(
- TR( "Dynamics"), ff, 12, false,
+ TR( "Dynamics"), ff, 20, false,
false, // italic?
false,
ALIGN_HCENTER | ALIGN_BASELINE, QPointF(0.0, 8.0), OS, QPointF(), true));
View
16 libmscore/tempotext.h
@@ -35,10 +35,10 @@ class TempoText : public Text {
public:
TempoText(Score*);
- virtual TempoText* clone() const { return new TempoText(*this); }
- virtual ElementType type() const { return TEMPO_TEXT; }
- virtual void write(Xml& xml) const;
- virtual void read(XmlReader&);
+ virtual TempoText* clone() const override { return new TempoText(*this); }
+ virtual ElementType type() const override { return TEMPO_TEXT; }
+ virtual void write(Xml& xml) const override;
+ virtual void read(XmlReader&) override;
Segment* segment() const { return (Segment*)parent(); }
Measure* measure() const { return (Measure*)parent()->parent(); }
@@ -50,12 +50,12 @@ class TempoText : public Text {
void setFollowText(bool v) { _followText = v; }
void undoSetFollowText(bool v);
- virtual void textChanged();
+ virtual void textChanged() override;
virtual void layout();
- QVariant getProperty(P_ID propertyId) const;
- bool setProperty(P_ID propertyId, const QVariant&);
- QVariant propertyDefault(P_ID id) const;
+ QVariant getProperty(P_ID propertyId) const override;
+ bool setProperty(P_ID propertyId, const QVariant&) override;
+ QVariant propertyDefault(P_ID id) const override;
};
View
62 libmscore/text.cpp
@@ -33,14 +33,17 @@ TextCursor Text::_cursor;
bool CharFormat::operator==(const CharFormat& cf) const
{
- return
- cf.type() == type()
- && cf.bold() == bold()
- && cf.italic() == italic()
- && cf.underline() == underline()
- && cf.valign() == valign()
- && cf.fontSize() == fontSize()
- && cf.fontFamily() == fontFamily();
+ if (cf.type() != type())
+ return false;
+ if (cf.bold() != bold()
+ || cf.italic() != italic()
+ || cf.underline() != underline()
+ || cf.valign() != valign()
+ || cf.fontSize() != fontSize())
+ return false;
+ if (type() == CharFormatType::TEXT)
+ return cf.fontFamily() == fontFamily();
+ return true;
}
//---------------------------------------------------------
@@ -163,13 +166,12 @@ QFont TextFragment::font(const Text* t) const
qreal m = format.fontSize() * MScore::DPI / PPI;
if (t->textStyle().sizeIsSpatiumDependent())
m *= t->spatium() / ( SPATIUM20 * MScore::DPI);
+
+ font.setUnderline(format.underline());
if (format.type() == CharFormatType::TEXT) {
font.setFamily(format.fontFamily());
font.setBold(format.bold());
font.setItalic(format.italic());
- font.setUnderline(format.underline());
- if (format.valign() != VerticalAlignment::AlignNormal)
- m *= subScriptSize;
}
else {
bool fallback = false;
@@ -187,9 +189,11 @@ QFont TextFragment::font(const Text* t) const
font.setWeight(QFont::Normal); // if not set we get system default
font.setStyleStrategy(QFont::NoFontMerging);
font.setHintingPreference(QFont::PreferVerticalHinting);
- if (f->family() == "Bravura") // HACK: why are bravura dynamics are so small?
- m *= 1.9;
+ // if (f->family() == "Bravura") // HACK: why are bravura dynamics are so small?
+ // m *= 1.9;
}
+ if (format.valign() != VerticalAlignment::AlignNormal)
+ m *= subScriptSize;
font.setPixelSize(lrint(m));
return font;
}
@@ -438,11 +442,22 @@ void TextBlock::insert(TextCursor* cursor, SymId id)
int rcol;
auto i = fragment(cursor->column(), &rcol);
if (i != _text.end()) {
- if (i->format.type() == CharFormatType::SYMBOL)
- i->ids.insert(rcol, id);
+ if (i->format.type() == CharFormatType::SYMBOL) {
+ if (!(i->format == *cursor->format())) {
+ if (rcol == 0)
+ _text.insert(i, TextFragment(cursor, id));
+ else {
+ TextFragment f2 = i->split(rcol);
+ i = _text.insert(i+1, TextFragment(cursor, id));
+ _text.insert(i+1, f2);
+ }
+ }
+ else
+ i->ids.insert(rcol, id);
+ }
else if (i->format.type() == CharFormatType::TEXT) {
if (rcol == 0) {
- if (i != _text.begin() && (i-1)->format.type() == CharFormatType::SYMBOL)
+ if (i != _text.begin() && (i-1)->format == *cursor->format())
(i-1)->ids.append(id);
else
_text.insert(i, TextFragment(cursor, id));
@@ -1134,9 +1149,8 @@ void Text::startEdit(MuseScoreView*, const QPointF& pt)
layout();
if (setCursor(pt))
updateCursorFormat(&_cursor);
- else {
+ else
_cursor.initFromStyle(textStyle());
- }
undoPushProperty(P_TEXT);
}
@@ -1293,6 +1307,7 @@ void Text::endEdit()
e->undoChangeProperty(P_TEXT, _text);
}
}
+ textChanged();
}
//---------------------------------------------------------
@@ -2070,8 +2085,17 @@ Element* Text::drop(const DropData& data)
void Text::setPlainText(const QString& s)
{
- _text = s.toHtmlEscaped();
+ setText(s.toHtmlEscaped());
}
+//---------------------------------------------------------
+// setText
+//---------------------------------------------------------
+
+void Text::setText(const QString& s)
+ {
+ _text = s;
+ textChanged();
+ }
}
View
5 libmscore/text.h
@@ -216,8 +216,8 @@ class Text : public Element {
const TextStyle& textStyle() const { return _textStyle; }
TextStyle& textStyle() { return _textStyle; }
- void setPlainText(const QString& s);
- void setText(const QString& s) { _text = s; }
+ void setPlainText(const QString&);
+ void setText(const QString&);
QString text() const { return _text; }
void insertText(const QString&);
@@ -288,6 +288,7 @@ class Text : public Element {
friend class TextBlock;
friend class TextFragment;
+ virtual void textChanged() {}
};
View
2  mscore/texttools.cpp
@@ -144,6 +144,7 @@ TextTools::TextTools(QWidget* parent)
tb->addWidget(typefaceFamily);
typefaceSize = new QDoubleSpinBox(this);
+ typefaceSize->setFocusPolicy(Qt::ClickFocus);
tb->addWidget(typefaceSize);
setWidget(tb);
@@ -250,6 +251,7 @@ void TextTools::updateTools()
QFont f(format->fontFamily());
typefaceFamily->setCurrentFont(f);
+ typefaceFamily->setEnabled(cursor->format()->type() == CharFormatType::TEXT);
typefaceSize->setValue(format->fontSize());
typefaceItalic->setChecked(format->italic());
View
10,076 share/locale/mscore_af.ts
4,810 additions, 5,266 deletions not shown
View
8,837 share/locale/mscore_ar.ts
4,189 additions, 4,648 deletions not shown
View
8,723 share/locale/mscore_ast.ts
4,132 additions, 4,591 deletions not shown
View
9,558 share/locale/mscore_be.ts
4,551 additions, 5,007 deletions not shown
View
8,735 share/locale/mscore_bg.ts
4,138 additions, 4,597 deletions not shown
View
8,689 share/locale/mscore_ca.ts
4,115 additions, 4,574 deletions not shown
View
5,149 share/locale/mscore_cs.ts
2,345 additions, 2,804 deletions not shown
View
8,691 share/locale/mscore_da.ts
4,116 additions, 4,575 deletions not shown
View
5,135 share/locale/mscore_de.ts
2,338 additions, 2,797 deletions not shown
View
6,117 share/locale/mscore_el.ts
2,830 additions, 3,287 deletions not shown
View
5,179 share/locale/mscore_en_GB.ts
2,360 additions, 2,819 deletions not shown
View
10,146 share/locale/mscore_en_US.ts
4,845 additions, 5,301 deletions not shown
View
8,713 share/locale/mscore_eo.ts
4,127 additions, 4,586 deletions not shown
View
5,179 share/locale/mscore_es.ts
2,360 additions, 2,819 deletions not shown
View
8,983 share/locale/mscore_et.ts
4,262 additions, 4,721 deletions not shown
View
8,741 share/locale/mscore_eu.ts
4,141 additions, 4,600 deletions not shown
View
8,723 share/locale/mscore_fa.ts
4,132 additions, 4,591 deletions not shown
View
8,691 share/locale/mscore_fi.ts
4,116 additions, 4,575 deletions not shown
View
8,723 share/locale/mscore_fo.ts
4,132 additions, 4,591 deletions not shown
View
8,195 share/locale/mscore_fr.ts
3,868 additions, 4,327 deletions not shown
View
6,446 share/locale/mscore_gl.ts
2,995 additions, 3,451 deletions not shown
View
9,102 share/locale/mscore_he.ts
4,323 additions, 4,779 deletions not shown
View
10,084 share/locale/mscore_hi_IN.ts
4,814 additions, 5,270 deletions not shown
View
8,711 share/locale/mscore_hr.ts
4,126 additions, 4,585 deletions not shown
View
8,693 share/locale/mscore_hu.ts
4,117 additions, 4,576 deletions not shown
View
10,080 share/locale/mscore_id.ts
4,812 additions, 5,268 deletions not shown
View
8,583 share/locale/mscore_it.ts
4,062 additions, 4,521 deletions not shown
View
8,196 share/locale/mscore_ja.ts
3,873 additions, 4,323 deletions not shown
View
8,615 share/locale/mscore_ko.ts
4,078 additions, 4,537 deletions not shown
View
8,701 share/locale/mscore_lt.ts
4,121 additions, 4,580 deletions not shown
View
9,646 share/locale/mscore_mn_MN.ts
4,595 additions, 5,051 deletions not shown
View
8,689 share/locale/mscore_nb.ts
4,115 additions, 4,574 deletions not shown
View
8,609 share/locale/mscore_nl.ts
4,075 additions, 4,534 deletions not shown
View
5,153 share/locale/mscore_pl.ts
2,347 additions, 2,806 deletions not shown
View
8,907 share/locale/mscore_pt.ts
4,224 additions, 4,683 deletions not shown
View
8,691 share/locale/mscore_pt_BR.ts
4,116 additions, 4,575 deletions not shown
View
8,723 share/locale/mscore_ro.ts
4,132 additions, 4,591 deletions not shown
View
8,581 share/locale/mscore_ru.ts
4,061 additions, 4,520 deletions not shown
View
8,693 share/locale/mscore_sk.ts
4,117 additions, 4,576 deletions not shown
View
8,753 share/locale/mscore_sl.ts
4,147 additions, 4,606 deletions not shown
View
7,501 share/locale/mscore_sr.ts
3,521 additions, 3,980 deletions not shown
View
8,691 share/locale/mscore_sv.ts
4,116 additions, 4,575 deletions not shown
View
9,306 share/locale/mscore_th.ts
4,425 additions, 4,881 deletions not shown
View
9,286 share/locale/mscore_tr.ts
4,415 additions, 4,871 deletions not shown
View
8,771 share/locale/mscore_uk.ts
4,156 additions, 4,615 deletions not shown
View
8,442 share/locale/mscore_uz@Latn.ts
4,286 additions, 4,156 deletions not shown
View
8,693 share/locale/mscore_vi.ts
4,117 additions, 4,576 deletions not shown
View
8,551 share/locale/mscore_zh_CN.ts
4,046 additions, 4,505 deletions not shown
View
8,781 share/locale/mscore_zh_TW.ts
4,161 additions, 4,620 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.