Merge branch 'master' of github.com:johanmattssonm/birdfont

Changed files (14)

• modified AUTHORS
• modified NEWS
• modified install.py
• modified libbirdfont/BirdFontFile.vala
• modified libbirdfont/DefaultCharactersSet.vala
• modified libbirdfont/Font.vala
• modified libbirdfont/ForesightTool.vala
• modified libbirdfont/Glyph.vala
• modified libbirdfont/LoadCallback.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/SpacingData.vala
• modified libbirdfont/VersionList.vala
• modified scripts/mac_build.py
• modified scripts/version.py

Diff

diff --git a/AUTHORS b/AUTHORSindex 5b3a3a2..e4baf2c 100644--- a/AUTHORS+++ b/AUTHORS@@ -6,3 +6,4 @@ Zhantong Zhang Clemens Lang Hideki Yamane Rene Mensen+Marko Jovanovacdiff --git a/NEWS b/NEWSindex 108c79a..314ba3a 100644--- a/NEWS+++ b/NEWS@@ -1,3 +1,9 @@+birdfont (2.3.1) stable;++  * Bug fixes++ -- Johan Mattsson <johan.mattsson.m@gmail.com>  Fri Mar 20 18:23:31 CET 2015+ birdfont (2.3.0) stable;    * Customizable color themes and better iconsdiff --git a/install.py b/install.pyindex b372619..3d54991 100755--- a/install.py+++ b/install.py@@ -51,21 +51,21 @@ if not os.path.exists ("build/configured"): 	print ("Project is not configured") 	exit (1) -if not os.path.exists ("build/installed"):-        print ("Project is not built")-        exit (1)- parser = OptionParser() parser.add_option ("-d", "--dest", dest="dest", help="install to this directory", metavar="DEST") parser.add_option ("-m", "--nogzip", dest="nogzip", help="don't gzip manpages", default=False) parser.add_option ("-n", "--manpages-directory", dest="mandir", help="put man pages in this directory under prefix") parser.add_option ("-l", "--libdir", dest="libdir", help="path to directory for shared libraries (lib or lib64).")+parser.add_option ("-c", "--skip-command-line-tools", dest="nocli", help="don't install command line tools")  (options, args) = parser.parse_args()  if not options.dest: 	options.dest = "" +if not options.nocli:+	options.nocli = False+ nogzip = options.nogzip  if not options.mandir:@@ -99,9 +99,10 @@ install ('resources/linux/birdfont.appdata.xml', '/share/appdata', 644) 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)+if not options.nocli:+	install ('build/bin/birdfont-autotrace', '/bin', 755)+	install ('build/bin/birdfont-export', '/bin', 755)+	install ('build/bin/birdfont-import', '/bin', 755)  #library if not options.libdir:@@ -137,7 +138,6 @@ else: 	print ("Can't find libbirdfont.") 	exit (1) - if os.path.isfile ('build/bin/libbirdxml.so.' + version.LIBBIRDXML_SO_VERSION):         install ('build/bin/libbirdxml.so.' + version.LIBBIRDXML_SO_VERSION, libdir, 644)         link (libdir, 'libbirdxml.so.' + version.LIBBIRDXML_SO_VERSION, ' libbirdxml.so.' + version.LIBBIRDXML_SO_VERSION_MAJOR)@@ -155,16 +155,21 @@ 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)++    if not options.nocli:+        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)++    if not options.nocli:+        install ('resources/linux/birdfont-autotrace.1', mandir, 644)+        install ('resources/linux/birdfont-export.1', mandir, 644)+        install ('resources/linux/birdfont-import.1', mandir, 644)  #translations for lang_dir in glob.glob('build/locale/*'):diff --git a/libbirdfont/BirdFontFile.vala b/libbirdfont/BirdFontFile.valaindex 303b5a3..50cb5a4 100644--- a/libbirdfont/BirdFontFile.vala+++ b/libbirdfont/BirdFontFile.vala@@ -261,7 +261,7 @@ class BirdFontFile : GLib.Object { 				os.put_string (Font.to_hex (sc.next.get_char ())); 				os.put_string ("\" "); 				-				os.put_string (" />\n");+				os.put_string ("/>\n"); 		} 	} 		diff --git a/libbirdfont/DefaultCharactersSet.vala b/libbirdfont/DefaultCharactersSet.valaindex c118e5f..ef1974b 100644--- a/libbirdfont/DefaultCharactersSet.vala+++ b/libbirdfont/DefaultCharactersSet.vala@@ -33,6 +33,7 @@ public class DefaultCharacterSet { 		add_language (t_("Latin"), "la", "");  		add_language (t_("Russian"), "ro", "А Б В Г Д Е Ё Ж З И Й К Л М Н О П Р С Т У Ф Х Ц Ч Ш Щ Ъ Ы Ь Э Ю Я а б в г д е ё ж з и й к л м н о п р с т у ф х ц ч ш щ ъ ы ь э ю я"); 		add_language (t_("Swedish"), "sv", "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö a b c d e f g h i j k l m n o p q r s t u v w x y z å ä ö");+		add_language (t_("Thai"), "th", "ก-ฺ ฿-๛"); 	} 	 	/** Add a new language to the menu for default character set.@@ -109,9 +110,7 @@ public class DefaultCharacterSet { 		 		all_characters = get_characters_for_prefered_language (); 		if (all_characters != "") {-			foreach (string c in all_characters.split (" ")) {-				gr.add_single (c.get_char ());-			}+			gr.parse_ranges (all_characters); 		} else {			 			/// All lower case letters in alphabetic order separated by space. Letters with diacritical marks should be included. 			lower_case = t_("a b c d e f g h i j k l m n o p q r s t u v w x y z");@@ -119,13 +118,8 @@ public class DefaultCharacterSet { 			/// All upper case letters in alphabetic order separated by space. Letters with diacritical marks should be included. 			upper_case = t_("A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"); -			foreach (string c in lower_case.split (" ")) {-				gr.add_single (c.get_char ());-			}--			foreach (string c in upper_case.split (" ")) {-				gr.add_single (c.get_char ());-			}+			gr.parse_ranges (lower_case);+			gr.parse_ranges (upper_case); 		} 		 		gr.add_range ('0', '9');diff --git a/libbirdfont/Font.vala b/libbirdfont/Font.valaindex 01b9f50..23f6f65 100644--- a/libbirdfont/Font.vala+++ b/libbirdfont/Font.vala@@ -703,7 +703,7 @@ public class Font : GLib.Object { 		glyph_name.remove_all (); 		ligature.remove_all (); 		-		if (path.has_suffix (".svg")) {+		if (path.has_suffix (".svg") || path.has_suffix (".SVG")) { 			Toolbox.select_tool_by_name ("cubic_points"); 			loaded = parse_svg_file (path); 					@@ -719,17 +719,17 @@ public class Font : GLib.Object { 			format = FontFormat.FFI; 		} -		if (path.has_suffix (".bf")) {+		if (path.has_suffix (".bf") || path.has_suffix (".BF")) { 			loaded = parse_bf_file (path); 			format = FontFormat.BIRDFONT; 		} -		if (path.has_suffix (".bfp")) {+		if (path.has_suffix (".bfp") || path.has_suffix (".BFP")) { 			loaded = parse_bfp_file (path); 			format = FontFormat.BIRDFONT_PART; 		}		 		-		if (path.has_suffix (".ttf")) {+		if (path.has_suffix (".ttf") || path.has_suffix (".TTF")) { 			loaded = parse_freetype_file (path); 			 			if (!loaded) {@@ -751,7 +751,7 @@ public class Font : GLib.Object { 			font_file = null; // make sure BirdFont asks where to save the file 		}			 -		if (path.has_suffix (".otf")) {+		if (path.has_suffix (".otf") || path.has_suffix (".OTF")) { 			loaded = parse_freetype_file (path); 						 			if (!loaded) {diff --git a/libbirdfont/ForesightTool.vala b/libbirdfont/ForesightTool.valaindex b5f94dc..79a6156 100644--- a/libbirdfont/ForesightTool.vala+++ b/libbirdfont/ForesightTool.vala@@ -197,7 +197,12 @@ public class ForesightTool : Tool { 						return; 					} 					last = PenTool.selected_points.get (PenTool.selected_points.size - 1);-					last.point.convert_to_curve ();+					+					if (last.point.get_right_handle ().is_line () || last.point.get_left_handle ().is_line ()) {+						last.point.convert_to_curve ();+						last.point.get_right_handle ().length = 0.01;+						last.point.get_left_handle ().length = 0.01;+					} 				} 				 				PenTool.move_selected_handle = true;diff --git a/libbirdfont/Glyph.vala b/libbirdfont/Glyph.valaindex 30348dd..594afec 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -2096,7 +2096,7 @@ public class Glyph : FontDisplay { 					glyph = gc.get_current (); 					glyph.left_limit = left_limit; 					glyph.right_limit = right_limit;-					glyph.add_help_lines ();+					// FIXME: DELETE glyph.add_help_lines (); 				} 			} 		}	diff --git a/libbirdfont/LoadCallback.vala b/libbirdfont/LoadCallback.valaindex 6b994c6..db7f96d 100644--- a/libbirdfont/LoadCallback.vala+++ b/libbirdfont/LoadCallback.vala@@ -15,6 +15,8 @@ namespace BirdFont { 	 public class LoadCallback : GLib.Object {+	SaveDialogListener dialog;+	Font font;  	public signal void file_loaded (); 	@@ -22,9 +24,6 @@ public class LoadCallback : GLib.Object { 	}  	public void load () {-		SaveDialogListener dialog;-		Font font;-		 		if (MenuTab.suppress_event) { 			warn_if_test ("Event suppressed"); 			return;diff --git a/libbirdfont/PenTool.vala b/libbirdfont/PenTool.valaindex 774990a..d0fc700 100644--- a/libbirdfont/PenTool.vala+++ b/libbirdfont/PenTool.vala@@ -124,10 +124,7 @@ public class PenTool : Tool { 			last_point_y = Glyph.path_coordinate_y (y); 		 			move_action (this, x, y);--			if (!has_join_icon ()) {-				press (b, x, y, false);-			}+			press (b, x, y, false);  			if (BirdFont.android) { 				point_selection_image = true;diff --git a/libbirdfont/SpacingData.vala b/libbirdfont/SpacingData.valaindex 28ce3c0..66304cc 100644--- a/libbirdfont/SpacingData.vala+++ b/libbirdfont/SpacingData.vala@@ -58,19 +58,17 @@ public class SpacingData : GLib.Object { 	} 	 	public void add_connections (string glyph) {-		string sb = glyph;-		-		connections.add (sb);+		connections.add (glyph); 		 		foreach (SpacingClass s in classes) { 			if (s.first == glyph) {-				if (has_connection (s.next)) {+				if (!has_connection (s.next)) { 					add_connections (s.next); 				} 			}  			if (s.next == glyph) {-				if (has_connection (s.first)) {+				if (!has_connection (s.first)) { 					add_connections (s.first); 				} 			}diff --git a/libbirdfont/VersionList.vala b/libbirdfont/VersionList.valaindex e7a59a4..14d9f02 100644--- a/libbirdfont/VersionList.vala+++ b/libbirdfont/VersionList.vala@@ -116,7 +116,7 @@ public class VersionList : DropMenu { 		 		if (unlikely (glyphs.size == 0 && current_version_id == -1)) { 			warning (@"No glyphs added to collection");-			gl = new Glyph ("", '\0');+			gl = new Glyph.no_lines ("", '\0'); 		} 		 		return (!) gl;diff --git a/scripts/mac_build.py b/scripts/mac_build.pyindex 1c77d4e..ce5cb63 100644--- a/scripts/mac_build.py+++ b/scripts/mac_build.py@@ -59,8 +59,6 @@ configfile.write_config (prefix) compile_translations() build.libbirdxml(prefix, cc, xml_library_cflags, xml_library_ldflags, valac, valaflags, "libbirdxml." + version.LIBBIRDXML_SO_VERSION + ".dylib", False) build.libbirdfont(prefix, cc, library_cflags, library_ldflags, valac, valaflags, "libbirdfont." + version.SO_VERSION + ".dylib", False)-build.birdfont_autotrace(prefix, cc, cflags, ldflags, valac, valaflags, False)-build.birdfont_export(prefix, cc, cflags, ldflags, valac, valaflags, False) build.birdfont_import(prefix, cc, cflags, ldflags, valac, valaflags, False)  if not options.nogtk:diff --git a/scripts/version.py b/scripts/version.pyindex 4484275..90ca2a9 100644--- a/scripts/version.py+++ b/scripts/version.py@@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. """ -VERSION = '2.3.0'+VERSION = '2.3.1' SO_VERSION_MAJOR = '36' SO_VERSION_MINOR = '0' SO_VERSION = SO_VERSION_MAJOR + '.' + SO_VERSION_MINOR