Process contextual ligatures before common ligatures

Changed files (3)

• modified libbirdfont/KerningStrings.vala
• modified libbirdfont/LigatureList.vala
• modified libbirdfont/Ligatures.vala

Diff

diff --git a/libbirdfont/KerningStrings.vala b/libbirdfont/KerningStrings.valaindex 8b1e3d5..9d7076c 100644--- a/libbirdfont/KerningStrings.vala+++ b/libbirdfont/KerningStrings.vala@@ -91,7 +91,6 @@ public class KerningStrings : GLib.Object { 				w = s.replace ("\r", ""); 				if (w != "") { 					kerning_strings.add (s);-					print (s + " Added"); 				} 			} 			diff --git a/libbirdfont/LigatureList.vala b/libbirdfont/LigatureList.valaindex 0b942fe..f749d63 100644--- a/libbirdfont/LigatureList.vala+++ b/libbirdfont/LigatureList.vala@@ -104,14 +104,14 @@ public class LigatureList : Table { 		rows.add (row); 		 		i = 0;-		ligatures.get_ligatures ((subst, liga) => {-			row = new Row.columns_3 (liga, "",  subst, i);+		ligatures.get_contextual_ligatures ((liga) => {+			row = new Row.columns_4 (liga.ligatures, liga.backtrack, liga.input, liga.lookahead, i); 			rows.add (row); 			i++; 		});--		ligatures.get_contextual_ligatures ((liga) => {-			row = new Row.columns_4 (liga.ligatures, liga.backtrack, liga.input, liga.lookahead, i);+		+		ligatures.get_ligatures ((subst, liga) => {+			row = new Row.columns_3 (liga, "",  subst, i); 			rows.add (row); 			i++; 		});diff --git a/libbirdfont/Ligatures.vala b/libbirdfont/Ligatures.valaindex cd8fda6..6707836 100644--- a/libbirdfont/Ligatures.vala+++ b/libbirdfont/Ligatures.vala@@ -109,6 +109,7 @@ public class Ligatures : GLib.Object { 		listener.signal_submit.connect (() => { 			TabContent.hide_text_input (); 			MainWindow.get_ligature_display ().update_rows ();+			sort_ligatures (); 		}); 		 		TabContent.show_text_input (listener);			@@ -130,6 +131,7 @@ public class Ligatures : GLib.Object { 		listener.signal_submit.connect (() => { 			TabContent.hide_text_input (); 			MainWindow.get_ligature_display ().update_rows ();+			sort_ligatures (); 		}); 		 		TabContent.show_text_input (listener);		@@ -151,6 +153,7 @@ public class Ligatures : GLib.Object { 		listener.signal_submit.connect (() => { 			TabContent.hide_text_input (); 			MainWindow.get_ligature_display ().update_rows ();+			sort_ligatures (); 		}); 		 		TabContent.show_text_input (listener);@@ -181,6 +184,7 @@ public class Ligatures : GLib.Object { 		listener.signal_submit.connect (() => { 			TabContent.hide_text_input (); 			MainWindow.get_ligature_display ().update_rows ();+			sort_ligatures (); 		}); 		 		TabContent.show_text_input (listener);