shithub: neatroff

Info  •  Files  •  Log  •  Branches

font: store every glyph described in the font descriptor

--- a/font.c

+++ b/font.c

@@ -332,13 +332,10 @@

 	if (strcmp("\"", tok)) {

 		if (fscanf(fin, "%d %s", &type, id) != 2)

 			return 1;

-		*gid = dict_get(fn->gl_dict, id);

-		if (*gid < 0) {

-			*gid = font_glyphput(fn, id, name, type);

-			g = &fn->gl[*gid];

-			sscanf(tok, "%hd,%hd,%hd,%hd,%hd", &g->wid,

-				&g->llx, &g->lly, &g->urx, &g->ury);

-		}

+		*gid = font_glyphput(fn, id, name, type);

+		g = &fn->gl[*gid];

+		sscanf(tok, "%hd,%hd,%hd,%hd,%hd", &g->wid,

+			&g->llx, &g->lly, &g->urx, &g->ury);

 		dict_put(fn->ch_dict, name, *gid);

 		(*n)++;

 	} else {