Merge branch 'master' into releases

caryll · Sep 28, 2017 · 18d6d24 · 18d6d24
2 parents c3fc710 + d761d24
commit 18d6d24
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/lib/consolidate/otl/gsub-ligature.c b/lib/consolidate/otl/gsub-ligature.c
@@ -12,9 +12,16 @@ bool consolidate_gsub_ligature(otfcc_Font *font, table_OTL *table, otl_Subtable
 		}
 		fontop_consolidateCoverage(font, subtable->items[k].from, options);
 		Coverage.shrink(subtable->items[k].from, false);
-		iSubtable_gsub_ligature.push(&nt, ((otl_GsubLigatureEntry){
-		                                      .from = subtable->items[k].from, .to = Handle.dup(subtable->items[k].to),
-		                                  }));
+		if (!subtable->items[k].from->numGlyphs) {
+			logWarning("[Consolidate] Ignoring empty ligature substitution to "
+			           "glyph /%s.\n",
+			           subtable->items[k].to.name);
+			continue;
+		}
+		iSubtable_gsub_ligature.push(
+		    &nt, ((otl_GsubLigatureEntry){
+		             .from = subtable->items[k].from, .to = Handle.dup(subtable->items[k].to),
+		         }));
 		subtable->items[k].from = NULL;
 	}
 	iSubtable_gsub_ligature.replace(subtable, &nt);

diff --git a/lib/consolidate/otl/gsub-multi.c b/lib/consolidate/otl/gsub-multi.c
@@ -23,7 +23,7 @@ bool consolidate_gsub_multi(otfcc_Font *font, table_OTL *table, otl_Subtable *_s
 		fontop_consolidateCoverage(font, subtable->items[k].to, options);
 		Coverage.shrink(subtable->items[k].to, false);
 		if (!subtable->items[k].to->numGlyphs) {
-			logWarning("[Consolidate] Ignorign empty one-to-many / alternative substitution for "
+			logWarning("[Consolidate] Ignoring empty one-to-many / alternative substitution for "
 			           "glyph /%s.\n",
 			           subtable->items[k].from.name);
 			continue;