===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.36
retrieving revision 1.38
diff -u -p -r1.36 -r1.38
--- pod2mdoc/pod2mdoc.c	2014/10/24 00:28:34	1.36
+++ pod2mdoc/pod2mdoc.c	2015/02/13 12:40:54	1.38
@@ -1,6 +1,7 @@
-/*	$Id: pod2mdoc.c,v 1.36 2014/10/24 00:28:34 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>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -26,6 +27,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "dict.h"
+
 /*
  * In what section can we find Perl module manuals?
  * Sometimes (Mac OS X) it's 3pm, sometimes (OpenBSD, etc.) 3p.
@@ -612,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;
@@ -1011,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)
@@ -1107,11 +1118,20 @@ again:
 			putchar('\n');
 			buf[ifa++] = '\0';
 			printf(".Fo %s\n", buf + ifo);
+			dict_put(buf + ifo, 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, MDOC_Fa);
 				printf(".Fa \"%s\"\n", buf + ifa);
 				if (cp == NULL)
 					break;
@@ -1333,12 +1353,26 @@ ordinary(struct state *st, const char *buf, size_t sta
 			 */
 
 			last = buf[start++];
-			if (' ' == last) {
-				outbuf_flush(st);
-				putchar(' ');
-				st->wantws = 1;
-			} else
+			if (' ' != last) {
 				outbuf_addchar(st);
+				continue;
+			}
+
+			if ( ! strcmp(st->outbuf + st->outbuflen - 2, "()") &&
+			    dict_get(st->outbuf, st->outbuflen - 2) ==
+			    MDOC_Fo) {
+				st->outbuflen -= 2;
+				st->outbuf[st->outbuflen] = '\0';
+				mdoc_newln(st);
+				fputs(".Fn ", stdout);
+				outbuf_flush(st);
+				mdoc_newln(st);
+				continue;
+			}
+
+			outbuf_flush(st);
+			putchar(' ');
+			st->wantws = 1;
 		}
 
 		if (start < end - 1 && '<' == buf[start + 1] &&
@@ -1504,6 +1538,7 @@ dofile(const struct args *args, const char *fname, 
 
 	free(title);
 
+	dict_init();
 	memset(&st, 0, sizeof(struct state));
 	st.oust = OUST_NL;
 	st.wantws = 1;
@@ -1531,6 +1566,7 @@ dofile(const struct args *args, const char *fname, 
 		dopar(&st, buf, cur, end);
 		cur = sup;
 	}
+	dict_destroy();
 }
 
 /*