pdf: a basic pdf post-processor

Author: aligrudi

Makefile

@@ -4,12 +4,15 @@ FDIR = /neatroff/font
 CC = cc
 CFLAGS = -Wall -O2 "-DTROFFFDIR=\"$(FDIR)\""
 LDFLAGS =
-OBJS = post.o out.o ps.o font.o dev.o clr.o dict.o iset.o
+OBJS = post.o ps.o font.o dev.o clr.o dict.o iset.o
+OBJSPDF = post.o pdf.o font.o dev.o clr.o dict.o iset.o sbuf.o
 
-all: post
+all: post pdf
 %.o: %.c post.h
 	$(CC) -c $(CFLAGS) $<
 post: $(OBJS)
 	$(CC) -o $@ $(OBJS) $(LDFLAGS)
+pdf: $(OBJSPDF)
+	$(CC) -o $@ $(OBJSPDF) $(LDFLAGS)
 clean:
-	rm -f *.o post
+	rm -f *.o post pdf

dict.c

@@ -25,7 +25,7 @@ static void dict_extend(struct dict *d, int size)
 
 struct dict *dict_make(int notfound, int dupkeys)
 {
-	struct dict *d = xmalloc(sizeof(*d));
+	struct dict *d = malloc(sizeof(*d));
 	memset(d, 0, sizeof(*d));
 	d->n = 1;
 	d->dupkeys = dupkeys;
@@ -54,7 +54,7 @@ void dict_put(struct dict *d, char *key, int val)
 		dict_extend(d, d->n + CNTMIN);
 	if (d->dupkeys) {
 		int len = strlen(key) + 1;
-		char *dup = xmalloc(len);
+		char *dup = malloc(len);
 		memcpy(dup, key, len);
 		key = dup;
 	}

font.c

@@ -7,6 +7,7 @@
 struct font {
 	char name[FNLEN];
 	char fontname[FNLEN];
+	char fontpath[1024];
 	int spacewid;
 	struct glyph *gl;		/* glyphs present in the font */
 	int gl_n, gl_sz;		/* number of glyphs in the font */
@@ -108,7 +109,7 @@ struct font *font_open(char *path)
 	fin = fopen(path, "r");
 	if (!fin)
 		return NULL;
-	fn = xmalloc(sizeof(*fn));
+	fn = malloc(sizeof(*fn));
 	if (!fn) {
 		fclose(fin);
 		return NULL;
@@ -126,6 +127,12 @@ struct font *font_open(char *path)
 			fscanf(fin, "%s", fn->name);
 		} else if (!strcmp("fontname", tok)) {
 			fscanf(fin, "%s", fn->fontname);
+		} else if (!strcmp("fontpath", tok)) {
+			int c = fgetc(fin);
+			while (c == ' ')
+				c = fgetc(fin);
+			ungetc(c, fin);
+			tilleol(fin, fn->fontpath);
 		} else if (!strcmp("ligatures", tok)) {
 			while (fscanf(fin, "%s", tok) == 1)
 				if (!strcmp("0", tok))
@@ -166,3 +173,18 @@ char *font_name(struct font *fn)
 {
 	return fn->fontname;
 }
+
+char *font_path(struct font *fn)
+{
+	return fn->fontpath;
+}
+
+int font_glnum(struct font *fn, struct glyph *g)
+{
+	return g - fn->gl;
+}
+
+struct glyph *font_glget(struct font *fn, int id)
+{
+	return id >= 0 && id < fn->gl_n ? &fn->gl[id] : NULL;
+}

iset.c

@@ -24,7 +24,7 @@ static void iset_extend(struct iset *iset, int cnt)
 
 struct iset *iset_make(void)
 {
-	struct iset *iset = xmalloc(sizeof(*iset));
+	struct iset *iset = malloc(sizeof(*iset));
 	memset(iset, 0, sizeof(*iset));
 	iset_extend(iset, CNTMIN);
 	return iset;
@@ -60,7 +60,7 @@ void iset_put(struct iset *iset, int key, int ent)
 	if (key >= 0 && key < iset->cnt && iset->len[key] + 1 >= iset->sz[key]) {
 		int olen = iset->sz[key];
 		int nlen = iset->sz[key] * 2 + 8;
-		void *nset = xmalloc(nlen * sizeof(iset->set[key][0]));
+		void *nset = malloc(nlen * sizeof(iset->set[key][0]));
 		if (iset->set[key]) {
 			memcpy(nset, iset->set[key],
 				olen * sizeof(iset->set[key][0]));