List all alternates

Changed files (4)

• modified libbirdfont/AlternateSets.vala
• modified libbirdfont/OpenFontFormat/Alternate.vala
• modified libbirdfont/OtfFeatureTable.vala
• modified libbirdfont/StrokeTool.vala

Diff

diff --git a/libbirdfont/AlternateSets.vala b/libbirdfont/AlternateSets.valaindex b95e968..b33d7d4 100644--- a/libbirdfont/AlternateSets.vala+++ b/libbirdfont/AlternateSets.vala@@ -32,6 +32,10 @@ public class AlternateSets : GLib.Object { 			} 		} 		+		tags.sort ((a, b) => {+			return strcmp ((string) a, (string) b);+		});+		 		return tags; 	} @@ -48,6 +52,18 @@ public class AlternateSets : GLib.Object { 		return alt; 	} 	+	public void remove_empty_sets () {+		int i = 0;+		foreach (Alternate a in alternates) {+			if (a.is_empty ()) {+				alternates.remove_at (i);+				remove_empty_sets ();+				return;+			}+			i++;+		}+	}+	 	public void add (Alternate alternate) { 		alternates.add (alternate); 	}@@ -61,4 +77,18 @@ public class AlternateSets : GLib.Object { 	} } +public class AlternateItem : GLib.Object {+	public Alternate alternate_list;+	public string alternate;+	+	public AlternateItem (Alternate alternate_list, string alternate) {+		this.alternate_list = alternate_list;+		this.alternate = alternate;+	}+	+	public void delete_item_from_list () {+		alternate_list.remove_alternate (alternate);+	}+}+ }diff --git a/libbirdfont/OpenFontFormat/Alternate.vala b/libbirdfont/OpenFontFormat/Alternate.valaindex 9dbdd0c..2d899ff 100644--- a/libbirdfont/OpenFontFormat/Alternate.vala+++ b/libbirdfont/OpenFontFormat/Alternate.vala@@ -26,14 +26,18 @@ public class Alternate : GLib.Object { 		this.tag = tag; 	} +	public bool is_empty () {+		return alternates.size == 0;+	}+ 	public void add (string alternate_name) { 		alternates.add (alternate_name); 	} 	-	public void remove (GlyphCollection g) {+	public void remove_alternate (string alt) { 		int i = 0; 		foreach (string a in alternates) {-			if (a == g.get_name ()) {+			if (a == alt) { 				break; 			} 			i++;@@ -41,7 +45,11 @@ public class Alternate : GLib.Object { 		 		if (i < alternates.size) { 			alternates.remove_at (i);-		}+		}		+	}+	+	public void remove (GlyphCollection g) {+		remove_alternate (g.get_name ()); 	} 	 	public Alternate copy () {diff --git a/libbirdfont/OtfFeatureTable.vala b/libbirdfont/OtfFeatureTable.valaindex c947c56..a3459a7 100644--- a/libbirdfont/OtfFeatureTable.vala+++ b/libbirdfont/OtfFeatureTable.vala@@ -24,14 +24,19 @@ public class OtfFeatureTable : Table { 	static const int OTF_FEATURE = 1; 	static const int SOURCE_GLYPH = 2; // the glyph to replace 	static const int REPLACEMENT_GLYPH = 3;+	static const int ALTERNATE_ENTRY = 4; 	 	GlyphCollection glyph_collection; 	GlyphCollection? replacement_glyph = null; 	string alternate_name = ""; 	TextListener listener; 	+	Gee.ArrayList<AlternateItem> undo_items;+	// FIXME: implement redo+	 	public OtfFeatureTable (GlyphCollection gc) { 		glyph_collection = gc;+		undo_items = new Gee.ArrayList<AlternateItem> (); 	}  	public override Gee.ArrayList<Row> get_rows () {@@ -40,6 +45,9 @@ public class OtfFeatureTable : Table {  	public override void selected_row (Row row, int column, bool delete_button) { 		int row_index = row.get_index ();+		Object o;+		String s;+		AlternateItem a; 		 		if (row_index == SOURCE_GLYPH) { 			GlyphSelection gs = new GlyphSelection ();@@ -60,14 +68,35 @@ public class OtfFeatureTable : Table { 			 			GlyphCanvas.set_display (gs); 		} else if (row_index == OTF_FEATURE) {-			String s = (String) row.get_row_data ();+			return_if_fail (row.has_row_data ());+			o = (!) row.get_row_data ();+			return_if_fail (o is String);+			s = (String) o; 			add_new_alternate (s.data);+		} else if (row_index == ALTERNATE_ENTRY) {+			if (delete_button) {+				return_if_fail (row.has_row_data ());+				o = (!) row.get_row_data ();+				return_if_fail (o is AlternateItem);+				a = (AlternateItem) o;+				+				a.delete_item_from_list ();				+				Font f = BirdFont.get_current_font ();+				f.alternates.remove_empty_sets ();+				+				undo_items.add (a);+				+				update_rows ();+				GlyphCanvas.redraw ();+			} 		} 	}  	public override void update_rows () { 		Row row;-+		Font font;+		+		font = BirdFont.get_current_font (); 		rows.clear ();  		row = new Row.headline (t_("Glyph Substitutions"));@@ -106,10 +135,34 @@ public class OtfFeatureTable : Table { 		row = new Row.columns_1 (OtfLabel.get_string ("swsh"), OTF_FEATURE, false); 		row.set_row_data (new String ("swsh")); 		rows.add (row);-				+		+		Gee.ArrayList<string> tags = font.alternates.get_all_tags ();+		foreach (string tag in tags) {+			row = new Row.headline (OtfLabel.get_string (tag));+			rows.add (row);+			add_alternate_items (tag);+		}+			 		GlyphCanvas.redraw (); 	} +	void add_alternate_items (string tag) {+		Font font = BirdFont.get_current_font ();+		foreach (Alternate alt in font.alternates.get_alt (tag)) {+			add_alternate_rows (alt);+		}		+	}++	void add_alternate_rows (Alternate alt) {+		Row row;+		+		foreach (string a in alt.alternates) {+			row = new Row.columns_2 (alt.glyph_name, a, ALTERNATE_ENTRY, true);+			row.set_row_data (new AlternateItem (alt, a));+			rows.add (row);+		}		+	}+ 	public override string get_label () { 		return t_("Glyph Substitutions"); 	}@@ -162,8 +215,26 @@ public class OtfFeatureTable : Table { 			MainWindow.tabs.close_display (this); 		} else { 			TabContent.show_text_input (listener);-		}+		}		+	}+	+	public override void undo () {+		AlternateItem item;+		Font font;+		+		font = BirdFont.get_current_font (); 		+		if (undo_items.size > 0) {+			item = undo_items.get (undo_items.size - 1);+			undo_items.remove_at (undo_items.size - 1);+			+			font.add_alternate (item.alternate_list.glyph_name,+				item.alternate,+				item.alternate_list.tag);+				+			update_rows ();+			GlyphCanvas.redraw ();+		} 	} } diff --git a/libbirdfont/StrokeTool.vala b/libbirdfont/StrokeTool.valaindex ae015b5..d4e3ffb 100644--- a/libbirdfont/StrokeTool.vala+++ b/libbirdfont/StrokeTool.vala@@ -226,7 +226,7 @@ public class StrokeTool : Tool { 			if (fabs (ep.get_right_handle ().angle - ep.get_left_handle ().angle) % (2 * PI) < 0.01) { 				ps = new PointSelection (ep, p); 				PenTool.remove_point_simplify (ps);-			} else if (ep.next != null && Path.distance_to_point (ep, next) < 0.01) {+			} else if (Path.distance_to_point (ep, next) < 0.01) { 				ps = new PointSelection (ep, p); 				PenTool.remove_point_simplify (ps); 			}