===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.34
retrieving revision 1.38
diff -u -p -r1.34 -r1.38
--- pod2mdoc/pod2mdoc.c	2014/07/19 00:42:22	1.34
+++ pod2mdoc/pod2mdoc.c	2015/02/13 12:40:54	1.38
@@ -1,6 +1,7 @@
-/*	$Id: pod2mdoc.c,v 1.34 2014/07/19 00:42:22 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;
@@ -1008,11 +1019,13 @@ command(struct state *st, const char *buf, size_t star
  * always stays in OUST_NL/wantws mode.
  */
 static void
-verbatim(struct state *st, const char *buf, size_t start, size_t end)
+verbatim(struct state *st, char *buf, size_t start, size_t end)
 {
-	size_t		 i;
+	size_t		 i, ift, ifo, ifa, ifc, inl;
+	char		*cp, *cp2;
+	int		 nopen;
 
-	if ( ! st->parsing || st->paused)
+	if ( ! st->parsing || st->paused || start == end)
 		return;
 again:
 	/* 
@@ -1023,10 +1036,11 @@ again:
 	 */
 	if (SECT_SYNOPSIS == st->sect) {
 		i = start;
-		for (i = start; i < end && ' ' == buf[i]; i++)
-			/* Spin. */ ;
+		while (i < end && buf[i] == ' ')
+			i++;
 		if (i == end)
 			return;
+
 		/* We're an include block! */
 		if (end - i > 10 && 
 			0 == memcmp(&buf[i], "#include <", 10)) {
@@ -1047,10 +1061,98 @@ again:
 				goto again;
 			return;
 		}
+
+		/* Parse function declaration. */
+		ifo = ifa = ifc = 0;
+		inl = end;
+		nopen = 0;
+		for (ift = i; i < end; i++) {
+			if (ifc) {
+				if (buf[i] != '\n')
+					continue;
+				inl = i;
+				break;
+			}
+			switch (buf[i]) {
+			case ' ':
+				if ( ! ifa)
+					ifo = i;
+				break;
+			case '(':
+				if (ifo) {
+					nopen++;
+					if ( ! ifa)
+						ifa = i;
+				} else
+					i = end;
+				break;
+			case ')':
+				switch (nopen) {
+				case 0:
+					i = end;
+					break;
+				case 1:
+					ifc = i;
+					break;
+				default:
+					nopen--;
+					break;
+				}
+				break;
+			default:
+				break;
+			}
+		}
+
+		/* Encode function declaration. */
+		if (ifc) {
+			for (i = ifa; i < ifc; i++)
+				if (buf[i] == '\n')
+					buf[i] = ' ';
+			buf[ifo++] = '\0';
+			printf(".Ft %s", buf + ift);
+			if (buf[ifo] == '*') {
+				fputs(" *", stdout);
+				ifo++;
+			}
+			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) {
+					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;
+				while (*cp == ' ')
+					cp++;
+				ifa = cp - buf;
+			}
+			puts(".Fc");
+			if (buf[ifc] == ';')
+				ifc++;
+			if (ifc < inl) {
+				buf[inl] = '\0';
+				puts(buf + ifc);
+			}
+			start = inl + 1;
+			if (start < end) 
+				goto again;
+			return;
+		}
 	}
 	
-	if (start == end)
-		return;
 	puts(".Bd -literal");
 	for (last = ' '; start < end; start++) {
 		/*
@@ -1251,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] &&
@@ -1335,7 +1451,7 @@ ordinary(struct state *st, const char *buf, size_t sta
  * (default: starts with "=").
  */
 static void
-dopar(struct state *st, const char *buf, size_t start, size_t end)
+dopar(struct state *st, char *buf, size_t start, size_t end)
 {
 
 	assert(OUST_NL == st->oust);
@@ -1357,7 +1473,7 @@ dopar(struct state *st, const char *buf, size_t start,
  */
 static void
 dofile(const struct args *args, const char *fname, 
-	const struct tm *tm, const char *buf, size_t sz)
+	const struct tm *tm, char *buf, size_t sz)
 {
 	char		 datebuf[64];
 	struct state	 st;
@@ -1422,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;
@@ -1449,6 +1566,7 @@ dofile(const struct args *args, const char *fname, 
 		dopar(&st, buf, cur, end);
 		cur = sup;
 	}
+	dict_destroy();
 }
 
 /*