shithub: fnt

Info  •  Files  •  Log  •  Branches

fix scaling; add highlight; change filling color

--- a/rast.c

+++ b/rast.c

@@ -597,9 +597,12 @@

 				gscaleX *= cg->scaleX;

 				gscaleY *= cg->scaleY;

 			}

-			if((cg->flags & CGLYPH_FL_SCALED_COMPONENT_OFFSET) == 0){

+			if(cg->flags & CGLYPH_FL_SCALED_COMPONENT_OFFSET){

 				dx *= gscaleX;

 				dy *= gscaleY;

+			}else{

+				dx *= scale;

+				dy *= scale;

 			}

 /* FIXME rounding

 			if(cg->flags & CGLYPH_FL_ROUND_TO_GRID_XY){

--- a/test.h

+++ b/test.h

@@ -1,21 +1,22 @@

 static void

 printusage(Otfile *f)

 {

-	f->print(f->aux, "usage: %s [-i GLYPH_ID] [-m] [-p PX] font.otf ...\n", argv0);

+	f->print(f->aux, "usage: %s [-i GLYPH_ID] [-p PPEM  [-g PIXELS] [-m ... -[-H GLYPH_ID]]] font.otf ...\n", argv0);

 	f->print(f->aux, " -i: specifies a single glyph id\n");

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

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

 	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, " -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 adds filling of empty pixels\n");

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

 }

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

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

 static int

 dumpmap(Otfile *f, GlyfImage *im, int n)

 {

-	int x, y, i, j, t, maxh, prebase, postbase, d;

+	int x, y, i, j, t, maxh, prebase, postbase, d, border;

 	int gap, total, mid, npix, bw, bh, lines, fill;

 	u8int *b;

@@ -35,6 +36,8 @@

 	npix = (mid+gap)*(maxh+gap)*n;

 	bh = sqrt(npix);

 	bw = npix/bh;

+	npix *= 2;

+	bh *= 2;

 	npix += bw*gap;

 	if((b = malloc(npix*3)) == nil)

 		return -1;

@@ -41,7 +44,8 @@

 	memset(b, 0xff, npix*3);

 	y = gap;

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

-		for(prebase = postbase = x = 0, j = i; j < n; j++){

+		prebase = postbase = 0;

+		for(x = 0, j = i; j < n; j++){

 			if(im[j].b == nil)

 				continue;

 			x += im[j].w + gap;

@@ -49,8 +53,8 @@

 				break;

 			if(prebase < im[j].h+im[j].baseline)

 				prebase = im[j].h+im[j].baseline;

-			if(postbase < im[j].baseline)

-				postbase = im[j].baseline;

+			if(im[j].baseline < 0 && postbase < -im[j].baseline)

+				postbase = -im[j].baseline;

 		}

 		maxh = prebase + postbase;

 		if(j == i || y+maxh > bh)

@@ -60,16 +64,24 @@

 			if(im[i].b == nil)

 				continue;

 			u8int *lt = b + ((y + prebase - (im[i].h+im[i].baseline))*bw + x)*3;

+			x += im[i].w + gap;

 			for(d = 0; d < im[i].h; d++, lt += bw*3){

 				for(t = 0; t < im[i].w; t++){

 					u8int r, g, b;

 					r = g = b = im[i].b[d*im[i].w + t];

-					if(lines && g == 0xff && (d == im[i].h+im[i].baseline)){

+					border = d == 0 || t == 0 || t == im[i].w-1 || d == im[i].h-1;

+					if((lines || highlight == i) && g == 0xff && (d == im[i].h+im[i].baseline)){

 						g = 0;

 						b = 0;

-					}else if(lines && g == 0xff && (fill || t == 0 || t == im[i].w-1 || d == 0 || d == im[i].h-1)){

-						r = 0;

-						b = 0;

+					}else if((lines || highlight == i) && g == 0xff && (fill || border)){

+						if(fill && !border){

+							r = 0xff;

+							g = 0x80;

+							b = 0xff;

+						}else if(border){

+							r = 0;

+							b = 0;

+						}

 					}

 					if(r != 0xff || g != 0xff || b != 0xff){ 

 						lt[t*3+0] = b;

@@ -78,7 +90,6 @@

 					}

 				}

 			}

-			x += im[i].w + gap;

 		}

 		y += maxh + gap;

 	}

@@ -92,6 +103,9 @@

 	ARGBEGIN{ \

 	case 'g': \

 		gap = strtol(EARGF(usage(&out)), nil, 0); \

+		break; \

+	case 'H': \

+		highlight = strtol(EARGF(usage(&out)), nil, 0); \

 		break; \

 	case 'i': \

 		gind = strtol(EARGF(usage(&out)), nil, 0); \