===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- pod2mdoc/pod2mdoc.c	2015/02/13 00:44:16	1.37
+++ pod2mdoc/pod2mdoc.c	2015/02/13 12:40:54	1.38
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.37 2015/02/13 00:44:16 schwarze Exp $	*/
+/*	$Id: pod2mdoc.c,v 1.38 2015/02/13 12:40:54 schwarze Exp $	*/
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -615,8 +615,16 @@ formatcode(struct state *st, const char *buf, size_t *
 			} 
 			if (0 == strncmp(buf + *start, "NULL", 4) &&
 			    ('=' == buf[*start + 4] ||
-			     '>' == buf[*start + 4]))
+			     '>' == buf[*start + 4])) {
 				printf("Dv ");
+				break;
+			}
+			i = 0;
+			while (isalnum((unsigned char)buf[*start + i]) ||
+			    '_' == buf[*start + i])
+				i++;
+			if (i && MDOC_Fa == dict_get(buf + *start, i))
+				printf("Fa ");
 			else
 				printf("Sy ");
 			break;
@@ -1014,7 +1022,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)
@@ -1114,8 +1122,16 @@ again:
 			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, MDOC_Fa);
 				printf(".Fa \"%s\"\n", buf + ifa);
 				if (cp == NULL)
 					break;