Merge new spacing classes with kerning classes

Changed files (3)

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

Diff

diff --git a/libbirdfont/KerningRange.vala b/libbirdfont/KerningRange.valaindex 0c6752d..faf09b8 100644--- a/libbirdfont/KerningRange.vala+++ b/libbirdfont/KerningRange.vala@@ -57,6 +57,10 @@ public class KerningRange : Tool { 		}); 	} 	+	public void update_spacing_class () {+		set_ranges (ranges);+	}+	 	public void set_ranges (string r) { 		GlyphRange glyph_range = new GlyphRange (); 		string new_range;@@ -69,7 +73,9 @@ public class KerningRange : Tool { 				ch = glyph_range.get_char (i); 				 				foreach (string c in MainWindow.get_spacing_class_tab ().get_all_connections (ch)) {-					new_range += " " + GlyphRange.serialize (c);+					if (!glyph_range.has_character (c) && c != "" && c != "?") {+						new_range += " " + GlyphRange.serialize (c);+					} 				} 			} 			diff --git a/libbirdfont/KerningTools.vala b/libbirdfont/KerningTools.valaindex 53e3ee7..c7f0b5b 100644--- a/libbirdfont/KerningTools.vala+++ b/libbirdfont/KerningTools.vala@@ -185,7 +185,7 @@ public class KerningTools : ToolCollection  { 			MainWindow.get_toolbox ().update_expanders (); 		} 	}-		+	 	public static void remove_empty_classes () { 		KerningRange kr; 		int i;@@ -213,6 +213,21 @@ public class KerningTools : ToolCollection  { 	public override Gee.ArrayList<Expander> get_expanders () { 		return expanders; 	}+	+	public static void update_spacing_classes () {	+		KerningRange kr;+		+		if (classes.tool.size == 0) {+			return;+		}++		foreach (Tool t in classes.tool) {+			return_if_fail (t is KerningRange);+			+			kr = (KerningRange) t;+			kr.update_spacing_class ();+		}+	} }  }diff --git a/libbirdfont/SpacingClassTab.vala b/libbirdfont/SpacingClassTab.valaindex 45954a6..9e5ca9f 100644--- a/libbirdfont/SpacingClassTab.vala+++ b/libbirdfont/SpacingClassTab.vala@@ -99,6 +99,8 @@ public class SpacingClassTab : FontDisplay { 				gc.get_current ().update_spacing_class (); 			} 		}+		+		KerningTools.update_spacing_classes (); 	}  	public void selected_row (Row row, int column, bool delete_button) {