[cantarell-fonts] Remove Oblique. Flip ¿. bug #639773
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cantarell-fonts] Remove Oblique. Flip ¿. bug #639773
- Date: Mon, 17 Jan 2011 23:14:18 +0000 (UTC)
commit 6c9da84d65c318334d5794cbdcb44684cd9b3dcc
Author: Jakub Steiner <jimmac gmail com>
Date: Tue Jan 18 00:13:10 2011 +0100
Remove Oblique. Flip ¿. bug #639773
src/Cantarell-Bold.sfd | 48 +-
src/Cantarell-BoldOblique.sfd |14316 --------------------
src/Cantarell-Oblique.sfd |12005 ----------------
...-Regular-Combined.sfd => Cantarell-Regular.sfd} | 699 +-
src/Makefile.am | 6 +-
ttf/Cantarell-Bold.ttf | Bin 58564 -> 58588 bytes
ttf/Cantarell-BoldOblique.ttf | Bin 61532 -> 0 bytes
ttf/Cantarell-Oblique.ttf | Bin 59356 -> 0 bytes
ttf/Cantarell-Regular.ttf | Bin 43116 -> 43076 bytes
ttf/Makefile.am | 4 +-
10 files changed, 377 insertions(+), 26701 deletions(-)
---
diff --git a/src/Cantarell-Bold.sfd b/src/Cantarell-Bold.sfd
index 0279024..908a43c 100644
--- a/src/Cantarell-Bold.sfd
+++ b/src/Cantarell-Bold.sfd
@@ -14,13 +14,14 @@ Descent: 534
LayerCount: 2
Layer: 0 0 "Back" 1
Layer: 1 0 "Fore" 0
+NeedsXUIDChange: 1
XUID: [1021 472 1916768597 5236576]
FSType: 0
OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1236980653
-ModificationTime: 1294750907
+ModificationTime: 1295305653
PfmFamily: 33
TTFWeight: 700
TTFWidth: 5
@@ -44,12 +45,13 @@ OS2Vendor: 'ABAT'
DEI: 91125
LangName: 1033 "" "" "" "" "" "" "" "" "" "Dave Crossland" "" "http://abattis.org"; "http://abattis.org"; "Copyright (c) 2009-2011, Dave Crossland <dave lab6 com>+AAoACgAA-This Font Software is licensed under the SIL Open Font License, Version 1.1.+AAoA-This license is copied below, and is also available with a FAQ at:+AAoA-http://scripts.sil.org/OFL+AAoACgAK------------------------------------------------------------+AAoA-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+AAoA------------------------------------------------------------+AAoACgAA-PREAMBLE+AAoA-The goals of the Open Font License (OFL) are to stimulate worldwide+AAoA-development of collaborative font projects, to support the font creation+AAoA-efforts of academic and linguistic communities, and to provide a free and+AAoA-open framework in which fonts may be shared and improved in partnership+AAoA-with others.+AAoACgAA-The OFL allows the licensed fonts to be used, studied, modified and+AAoA-redistributed freely
as long as they are not sold by themselves. The+AAoA-fonts, including any derivative works, can be bundled, embedded, +AAoA-redistributed and/or sold with any software provided that any reserved+AAoA-names are not used by derivative works. The fonts and derivatives,+AAoA-however, cannot be released under any other type of license. The+AAoA-requirement for fonts to remain under this license does not apply+AAoA-to any document created using the fonts or their derivatives.+AAoACgAA-DEFINITIONS+AAoAIgAA-Font Software+ACIA refers to the set of files released by the Copyright+AAoA-Holder(s) under this license and clearly marked as such. This may+AAoA-include source files, build scripts and documentation.+AAoACgAi-Reserved Font Name+ACIA refers to any names specified as such after the+AAoA-copyright statement(s).+AAoACgAi-Original Version+ACIA refers to the collection of Font Software components as+AAoA-distributed by the Copyright Holder(s).+AAoACgAi-Modified Version+ACIA refers t
o any derivative made by adding to, deleting,+AAoA-or substituting -- in part or in whole -- any of the components of the+AAoA-Original Version, by changing formats or by porting the Font Software to a+AAoA-new environment.+AAoACgAi-Author+ACIA refers to any designer, engineer, programmer, technical+AAoA-writer or other person who contributed to the Font Software.+AAoACgAA-PERMISSION & CONDITIONS+AAoA-Permission is hereby granted, free of charge, to any person obtaining+AAoA-a copy of the Font Software, to use, study, copy, merge, embed, modify,+AAoA-redistribute, and sell modified and unmodified copies of the Font+AAoA-Software, subject to the following conditions:+AAoACgAA-1) Neither the Font Software nor any of its individual components,+AAoA-in Original or Modified Versions, may be sold by itself.+AAoACgAA-2) Original or Modified Versions of the Font Software may be bundled,+AAoA-redistributed and/or sold with any software, provided that each copy+AAoA-contains the above
copyright notice and this license. These can be+AAoA-included either as stand-alone text files, human-readable headers or+AAoA-in the appropriate machine-readable metadata fields within text or+AAoA-binary files as long as those fields can be easily viewed by the user.+AAoACgAA-3) No Modified Version of the Font Software may use the Reserved Font+AAoA-Name(s) unless explicit written permission is granted by the corresponding+AAoA-Copyright Holder. This restriction only applies to the primary font name as+AAoA-presented to the users.+AAoACgAA-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font+AAoA-Software shall not be used to promote, endorse or advertise any+AAoA-Modified Version, except to acknowledge the contribution(s) of the+AAoA-Copyright Holder(s) and the Author(s) or with their explicit written+AAoA-permission.+AAoACgAA-5) The Font Software, modified or unmodified, in part or in whole,+AAoA-must be distributed entirely under this license, and mus
t not be+AAoA-distributed under any other license. The requirement for fonts to+AAoA-remain under this license does not apply to any document created+AAoA-using the Font Software.+AAoACgAA-TERMINATION+AAoA-This license becomes null and void if any of the above conditions are+AAoA-not met.+AAoACgAA-DISCLAIMER+AAoA-THE FONT SOFTWARE IS PROVIDED +ACIA-AS IS+ACIA, WITHOUT WARRANTY OF ANY KIND,+AAoA-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+AAoA-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+AAoA-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE+AAoA-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+AAoA-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+AAoA-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+AAoA-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM+AAoA-OTHER DEALINGS IN THE FONT SOFTWARE." "http://scripts.sil.org/OFL"; ""
"" "" "" "" "Cantarell"
Encoding: UnicodeFull
+Compacted: 1
UnicodeInterp: none
NameList: Adobe Glyph List
DisplaySize: -96
AntiAlias: 1
FitToEm: 1
-WinInfo: 286 13 7
+WinInfo: 78 13 7
Grid
-2048 2164 m 0
4096 2164 l 0
@@ -3382,32 +3384,30 @@ Encoding: 191 191 108
Width: 1047
VWidth: 2097
Flags: W
-HStem: -182 223<252.618 623.014> 1179 283<298 580>
-VStem: 298 282<1179 1462> 313 252<762.038 1029> 698 247<116.21 337.854>
-DStem2: 158 122 75 -73 0.926739 -0.375705<0 312.578>
+HStem: -182 223<396.986 767.382>
+VStem: 75 247<116.21 337.854> 455 252<762.038 988>
LayerCount: 2
Fore
SplineSet
-313 1029 m 1xd8
- 565 1029 l 1
- 565 988 l 2
- 565 512 945 628 945 241 c 0
- 945 -6 686 -182 491 -182 c 0
- 339 -182 231 -147 110 -90 c 1
- 75 -73 l 1
- 158 122 l 1
- 195 107 l 2
- 335 50 411 41 465 41 c 0
- 623 41 698 133 698 225 c 0
- 698 458 313 394 313 988 c 2
- 313 1029 l 1xd8
-298 1462 m 1xe8
- 580 1462 l 1
- 580 1179 l 1
- 298 1179 l 1
- 298 1462 l 1xe8
+707 1029 m 1
+ 455 1029 l 1
+ 455 988 l 2
+ 455 512 75 628 75 241 c 0
+ 75 -6 334 -182 529 -182 c 0
+ 681 -182 789 -147 910 -90 c 1
+ 945 -73 l 1
+ 862 122 l 1
+ 825 107 l 2
+ 685 50 609 41 555 41 c 0
+ 397 41 322 133 322 225 c 0
+ 322 458 707 394 707 988 c 2
+ 707 1029 l 1
+722 1462 m 1
+ 440 1462 l 1
+ 440 1179 l 1
+ 722 1179 l 1
+ 722 1462 l 1
EndSplineSet
-Validated: 1
EndChar
StartChar: uni00B5
diff --git a/src/Cantarell-Regular-Combined.sfd b/src/Cantarell-Regular.sfd
similarity index 97%
rename from src/Cantarell-Regular-Combined.sfd
rename to src/Cantarell-Regular.sfd
index 811e468..7227754 100644
--- a/src/Cantarell-Regular-Combined.sfd
+++ b/src/Cantarell-Regular.sfd
@@ -16,13 +16,14 @@ Layer: 0 0 "Back" 1
Layer: 1 1 "Fore" 0
Layer: 2 0 "Temp" 1
Layer: 3 0 "Spiro" 1
+NeedsXUIDChange: 1
XUID: [1021 472 1916768597 5236576]
FSType: 0
OS2Version: 0
OS2_WeightWidthSlopeOnly: 0
OS2_UseTypoMetrics: 1
CreationTime: 1236980653
-ModificationTime: 1294750393
+ModificationTime: 1295305427
PfmFamily: 33
TTFWeight: 500
TTFWidth: 5
@@ -53,7 +54,7 @@ NameList: Adobe Glyph List
DisplaySize: -96
AntiAlias: 1
FitToEm: 1
-WinInfo: 308 11 8
+WinInfo: 96 12 8
Grid
-21 1422 m 25
1635 1422 l 29
@@ -6422,35 +6423,35 @@ StartChar: questiondown
Encoding: 191 191 108
Width: 1047
VWidth: 2097
-Flags: MW
-LayerCount: 4
-Fore
-SplineSet
-675 -93 m 128,-1,1
- 581 -141 581 -141 484 -141 c 0,2,3
- 314 -141 314 -141 128 -53 c 1,4,-1
- 180 69 l 1,5,6
- 344 2 344 2 468.5 2 c 128,-1,7
- 593 2 593 2 666 67.5 c 128,-1,8
- 739 133 739 133 739 225 c 0,9,10
- 738 310 738 310 690 364 c 0,11,12
- 668 390 668 390 639 413 c 2,13,-1
- 578 463 l 2,14,15
- 495 531 495 531 460 582.5 c 0,16,17
- 424 634 424 634 402 687 c 0,18,19
- 354 801 354 801 354 988 c 1,20,-1
- 524 988 l 1,21,22
- 524 794 524 794 600 686 c 0,23,24
- 652 610 652 610 754 528 c 0,25,26
- 794 496 794 496 828 460 c 0,27,28
- 904 379 904 379 904 257.5 c 128,-1,29
- 904 136 904 136 836.5 45.5 c 128,-1,0
- 769 -45 769 -45 675 -93 c 128,-1,1
-339 1220 m 1,30,-1
- 339 1420 l 1,31,-1
- 539 1420 l 1,32,-1
- 539 1220 l 1,33,-1
- 339 1220 l 1,30,-1
+Flags: HMW
+LayerCount: 4
+Fore
+SplineSet
+357 -93 m 128,-1,1
+ 451 -141 451 -141 548 -141 c 0,2,3
+ 718 -141 718 -141 904 -53 c 1,4,-1
+ 852 69 l 1,5,6
+ 688 2 688 2 563.5 2 c 128,-1,7
+ 439 2 439 2 366 67.5 c 128,-1,8
+ 293 133 293 133 293 225 c 0,9,10
+ 294 310 294 310 342 364 c 0,11,12
+ 364 390 364 390 393 413 c 2,13,-1
+ 454 463 l 2,14,15
+ 537 531 537 531 572 582.5 c 0,16,17
+ 608 634 608 634 630 687 c 0,18,19
+ 678 801 678 801 678 988 c 1,20,-1
+ 508 988 l 1,21,22
+ 508 794 508 794 432 686 c 0,23,24
+ 380 610 380 610 278 528 c 0,25,26
+ 238 496 238 496 204 460 c 0,27,28
+ 128 379 128 379 128 257.5 c 128,-1,29
+ 128 136 128 136 195.5 45.5 c 128,-1,0
+ 263 -45 263 -45 357 -93 c 128,-1,1
+693 1220 m 1,30,-1
+ 693 1420 l 1,31,-1
+ 493 1420 l 1,32,-1
+ 493 1220 l 1,33,-1
+ 693 1220 l 1,30,-1
EndSplineSet
Layer: 3
SplineSet
@@ -6857,11 +6858,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-1041 995 m 1,0,-1
- 1099 939 l 1,1,-1
- 168 -15 l 1,2,-1
- 110 41 l 1,3,-1
- 1041 995 l 1,0,-1
+1041 995 m 1
+ 1099 939 l 1
+ 168 -15 l 1
+ 110 41 l 1
+ 1041 995 l 1
EndSplineSet
Refer: 6 111 N 1 0 0 1 0 0 2
Layer: 3
@@ -7470,24 +7471,24 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-772 25 m 1,0,-1
- 916 19 l 1,1,-1
- 878 -135 l 1,2,3
- 946 -155 946 -155 977 -174 c 0,4,5
- 1049 -216 1049 -216 1057 -301 c 0,6,7
- 1065 -397 1065 -397 985 -461 c 0,8,9
- 902 -526 902 -526 766 -497 c 0,10,11
- 738 -491 738 -491 642 -463 c 2,12,-1
- 608 -453 l 1,13,-1
- 638 -349 l 1,14,-1
- 668 -358 l 2,15,16
- 811 -400 811 -400 849 -399 c 0,17,18
- 922 -397 922 -397 940 -352 c 0,19,20
- 954 -319 954 -319 936 -294 c 0,21,22
- 918 -270 918 -270 899 -261 c 0,23,24
- 880 -252 880 -252 848 -242 c 2,25,-1
- 710 -201 l 1,26,-1
- 772 25 l 1,0,-1
+772 25 m 1
+ 916 19 l 1
+ 878 -135 l 1
+ 946 -155 946 -155 977 -174 c 0
+ 1049 -216 1049 -216 1057 -301 c 0
+ 1065 -397 1065 -397 985 -461 c 0
+ 902 -526 902 -526 766 -497 c 0
+ 738 -491 738 -491 642 -463 c 2
+ 608 -453 l 1
+ 638 -349 l 1
+ 668 -358 l 2
+ 811 -400 811 -400 849 -399 c 0
+ 922 -397 922 -397 940 -352 c 0
+ 954 -319 954 -319 936 -294 c 0
+ 918 -270 918 -270 899 -261 c 0
+ 880 -252 880 -252 848 -242 c 2
+ 710 -201 l 1
+ 772 25 l 1
EndSplineSet
Refer: 54 67 N 1 0 0 1 0 0 3
Layer: 3
@@ -7692,16 +7693,16 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-354 1421 m 1,0,-1
- 539 1421 l 1,1,-1
- 539 1236 l 1,2,-1
- 354 1236 l 1,3,-1
- 354 1421 l 1,0,-1
--15 1421 m 1,4,-1
- 170 1421 l 1,5,-1
- 170 1236 l 1,6,-1
- -15 1236 l 1,7,-1
- -15 1421 l 1,4,-1
+354 1421 m 1
+ 539 1421 l 1
+ 539 1236 l 1
+ 354 1236 l 1
+ 354 1421 l 1
+-15 1421 m 1
+ 170 1421 l 1
+ 170 1236 l 1
+ -15 1236 l 1
+ -15 1421 l 1
EndSplineSet
Refer: 140 305 N 1 0 0 1 0 0 3
Layer: 3
@@ -8279,11 +8280,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-445 1549 m 1,0,-1
- 809 1225 l 1,1,-1
- 729 1125 l 1,2,-1
- 353 1440 l 1,3,-1
- 445 1549 l 1,0,-1
+445 1549 m 1
+ 809 1225 l 1
+ 729 1125 l 1
+ 353 1440 l 1
+ 445 1549 l 1
EndSplineSet
Refer: 0 97 N 1 0 0 1 0 0 3
Layer: 3
@@ -8305,11 +8306,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-676 1549 m 1,0,-1
- 768 1440 l 1,1,-1
- 392 1125 l 1,2,-1
- 312 1225 l 1,3,-1
- 676 1549 l 1,0,-1
+676 1549 m 1
+ 768 1440 l 1
+ 392 1125 l 1
+ 312 1225 l 1
+ 676 1549 l 1
EndSplineSet
Refer: 0 97 N 1 0 0 1 0 0 3
Layer: 3
@@ -8373,11 +8374,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-460 1549 m 1,0,-1
- 824 1225 l 1,1,-1
- 744 1125 l 1,2,-1
- 368 1440 l 1,3,-1
- 460 1549 l 1,0,-1
+460 1549 m 1
+ 824 1225 l 1
+ 744 1125 l 1
+ 368 1440 l 1
+ 460 1549 l 1
EndSplineSet
Refer: 2 101 N 1 0 0 1 0 0 3
Layer: 3
@@ -8399,11 +8400,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-776 1549 m 1,0,-1
- 868 1440 l 1,1,-1
- 492 1125 l 1,2,-1
- 412 1225 l 1,3,-1
- 776 1549 l 1,0,-1
+776 1549 m 1
+ 868 1440 l 1
+ 492 1125 l 1
+ 412 1225 l 1
+ 776 1549 l 1
EndSplineSet
Refer: 2 101 N 1 0 0 1 0 0 3
Layer: 3
@@ -8439,11 +8440,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-82 1549 m 1,0,-1
- 446 1225 l 1,1,-1
- 366 1125 l 1,2,-1
- -10 1440 l 1,3,-1
- 82 1549 l 1,0,-1
+82 1549 m 1
+ 446 1225 l 1
+ 366 1125 l 1
+ -10 1440 l 1
+ 82 1549 l 1
EndSplineSet
Refer: 140 305 N 1 0 0 1 0 0 3
Layer: 3
@@ -8465,11 +8466,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-476 1549 m 1,0,-1
- 568 1440 l 1,1,-1
- 192 1125 l 1,2,-1
- 112 1225 l 1,3,-1
- 476 1549 l 1,0,-1
+476 1549 m 1
+ 568 1440 l 1
+ 192 1125 l 1
+ 112 1225 l 1
+ 476 1549 l 1
EndSplineSet
Refer: 140 305 N 1 0 0 1 0 0 3
Layer: 3
@@ -8505,11 +8506,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-529 1549 m 1,0,-1
- 893 1225 l 1,1,-1
- 813 1125 l 1,2,-1
- 437 1440 l 1,3,-1
- 529 1549 l 1,0,-1
+529 1549 m 1
+ 893 1225 l 1
+ 813 1125 l 1
+ 437 1440 l 1
+ 529 1549 l 1
EndSplineSet
Refer: 6 111 N 1 0 0 1 0 0 3
Layer: 3
@@ -8531,11 +8532,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-706 1549 m 1,0,-1
- 798 1440 l 1,1,-1
- 422 1125 l 1,2,-1
- 342 1225 l 1,3,-1
- 706 1549 l 1,0,-1
+706 1549 m 1
+ 798 1440 l 1
+ 422 1125 l 1
+ 342 1225 l 1
+ 706 1549 l 1
EndSplineSet
Refer: 6 111 N 1 0 0 1 0 0 3
Layer: 3
@@ -8585,11 +8586,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-477 1549 m 1,0,-1
- 841 1225 l 1,1,-1
- 761 1125 l 1,2,-1
- 385 1440 l 1,3,-1
- 477 1549 l 1,0,-1
+477 1549 m 1
+ 841 1225 l 1
+ 761 1125 l 1
+ 385 1440 l 1
+ 477 1549 l 1
EndSplineSet
Refer: 14 117 N 1 0 0 1 0 0 3
Layer: 3
@@ -8611,11 +8612,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-766 1549 m 1,0,-1
- 858 1440 l 1,1,-1
- 482 1125 l 1,2,-1
- 402 1225 l 1,3,-1
- 766 1549 l 1,0,-1
+766 1549 m 1
+ 858 1440 l 1
+ 482 1125 l 1
+ 402 1225 l 1
+ 766 1549 l 1
EndSplineSet
Refer: 14 117 N 1 0 0 1 0 0 3
Layer: 3
@@ -8651,11 +8652,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-766 1549 m 1,0,-1
- 858 1440 l 1,1,-1
- 482 1125 l 1,2,-1
- 402 1225 l 1,3,-1
- 766 1549 l 1,0,-1
+766 1549 m 1
+ 858 1440 l 1
+ 482 1125 l 1
+ 402 1225 l 1
+ 766 1549 l 1
EndSplineSet
Refer: 26 121 N 1 0 0 1 0 0 3
Layer: 3
@@ -10269,11 +10270,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-364 1697 m 1,0,-1
- 1104 1697 l 1,1,-1
- 1104 1568 l 1,2,-1
- 364 1568 l 1,3,-1
- 364 1697 l 1,0,-1
+364 1697 m 1
+ 1104 1697 l 1
+ 1104 1568 l 1
+ 364 1568 l 1
+ 364 1697 l 1
EndSplineSet
Refer: 32 65 N 1 0 0 1 0 0 3
Layer: 3
@@ -10295,11 +10296,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-265 1333 m 1,0,-1
- 797 1333 l 1,1,-1
- 797 1204 l 1,2,-1
- 265 1204 l 1,3,-1
- 265 1333 l 1,0,-1
+265 1333 m 1
+ 797 1333 l 1
+ 797 1204 l 1
+ 265 1204 l 1
+ 265 1333 l 1
EndSplineSet
Refer: 0 97 N 1 0 0 1 0 0 3
Layer: 3
@@ -10363,11 +10364,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-686 1549 m 1,0,-1
- 778 1440 l 1,1,-1
- 402 1125 l 1,2,-1
- 322 1225 l 1,3,-1
- 686 1549 l 1,0,-1
+686 1549 m 1
+ 778 1440 l 1
+ 402 1125 l 1
+ 322 1225 l 1
+ 686 1549 l 1
EndSplineSet
Refer: 18 99 N 1 0 0 1 0 0 3
Layer: 3
@@ -10487,11 +10488,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-1209 1511 m 1,0,-1
- 1374 1511 l 1,1,-1
- 1256 1121 l 1,2,-1
- 1091 1121 l 1,3,-1
- 1209 1511 l 1,0,-1
+1209 1511 m 1
+ 1374 1511 l 1
+ 1256 1121 l 1
+ 1091 1121 l 1
+ 1209 1511 l 1
EndSplineSet
Refer: 1 100 N 1 0 0 1 0 0 2
Layer: 3
@@ -10525,11 +10526,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-360 1697 m 1,0,-1
- 1093 1697 l 1,1,-1
- 1093 1568 l 1,2,-1
- 360 1568 l 1,3,-1
- 360 1697 l 1,0,-1
+360 1697 m 1
+ 1093 1697 l 1
+ 1093 1568 l 1
+ 360 1568 l 1
+ 360 1697 l 1
EndSplineSet
Refer: 34 69 N 1 0 0 1 0 0 3
Layer: 3
@@ -10775,27 +10776,27 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-176 1584 m 1,0,-1
- 72 1612 l 1,1,-1
- 98 1710 l 2,2,3
- 134 1846 134 1846 251 1864 c 0,4,5
- 326 1875 326 1875 376 1827 c 0,6,7
- 388 1816 388 1816 405 1792 c 2,8,-1
- 453 1728 l 2,9,10
- 482 1689 482 1689 498 1684 c 0,11,12
- 544 1668 544 1668 566 1714 c 0,13,14
- 572 1726 572 1726 583 1766 c 2,15,-1
- 610 1864 l 1,16,-1
- 714 1835 l 1,17,-1
- 688 1738 l 2,18,19
- 667 1661 667 1661 633 1614 c 0,20,21
- 599 1568 599 1568 544 1555 c 0,22,23
- 464 1537 464 1537 411 1591 c 0,24,25
- 399 1603 399 1603 381 1626 c 2,26,-1
- 333 1690 l 2,27,28
- 302 1731 302 1731 285 1737 c 0,29,30
- 224 1758 224 1758 203 1682 c 2,31,-1
- 176 1584 l 1,0,-1
+176 1584 m 1
+ 72 1612 l 1
+ 98 1710 l 2
+ 134 1846 134 1846 251 1864 c 0
+ 326 1875 326 1875 376 1827 c 0
+ 388 1816 388 1816 405 1792 c 2
+ 453 1728 l 2
+ 482 1689 482 1689 498 1684 c 0
+ 544 1668 544 1668 566 1714 c 0
+ 572 1726 572 1726 583 1766 c 2
+ 610 1864 l 1
+ 714 1835 l 1
+ 688 1738 l 2
+ 667 1661 667 1661 633 1614 c 0
+ 599 1568 599 1568 544 1555 c 0
+ 464 1537 464 1537 411 1591 c 0
+ 399 1603 399 1603 381 1626 c 2
+ 333 1690 l 2
+ 302 1731 302 1731 285 1737 c 0
+ 224 1758 224 1758 203 1682 c 2
+ 176 1584 l 1
EndSplineSet
Refer: 40 73 N 1 0 0 1 0 0 3
Layer: 3
@@ -10843,27 +10844,27 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-45 1142 m 1,0,-1
- -59 1170 l 1,1,-1
- -33 1268 l 2,2,3
- 3 1404 3 1404 120 1422 c 0,4,5
- 195 1433 195 1433 245 1385 c 0,6,7
- 257 1374 257 1374 274 1350 c 2,8,-1
- 322 1286 l 2,9,10
- 351 1247 351 1247 367 1242 c 0,11,12
- 413 1226 413 1226 435 1272 c 0,13,14
- 441 1284 441 1284 452 1324 c 2,15,-1
- 479 1422 l 1,16,-1
- 583 1393 l 1,17,-1
- 557 1296 l 2,18,19
- 536 1219 536 1219 502 1172 c 0,20,21
- 468 1126 468 1126 413 1113 c 0,22,23
- 333 1095 333 1095 280 1149 c 0,24,25
- 268 1161 268 1161 250 1184 c 2,26,-1
- 202 1248 l 2,27,28
- 171 1289 171 1289 154 1295 c 0,29,30
- 93 1316 93 1316 72 1240 c 2,31,-1
- 45 1142 l 1,0,-1
+45 1142 m 1
+ -59 1170 l 1
+ -33 1268 l 2
+ 3 1404 3 1404 120 1422 c 0
+ 195 1433 195 1433 245 1385 c 0
+ 257 1374 257 1374 274 1350 c 2
+ 322 1286 l 2
+ 351 1247 351 1247 367 1242 c 0
+ 413 1226 413 1226 435 1272 c 0
+ 441 1284 441 1284 452 1324 c 2
+ 479 1422 l 1
+ 583 1393 l 1
+ 557 1296 l 2
+ 536 1219 536 1219 502 1172 c 0
+ 468 1126 468 1126 413 1113 c 0
+ 333 1095 333 1095 280 1149 c 0
+ 268 1161 268 1161 250 1184 c 2
+ 202 1248 l 2
+ 171 1289 171 1289 154 1295 c 0
+ 93 1316 93 1316 72 1240 c 2
+ 45 1142 l 1
EndSplineSet
Refer: 140 305 N 1 0 0 1 0 -9 3
Layer: 3
@@ -10911,11 +10912,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-200 1697 m 1,0,-1
- 610 1697 l 1,1,-1
- 610 1568 l 1,2,-1
- 200 1568 l 1,3,-1
- 200 1697 l 1,0,-1
+200 1697 m 1
+ 610 1697 l 1
+ 610 1568 l 1
+ 200 1568 l 1
+ 200 1697 l 1
EndSplineSet
Refer: 40 73 N 1 0 0 1 0 0 3
Layer: 3
@@ -10937,11 +10938,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-80 1333 m 1,0,-1
- 444 1333 l 1,1,-1
- 444 1204 l 1,2,-1
- 80 1204 l 1,3,-1
- 80 1333 l 1,0,-1
+80 1333 m 1
+ 444 1333 l 1
+ 444 1204 l 1
+ 80 1204 l 1
+ 80 1333 l 1
EndSplineSet
Refer: 140 305 N 1 0 0 1 0 0 3
Layer: 3
@@ -10963,16 +10964,16 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-590 1872 m 1,0,-1
- 683 1795 l 1,1,2
- 624 1696 624 1696 540 1633 c 0,3,4
- 456 1570 456 1570 379 1561 c 0,5,6
- 179 1536 179 1536 81 1712 c 0,7,8
- 56 1757 56 1757 40 1808 c 1,9,-1
- 163 1874 l 1,10,11
- 198 1780 198 1780 265 1735 c 0,12,13
- 394 1647 394 1647 537 1806 c 0,14,15
- 563 1836 563 1836 590 1872 c 1,0,-1
+590 1872 m 1
+ 683 1795 l 1
+ 624 1696 624 1696 540 1633 c 0
+ 456 1570 456 1570 379 1561 c 0
+ 179 1536 179 1536 81 1712 c 0
+ 56 1757 56 1757 40 1808 c 1
+ 163 1874 l 1
+ 198 1780 198 1780 265 1735 c 0
+ 394 1647 394 1647 537 1806 c 0
+ 563 1836 563 1836 590 1872 c 1
EndSplineSet
Refer: 40 73 N 1 0 0 1 -40 0 3
Layer: 3
@@ -11005,16 +11006,16 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-514 1433 m 1,0,-1
- 607 1356 l 1,1,2
- 547 1255 547 1255 464 1193 c 0,3,4
- 380 1131 380 1131 303 1122 c 0,5,6
- 103 1097 103 1097 5 1273 c 0,7,8
- -20 1318 -20 1318 -36 1369 c 1,9,-1
- 87 1435 l 1,10,11
- 123 1341 123 1341 189 1296 c 0,12,13
- 318 1208 318 1208 461 1367 c 0,14,15
- 487 1397 487 1397 514 1433 c 1,0,-1
+514 1433 m 1
+ 607 1356 l 1
+ 547 1255 547 1255 464 1193 c 0
+ 380 1131 380 1131 303 1122 c 0
+ 103 1097 103 1097 5 1273 c 0
+ -20 1318 -20 1318 -36 1369 c 1
+ 87 1435 l 1
+ 123 1341 123 1341 189 1296 c 0
+ 318 1208 318 1208 461 1367 c 0
+ 487 1397 487 1397 514 1433 c 1
EndSplineSet
Refer: 140 305 N 1 0 0 1 0 0 3
Layer: 3
@@ -11215,11 +11216,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-590 1511 m 1,0,-1
- 755 1511 l 1,1,-1
- 637 1121 l 1,2,-1
- 472 1121 l 1,3,-1
- 590 1511 l 1,0,-1
+590 1511 m 1
+ 755 1511 l 1
+ 637 1121 l 1
+ 472 1121 l 1
+ 590 1511 l 1
EndSplineSet
Refer: 10 108 N 1 0 0 1.00066 0 0 2
Layer: 3
@@ -11353,11 +11354,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-532 1697 m 1,0,-1
- 1272 1697 l 1,1,-1
- 1272 1568 l 1,2,-1
- 532 1568 l 1,3,-1
- 532 1697 l 1,0,-1
+532 1697 m 1
+ 1272 1697 l 1
+ 1272 1568 l 1
+ 532 1568 l 1
+ 532 1697 l 1
EndSplineSet
Refer: 31 79 N 1 0 0 1 0 0 3
Layer: 3
@@ -11379,11 +11380,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-251 1333 m 1,0,-1
- 991 1333 l 1,1,-1
- 991 1204 l 1,2,-1
- 251 1204 l 1,3,-1
- 251 1333 l 1,0,-1
+251 1333 m 1
+ 991 1333 l 1
+ 991 1204 l 1
+ 251 1204 l 1
+ 251 1333 l 1
EndSplineSet
Refer: 6 111 N 1 0 0 1 0 0 3
Layer: 3
@@ -11447,11 +11448,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-606 1549 m 1,0,-1
- 698 1440 l 1,1,-1
- 322 1125 l 1,2,-1
- 242 1225 l 1,3,-1
- 606 1549 l 1,0,-1
+606 1549 m 1
+ 698 1440 l 1
+ 322 1125 l 1
+ 242 1225 l 1
+ 606 1549 l 1
EndSplineSet
Refer: 20 114 N 1 0 0 1 0 0 3
Layer: 3
@@ -11543,11 +11544,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-676 1549 m 1,0,-1
- 768 1440 l 1,1,-1
- 392 1125 l 1,2,-1
- 312 1225 l 1,3,-1
- 676 1549 l 1,0,-1
+676 1549 m 1
+ 768 1440 l 1
+ 392 1125 l 1
+ 312 1225 l 1
+ 676 1549 l 1
EndSplineSet
Refer: 7 115 N 1 0 0 1 0 0 3
Layer: 3
@@ -11597,24 +11598,24 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-662 24 m 1,0,-1
- 806 18 l 1,1,-1
- 767 -136 l 1,2,3
- 835 -156 835 -156 866 -175 c 0,4,5
- 938 -217 938 -217 946 -302 c 0,6,7
- 954 -398 954 -398 874 -462 c 0,8,9
- 791 -527 791 -527 655 -498 c 0,10,11
- 628 -492 628 -492 532 -464 c 2,12,-1
- 498 -454 l 1,13,-1
- 528 -350 l 1,14,-1
- 558 -359 l 2,15,16
- 701 -401 701 -401 738 -400 c 0,17,18
- 812 -398 812 -398 830 -353 c 0,19,20
- 844 -320 844 -320 825 -295 c 0,21,22
- 807 -271 807 -271 788 -262 c 0,23,24
- 768 -253 768 -253 736 -243 c 2,25,-1
- 600 -202 l 1,26,-1
- 662 24 l 1,0,-1
+662 24 m 1
+ 806 18 l 1
+ 767 -136 l 1
+ 835 -156 835 -156 866 -175 c 0
+ 938 -217 938 -217 946 -302 c 0
+ 954 -398 954 -398 874 -462 c 0
+ 791 -527 791 -527 655 -498 c 0
+ 628 -492 628 -492 532 -464 c 2
+ 498 -454 l 1
+ 528 -350 l 1
+ 558 -359 l 2
+ 701 -401 701 -401 738 -400 c 0
+ 812 -398 812 -398 830 -353 c 0
+ 844 -320 844 -320 825 -295 c 0
+ 807 -271 807 -271 788 -262 c 0
+ 768 -253 768 -253 736 -243 c 2
+ 600 -202 l 1
+ 662 24 l 1
EndSplineSet
Refer: 55 83 N 1 0 0 1 0 0 3
Layer: 3
@@ -11820,11 +11821,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-395 1697 m 1,0,-1
- 1225 1697 l 1,1,-1
- 1225 1568 l 1,2,-1
- 395 1568 l 1,3,-1
- 395 1697 l 1,0,-1
+395 1697 m 1
+ 1225 1697 l 1
+ 1225 1568 l 1
+ 395 1568 l 1
+ 395 1697 l 1
EndSplineSet
Refer: 51 85 N 1 0 0 1 0 0 3
Layer: 3
@@ -11846,11 +11847,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-293 1333 m 1,0,-1
- 891 1333 l 1,1,-1
- 891 1204 l 1,2,-1
- 293 1204 l 1,3,-1
- 293 1333 l 1,0,-1
+293 1333 m 1
+ 891 1333 l 1
+ 891 1204 l 1
+ 293 1204 l 1
+ 293 1333 l 1
EndSplineSet
Refer: 14 117 N 1 0 0 1 0 0 3
Layer: 3
@@ -11998,11 +11999,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-686 1549 m 1,0,-1
- 778 1440 l 1,1,-1
- 402 1125 l 1,2,-1
- 322 1225 l 1,3,-1
- 686 1549 l 1,0,-1
+686 1549 m 1
+ 778 1440 l 1
+ 402 1125 l 1
+ 322 1225 l 1
+ 686 1549 l 1
EndSplineSet
Refer: 25 122 N 1 0 0 1 0 0 3
Layer: 3
@@ -12273,11 +12274,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-146 644 m 1,0,-1
- 720 976 l 1,1,-1
- 720 804 l 1,2,-1
- 146 472 l 1,3,-1
- 146 644 l 1,0,-1
+146 644 m 1
+ 720 976 l 1
+ 720 804 l 1
+ 146 472 l 1
+ 146 644 l 1
EndSplineSet
Refer: 33 76 N 1 0 0 1 0 0 2
Layer: 3
@@ -12299,11 +12300,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-90 672 m 1,0,-1
- 607 971 l 1,1,-1
- 607 821 l 1,2,-1
- 90 523 l 1,3,-1
- 90 672 l 1,0,-1
+90 672 m 1
+ 607 971 l 1
+ 607 821 l 1
+ 90 523 l 1
+ 90 672 l 1
EndSplineSet
Refer: 10 108 N 1 0 0 1 30 0 2
Layer: 3
@@ -12364,11 +12365,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-140 1422 m 1,0,-1
- 290 1422 l 1,1,-1
- 290 988 l 1,2,-1
- 140 988 l 1,3,-1
- 140 1422 l 1,0,-1
+140 1422 m 1
+ 290 1422 l 1
+ 290 988 l 1
+ 140 988 l 1
+ 140 1422 l 1
EndSplineSet
Refer: 5 110 N 1 0 0 1 170 0 2
Layer: 3
@@ -12473,11 +12474,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-254 753 m 1,0,-1
- 1087 753 l 1,1,-1
- 1087 603 l 1,2,-1
- 254 603 l 1,3,-1
- 254 753 l 1,0,-1
+254 753 m 1
+ 1087 753 l 1
+ 1087 603 l 1
+ 254 603 l 1
+ 254 753 l 1
EndSplineSet
Refer: 39 84 N 1 0 0 1 0 0 2
Layer: 3
@@ -12499,11 +12500,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-70 588 m 1,0,-1
- 668 588 l 1,1,-1
- 668 479 l 1,2,-1
- 70 479 l 1,3,-1
- 70 588 l 1,0,-1
+70 588 m 1
+ 668 588 l 1
+ 668 479 l 1
+ 70 479 l 1
+ 70 588 l 1
EndSplineSet
Refer: 19 116 N 1 0 0 1 0 0 2
Layer: 3
@@ -12525,11 +12526,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-152 1271 m 1,0,-1
- 1552 1271 l 1,1,-1
- 1552 1133 l 1,2,-1
- 152 1133 l 1,3,-1
- 152 1271 l 1,0,-1
+152 1271 m 1
+ 1552 1271 l 1
+ 1552 1133 l 1
+ 152 1133 l 1
+ 152 1271 l 1
EndSplineSet
Refer: 29 72 S 1 0 0 1 0 0 2
Layer: 3
@@ -12551,11 +12552,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-95 1271 m 1,0,-1
- 677 1271 l 1,1,-1
- 677 1142 l 1,2,-1
- 95 1142 l 1,3,-1
- 95 1271 l 1,0,-1
+95 1271 m 1
+ 677 1271 l 1
+ 677 1142 l 1
+ 95 1142 l 1
+ 95 1271 l 1
EndSplineSet
Refer: 3 104 N 1 0 0 1 0 0 2
Layer: 3
@@ -12577,11 +12578,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-566 1271 m 1,0,-1
- 1148 1271 l 1,1,-1
- 1148 1142 l 1,2,-1
- 566 1142 l 1,3,-1
- 566 1271 l 1,0,-1
+566 1271 m 1
+ 1148 1271 l 1
+ 1148 1142 l 1
+ 566 1142 l 1
+ 566 1271 l 1
EndSplineSet
Refer: 1 100 N 1 0 0 1 0 0 2
Layer: 3
@@ -12617,16 +12618,16 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-630 1549 m 1,0,-1
- 722 1440 l 1,1,-1
- 346 1125 l 1,2,-1
- 266 1225 l 1,3,-1
- 630 1549 l 1,0,-1
-1069 1549 m 1,4,-1
- 1161 1440 l 1,5,-1
- 785 1125 l 1,6,-1
- 705 1225 l 1,7,-1
- 1069 1549 l 1,4,-1
+630 1549 m 1
+ 722 1440 l 1
+ 346 1125 l 1
+ 266 1225 l 1
+ 630 1549 l 1
+1069 1549 m 1
+ 1161 1440 l 1
+ 785 1125 l 1
+ 705 1225 l 1
+ 1069 1549 l 1
EndSplineSet
Refer: 6 111 N 1 0 0 1 0 0 3
Layer: 3
@@ -13285,16 +13286,16 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-1079 1549 m 1,0,-1
- 1171 1440 l 1,1,-1
- 795 1125 l 1,2,-1
- 715 1225 l 1,3,-1
- 1079 1549 l 1,0,-1
-620 1549 m 1,4,-1
- 712 1440 l 1,5,-1
- 336 1125 l 1,6,-1
- 256 1225 l 1,7,-1
- 620 1549 l 1,4,-1
+1079 1549 m 1
+ 1171 1440 l 1
+ 795 1125 l 1
+ 715 1225 l 1
+ 1079 1549 l 1
+620 1549 m 1
+ 712 1440 l 1
+ 336 1125 l 1
+ 256 1225 l 1
+ 620 1549 l 1
EndSplineSet
Refer: 14 117 N 1 0 0 1 0 0 3
Layer: 3
@@ -13723,11 +13724,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-755 1549 m 1,0,-1
- 1119 1225 l 1,1,-1
- 1039 1125 l 1,2,-1
- 663 1440 l 1,3,-1
- 755 1549 l 1,0,-1
+755 1549 m 1
+ 1119 1225 l 1
+ 1039 1125 l 1
+ 663 1440 l 1
+ 755 1549 l 1
EndSplineSet
Refer: 11 119 N 1 0 0 1 0 0 3
Layer: 3
@@ -13763,11 +13764,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-1046 1549 m 1,0,-1
- 1138 1440 l 1,1,-1
- 762 1125 l 1,2,-1
- 682 1225 l 1,3,-1
- 1046 1549 l 1,0,-1
+1046 1549 m 1
+ 1138 1440 l 1
+ 762 1125 l 1
+ 682 1225 l 1
+ 1046 1549 l 1
EndSplineSet
Refer: 11 119 N 1 0 0 1 0 0 3
Layer: 3
@@ -13803,11 +13804,11 @@ Flags: MW
LayerCount: 4
Fore
SplineSet
-445 1549 m 1,0,-1
- 809 1225 l 1,1,-1
- 729 1125 l 1,2,-1
- 353 1440 l 1,3,-1
- 445 1549 l 1,0,-1
+445 1549 m 1
+ 809 1225 l 1
+ 729 1125 l 1
+ 353 1440 l 1
+ 445 1549 l 1
EndSplineSet
Refer: 26 121 N 1 0 0 1 0 0 3
Layer: 3
diff --git a/src/Makefile.am b/src/Makefile.am
index 5d1c283..65c339c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,6 @@
noinst_DATA = \
- Cantarell-Regular-Combined.sfd \
- Cantarell-Bold.sfd \
- Cantarell-BoldOblique.sfd \
- Cantarell-Oblique.sfd
+ Cantarell-Regular.sfd \
+ Cantarell-Bold.sfd
EXTRA_DIST = $(noinst_DATA)
diff --git a/ttf/Cantarell-Bold.ttf b/ttf/Cantarell-Bold.ttf
index f8d7ea3..cf1c84c 100644
Binary files a/ttf/Cantarell-Bold.ttf and b/ttf/Cantarell-Bold.ttf differ
diff --git a/ttf/Cantarell-Regular.ttf b/ttf/Cantarell-Regular.ttf
index 5c5f253..0c52f35 100644
Binary files a/ttf/Cantarell-Regular.ttf and b/ttf/Cantarell-Regular.ttf differ
diff --git a/ttf/Makefile.am b/ttf/Makefile.am
index d9d4031..76f4559 100644
--- a/ttf/Makefile.am
+++ b/ttf/Makefile.am
@@ -2,8 +2,6 @@
fontdir = $(datadir)/fonts/cantarell
font_DATA = \
Cantarell-Regular.ttf \
- Cantarell-Bold.ttf \
- Cantarell-BoldOblique.ttf \
- Cantarell-Oblique.ttf
+ Cantarell-Bold.ttf
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
