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

Changed files (4)

• modified NEWS
• modified install.py
• modified libbirdfont/OpenFontFormat/Cmap.vala
• modified scripts/version.py

Diff

diff --git a/NEWS b/NEWSindex bb0291c..008c1d2 100644--- 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 fixesdiff --git a/install.py b/install.pyindex d71e05c..b16b219 100755--- a/install.py+++ b/install.py@@ -94,6 +94,7 @@ install ('resources/linux/48x48/birdfont.png', '/share/icons/hicolor/48x48/apps' 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 @@ else: #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) diff --git a/libbirdfont/OpenFontFormat/Cmap.vala b/libbirdfont/OpenFontFormat/Cmap.valaindex a7ab5a9..e3a505b 100644--- a/libbirdfont/OpenFontFormat/Cmap.vala+++ b/libbirdfont/OpenFontFormat/Cmap.vala@@ -102,22 +102,22 @@ public class CmapTable : Table { 		 		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 ();diff --git a/scripts/version.py b/scripts/version.pyindex 5493edd..7448c2c 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License 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