The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Merge branch 'master' of gitorious.org:birdfont/birdfont

These changes was commited to the Birdfont repository Sat, 13 Sep 2014 21:10:53 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 13 Sep 2014 21:10:53 +0000 (23:10 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Sat, 13 Sep 2014 21:10:53 +0000 (23:10 +0200)
commit 0fb7e52999664c3333dbb85520fa6a6d935f2bf4
tree c9dc7158bad92f8fcdc6ff32af6eb077f871a8e3
parent b05e635175bd21500a8f2522a23ed82b2ed83ed6
parent 1f769c7905c0c7f1c20b67f4e6ad584289b82aa1
Merge branch 'master' of gitorious.org:birdfont/birdfont

NEWS
install.py
libbirdfont/OpenFontFormat/Cmap.vala
scripts/version.py
diff --git a/NEWS b/NEWS
--- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ + birdfont (1.3) stable; + + * A bug fix + + -- Johan Mattsson <johan.mattsson.m@gmail.com> Sat Sep 13 22:53:12 CEST 2014 + birdfont (1.2) stable; * Bug fixes
--- a/install.py +++ b/install.py @@ -94,6 +94,7 @@ if os.path.isfile ('build/bin/birdfont'): install ('build/bin/birdfont', '/bin', 755) + install ('build/bin/birdfont-autotrace', '/bin', 755) install ('build/bin/birdfont-export', '/bin', 755) install ('build/bin/birdfont-import', '/bin', 755) @@ -128,10 +129,12 @@ #manpages if not nogzip: install ('build/birdfont.1.gz', mandir, 644) + install ('build/birdfont-autotrace.1.gz', mandir, 644) install ('build/birdfont-export.1.gz', mandir, 644) install ('build/birdfont-import.1.gz', mandir, 644) else: install ('resources/linux/birdfont.1', mandir, 644) + install ('resources/linux/birdfont-autotrace.1', mandir, 644) install ('resources/linux/birdfont-export.1', mandir, 644) install ('resources/linux/birdfont-import.1', mandir, 644)
--- a/libbirdfont/OpenFontFormat/Cmap.vala +++ b/libbirdfont/OpenFontFormat/Cmap.vala @@ -102,22 +102,22 @@ fd.add_u16 (0); // table version fd.add_u16 (n_encoding_tables); + + fd.add_u16 (1); // platform + fd.add_u16 (0); // encoding + fd.add_ulong (28); // subtable offseet fd.add_u16 (3); // platform fd.add_u16 (1); // encoding (Format Unicode UCS-4) - fd.add_ulong (28); // subtable offseet + fd.add_ulong (28 + cmap0_data.length ()); // subtable offseet fd.add_u16 (3); // platform fd.add_u16 (10); // encoding - fd.add_ulong (28 + cmap4_data.length ()); // subtable offseet + fd.add_ulong (28 + cmap0_data.length () + cmap4_data.length ()); // subtable offseet - fd.add_u16 (1); // platform - fd.add_u16 (0); // encoding - fd.add_ulong (28 + cmap4_data.length () + cmap12_data.length ()); // subtable offseet - + fd.append (cmap0_data); fd.append (cmap4_data); fd.append (cmap12_data); - fd.append (cmap0_data); // padding fd.pad ();
--- a/scripts/version.py +++ b/scripts/version.py @@ -16,8 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ - VERSION = '1.2' - SO_VERSION_MAJOR = '24' + VERSION = '1.3' + SO_VERSION_MAJOR = '25' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR