shithub: fnt

Info  •  Files  •  Log  •  Branches

fix and bring back glyph pretty-printing

--- a/mkfile

+++ b/mkfile

@@ -12,6 +12,7 @@

 HFILES=\

   otf.h\

+  plan9/otfsys.h\

 default:V: all

--- a/otf.c

+++ b/otf.c

@@ -353,7 +353,7 @@

 print_ComponentGlyph(Otfile *f, int indent, Otf *o, ComponentGlyph *v)

 {

 	void *a = f->aux;

-	f->print(a, "%*s%s: %#ux%s%s%s%s%s%s%s%s%s%s\n", indent, "", "flags", v->flags,

+	f->print(a, "%*s%s: %#"PRIx16"%s%s%s%s%s%s%s%s%s%s\n", indent, "", "flags", v->flags,

 		(v->flags&CGLYPH_FL_ROUND_TO_GRID_XY)?" CGLYPH_FL_ROUND_TO_GRID_XY":"",

 		(v->flags&CGLYPH_FL_SCALE)?" CGLYPH_FL_SCALE":"",

 		(v->flags&CGLYPH_FL_MORE_COMPONENTS)?" CGLYPH_FL_MORE_COMPONENTS":"",

@@ -365,7 +365,7 @@

 		(v->flags&CGLYPH_FL_SCALED_COMPONENT_OFFSET)?" CGLYPH_FL_SCALED_COMPONENT_OFFSET":"",

 		(v->flags&CGLYPH_FL_UNSCALED_COMPONENT_OFFSET)?" CGLYPH_FL_UNSCALED_COMPONENT_OFFSET":""

 	);

-	f->print(a, "%*s%s: %ud\n", indent, "", "glyphIndex", v->glyphIndex);

+	f->print(a, "%*s%s: %"PRIu16"\n", indent, "", "glyphIndex", v->glyphIndex);

 	if(v->arg1 != 0 || v->arg2 != 0){

 		f->print(f->aux, "%*s%s: %d\n", indent, "", "arg1", v->arg1);

 		f->print(f->aux, "%*s%s: %d\n", indent, "", "arg2", v->arg2);

@@ -382,15 +382,15 @@

 		f->print(a, "%*s%s: %g\n", indent, "", "scaleY", v->scaleY);

 	}

 	if(v->numInstr > 0 && v->instr != nil){

-		f->print(a, "%*s%s: %ud\n", indent, "", "numInstr", v->numInstr);

+		f->print(a, "%*s%s: %"PRIu16"\n", indent, "", "numInstr", v->numInstr);

 		f->print(a, "%*s%s:", indent, "", "instr");

 		for(int i = 0; i < v->numInstr; i++)

-			f->print(a, " %02ux", v->instr[i]);

+			f->print(a, " %02"PRIx8, v->instr[i]);

 		f->print(a, "\n");

 	}

 	if(v->next != nil){

 		f->print(a, "%*s%s:\n", indent, "", "next");

-		print_ComponentGlyph(a, indent+indentΔ, o, v->next);

+		print_ComponentGlyph(f, indent+indentΔ, o, v->next);

 	}

 }

@@ -524,7 +524,7 @@

 	if(v->numEndPtsOfContours > 0){

 		f->print(a, "%*s%s:", indent, "", "endPtsOfContours");

 		for(int i = 0; i < v->numEndPtsOfContours; i++)

-			f->print(a, " %ud", v->endPtsOfContours[i]);

+			f->print(a, " %"PRId16, v->endPtsOfContours[i]);

 		f->print(a, "\n");

 	}

 	if(v->instructionLength > 0){

@@ -531,7 +531,7 @@

 		f->print(a, "%*s%s: %ud\n", indent, "", "instructionLength", v->instructionLength);

 		f->print(a, "%*s%s:", indent, "", "instructions");

 		for(int i = 0; i < v->instructionLength; i++)

-			f->print(a, " %02ux", v->instructions[i]);

+			f->print(a, " %02"PRIx8, v->instructions[i]);

 		f->print(a, "\n");

 	}

 	if(v->numPoints > 0){

--- a/otf.c.in

+++ b/otf.c.in

@@ -339,7 +339,7 @@

 print_ComponentGlyph(Otfile *f, int indent, Otf *o, ComponentGlyph *v)

 {

 	void *a = f->aux;

-	f->print(a, "%*s%s: %#ux%s%s%s%s%s%s%s%s%s%s\n", indent, "", "flags", v->flags,

+	f->print(a, "%*s%s: %#"PRIx16"%s%s%s%s%s%s%s%s%s%s\n", indent, "", "flags", v->flags,

 		(v->flags&CGLYPH_FL_ROUND_TO_GRID_XY)?" CGLYPH_FL_ROUND_TO_GRID_XY":"",

 		(v->flags&CGLYPH_FL_SCALE)?" CGLYPH_FL_SCALE":"",

 		(v->flags&CGLYPH_FL_MORE_COMPONENTS)?" CGLYPH_FL_MORE_COMPONENTS":"",

@@ -351,7 +351,7 @@

 		(v->flags&CGLYPH_FL_SCALED_COMPONENT_OFFSET)?" CGLYPH_FL_SCALED_COMPONENT_OFFSET":"",

 		(v->flags&CGLYPH_FL_UNSCALED_COMPONENT_OFFSET)?" CGLYPH_FL_UNSCALED_COMPONENT_OFFSET":""

 	);

-	f->print(a, "%*s%s: %ud\n", indent, "", "glyphIndex", v->glyphIndex);

+	f->print(a, "%*s%s: %"PRIu16"\n", indent, "", "glyphIndex", v->glyphIndex);

 	if(v->arg1 != 0 || v->arg2 != 0){

 		f->print(f->aux, "%*s%s: %d\n", indent, "", "arg1", v->arg1);

 		f->print(f->aux, "%*s%s: %d\n", indent, "", "arg2", v->arg2);

@@ -368,15 +368,15 @@

 		f->print(a, "%*s%s: %g\n", indent, "", "scaleY", v->scaleY);

 	}

 	if(v->numInstr > 0 && v->instr != nil){

-		f->print(a, "%*s%s: %ud\n", indent, "", "numInstr", v->numInstr);

+		f->print(a, "%*s%s: %"PRIu16"\n", indent, "", "numInstr", v->numInstr);

 		f->print(a, "%*s%s:", indent, "", "instr");

 		for(int i = 0; i < v->numInstr; i++)

-			f->print(a, " %02ux", v->instr[i]);

+			f->print(a, " %02"PRIx8, v->instr[i]);

 		f->print(a, "\n");

 	}

 	if(v->next != nil){

 		f->print(a, "%*s%s:\n", indent, "", "next");

-		print_ComponentGlyph(a, indent+indentΔ, o, v->next);

+		print_ComponentGlyph(f, indent+indentΔ, o, v->next);

 	}

 }

@@ -510,7 +510,7 @@

 	if(v->numEndPtsOfContours > 0){

 		f->print(a, "%*s%s:", indent, "", "endPtsOfContours");

 		for(int i = 0; i < v->numEndPtsOfContours; i++)

-			f->print(a, " %ud", v->endPtsOfContours[i]);

+			f->print(a, " %"PRId16, v->endPtsOfContours[i]);

 		f->print(a, "\n");

 	}

 	if(v->instructionLength > 0){

@@ -517,7 +517,7 @@

 		f->print(a, "%*s%s: %ud\n", indent, "", "instructionLength", v->instructionLength);

 		f->print(a, "%*s%s:", indent, "", "instructions");

 		for(int i = 0; i < v->instructionLength; i++)

-			f->print(a, " %02ux", v->instructions[i]);

+			f->print(a, " %02"PRIx8, v->instructions[i]);

 		f->print(a, "\n");

 	}

 	if(v->numPoints > 0){

--- a/plan9/otfsys.h

+++ b/plan9/otfsys.h

@@ -2,4 +2,9 @@

 #include <u.h>

 #include <libc.h>

+#define PRIx8 "ux"

+#define PRIx16 "ux"

+#define PRIu16 "ud"

+#define PRId16 "d"

+

 Tmfmt fmttime(vlong v);

--- a/rast.c

+++ b/rast.c

@@ -351,7 +351,7 @@

 	s₀ = 0;

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

 #define det(a,b) (a.x*b.y - a.y*b.x)

-#define cQ(s) (det(s.p0, s.p1) + det(s.p1, s.p2) + det(s.p0, s.p2)/2)/3

+#define cQ(s) (det(s.p0, s.p1) + det(s.p1, s.p2) + det(s.p0, s.p2)/2.0)/3.0

 		s₀ -= cQ(seg[i]);

 #undef det

 #undef cQ

--- a/test_plan9.c

+++ b/test_plan9.c

@@ -112,22 +112,23 @@

 			fprint(2, "%r\n");

 			continue;

 		}

-		if(G){

+		if(G && gi < 0){

 			int i, n = otfglyfnum(o);

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

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

 				Glyf *g = otfglyf(o, i);

-				if(g != nil && g->simple != nil && g->numberOfContours > 0){

-					if(h > 0){

-						int w;

-						u8int *b = otfdrawglyf(g, h, &w);

-						if(b == nil)

-							sysfatal("%r");

-						im[i].w = w;

-						im[i].b = b;

-					}else{

-						fprint(2, "%d ", i);

-					}

+				if(g == nil)

+					continue;

+				if(h > 0 && g->simple != nil && g->numberOfContours > 0){

+					int w;

+					u8int *b = otfdrawglyf(g, h, &w);

+					if(b == nil)

+						sysfatal("%r");

+					im[i].w = w;

+					im[i].b = b;

+				}else if(h <= 0){

+					Bprint(out.aux, "%d (%s):\n", i, g->simple ? "simple" : "component");

+					print_Glyf(&out, indentΔ, o, g);

 				}

 				free(g);

 			}

--- a/test_unix.c

+++ b/test_unix.c

@@ -139,24 +139,25 @@

 			fprintf(stderr, "%s: failed\n", argv[i]);

 			continue;

 		}

-		if(G){

+		if(G && gi < 0){

 			int i, n = otfglyfnum(o);

 			Image *im = h > 0 ? calloc(n, sizeof(*im)) : NULL;

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

 				Glyf *g = otfglyf(o, i);

-				if(g != NULL && g->simple != NULL && g->numberOfContours > 0){

-					if(h > 0){

-						int w;

-						u8int *b = otfdrawglyf(g, h, &w);

-						if(b == NULL){

-							fprintf(stderr, "failed\n");

-							exit(1);

-						}

-						im[i].w = w;

-						im[i].b = b;

-					}else{

-						fprintf(out.aux, "%d ", i);

+				if(g == NULL)

+					continue;

+				if(h > 0 && g->simple != NULL && g->numberOfContours > 0){

+					int w;

+					u8int *b = otfdrawglyf(g, h, &w);

+					if(b == NULL){

+						fprintf(stderr, "failed\n");

+						exit(1);

 					}

+					im[i].w = w;

+					im[i].b = b;

+				}else if(h <= 0){

+					fprintf(out.aux, "%d (%s):\n", i, g->simple ? "simple" : "component");

+					print_Glyf(&out, indentΔ, o, g);

 				}

 				free(g);

 			}

@@ -165,8 +166,6 @@

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

 					free(im[i].b);

 				free(im);

-			}else{

-				fprintf(out.aux, "\n");

 			}

 		}else if(gi < 0){

 			otfprint(o, &out, indentΔ);

--- a/unix/otfsys.h

+++ b/unix/otfsys.h

@@ -3,6 +3,7 @@

 #include <stdlib.h>

 #include <string.h>

 #include <math.h>

+#include <inttypes.h>

 #define nil NULL

 #define USED(x) (void)(x)