Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
492 lines (483 sloc) 13.9 KB
From 7b93bc60b7c5255214cbc2bb651a6e775e7b2c77 Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Thu, 10 May 2012 13:01:44 +0000
Subject: Simplify shapes based on feedback by a genuine Russian.
---
diff --git a/otf/Cantarell-Bold.otf b/otf/Cantarell-Bold.otf
index 2cb815a..77ed8ef 100644
--- a/otf/Cantarell-Bold.otf
+++ b/otf/Cantarell-Bold.otf
Binary files differ
diff --git a/otf/Cantarell-Regular.otf b/otf/Cantarell-Regular.otf
index f5aa770..3940a15 100644
--- a/otf/Cantarell-Regular.otf
+++ b/otf/Cantarell-Regular.otf
Binary files differ
diff --git a/src/Cantarell-Bold.sfd b/src/Cantarell-Bold.sfd
index 15807d2..d88a1aa 100644
--- a/src/Cantarell-Bold.sfd
+++ b/src/Cantarell-Bold.sfd
@@ -22,7 +22,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1236980653
-ModificationTime: 1336646972
+ModificationTime: 1336654869
PfmFamily: 33
TTFWeight: 700
TTFWidth: 5
@@ -13112,19 +13112,30 @@ StartChar: afii10043
Encoding: 1065 1065 419
Width: 1184
VWidth: 2048
-Flags: W
+Flags: HW
HStem: 0 123.5<227.2 511.605 653.405 935.605> 675.8 20<90.9004 227.2 511.605 653.405 935.605 1077.41>
VStem: 90.9004 136.3<123.5 695.8> 511.605 141.8<123.5 695.8> 935.605 141.8<123.5 695.8> 982.924 130<-148 118.354>
LayerCount: 3
Fore
SplineSet
-982.924 -148 m 1xf4
- 982.924 118.354 l 1
+1077.41 118.354 m 1
1112.92 118.354 l 1
1112.92 -148 l 1
- 982.924 -148 l 1xf4
+ 982.924 -148 l 1
+ 982.924 0 l 1
+ 90.9004 0 l 1
+ 90.9004 695.8 l 1
+ 227.2 695.8 l 1
+ 227.2 123.5 l 1
+ 511.605 123.5 l 1
+ 511.605 695.8 l 1
+ 653.405 695.8 l 1
+ 653.405 123.5 l 1
+ 935.605 123.5 l 1
+ 935.605 695.8 l 1
+ 1077.41 695.8 l 1
+ 1077.41 118.354 l 1
EndSplineSet
-Refer: 418 1064 N 1 0 0 1 0 0 2
EndChar
StartChar: afii10044
@@ -13498,7 +13509,7 @@ StartChar: afii10069
Encoding: 1076 1076 430
Width: 745
VWidth: 2048
-Flags: WO
+Flags: W
HStem: -20 20G<165 600>
LayerCount: 3
Back
@@ -13792,7 +13803,7 @@ StartChar: afii10077
Encoding: 1083 1083 437
Width: 727
VWidth: 2048
-Flags: WO
+Flags: W
HStem: -10.375 108<53.1598 146.287> 481.934 21G<544.16 579.16>
LayerCount: 3
Back
@@ -13903,7 +13914,7 @@ StartChar: afii10080
Encoding: 1086 1086 440
Width: 608
VWidth: 1023
-Flags: WO
+Flags: W
HStem: -10 90<230.691 379.874> 400 90<222.82 374.127>
VStem: 44.9072 119<168.275 325.09> 441.106 118<159.172 317.512>
LayerCount: 3
@@ -13961,7 +13972,7 @@ StartChar: afii10084
Encoding: 1090 1090 444
Width: 581
VWidth: 2048
-Flags: HWO
+Flags: HW
HStem: 0 21G<231.2 353.2> 384 110<25 231.2 353.2 556>
VStem: 231.2 122<0 384>
LayerCount: 3
@@ -14255,19 +14266,31 @@ StartChar: afii10092
Encoding: 1098 1098 452
Width: 571
VWidth: 2048
-Flags: W
-HStem: -11 92<196.436 368.307> 0 21<64 158.17> 241 86<175.459 372.75> 406.799 75.1353<0 174.042> 461.934 20<64 174>
+Flags: HW
+HStem: -11 92<196.436 368.307> 0 21<64 158.17> 241 86<175.459 372.75> 406.799 75.1353<0 174.042> 461.934 19.9996<64 174>
VStem: 64 110<97.4617 228.29 309.672 481.934> 404.5 121<112.439 209.49>
LayerCount: 3
Fore
SplineSet
-0 481.934 m 1x36
- 174.042 481.934 l 1x2e
- 174.042 406.799 l 1
+291.5 241 m 0
+ 267.472 241.728 203.013 231.156 174 223.268 c 1
+ 174 103.35 l 1
+ 211.975 93 242.08 81.208 296.5 81 c 0
+ 354.106 80.7803 404.5 112 404.5 158 c 0
+ 404.5 213.167 357.5 239 291.5 241 c 0
+174.042 481.934 m 1
+ 174 309.672 l 1
+ 204.671 318.219 264.494 327.561 321.289 327 c 0
+ 422.5 326 525.5 257.005 525.5 161 c 0
+ 525.5 63 445.952 -8.60059 308 -11 c 0
+ 250.5 -12 190.486 13.7949 160 23 c 1
+ 145.974 0 l 1
+ 64 0 l 1
+ 64 406.799 l 1
0 406.799 l 1
- 0 481.934 l 1x36
+ 0 481.934 l 5
+ 174.042 481.934 l 1
EndSplineSet
-Refer: 454 1100 N 1 0 0 1 0 0 2
EndChar
StartChar: afii10093
@@ -14458,18 +14481,14 @@ StartChar: afii10097
Encoding: 1103 1103 457
Width: 577
VWidth: 2048
-Flags: W
+Flags: HW
HStem: -0.980469 20.167G<84.0384 198.3 408.815 432.804> 197.667 70.333<362 409.794> 469.939 12.2195G<251.202 304.079 434.378 537.809>
VStem: 410 127.809<0 197.667 268 374.8>
LayerCount: 3
Fore
SplineSet
-76.0986 343.89 m 0
- 76.4629 384.571 95.5537 420.527 130.875 448.866 c 1
- 170.303 478.28 221.88 489.939 280.524 489.939 c 0
- 327.633 489.939 369.3 473.711 426.265 450.378 c 1
- 448.15 482.159 l 1
- 537.809 482.159 l 1
+322.3 481.934 m 6
+ 537.809 482 l 1
537.809 0 l 1
517.809 0 l 0
478.094 0 450.226 -0.335938 432.804 -0.963867 c 0
@@ -14479,14 +14498,15 @@ SplineSet
386.622 191.864 364.557 185.656 336.3 181.711 c 1
198.3 -0 l 1
68.7695 -0.980469 l 1
- 216.091 191.989 l 5
+ 216.091 191.989 l 1
152.3 215.711 75.3 254.711 76.0986 343.89 c 0
+ 78.3 427.063 151.3 481.881 322.3 481.934 c 6
200 337 m 0
- 196.3 288.712 275 256 362 264 c 1
+ 200 279.063 263.3 268 322 268 c 2
410 268 l 1
- 410 367 l 1
- 376.3 379.711 351.075 388.564 321.289 394.711 c 0
- 258.289 407.712 203.876 387.58 200 337 c 0
+ 410 398 l 1
+ 321.289 398 l 2
+ 256.984 396.296 200 385.063 200 337 c 0
EndSplineSet
EndChar
diff --git a/src/Cantarell-Regular.sfd b/src/Cantarell-Regular.sfd
index 49d8454..d8ab72c 100644
--- a/src/Cantarell-Regular.sfd
+++ b/src/Cantarell-Regular.sfd
@@ -23,7 +23,7 @@ OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1236980653
-ModificationTime: 1336650828
+ModificationTime: 1336654623
PfmFamily: 33
TTFWeight: 400
TTFWidth: 5
@@ -1910,7 +1910,7 @@ StartChar: k
Encoding: 107 107 22
Width: 503
VWidth: 1023
-Flags: HMW
+Flags: HMWO
HStem: 0 73 217 73 408 73 651 20
VStem: 68 80<0 738>
LayerCount: 4
@@ -3260,28 +3260,28 @@ VStem: 90 83<73 333 397 630> 445 80<455.096 589.018> 493 82<129.551 273.926>
LayerCount: 4
Fore
SplineSet
-445 523 m 4xf8
- 445 595.153 390.012 630 306 630 c 6
- 173 630 l 5
- 173 397 l 5
- 261 400 l 5
- 384 403 445 444 445 523 c 4xf8
-500 202 m 4
- 500 296.148 415.453 339.516 314.838 339.516 c 4
- 308.039 339.516 301.091 339.343 294 339 c 6
- 173 333 l 5
- 173 73 l 5
- 326 73 l 6
- 419.778 73 500 109.278 500 202 c 4
-435 388 m 5
- 514.426 373.223 582 301.279 582 210 c 4
- 582 152 560 103 516 63 c 4
- 469 21 402 0 315 0 c 6
- 90 0 l 5
- 90 694 l 5
- 334 694 l 6
- 443.235 694 525 632.273 525 527 c 4
- 525 470.422 475.964 403.605 435 388 c 5
+445 523 m 0xf8
+ 445 595.153 390.012 630 306 630 c 2
+ 173 630 l 1
+ 173 397 l 1
+ 261 400 l 1
+ 384 403 445 444 445 523 c 0xf8
+500 202 m 0
+ 500 296.148 415.453 339.516 314.838 339.516 c 0
+ 308.039 339.516 301.091 339.343 294 339 c 2
+ 173 333 l 1
+ 173 73 l 1
+ 326 73 l 2
+ 419.778 73 500 109.278 500 202 c 0
+435 388 m 1
+ 514.426 373.223 582 301.279 582 210 c 0
+ 582 152 560 103 516 63 c 0
+ 469 21 402 0 315 0 c 2
+ 90 0 l 1
+ 90 694 l 1
+ 334 694 l 2
+ 443.235 694 525 632.273 525 527 c 0
+ 525 470.422 475.964 403.605 435 388 c 1
EndSplineSet
Layer: 3
SplineSet
@@ -15722,72 +15722,14 @@ EndChar
StartChar: afii10067
Encoding: 1074 1074 428
-Width: 492
+Width: 632
VWidth: 1023
Flags: W
-HStem: -6 60<187.679 324.481> 214 60<146 296.991> 429 64<170.294 323.287>
-VStem: 65 81<87.4961 214 274 402.6> 343.7 79<316.226 407.837> 356.7 80<84.2734 184.703>
+HStem: 0 75.5<143.8 323.475> 217 56<144.56 274.232> 422.601 59.333<144.56 282.599>
+VStem: 66.7998 77.7598<75.5 217 273 422.601> 305.8 76<300.921 400.863> 348.916 76.8838<99.6011 192.71>
LayerCount: 4
Back
SplineSet
-252.67 498.215 m 0
- 258.224 498.215 264.268 498.052 270.801 497.725 c 0
- 316.86 494.132 354.428 478.615 383.5 451.175 c 0
- 411.92 424.388 424.823 393.845 422.21 359.545 c 0
- 420.903 341.252 416.33 325.572 408.49 312.505 c 0
- 399.996 298.459 388.728 287.351 374.681 279.185 c 1
- 361.94 271.345 346.26 264.485 327.641 258.605 c 0
- 327.314 258.605 326.578 258.442 325.436 258.115 c 0
- 324.281 257.789 323.383 257.462 322.74 257.135 c 1
- 332.213 254.521 341.033 251.419 349.2 247.825 c 0
- 366.515 240.638 381.866 231.818 395.26 221.365 c 0
- 408 211.565 417.963 198.662 425.15 182.655 c 0
- 432.337 166.975 435.931 149.662 435.931 130.715 c 0
- 435.931 93.8018 420.576 61.7891 389.87 34.6748 c 1
- 358.185 7.23535 319.638 -6.48535 274.23 -6.48535 c 0
- 223.923 -6.48535 179.17 11.3184 139.971 46.9248 c 1
- 121.351 3.80469 l 1
- 65 3.80469 l 1
- 65 323.285 l 2
- 65 347.459 68.1045 369.835 74.3105 390.415 c 1
- 79.8633 410.015 89.3369 427.655 102.73 443.335 c 1
- 120.043 462.935 140.46 476.818 163.98 484.985 c 0
- 187.5 493.152 217.064 497.561 252.67 498.215 c 0
-316.86 413.935 m 1
- 287.786 429.289 258.388 435.822 228.66 433.535 c 0
- 198.935 431.248 177.373 422.755 163.98 408.055 c 0
- 159.734 403.155 156.304 397.03 153.69 389.68 c 0
- 151.076 382.33 149.444 375.552 148.79 369.345 c 0
- 148.138 363.138 147.32 353.992 146.34 341.905 c 0
- 145.688 333.738 145.36 324.101 145.36 312.995 c 2
- 145.36 275.265 l 1
- 148.627 275.265 156.467 274.938 168.88 274.285 c 0
- 181.294 273.632 188.808 273.632 191.42 274.285 c 1
- 193.706 274.285 199.098 274.53 207.59 275.02 c 0
- 216.083 275.51 221.719 275.837 224.495 276 c 0
- 227.272 276.164 232.253 276.572 239.44 277.225 c 0
- 246.629 277.879 251.856 278.777 255.12 279.92 c 0
- 258.39 281.062 263.125 282.452 269.33 284.085 c 0
- 275.536 285.719 280.683 287.842 284.766 290.455 c 0
- 288.849 293.068 293.503 296.172 298.73 299.765 c 0
- 303.957 303.358 309.021 307.523 313.92 312.26 c 0
- 318.82 316.999 323.721 322.47 328.62 328.675 c 1
- 337.113 337.495 342.015 348.601 343.32 361.995 c 1
- 344.953 385.188 336.133 402.502 316.86 413.935 c 1
-145.36 215.485 m 1
- 145.36 105.235 l 1
- 175.74 72.5684 211.673 56.2354 253.16 56.2354 c 0
- 281.58 56.2354 306.08 64.4023 326.66 80.7354 c 1
- 346.913 96.0889 357.04 114.055 357.04 134.635 c 0
- 357.04 149.009 352.957 161.422 344.79 171.875 c 0
- 336.297 182.655 326.496 190.658 315.391 195.885 c 0
- 304.61 201.112 289.583 205.358 270.311 208.625 c 0
- 248.423 212.219 232.58 214.178 222.78 214.505 c 0
- 209.713 215.158 193.706 215.485 174.761 215.485 c 2
- 145.36 215.485 l 1
-EndSplineSet
-Fore
-SplineSet
146 274 m 25xf8
177.083 274.39 225.7 275 225.7 275 c 2
297.722 275.903 343.7 326 343.7 366 c 0
@@ -15811,6 +15753,29 @@ SplineSet
121.7 0 l 25
65 0 l 25
EndSplineSet
+Fore
+SplineSet
+305.8 357.5 m 0xf8
+ 305.8 392.5 270.8 422.601 222.32 422.601 c 2
+ 144.56 422.601 l 1
+ 144.56 273 l 1
+ 189.92 273 l 1
+ 278.48 275.16 305.8 308.49 305.8 357.5 c 0xf8
+192.133 217 m 2
+ 144.56 217 l 1
+ 143.8 75.5 l 1
+ 235.96 75.5 l 2
+ 303.48 75.5 348.916 96.6667 348.916 145.549 c 4xf4
+ 348.916 195.667 311.133 217 192.133 217 c 2
+228.8 0 m 1
+ 66.7998 0 l 1
+ 66.7998 481.68 l 1
+ 220.8 481.934 l 2
+ 325.8 482.107 381.8 418.5 381.8 359.5 c 0xf8
+ 381.8 305.5 352.293 276.736 322.8 265.5 c 1
+ 379.986 254.861 426.314 208.507 425.8 153.5 c 0
+ 424.8 46.5 339.8 0 228.8 0 c 1
+EndSplineSet
EndChar
StartChar: afii10068
@@ -16208,27 +16173,39 @@ EndChar
StartChar: afii10078
Encoding: 1084 1084 438
-Width: 741
+Width: 765
VWidth: 2048
-Flags: W
-HStem: 0 21G<19.8945 104.07 326.044 409.765 636.394 720.11>
+Flags: WO
+HStem: 0 21G<19.8945 112.927 336.172 426.624 654.553 747.167> 462.92 20G<175.139 270.586 492.022 587.505>
LayerCount: 4
Fore
SplineSet
-19.8945 0 m 1
- 176.695 493.92 l 1
- 250.685 493.92 l 1
- 367.305 93.5898 l 1
- 484.905 493.92 l 1
- 558.89 493.92 l 1
- 720.11 0 l 1
- 642.2 0 l 1
- 522.14 413.561 l 1
- 404.055 0 l 1
- 331.535 0 l 1
- 217.855 414.051 l 1
- 98.2949 0 l 1
+106.785 0 m 1
19.8945 0 l 1
+ 181.846 482.92 l 1
+ 264.531 482.92 l 5
+ 381.825 95.4766 l 1
+ 498.02 482.92 l 1
+ 580.607 482.92 l 1
+ 747.167 0 l 1
+ 660.724 0 l 1
+ 539.643 392.458 l 1
+ 420.555 0 l 1
+ 342.012 0 l 1
+ 227.364 392.659 l 1
+ 106.785 0 l 1
+EndSplineSet
+Layer: 2
+SplineSet
+447.2 482.92 m 5
+ 447.2 0 l 5
+ 364.78 0 l 5
+ 364.78 413 l 5
+ 144.36 413 l 5
+ 144.36 0 l 5
+ 60 0 l 5
+ 60 482.92 l 5
+ 447.2 482.92 l 5
EndSplineSet
EndChar
@@ -16524,9 +16501,9 @@ StartChar: afii10089
Encoding: 1095 1095 449
Width: 497
VWidth: 2048
-Flags: HWO
-HStem: 0 21G<360.17 437.59> 184.729 69.5801<163.503 307.185> 461.92 20G<50 127.42 360.17 437.59>
-VStem: 50 77.4199<293.224 481.92> 360.17 77.4199<0 230.3 280.822 481.92>
+Flags: W
+HStem: 0 21G<360.17 437.59> 184.729 69.581<163.503 307.186> 461.92 20G<50 127.42 360.17 437.59>
+VStem: 50 77.42<293.225 481.92> 360.17 77.42<0 230.3 284.559 481.92>
LayerCount: 4
Fore
SplineSet
@@ -16655,7 +16632,7 @@ StartChar: afii10092
Encoding: 1098 1098 452
Width: 500
VWidth: 2048
-Flags: WO
+Flags: W
HStem: -11.25 66<180.785 334.121> 0 21G<60 138.449> 222 59.75<146 332.86> 437.799 44.1346<-23.9583 60>
VStem: 60 86<106.75 222 281.75 437.799> 369 81<88.6218 188.772>
LayerCount: 4
@@ -16700,7 +16677,7 @@ StartChar: afii10094
Encoding: 1100 1100 454
Width: 500
VWidth: 2048
-Flags: WO
+Flags: W
HStem: -11.2503 66<180.459 334.121> 0 21G<60 138.449> 222 59.75<146 332.86> 461.934 20G<60 146>
VStem: 60 86<106.75 222 281.75 481.934> 369 81<88.622 188.772>
LayerCount: 4
@@ -16864,17 +16841,13 @@ StartChar: afii10097
Encoding: 1103 1103 457
Width: 497
VWidth: 2048
-Flags: WO
-HStem: -0.980469 21.9805G<25.7695 146.8 353 436> 208.31 53.1904<278.939 353> 427.646 60.2939<156.637 331.536>
-VStem: 54.1904 70.0498<300.2 398.207> 353 82.9<0 208.699 262.09 405.887>
+Flags: W
+HStem: -0.980469 21.9805G<25.7695 146.8 353 436> 208.31 53.1904<278.939 353> 425 57<160.526 352.81>
+VStem: 54.1904 73.0498<299.851 394.441> 353 82.9<0 208.699 262.09 425>
LayerCount: 4
Fore
SplineSet
-54.1904 351.819 m 0
- 54.3911 425.987 121.28 487.842 220.79 487.939 c 0
- 261.3 487.979 306.633 480.935 353.3 458.979 c 1
- 362.3 481.934 l 1
- 435.9 482.159 l 1
+435.9 482 m 1
435.9 244.51 l 1
435.9 154.35 l 1
436 -0 l 1
@@ -16885,11 +16858,13 @@ SplineSet
25.7695 -0.980469 l 1
200.21 214.619 l 1
116.967 224 53.9667 269.146 54.1904 351.819 c 0
+ 54.3911 425.987 121.28 481.902 220.79 482 c 0
+ 435.9 482 l 1
353.09 262.09 m 1
- 352.81 396.279 l 1
- 329.967 406.646 294.967 425.646 240.967 427.646 c 0
- 168.633 430.324 124.967 393.646 124.24 353.35 c 0
- 123.49 311.751 156.967 281.5 198.967 268.5 c 0
+ 352.81 425 l 1
+ 240.967 425 l 0
+ 177.3 428.48 127.967 393.646 127.24 353.35 c 0
+ 126.49 311.751 156.967 281.5 198.967 268.5 c 0
219.209 262.234 267.467 261 293.967 261.5 c 2
293.967 261.5 343.757 261.972 353.09 262.09 c 1
EndSplineSet
--
cgit v0.9.0.2