===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.37
retrieving revision 1.39
diff -u -p -r1.37 -r1.39
--- pod2mdoc/pod2mdoc.c	2015/02/13 00:44:16	1.37
+++ pod2mdoc/pod2mdoc.c	2015/02/13 15:35:15	1.39
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.37 2015/02/13 00:44:16 schwarze Exp $	*/
+/*	$Id: pod2mdoc.c,v 1.39 2015/02/13 15:35:15 schwarze Exp $	*/
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -479,6 +479,7 @@ formatcode(struct state *st, const char *buf, size_t *
 {
 	enum fmt	 fmt;
 	size_t		 i, j, dsz;
+	unsigned char	 uc;
 
 	assert(*start + 1 < end);
 	assert('<' == buf[*start + 1]);
@@ -612,13 +613,28 @@ formatcode(struct state *st, const char *buf, size_t *
 				else
 					printf("Ar ");
 				break;
-			} 
-			if (0 == strncmp(buf + *start, "NULL", 4) &&
-			    ('=' == buf[*start + 4] ||
-			     '>' == buf[*start + 4]))
+			}
+			i = 0;
+			uc = buf[*start];
+			while (isalnum(uc) || '_' == uc || ' ' == uc)
+				uc = buf[*start + ++i];
+			if ('=' != uc && '>' != uc)
+				i = 0;
+			if (4 == i && ! strncmp(buf + *start, "NULL", 4)) {
 				printf("Dv ");
-			else
+				break;
+			}
+			switch (i ? dict_get(buf + *start, i) : MDOC_MAX) {
+			case MDOC_Fa:
+				printf("Fa ");
+				break;
+			case MDOC_Vt:
+				printf("Vt ");
+				break;
+			default:
 				printf("Sy ");
+				break;
+			}
 			break;
 		case (FMT_CODE):
 			printf("Qo Li ");
@@ -1006,6 +1022,32 @@ command(struct state *st, const char *buf, size_t star
 }
 
 /*
+ * Put the type provided as an argument into the dictionary.
+ */
+static void
+register_type(const char *ptype)
+{
+	const char	*pname, *pend;
+
+	pname = ptype;
+	while (isalnum((unsigned char)*pname) || '_' == *pname)
+		pname++;
+	if ((pname - ptype == 6 && ! strncmp(ptype, "struct", 6)) ||
+	    (pname - ptype == 4 && ! strncmp(ptype, "enum", 4))) {
+		while (' ' == *pname)
+			pname++;
+		pend = pname;
+		while (isalnum((unsigned char)*pend) || '_' == *pend)
+			pend++;
+		if (pend > pname)
+			dict_put(pname, pend - pname, MDOC_Vt);
+	} else
+		pend = pname;
+	if (pend > ptype)
+		dict_put(ptype, pend - ptype, MDOC_Vt);
+}
+
+/*
  * Just pump out the line in a verbatim block.
  * From the perspective of external callers,
  * always stays in OUST_NL/wantws mode.
@@ -1014,7 +1056,7 @@ static void
 verbatim(struct state *st, char *buf, size_t start, size_t end)
 {
 	size_t		 i, ift, ifo, ifa, ifc, inl;
-	char		*cp;
+	char		*cp, *cp2;
 	int		 nopen;
 
 	if ( ! st->parsing || st->paused || start == end)
@@ -1102,6 +1144,7 @@ again:
 				if (buf[i] == '\n')
 					buf[i] = ' ';
 			buf[ifo++] = '\0';
+			register_type(buf + ift);
 			printf(".Ft %s", buf + ift);
 			if (buf[ifo] == '*') {
 				fputs(" *", stdout);
@@ -1110,12 +1153,21 @@ again:
 			putchar('\n');
 			buf[ifa++] = '\0';
 			printf(".Fo %s\n", buf + ifo);
-			dict_put(buf + ifo, MDOC_Fo);
+			dict_put(buf + ifo, 0, MDOC_Fo);
 			buf[ifc++] = '\0';
 			for (;;) {
 				cp = strchr(buf + ifa, ',');
-				if (cp != NULL)
+				if (cp != NULL) {
+					cp2 = cp;
 					*cp++ = '\0';
+				} else
+					cp2 = strchr(buf + ifa, '\0');
+				while (isalnum((unsigned char)cp2[-1]) ||
+				    '_' == cp2[-1])
+					cp2--;
+				if ('\0' != *cp2)
+					dict_put(cp2, 0, MDOC_Fa);
+				register_type(buf + ifa);
 				printf(".Fa \"%s\"\n", buf + ifa);
 				if (cp == NULL)
 					break;