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

Changed files (10)

• modified AUTHORS
• modified NEWS
• modified libbirdfont/BirdFontFile.vala
• modified libbirdfont/DefaultCharactersSet.vala
• modified libbirdfont/ForesightTool.vala
• modified libbirdfont/Glyph.vala
• modified libbirdfont/PenTool.vala
• modified libbirdfont/SpacingData.vala
• modified libbirdfont/VersionList.vala
• 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/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/ForesightTool.vala b/libbirdfont/ForesightTool.valaindex 751f38b..74f5482 100644--- a/libbirdfont/ForesightTool.vala+++ b/libbirdfont/ForesightTool.vala@@ -195,7 +195,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 e588608..733a3d9 100644--- a/libbirdfont/Glyph.vala+++ b/libbirdfont/Glyph.vala@@ -2090,7 +2090,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/PenTool.vala b/libbirdfont/PenTool.valaindex 10b1cd7..6596455 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/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