GNOME.org
 

[cantarell-fonts] Revert versioning scheme.

commit 611c169df5287c059d63b0c8f0570647c75c9189
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Mon Feb 15 21:44:01 2016 +0100

    Revert versioning scheme.
    
    The new one broke release scripts and assumptions about versioning.
    Package version and font version may divert again and must be set
    seperately.

 .gitignore                              |    1 -
 configure.ac                            |    3 +--
 otf/Cantarell-Bold.otf                  |  Bin 100764 -> 100840 bytes
 otf/Cantarell-BoldOblique.otf           |  Bin 118164 -> 112540 bytes
 otf/Cantarell-Oblique.otf               |  Bin 117820 -> 111532 bytes
 otf/Cantarell-Regular.otf               |  Bin 98272 -> 98344 bytes
 scripts/{generate.sh.in => generate.sh} |    1 -
 src/Cantarell-Bold.sfdir/font.props     |    6 +++---
 src/Cantarell-Regular.sfdir/font.props  |    4 ++--
 9 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9038570..4e0d363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 /*~
 /.*.sw[nop]
 /src/*.sfd-*
-/scripts/generate.sh
 /.gitignore
 /.libs
 /GPATH
diff --git a/configure.ac b/configure.ac
index 763d5c7..233c30c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([cantarell-fonts], [0.00021],
+AC_INIT([cantarell-fonts], [0.0.22],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=cantarell-fonts])
 
 AM_INIT_AUTOMAKE([1.9 tar-ustar foreign dist-bzip2 no-dist-gzip])
@@ -57,7 +57,6 @@ fontconfig/Makefile
 src/Makefile
 otf/Makefile
 scripts/Makefile
-scripts/generate.sh
 ])
 
 AC_OUTPUT
diff --git a/otf/Cantarell-Bold.otf b/otf/Cantarell-Bold.otf
index e5f45c2..5c7838e 100644
Binary files a/otf/Cantarell-Bold.otf and b/otf/Cantarell-Bold.otf differ
diff --git a/otf/Cantarell-BoldOblique.otf b/otf/Cantarell-BoldOblique.otf
index 747899e..a0da06a 100644
Binary files a/otf/Cantarell-BoldOblique.otf and b/otf/Cantarell-BoldOblique.otf differ
diff --git a/otf/Cantarell-Oblique.otf b/otf/Cantarell-Oblique.otf
index 44693bb..2a69a00 100644
Binary files a/otf/Cantarell-Oblique.otf and b/otf/Cantarell-Oblique.otf differ
diff --git a/otf/Cantarell-Regular.otf b/otf/Cantarell-Regular.otf
index 5a779d0..b74ed24 100644
Binary files a/otf/Cantarell-Regular.otf and b/otf/Cantarell-Regular.otf differ
diff --git a/scripts/generate.sh.in b/scripts/generate.sh
similarity index 98%
rename from scripts/generate.sh.in
rename to scripts/generate.sh
index 66f72d1..5c3d765 100755
--- a/scripts/generate.sh.in
+++ b/scripts/generate.sh
@@ -10,7 +10,6 @@ SetPref("TTFFoundry", "Cantarell")
 i = 1
 while (i < $argc)
     Open($argv[i])
-    SetFontNames("", "", "", "", "", "@PACKAGE_VERSION@")
 
     if (Validate(1))
       Error($argv[i] + " did not pass validation. Tolerate no technical flaws in the source! Run 'Validate' 
in FontForge to see and fix what's wrong. The generated files might not validate completely due to the way 
FontForge scripting seems to work..")
diff --git a/src/Cantarell-Bold.sfdir/font.props b/src/Cantarell-Bold.sfdir/font.props
index 69f2923..6cf8ada 100644
--- a/src/Cantarell-Bold.sfdir/font.props
+++ b/src/Cantarell-Bold.sfdir/font.props
@@ -6,7 +6,7 @@ Weight: Bold
 Copyright: Copyright (c) 2009--2016, The Cantarell Authors\n\nThis Font Software is licensed under the SIL 
Open Font License, Version 1.1.\nThis license is copied below, and is also available with a FAQ 
at:\nhttp://scripts.sil.org/OFL
 UComments: "Cantarell was originally designed by Dave Crossland and is developed by the GNOME 
community+AA0ACgAA-dave understandinglimited com+AA0ACgAA-http://live.gnome.org/CantarellFonts";
 FontLog: "See Cantarell Regular."
-Version: 001.000
+Version: 0.022
 ItalicAngle: 0
 UnderlinePosition: -100
 UnderlineWidth: 50
@@ -23,7 +23,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 0
 CreationTime: 1236980653
-ModificationTime: 1453745310
+ModificationTime: 1455568654
 PfmFamily: 33
 TTFWeight: 700
 TTFWidth: 5
@@ -60,7 +60,7 @@ NameList: AGL For New Fonts
 DisplaySize: -72
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 688 8 14
+WinInfo: 0 8 14
 BeginPrivate: 11
 BlueValues 31 [-10 0 481 492 692 706 718 730]
 OtherBlues 11 [-264 -259]
diff --git a/src/Cantarell-Regular.sfdir/font.props b/src/Cantarell-Regular.sfdir/font.props
index 53b2f5a..a0f8cde 100644
--- a/src/Cantarell-Regular.sfdir/font.props
+++ b/src/Cantarell-Regular.sfdir/font.props
@@ -6,7 +6,7 @@ Weight: Regular
 Copyright: Copyright (c) 2009--2016, The Cantarell Authors\n\nThis Font Software is licensed under the SIL 
Open Font License, Version 1.1.\nThis license is copied below, and is also available with a FAQ 
at:\nhttp://scripts.sil.org/OFL
 UComments: "Cantarell was originally designed by Dave Crossland and is developed by the GNOME 
community+AA0ACgAA-dave understandinglimited com+AA0ACgAA-http://live.gnome.org/CantarellFonts";
 FontLog: "0.0.21+AAoA - bold: latin and cyrillic respace+AAoA - bold: adapt f ligatures for the new i+AAoA - 
redular: adjust spacing of Thorn, +AN8A, +Hp4ACgAA - bold: improvements form Cambay+AAoA - bold: match width 
of numerals to regular+AAoA - numerals - improved spacing+AAoACgAA-0.0.20.1+AAoA - fix composited glyph 
issues+AAoA - fix parallel build issue+AAoACgAA-0.0.20+AAoA - Cyrillic improvements+AAoA - x-height hinting 
tweaks+AAoA - sync bold to regular+AAoA - OE and oe ligatures+AAoA - ratio respaced+AAoA - capital sharp s 
for German+AAoACgAA-0.0.19+AAoA - generate oblique version+AAoA - more diacritics work; full Latin 4 
coverage+AAoA - tabular figures+AAoA - fold over work done on Cambay (Pooja Saxena)+AAoACgAA-0.0.18.1+AAoA - 
improved terminals on a,e,r,s,S,l,2+AAoA - fix validation errors+AAoACgAA-0.0.18+AAoA - respaced t+AAoA - 
bold accents fixes+AAoA - consistent stem width and various Improvements on E, H, B and S+AAoA - harmonized o 
and c+AAoA - improved capi
 tals+AAoA - superscript 123 fixes+AAoA - extra glyps for gtk+- (arrows, openbox)+AAoA - respaced 4 and 
7+AAoA +AAoA-0.0.17.2+AAoA - rebuild accented glyphs for bold+AAoACgAA-0.0.17.1+AAoA - accent fixes+AAoA - 
revert ijbdklh to snap to caps height+AAoA - proper weight of f ligatures for bold+AAoA - respaced 
ligatures+AAoACgAA-0.0.17+AAoA - improved shapes and metrics by Nikolaus Waxweiler:+AAoA  - baseline and 
bluezone fixes for autohinter to produce valid hints+AAoA  - many glyphs adjusted for baseline and proper 
hinting.+AAoACgAA-0.0.16+AAoA - add space variations (#735205)+AAoACgAA-0.0.15+AAoA - improved spacing for 
cyrillics (#703588)+AAoA - fixed hinting on numerals (704084)+AAoA - bold outlines improved (#706358)+AAoA - 
improved cyrillics (#706358)+AAoA - improved outlines and spacing (#703115)+AAoA - missing romanian accent 
glyphs (#705004)+AAoA - uppercase U shape improvements (#702955)+AAoACgAA-0.0.14+AAoA - Large improvement to 
shapes of latin and extended latin gl
 yphs (Pooja Saxena)+AAoA - Improvements to the numeral shapes (Pooja)+AAoA - Greatly improved horizontal 
metrics of regular weight (Pooja)+AAoA - Corrected maths (Pooja)+AAoA - Corrected outlines & metrics of 
Cyrillics (Pooja)+AAoACgAA-0.0.13+AAoA - many l/rbearking tweaks+AAoA - extra symbols for Shell (bug 
#657957)+AAoA - balanced shape for s and S+AAoA - balanced shape for 6 and 9+AAoA - balanced 2 and 3+AAoA - 
improved hhints+AAoA - OT anchors for accents+AAoA - contrast tweaks to bold (b, B, e)+AAoACgAA-0.0.12+AAoA - 
improved ligatures+AAoA - improve and add missing cyrillics. bug #689220+AAoA - advanced typo glyphs. bug 
#689184+AAoACgAA-0.0.11+AAoA - use ligature lookup tables+AAoA - make digits monospaced for 
bold+AAoACgAA-0.0.10.1+AAoA - build related fixes+AAoACgAA-0.0.10+AAoA - generate OTF from SFDs automatically 
(Fabian Greffrath)+AAoA - install to appropriate system directories (Fabian Greffrath)+AAoA - fix cyrillic 
metrics+AAoA - improve EE diacritics+AAoACgAA-
 0.0.9+AAoA - initial support for Cyrillic+AAoA - uppercase Greek+AAoACgAA-0.0.8+AAoA - accented l. 
#665433+AAoA - extrema & node fixes+AAoA - build related fixes+AAoACgAA-0.0.7+AAoA - ON/OFF glyphs. bug 
#643120+AAoA - combining circumflex metrics. bug #637066 +AAoA - ] hinting. bug #652834+AAoA - bold: 
'a','e','n','s' and 'c' hints.+AAoA - black circle a circle. bug #660442+AAoA - bold: sync accented 
characters with base glyph.+AAoACgAA-0.0.6+AAoA - bold l+AAoA - fix umlaut positions. bug #646222+AAoA - 
README fixes+AAoACgAA-0.0.5+AAoA - improved password entry glyph+AAoA - improved hyphen by making narrower 
+AAoA - improved licensing and FONTLOG metadata +AAoA - improved vertical metrics+AAoACgAA-0.0.4+AAoA - 
improved hints on numerals and bold letters+AAoA - improved metrics+AAoACgAA-0.0.3+AAoA - create the tarball 
from the actual git master+AAoA - fixed the fontconfig script not to override the global 
default+AAoACgAA-0.0.2+AAoA - improved hints, hinting related metrics+A
 AoA - added black circle glyph for password entries+AAoA - increased size of '^'+AAoACgAA-0.0.1+AAoA - 
Initial GNOME release of Cantarell.+AAoA - Various improvements by Jakub Steiner"
-Version: 001.000
+Version: 0.022
 ItalicAngle: 0
 UnderlinePosition: -100
 UnderlineWidth: 50
@@ -23,7 +23,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 0
 CreationTime: 1236980653
-ModificationTime: 1453736445
+ModificationTime: 1455568644
 PfmFamily: 33
 TTFWeight: 400
 TTFWidth: 5
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]