Merge pull request #375 from gregorio-project/microoptfonts

many micro-optimizations
gregorio-project · May 9, 2015 · 3f1e100 · 3f1e100
2 parents fc50c27 + 016508a
commit 3f1e100
Show file tree

Hide file tree

Showing 12 changed files with 1,405 additions and 768 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,10 +6,12 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Handling of the first syllable in gabc is now more consistent with the all other syllables.  This centers the syllable correctly when using latin syllable centering (see [#42](https://github.com/gregorio-project/gregorio/issues/42)) and makes the use of styles less surprising in the first syllable (see [#135](https://github.com/gregorio-project/gregorio/issues/135)).
 - Handling of manually-placed custos is improved.  In particular, a manual custos at the end of the score should no longer be lost when the bar happens to be at the end of the line.
+- Improved rendering of torculus resupinus flexus figures (see [#18](https://github.com/gregorio-project/gregorio/issues/18)).
 
 ### Changed
 - The spacing algorithm has completely changed, expect your scores to look quite different (better we hope).
 - Lines are now aligned on the leftmost note instead of the leftmost letter.
+- Some glyph shapes are improved a little in greciliae, it should be noticeable especially for porrectus.
 - The `O` modifier in gabc now has expanded uses beyond the salicus `(egOi)`.  A stemmed oriscus will appear on a lone pitch `(gO)` or a followed by a lower pitch `(gOe)` (see [#76](https://github.com/gregorio-project/gregorio/issues/76)).  A virga strata will appear on the second note of two ascending pitches `(giO)`.
 - With thanks to *Abbazia Mater Ecclesiae (IT)* for drawing the new shapes, the strophicus in greciliae has changed to better differentiate from the punctum inclinatum.  Use `\grechangeglyph{Stropha}{greciliae}{.caeciliae}\grechangeglyph{StrophaAucta}{greciliae}{.caeciliae}` if you prefer the old shape.
 - Default initial sizes have been chosen so that they are more appropriate when an infinitely scaling font is loaded.  LaTeX will make an automatic substitution of the closest avaialble size when such a font is not used.

diff --git a/Makefile.am b/Makefile.am
@@ -23,4 +23,8 @@ EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS.md \
 			 UPGRADE.md COPYING.md .gregorio-version VersionManager.py \
 			 build.sh install.sh install-gtex.sh
 
+fonts: make-fonts
+make-fonts:
+	make -C fonts fonts
+
 export TOP_LEVEL_MAKE = true
diff --git a/fonts/greciliae-base.sfd b/fonts/greciliae-base.sfd
@@ -19,7 +19,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1176402534
-ModificationTime: 1430806480
+ModificationTime: 1430905331
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -41,15 +41,15 @@ NameList: Adobe Glyph List
 DisplaySize: -96
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 19 19 8
+WinInfo: 0 19 8
 Grid
 148 1300 m 0
  148 -700 l 0
 17.75 1300 m 0
  17.75 -700 l 0
 EndSplineSet
 TeXData: 1 0 0 346030 173015 115343 0 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 379 134
+BeginChars: 379 139
 
 StartChar: Punctum
 Encoding: 0 -1 0
@@ -846,7 +846,7 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: vsbase
+StartChar: VirgaLineBR
 Encoding: 37 -1 37
 Width: 166
 VWidth: 2637
@@ -918,7 +918,7 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: qbase
+StartChar: QuilismaLineTR
 Encoding: 40 -1 40
 Width: 166
 VWidth: 2496
@@ -946,7 +946,7 @@ SplineSet
 EndSplineSet
 EndChar
 
-StartChar: obase
+StartChar: OriscusLineTR
 Encoding: 41 -1 41
 Width: 166
 VWidth: 2537
@@ -1104,46 +1104,46 @@ EndChar
 
 StartChar: porrectus1
 Encoding: 48 -1 48
-Width: 503
+Width: 447
 VWidth: 2553
 Flags: HW
 HStem: -409 15 -94 15 221 15 536 15
 LayerCount: 2
 Fore
 SplineSet
-471.85 -201.2 m 4
- 315.859 -201.2 150.71 -172.379 0 -40 c 5
- 0 157.601 l 5
- 47.667 110.8 126.963 58.4531 237.85 0.299805 c 4
- 289.005 -26.5283 357 -40.7998 415.75 -40 c 4
- 451.28 -39.5166 476.333 -23.5322 485 9.40039 c 5
- 485 37.2002 l 5
- 503 37.2002 l 5
- 503 -183 l 6
- 503 -195.133 492.65 -201.2 471.85 -201.2 c 4
+415.85 -201.2 m 0
+ 287 -200.5 123.5 -138.801 0 -34 c 1
+ 0 157.601 l 1
+ 49.5 112.45 117.5 55.5 228.85 -0.700195 c 0
+ 265.646 -19.2715 321.5 -42.8004 359.75 -40 c 0
+ 395.189 -37.4055 420.333 -23.5322 429 9.40039 c 1
+ 429 37.2002 l 1
+ 447 37.2002 l 1
+ 447 -183 l 2
+ 447 -195.133 436.65 -201.313 415.85 -201.2 c 0
 EndSplineSet
 EndChar
 
 StartChar: porrectus2
 Encoding: 49 -1 49
-Width: 629
+Width: 547
 VWidth: 2575
 Flags: HW
 HStem: -409 15 -94 15 221 15 536 15
 LayerCount: 2
 Fore
 SplineSet
-628 -354.1 m 5
- 628.006 -361.908 616.933 -373.562 597 -374 c 5
- 512.933 -374 412.48 -336.605 295.4 -262.2 c 4
- 162.892 -177.99 65 -99.2676 0 -25.5996 c 5
- 0 172 l 5
- 139.94 -11.6719 354.969 -174.639 540.9 -201.8 c 5
- 552.601 -201.8 l 6
- 579.468 -201.8 610 -177.6 610 -152.4 c 6
- 610 -131.1 l 5
- 628 -131.1 l 5
- 628 -354.1 l 5
+547 -354.1 m 5
+ 547.006 -361.908 535.933 -368.562 516 -369 c 1
+ 461.933 -369 402.48 -336.605 285.4 -262.2 c 0
+ 152.892 -177.99 65 -99.2676 0 -25.5996 c 1
+ 0 172 l 1
+ 139.94 -11.6719 374 -183 481.9 -201.8 c 1
+ 493.601 -201.8 l 2
+ 512.75 -201.8 529 -167.5 529 -152.4 c 2
+ 529 -131.1 l 1
+ 547 -131.1 l 1
+ 547 -354.1 l 5
 EndSplineSet
 EndChar
 
@@ -1152,67 +1152,70 @@ Encoding: 50 -1 50
 Width: 628
 VWidth: 2556
 Flags: HW
-HStem: -409 15 -94 15 221 15 536 15
+VStem: 610 18<-358.804 -326.4>
 LayerCount: 2
 Fore
 SplineSet
-598 -550.9 m 4
- 516.533 -523.167 416.433 -458.601 297.7 -357.2 c 4
- 215.367 -288.733 116.133 -183 0 -40 c 5
- 0 157.6 l 5
- 132.601 -6.2002 233.259 -126.734 305.601 -196.601 c 4
- 440 -326.4 542 -374.4 561.7 -374.9 c 4
- 582.493 -375.428 610 -360.4 610 -340.3 c 5
- 610 -326.4 l 5
- 628 -326.4 l 5
- 628 -530.101 l 6
- 628 -545.698 622.268 -553.5 611 -553.5 c 4
- 607.533 -553.5 603.2 -552.633 598 -550.9 c 4
+598 -556 m 0
+ 517 -528 416 -464 298 -362 c 0
+ 215 -294 116 -188 0 -45 c 1
+ 0 162 l 5
+ 133 -2 233 -123 306 -193 c 4
+ 440 -322 547 -370 567 -370 c 0
+ 587 -370 610 -360 610 -340 c 1
+ 610 -326 l 1
+ 628 -326 l 1
+ 628 -535 l 2
+ 628 -551 622 -559 611 -559 c 0
+ 608 -559 603 -558 598 -556 c 0
 EndSplineSet
 EndChar
 
 StartChar: porrectus4
 Encoding: 51 -1 51
-Width: 628
+Width: 704
 VWidth: 2500
 Flags: HW
 HStem: -409 15 -94 15 221 15 536 15
 LayerCount: 2
 Fore
 SplineSet
-598 -727.399 m 0
- 448.206 -656.618 231.179 -394.498 0 -54 c 1
- 0 161.601 l 1
- 61.5332 47.2002 162.165 -98.7559 301.601 -276.5 c 0
- 392.664 -392.583 455.7 -468.199 538.9 -533.199 c 0
- 547.567 -539.267 555.367 -542.3 562.3 -542.3 c 0
- 580.5 -542.3 600.467 -537.8 610 -498.8 c 1
- 610 -477.399 l 1
- 628 -477.399 l 1
- 628 -689.899 l 2
- 628 -705.495 623.133 -713.3 613.601 -713.3 c 0
- 609.268 -713.3 604.067 -730 598 -727.399 c 0
+668 -709.399 m 0
+ 518 -609 224 -393 0 -54 c 1
+ 0 178.601 l 1
+ 68 67 167.609 -64.1445 322.601 -228.5 c 0
+ 426.333 -338.5 510 -418 625.9 -509.199 c 0
+ 634.215 -515.742 642.367 -516.3 649.3 -516.3 c 0
+ 667.5 -516.3 679 -509 686 -485.8 c 1
+ 686 -464.399 l 1
+ 704 -464.399 l 1
+ 704 -684.899 l 2
+ 704 -700.495 693.133 -713.3 683.601 -713.3 c 0
+ 679.268 -713.3 673.486 -713.071 668 -709.399 c 0
 EndSplineSet
 EndChar
 
 StartChar: porrectus5
 Encoding: 52 -1 52
-Width: 931
+Width: 849
 VWidth: 2048
 Flags: HW
 HStem: -409 15 -94 15 221 15 536 15
 LayerCount: 2
 Fore
 SplineSet
-0 -34 m 1
- 0 183 l 2
- 0 187.739 5.35547 186.627 7 182.75 c 0
- 122.5 -89.5 386.5 -592 913 -712 c 1
- 913 -669 913 -654.875 913 -612 c 1
- 923.125 -612 926.281 -611.9 931 -612 c 1
- 931 -841 l 2
- 931 -843.229 930.646 -842.992 928.76 -842.591 c 1
- 351 -717 54 -249 0 -34 c 1
+813 -847.399 m 0
+ 663.206 -776.618 231.179 -394.498 0 -54 c 1
+ 0 178.601 l 1
+ 61.5332 64.2002 212.399 -131.5 374.5 -300 c 0
+ 476.788 -406.326 650.5 -570 770.9 -647.199 c 0
+ 779.807 -652.91 787.367 -654.3 794.3 -654.3 c 0
+ 812.5 -654.3 824 -647 831 -623.8 c 1
+ 831 -602.399 l 1
+ 849 -602.399 l 1
+ 849 -822.899 l 2
+ 849 -838.495 838.133 -851.3 828.601 -851.3 c 0
+ 824.268 -851.3 819.067 -850 813 -847.399 c 0
 EndSplineSet
 EndChar
 
@@ -2854,7 +2857,7 @@ StartChar: OriscusScapusLongqueue
 Encoding: 126 -1 123
 Width: 166
 VWidth: 2537
-Flags: HWO
+Flags: HW
 HStem: -409 15 -94 15 221 15 536 15
 LayerCount: 2
 Fore
@@ -3114,5 +3117,121 @@ SplineSet
  -2 64 l 25
 EndSplineSet
 EndChar
+
+StartChar: porrectusam11
+Encoding: 136 -1 134
+Width: 503
+VWidth: 2553
+Flags: W
+HStem: -409 15 -94 15 221 15 536 15
+LayerCount: 2
+Fore
+SplineSet
+471.85 -201.2 m 4
+ 315.859 -201.2 150.71 -172.379 0 -40 c 5
+ 0 157.601 l 5
+ 47.667 110.8 126.963 58.4531 237.85 0.299805 c 4
+ 289.005 -26.5283 357 -40.7998 415.75 -40 c 4
+ 451.28 -39.5166 476.333 -23.5322 485 9.40039 c 5
+ 485 37.2002 l 5
+ 503 37.2002 l 5
+ 503 -183 l 6
+ 503 -195.133 492.65 -201.2 471.85 -201.2 c 4
+EndSplineSet
+EndChar
+
+StartChar: porrectusam12
+Encoding: 137 -1 135
+Width: 629
+VWidth: 2575
+Flags: HW
+LayerCount: 2
+Fore
+SplineSet
+628 -354.1 m 1
+ 628.006 -361.908 616.933 -373.562 597 -374 c 1
+ 512.933 -374 412.48 -336.605 295.4 -262.2 c 0
+ 162.892 -177.99 65 -99.2676 0 -25.5996 c 1
+ 0 172 l 1
+ 139.94 -11.6719 354.969 -174.639 540.9 -201.8 c 1
+ 552.601 -201.8 l 2
+ 579.468 -201.8 610 -177.6 610 -152.4 c 2
+ 610 -131.1 l 1
+ 628 -131.1 l 1
+ 628 -354.1 l 1
+EndSplineSet
+EndChar
+
+StartChar: porrectusam13
+Encoding: 138 -1 136
+Width: 678
+VWidth: 2556
+Flags: HW
+VStem: 612 18<-358.804 -326.4>
+LayerCount: 2
+Fore
+SplineSet
+644 -536 m 0
+ 549 -509.2 416 -459 298 -357 c 0
+ 215 -289 116 -183 0 -40 c 1
+ 0 158 l 1
+ 133 -6 233 -127 306 -197 c 0
+ 440 -326 548 -369.2 612 -375 c 0
+ 631.918 -376.805 660 -360 660 -340 c 1
+ 660 -326 l 1
+ 678 -326 l 1
+ 678 -511 l 2
+ 678 -527 668 -539 657 -539 c 0
+ 654 -539 649.183 -537.462 644 -536 c 0
+EndSplineSet
+EndChar
+
+StartChar: porrectusam14
+Encoding: 139 -1 137
+Width: 721
+VWidth: 2500
+Flags: HW
+HStem: -409 15 -94 15 221 15 536 15
+LayerCount: 2
+Fore
+SplineSet
+691 -717.399 m 0
+ 370.167 -561 250 -440 0 -54 c 1
+ 0 168.601 l 1
+ 61.5332 54.2002 159.01 -94.2767 301.601 -269.5 c 0
+ 437.5 -436.5 532.167 -502 629.9 -531.199 c 4
+ 640.038 -534.228 648.367 -535.3 655.3 -535.3 c 0
+ 673.5 -535.3 693.467 -530.8 703 -491.8 c 1
+ 703 -470.399 l 1
+ 721 -470.399 l 1
+ 721 -679.899 l 2
+ 721 -695.495 718.133 -722.3 708.601 -722.3 c 0
+ 704.268 -722.3 696.933 -720.292 691 -717.399 c 0
+EndSplineSet
+EndChar
+
+StartChar: porrectusam15
+Encoding: 140 -1 138
+Width: 933
+VWidth: 2048
+Flags: HW
+HStem: -409 15 -94 15 221 15 536 15
+LayerCount: 2
+Fore
+SplineSet
+903 -842.399 m 0
+ 471 -707 254 -471.751 0 -54 c 1
+ 0 168.601 l 1
+ 61.5332 54.2002 264.258 -242.258 424 -402 c 4
+ 580 -558 667 -632 851.9 -678.199 c 0
+ 862.165 -680.764 866.367 -680.3 873.3 -680.3 c 0
+ 891.5 -680.3 905.467 -665.8 915 -626.8 c 1
+ 915 -605.399 l 1
+ 933 -605.399 l 1
+ 933 -804.899 l 2
+ 933 -820.495 930.133 -847.3 920.601 -847.3 c 0
+ 916.268 -847.3 909.298 -844.373 903 -842.399 c 0
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont