[cantarell-fonts/greek] ffi, fi ligature fixes

[Jakub Steiner <jimmac src gnome org>]

commit ecb90648414b20213f57515169ad3f9d631eb4fb
Author: Jakub Steiner <jimmac gmail com>
Date:   Mon Nov 26 14:48:02 2012 +0100

    ffi, fi ligature fixes

 otf/Cantarell-Bold.otf    |  Bin 50832 -> 50812 bytes
 src/Cantarell-Bold.sfd    |  126 ++++++++++++++++++++-------------------------
 src/Cantarell-Regular.sfd |  108 +++++++++++++++++---------------------
 3 files changed, 105 insertions(+), 129 deletions(-)
---
diff --git a/otf/Cantarell-Bold.otf b/otf/Cantarell-Bold.otf
index fecef94..4c43832 100644
Binary files a/otf/Cantarell-Bold.otf and b/otf/Cantarell-Bold.otf differ
diff --git a/src/Cantarell-Bold.sfd b/src/Cantarell-Bold.sfd
index 3ea9e6c..6ae3a76 100644
--- a/src/Cantarell-Bold.sfd
+++ b/src/Cantarell-Bold.sfd
@@ -21,7 +21,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1236980653
-ModificationTime: 1353003869
+ModificationTime: 1353939612
 PfmFamily: 33
 TTFWeight: 700
 TTFWidth: 5
@@ -52,7 +52,7 @@ NameList: Adobe Glyph List
 DisplaySize: -48
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 57 19 12
+WinInfo: 168 24 18
 BeginPrivate: 0
 EndPrivate
 Grid
@@ -2098,7 +2098,7 @@ StartChar: zero
 Encoding: 48 48 66
 Width: 660
 VWidth: 1023
-Flags: HWO
+Flags: HW
 HStem: -10 114<253.279 407.14> 588 115<251.172 408.419>
 VStem: 26.5 123<227.02 470.272> 510.5 123<225.789 469.377>
 LayerCount: 3
@@ -11519,11 +11519,11 @@ EndChar
 
 StartChar: uniFB01
 Encoding: 64257 64257 383
-Width: 700
+Width: 703
 VWidth: 0
-Flags: HW
-HStem: 0 21G<110 230 532 652> 379 103<30 110 230 422> 562 132<525 660> 591 107<260.209 443.734>
-VStem: 110 120<0 379 482 563.17> 525 135<562 694> 532 120<0 482>
+Flags: WO
+HStem: 0 21G<146.72 266.72 508.862 628.862> 379 103<66.7197 146.72 266.72 508.862> 603 106.313<301.6 509.904>
+VStem: 146.72 120<0 379 482 568.662> 508.862 120<0 379 550.104 591.767>
 LayerCount: 3
 Back
 SplineSet
@@ -11559,33 +11559,28 @@ SplineSet
 EndSplineSet
 Fore
 SplineSet
-505 694 m 1
- 640 694 l 1
- 640 562 l 1
- 505 562 l 1
- 505 694 l 1
-110 511 m 2
- 110 584 112 698 315 698 c 0
- 343 698 384 696 443 678 c 1
- 460 672 l 1
- 440 575 l 1
- 420 580 l 2
- 406 583 376 591 347 591 c 0
- 264 591 230 561 230 515 c 2
- 230 482 l 1
- 512 482 l 1
- 632 482 l 1
- 632 0 l 1
- 512 0 l 1
- 512 379 l 1
- 230 379 l 1
- 230 0 l 1
- 110 0 l 1
- 110 379 l 1
- 30 379 l 1
- 30 482 l 1
- 110 482 l 1
- 110 511 l 2
+146.72 511 m 2
+ 146.72 584 174.176 709.313 377.176 709.313 c 1
+ 478.151 709.313 582.718 683.774 642.583 664.265 c 1
+ 631.664 550.104 l 1
+ 511.595 550.104 l 1
+ 512.12 584.771 l 1
+ 512.12 584.771 463.151 603 383.72 603 c 0
+ 300.72 603 266.72 561 266.72 515 c 2
+ 266.72 482 l 1
+ 508.862 482 l 1
+ 628.862 482 l 1
+ 628.862 0 l 1
+ 508.862 0 l 1
+ 508.862 379 l 1
+ 266.72 379 l 1
+ 266.72 0 l 1
+ 146.72 0 l 1
+ 146.72 379 l 1
+ 66.7197 379 l 1
+ 66.7197 482 l 1
+ 146.72 482 l 1
+ 146.72 511 l 2
 EndSplineSet
 LCarets2: 1 0 
 Ligature2: "'liga' Standard Ligatures in Latin lookup 0-1" f i
@@ -11632,7 +11627,7 @@ EndChar
 
 StartChar: uniFB03
 Encoding: 64259 64259 385
-Width: 1027
+Width: 936
 VWidth: 0
 Flags: HW
 HStem: 0 21G<-200 -80 222 342> 379 103<-280 -200 -80 112> 562 132<215 350> 591 107<-49.791 133.734>
@@ -11640,27 +11635,7 @@ VStem: -200 120<0 379 482 563.17> 215 135<562 694> 222 120<0 482>
 LayerCount: 3
 Fore
 SplineSet
-464 511 m 2
- 464 584 459 698 662 698 c 0
- 690 698 724 696 783 678 c 1
- 800 672 l 1
- 780 575 l 1
- 760 580 l 2
- 746 583 723 591 694 591 c 0
- 611 591 584 561 584 515 c 2
- 584 482 l 1
- 839 482 l 5
- 959 482 l 5
- 959 0 l 5
- 839 0 l 5
- 839 379 l 5
- 584 379 l 1
- 584 0 l 1
- 464 0 l 1
- 464 379 l 1
- 406.044 379 l 1
- 391 379 l 1
- 225.044 379 l 1
+225.044 379 m 1
  225.044 0 l 1
  105.044 0 l 1
  105.044 379 l 1
@@ -11676,15 +11651,26 @@ SplineSet
  390.044 583 360.044 591 331.044 591 c 0
  255.645 591 225.044 561 225.044 515 c 2
  225.044 482 l 1
- 391 482 l 1
- 406.044 482 l 1
- 464 482 l 1
- 464 511 l 2
-832 694 m 5
- 967 694 l 5
- 967 562 l 5
- 832 562 l 5
- 832 694 l 5
+ 447.72 482 l 1
+ 447.72 511 l 2
+ 447.72 584 475.176 709.313 678.176 709.313 c 1
+ 759.599 706.159 823.718 683.774 883.583 664.265 c 1
+ 871.664 550.103 l 1
+ 751.595 550.103 l 1
+ 753.12 584.771 l 1
+ 753.12 584.771 711.812 596 684.72 596 c 0
+ 601.72 596 567.72 561 567.72 515 c 2
+ 567.72 482 l 1
+ 746.862 482 l 1
+ 866.862 482 l 1
+ 866.862 0 l 1
+ 746.862 0 l 1
+ 746.862 379 l 1
+ 567.72 379 l 1
+ 567.72 0 l 1
+ 447.72 0 l 1
+ 447.72 379 l 1
+ 225.044 379 l 1
 EndSplineSet
 LCarets2: 2 0 0 
 Ligature2: "'liga' Standard Ligatures in Latin lookup 0-1" f uniFB01
@@ -11696,15 +11682,15 @@ StartChar: uniFB04
 Encoding: 64260 64260 386
 Width: 1122
 VWidth: 0
-Flags: HWO
+Flags: HW
 HStem: -9.90039 104.22<981.5 1144.59> 0 21G<146 266 516 636> 379 103<66 146 266 516 636 829> 591 107<296.209 
479.734 666.459 850.648>
 VStem: 146 120<0 379 482 563.17> 516 120<0 379 482 563.17> 909 120.14<102.826 693.75>
 LayerCount: 3
 Fore
 SplineSet
 497 511 m 2
- 497 584 516 698 719 698 c 0
- 832.5 698 895.56 685.444 951.5 677.05 c 2
+ 497 584 515.521 705.05 718.521 705.05 c 0
+ 832.021 705.05 895.561 685.443 951.5 677.05 c 2
  972.5 673.898 l 1
  971.145 163.32 l 2
  971.046 126.1 973.046 94.3193 1034.64 94.3193 c 0
@@ -11713,8 +11699,8 @@ SplineSet
  1074.64 8.09961 1059.4 -9.90039 955 -9.90039 c 0
  892 -9.90039 850.819 37.0928 851 105.1 c 2
  852.28 587.988 l 1
- 817.5 594.05 786.101 596.858 751 597 c 0
- 668 597 617 561 617 515 c 2
+ 833.189 595.05 785.623 603.908 750.521 604.05 c 0
+ 667.521 604.05 617 579.55 617 515 c 2
  617 482 l 1
  809 482 l 1
  809 379 l 1
diff --git a/src/Cantarell-Regular.sfd b/src/Cantarell-Regular.sfd
index 5a57d62..fda67a4 100644
--- a/src/Cantarell-Regular.sfd
+++ b/src/Cantarell-Regular.sfd
@@ -22,7 +22,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1236980653
-ModificationTime: 1353003840
+ModificationTime: 1353937639
 PfmFamily: 33
 TTFWeight: 400
 TTFWidth: 5
@@ -53,7 +53,7 @@ NameList: Adobe Glyph List
 DisplaySize: -48
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 50 25 19
+WinInfo: 100 25 19
 BeginPrivate: 0
 EndPrivate
 Grid
@@ -14302,7 +14302,7 @@ EndChar
 
 StartChar: uniFB01
 Encoding: 64257 64257 383
-Width: 572
+Width: 487
 VWidth: 0
 Flags: HW
 HStem: 0 21<95.9523 177 460 542> 419 63<25 95 176 337> 463 20<460 542> 586 83<460 542> 631.456 
66.352<210.753 361.572>
@@ -14310,34 +14310,29 @@ VStem: 95 81<0 419 482 598.066> 460 82<0 483 586 669>
 LayerCount: 4
 Fore
 SplineSet
-280.998 631.456 m 0
- 224.213 631.456 184.257 599.045 178 559 c 0
- 177 552 176 541 176 528 c 2
- 176 482 l 1
- 430 482 l 1
- 430 482.934 l 1
- 512 482.934 l 1
- 512 -0.0664062 l 1
- 430 -0.0664062 l 1
- 430 419 l 1
- 176 419 l 1
- 177 0 l 1
- 96 0 l 1
- 95 419 l 1
- 25 419 l 1
- 25 482 l 1
- 95 482 l 1
- 95 531 l 2
- 95 573 100 604 110 622 c 0
- 138.782 672.368 187.379 697.808 255.791 697.808 c 0
- 296.645 697.808 338.183 689.145 372 679 c 1
- 359 619 l 1
- 328.489 627.375 302.632 631.456 280.998 631.456 c 0
-430 668.934 m 1
- 512 668.934 l 1
- 512 585.934 l 1
- 430 585.934 l 1
- 430 668.934 l 1
+278.68 631.603 m 4
+ 221.895 631.603 181.938 599.191 175.682 559.146 c 4
+ 174.682 552.146 173.682 541.146 173.682 528.146 c 6
+ 173.682 482.146 l 5
+ 422 483.08 l 5
+ 422 0.0800781 l 5
+ 340 0.0800781 l 5
+ 340 419.146 l 5
+ 173.682 419.146 l 5
+ 174.682 0.146484 l 5
+ 93.6816 0.146484 l 5
+ 92.6816 419.146 l 5
+ 22.6816 419.146 l 5
+ 22.6816 482.146 l 5
+ 92.6816 482.146 l 5
+ 92.6816 531.146 l 6
+ 92.6816 573.146 97.6816 604.146 107.682 622.146 c 4
+ 136.464 672.514 185.061 697.954 253.473 697.954 c 4
+ 353.326 697.954 396.676 679.392 430.493 669.247 c 5
+ 421.493 593.247 l 5
+ 344.043 594.082 l 5
+ 339.643 627.732 l 5
+ 324.393 629.482 300.027 631.603 278.68 631.603 c 4
 EndSplineSet
 Layer: 3
 Refer: 4 105 N 1 0 0 1 400.391 0 2
@@ -14391,7 +14386,7 @@ EndChar
 
 StartChar: uniFB03
 Encoding: 64259 64259 385
-Width: 884
+Width: 796
 VWidth: 0
 Flags: HW
 HStem: 0 21G<95.952 177 415.952 497 737 817> 419 63<25 95 176 415 496 658> 602 92<729 824> 619 60<282.015 
360.517 602.385 681.4> 631.456 66.3516<210.753 361.572 530.94 682.072>
@@ -14399,21 +14394,7 @@ VStem: 95 81<0 419 482 598.066> 415 81<0 419 482 597.65> 729 95<602 694> 737 80<
 LayerCount: 4
 Fore
 SplineSet
-592.354 631.456 m 0
- 534.811 631.456 496.538 599.201 489 559 c 0
- 488 552 487 541 487 528 c 2
- 487 482 l 1
- 737 482 l 1
- 739 482 l 1
- 817 482 l 1
- 817 0 l 1
- 737 0 l 1
- 737 419 l 1
- 487 419 l 1
- 488 0 l 1
- 407 0 l 1
- 406 419 l 1
- 176 419 l 1
+176 419 m 1
  177 0 l 1
  96 0 l 1
  95 419 l 1
@@ -14429,18 +14410,27 @@ SplineSet
  224.213 631.456 184.257 599.045 178 559 c 0
  177 552 176 541 176 528 c 2
  176 482 l 1
- 406 482 l 1
- 406 531 l 2
- 406 573 411 604 421 622 c 0
- 449.782 672.368 498.379 697.808 566.791 697.808 c 0
- 607.645 697.808 649.183 689.145 683 679 c 1
- 671 619 l 1
- 640.489 627.375 614.274 631.456 592.354 631.456 c 0
-729 694 m 1
- 824 694 l 1
- 824 602 l 1
- 729 602 l 1
- 729 694 l 1
+ 401.682 482.146 l 1
+ 401.682 531.146 l 2
+ 401.682 573.146 406.682 604.146 416.682 622.146 c 0
+ 445.464 672.514 494.061 697.954 562.473 697.954 c 0
+ 662.326 697.954 705.676 679.392 739.493 669.247 c 1
+ 730.493 593.247 l 1
+ 653.043 594.082 l 1
+ 648.643 627.732 l 1
+ 633.393 629.482 609.027 631.603 587.68 631.603 c 0
+ 530.895 631.603 490.938 599.191 484.682 559.146 c 0
+ 483.682 552.146 482.682 541.146 482.682 528.146 c 2
+ 482.682 482.146 l 1
+ 731 483.08 l 1
+ 731 0.0800781 l 1
+ 649 0.0800781 l 1
+ 649 419.146 l 1
+ 482.682 419.146 l 1
+ 483.682 0.146484 l 1
+ 402.682 0.146484 l 1
+ 401.682 419.146 l 1
+ 176 419 l 1
 EndSplineSet
 Layer: 3
 SplineSet