Fix kerning classes

Changed files (3)

• modified libbirdfont/GlyphRange.vala
• modified libbirdfont/KerningRange.vala
• modified libbirdfont/KerningTools.vala

Diff

diff --git a/libbirdfont/GlyphRange.vala b/libbirdfont/GlyphRange.valaindex 85b8e0a..0b26b5b 100644--- a/libbirdfont/GlyphRange.vala+++ b/libbirdfont/GlyphRange.vala@@ -182,7 +182,11 @@ public class GlyphRange { 			} 			 			if (w.char_count () == 1) {-				add_single (w.get_char ());+				unichar c = w.get_char_validated ();+				+				if (c > 0) {+					add_single (c);+				} 			} else if (w == "space") { 				add_single (' '); 			} else if (w == "divis") {diff --git a/libbirdfont/KerningRange.vala b/libbirdfont/KerningRange.valaindex 2256261..806e8e4 100644--- a/libbirdfont/KerningRange.vala+++ b/libbirdfont/KerningRange.vala@@ -113,7 +113,8 @@ public class KerningRange : Tool { 		TextListener listener = new TextListener (t_("Kerning class"), ranges, t_("Set")); 		listener.signal_text_input.connect ((text) => { 			set_ranges (text);-			Toolbox.redraw_tool_box ();+			KerningTools.classes.clear_cache ();+			KerningTools.classes.redraw (); 		}); 		 		listener.signal_submit.connect (() => {diff --git a/libbirdfont/KerningTools.vala b/libbirdfont/KerningTools.valaindex 494a0e7..5c63ae3 100644--- a/libbirdfont/KerningTools.vala+++ b/libbirdfont/KerningTools.vala@@ -54,7 +54,12 @@ public class KerningTools : ToolCollection  { 		active_otf_features = new OtfTags (); 		 		Expander kerning_tools = new Expander (t_("Kerning Tools"));-		classes = new Expander ();+		+		if (is_null (classes)) {+			classes = new Expander ();+			update_kerning_classes ();+		}+		 		expanders = new Gee.ArrayList<Expander> ();  		Expander font_name = new Expander ();@@ -86,6 +91,7 @@ public class KerningTools : ToolCollection  { 			KerningRange kr = new KerningRange (f, @"$label $(++next_class)"); 			classes.add_tool (kr); 			self.set_selected (false);+			classes.clear_cache (); 			classes.redraw (); 		}); 		kerning_tools.add_tool (new_kerning_class);@@ -176,8 +182,8 @@ public class KerningTools : ToolCollection  { 		expanders.add (font_name); 		expanders.add (zoom_expander); 		expanders.add (kerning_tools);+		expanders.add (otf_features);		 		expanders.add (classes);-		expanders.add (otf_features); 	} 	 	public static void add_otf_label (string tag) {@@ -266,6 +272,9 @@ public class KerningTools : ToolCollection  { 				add_unique_class (kr); 			} 		}+		+		classes.clear_cache ();+		classes.redraw (); 	}  	private static void remove_all_kerning_classes () {