shithub: neatmkfn

Info  •  Files  •  Log

afm: move afm-related functions to afm.c

--- a/Makefile

+++ b/Makefile

@@ -5,7 +5,7 @@

 all: mkfn

 %.o: %.c

 	$(CC) -c $(CFLAGS) $<

-mkfn: mkfn.o trfn.o sbuf.o tab.o otf.o

+mkfn: mkfn.o trfn.o sbuf.o tab.o afm.o otf.o

 	$(CC) -o $@ $^ $(LDFLAGS)

 clean:

 	rm -f *.o mkfn

--- /dev/null

+++ b/afm.c

@@ -1,0 +1,94 @@

+#include <ctype.h>

+#include <stdio.h>

+#include <stdlib.h>

+#include <string.h>

+#include "trfn.h"

+

+#define TOKLEN		256

+

+static char *afm_charfield(char *s, char *d)

+{

+	while (*s && !isspace(*s) && *s != ';')

+		*d++ = *s++;

+	while (isspace(*s) || *s == ';')

+		s++;

+	*d = '\0';

+	return s;

+}

+

+int afm_read(void)

+{

+	char ln[1024];

+	char ch[TOKLEN] = "", pos[TOKLEN] = "";

+	char c1[TOKLEN] = "", c2[TOKLEN] = "";

+	char wid[TOKLEN] = "", field[TOKLEN] = "";

+	char llx[TOKLEN] = "0", lly[TOKLEN] = "0";

+	char urx[TOKLEN] = "0", ury[TOKLEN] = "0";

+	char *s;

+	while (fgets(ln, sizeof(ln), stdin)) {

+		if (ln[0] == '#')

+			continue;

+		if (!strncmp("FontName ", ln, 8)) {

+			sscanf(ln, "FontName %s", ch);

+			trfn_psfont(ch);

+			continue;

+		}

+		if (!strncmp("StartCharMetrics", ln, 16))

+			break;

+	}

+	while (fgets(ln, sizeof(ln), stdin)) {

+		if (ln[0] == '#')

+			continue;

+		if (!strncmp("EndCharMetrics", ln, 14))

+			break;

+		s = ln;

+		while (*s) {

+			s = afm_charfield(s, field);

+			if (!strcmp("C", field)) {

+				s = afm_charfield(s, pos);

+				continue;

+			}

+			if (!strcmp("WX", field)) {

+				s = afm_charfield(s, wid);

+				continue;

+			}

+			if (!strcmp("N", field)) {

+				s = afm_charfield(s, ch);

+				continue;

+			}

+			if (!strcmp("B", field)) {

+				s = afm_charfield(s, llx);

+				s = afm_charfield(s, lly);

+				s = afm_charfield(s, urx);

+				s = afm_charfield(s, ury);

+				continue;

+			}

+			if (!strcmp("L", field)) {

+				s = afm_charfield(s, c1);

+				s = afm_charfield(s, c2);

+				continue;

+			}

+			break;

+		}

+		if (ch[0] && pos[0] && wid[0])

+			trfn_char(ch, atoi(pos), 0, atoi(wid),

+				atoi(llx), atoi(lly), atoi(urx), atoi(ury));

+	}

+	while (fgets(ln, sizeof(ln), stdin)) {

+		if (ln[0] == '#')

+			continue;

+		if (!strncmp("StartKernPairs", ln, 14))

+			break;

+	}

+	while (fgets(ln, sizeof(ln), stdin)) {

+		if (ln[0] == '#')

+			continue;

+		if (!strncmp("EndKernPairs", ln, 12))

+			break;

+		if (sscanf(ln, "KPX %s %s %s", c1, c2, wid) == 3)

+			trfn_kern(c1, c2, atoi(wid));

+	}

+	return 0;

+}

+

+

--- a/mkfn.c

+++ b/mkfn.c

@@ -5,105 +5,15 @@

  *

  * This program is released under the Modified BSD license.

  */

-#include <ctype.h>

-#include <fcntl.h>

 #include <stdio.h>

 #include <string.h>

 #include <stdlib.h>

-#include <unistd.h>

 #include "trfn.h"

-#define TOKLEN		256

-

 static char *trfn_scripts;	/* filtered scripts */

 static char *trfn_langs;	/* filtered languages */

 static char *trfn_featranks;	/* manual feature ordering */

-static char *afm_charfield(char *s, char *d)

-{

-	while (*s && !isspace(*s) && *s != ';')

-		*d++ = *s++;

-	while (isspace(*s) || *s == ';')

-		s++;

-	*d = '\0';

-	return s;

-}

-

-static int afm_read(void)

-{

-	char ln[1024];

-	char ch[TOKLEN] = "", pos[TOKLEN] = "";

-	char c1[TOKLEN] = "", c2[TOKLEN] = "";

-	char wid[TOKLEN] = "", field[TOKLEN] = "";

-	char llx[TOKLEN] = "0", lly[TOKLEN] = "0";

-	char urx[TOKLEN] = "0", ury[TOKLEN] = "0";

-	char *s;

-	while (fgets(ln, sizeof(ln), stdin)) {

-		if (ln[0] == '#')

-			continue;

-		if (!strncmp("FontName ", ln, 8)) {

-			sscanf(ln, "FontName %s", ch);

-			trfn_psfont(ch);

-			continue;

-		}

-		if (!strncmp("StartCharMetrics", ln, 16))

-			break;

-	}

-	while (fgets(ln, sizeof(ln), stdin)) {

-		if (ln[0] == '#')

-			continue;

-		if (!strncmp("EndCharMetrics", ln, 14))

-			break;

-		s = ln;

-		while (*s) {

-			s = afm_charfield(s, field);

-			if (!strcmp("C", field)) {

-				s = afm_charfield(s, pos);

-				continue;

-			}

-			if (!strcmp("WX", field)) {

-				s = afm_charfield(s, wid);

-				continue;

-			}

-			if (!strcmp("N", field)) {

-				s = afm_charfield(s, ch);

-				continue;

-			}

-			if (!strcmp("B", field)) {

-				s = afm_charfield(s, llx);

-				s = afm_charfield(s, lly);

-				s = afm_charfield(s, urx);

-				s = afm_charfield(s, ury);

-				continue;

-			}

-			if (!strcmp("L", field)) {

-				s = afm_charfield(s, c1);

-				s = afm_charfield(s, c2);

-				continue;

-			}

-			break;

-		}

-		if (ch[0] && pos[0] && wid[0])

-			trfn_char(ch, atoi(pos), 0, atoi(wid),

-				atoi(llx), atoi(lly), atoi(urx), atoi(ury));

-	}

-	while (fgets(ln, sizeof(ln), stdin)) {

-		if (ln[0] == '#')

-			continue;

-		if (!strncmp("StartKernPairs", ln, 14))

-			break;

-	}

-	while (fgets(ln, sizeof(ln), stdin)) {

-		if (ln[0] == '#')

-			continue;

-		if (!strncmp("EndKernPairs", ln, 12))

-			break;

-		if (sscanf(ln, "KPX %s %s %s", c1, c2, wid) == 3)

-			trfn_kern(c1, c2, atoi(wid));

-	}

-	return 0;

-}

-

 /* return 1 if script script is to be included */

 int trfn_script(char *script, int nscripts)

 {

@@ -138,6 +48,7 @@

 }

 int otf_read(void);

+int afm_read(void);

 void otf_feat(int res, int kmin, int warn);

 static char *usage =