shithub: fnt

Info  •  Files  •  Log  •  Branches

add -R option to only process glyphs representing valid runes

--- a/test.h

+++ b/test.h

@@ -7,12 +7,13 @@

 	f->print(f->aux, " -p: draw (of size in pixels per em) and write the image to stdout\n");

 	f->print(f->aux, " -g: gap (in pixels) to add to every border of a glyph\n");

 	f->print(f->aux, " -m: print out glyph ids or render them all as a map (with -p)\n");

+	f->print(f->aux, " -R: ignore glyphs that do not represent valid runes\n");

 	f->print(f->aux, " -H: highlight a specific glyph in the map by its ID\n");

 	f->print(f->aux, "Specifying -m more than once adds guide lines\n");

 	f->print(f->aux, "Specifying -m more than twice makes empty pixels filled out\n");

 }

-static int gap, gind = -1, map, highlight = -1;

+static int gap, gind = -1, map, highlight = -1, runesonly;

 static double ppem;

 static Rune rune = NoRune;

@@ -113,8 +114,13 @@

 	if((o = otfopen(in)) == nil)

 		return -1;

 	n = otfglyfnum(o);

-	if(rune != NoRune && (gind = otfrune2glyph(o, rune)) < 0){

-		werrstr("no such rune->glyph mapping\n");

+	if(rune != NoRune){

+		if((gind = otfrune2glyph(o, rune)) < 0){

+			werrstr("no such rune->glyph mapping\n");

+			return -1;

+		}

+	}else if(gind >= 0 && runesonly && otfglyph2rune(o, gind) == NoRune){

+		werrstr("no such glyph->rune mapping\n");

 		return -1;

 	}

 	if(gind >= n){

@@ -124,6 +130,8 @@

 	if(map && gind < 0){

 		im = ppem > 0 ? calloc(n, sizeof(*im)) : nil;

 		for(i = 0; i < n; i++){

+			if(runesonly && otfglyph2rune(o, i) == NoRune)

+				continue;

 			if((g = otfglyf(o, i)) == nil){

 				gind = i;

 glypherr:

@@ -197,6 +205,9 @@

 			out.print(out.aux, "invalid rune\n"); \

 			usage(&out); \

 		} \

+		break; \

+	case 'R': \

+		runesonly++; \

 		break; \

 	default: \

 		usage(&out); \