fix missing flags

caryll · Aug 21, 2017 · f52d452 · f52d452
1 parent 0b641a5
commit f52d452
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/consolidate/otl/gpos-single.c b/lib/consolidate/otl/gpos-single.c
@@ -16,14 +16,16 @@ bool consolidate_gpos_single(otfcc_Font *font, table_OTL *table, otl_Subtable *_
 	gpos_single_hash *h = NULL;
 	for (glyphid_t k = 0; k < subtable->length; k++) {
 		if (!GlyphOrder.consolidateHandle(font->glyph_order, &subtable->items[k].target)) {
-			logWarning("[Consolidate] Ignored missing glyph /%s.\n", subtable->items[k].target.name);
+			logWarning("[Consolidate] Ignored missing glyph /%s.\n",
+			           subtable->items[k].target.name);
 			continue;
 		}
 		gpos_single_hash *s;
 		int fromid = subtable->items[k].target.index;
 		HASH_FIND_INT(h, &fromid, s);
 		if (s) {
-			logWarning("[Consolidate] Detected glyph double-mapping about /%s.\n", subtable->items[k].target.name);
+			logWarning("[Consolidate] Detected glyph double-mapping about /%s.\n",
+			           subtable->items[k].target.name);
 		} else {
 			NEW(s);
 			s->fromid = subtable->items[k].target.index;
@@ -38,10 +40,10 @@ bool consolidate_gpos_single(otfcc_Font *font, table_OTL *table, otl_Subtable *_
 
 	gpos_single_hash *s, *tmp;
 	HASH_ITER(hh, h, s, tmp) {
-		iSubtable_gpos_single.push(subtable,
-		                           ((otl_GposSingleEntry){
-		                               .target = Handle.fromConsolidated(s->fromid, s->fromname), .value = s->v,
-		                           }));
+		iSubtable_gpos_single.push(
+		    subtable, ((otl_GposSingleEntry){
+		                  .target = Handle.fromConsolidated(s->fromid, s->fromname), .value = s->v,
+		              }));
 		sdsfree(s->fromname);
 		HASH_DEL(h, s);
 		FREE(s);

diff --git a/lib/table/glyf.c b/lib/table/glyf.c
@@ -315,6 +315,8 @@ static glyf_Glyph *otfcc_read_composite_glyph(font_file_pointer start,
 			ref.d = otfcc_from_f2dot14(read_16s(start + offset + 2));
 			offset += 8;
 		}
+		ref.roundToGrid = flags & ROUND_XY_TO_GRID;
+		ref.useMyMetrics = flags & USE_MY_METRICS;
 		if (flags & WE_HAVE_INSTRUCTIONS) { glyphHasInstruction = true; }
 		glyf_iReferenceList.push(&g->references, ref);
 	} while (flags & MORE_COMPONENTS);