===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.20
retrieving revision 1.25
diff -u -p -r1.20 -r1.25
--- pod2mdoc/pod2mdoc.c	2014/04/03 11:34:30	1.20
+++ pod2mdoc/pod2mdoc.c	2014/07/11 09:05:03	1.25
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.20 2014/04/03 11:34:30 kristaps Exp $ */
+/*	$Id: pod2mdoc.c,v 1.25 2014/07/11 09:05:03 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -179,18 +179,26 @@ formatescape(const char *buf, size_t *start, size_t en
 static int
 trylink(const char *buf, size_t *start, size_t end, size_t dsz)
 {
-	size_t		 linkstart, realend, linkend, i, j, textsz;
+	size_t		 linkstart, realend, linkend, 
+			 i, j, textsz, stack;
 	const char	*text;
 
 	/* 
 	 * Scan to the start of the terminus. 
 	 * This function is more or less replicated in the formatcode()
 	 * for null or index formatting codes.
+	 * However, we're slightly different because we might have
+	 * nested escapes we need to ignore.
 	 */
+	stack = 0;
 	for (linkstart = realend = *start; realend < end; realend++) {
+		if ('<' == buf[realend])
+			stack++;
 		if ('>' != buf[realend])
 			continue;
-		else if (dsz == 1)
+		else if (stack-- > 0)
+			continue;
+		if (dsz == 1)
 			break;
 		assert(realend > 0);
 		if (' ' != buf[realend - 1])
@@ -452,6 +460,13 @@ formatcode(struct state *st, const char *buf, size_t *
 			(*start) += dsz;
 			break;
 		}
+		if (*start < end) {
+			assert('>' == buf[*start]);
+			(*start)++;
+		}
+		if (isspace(last))
+			while (*start < end && isspace((int)buf[*start]))
+				(*start)++;
 		return(0);
 	}
 
@@ -848,10 +863,47 @@ static void
 verbatim(struct state *st, const char *buf, size_t start, size_t end)
 {
 	int		 last;
+	size_t		 i;
 
 	if ( ! st->parsing || st->paused)
 		return;
-
+again:
+	/* 
+	 * If we're in the SYNOPSIS, see if we're an #include block.
+	 * If we are, then print the "In" macro and re-loop.
+	 * This handles any number of inclusions, but only when they
+	 * come before the remaining parts...
+	 */
+	if (SECT_SYNOPSIS == st->sect) {
+		i = start;
+		for (i = start; i < end && ' ' == buf[i]; i++)
+			/* Spin. */ ;
+		if (i == end)
+			return;
+		/* We're an include block! */
+		if (end - i > 10 && 
+			0 == memcmp(&buf[i], "#include <", 10)) {
+			start = i + 10;
+			while (start < end && ' ' == buf[start])
+				start++;
+			fputs(".In ", stdout);
+			/* Stop til the '>' marker or we hit eoln. */
+			while (start < end && 
+				'>' != buf[start] && '\n' != buf[start])
+				putchar(buf[start++]);
+			putchar('\n');
+			if (start < end && '>' == buf[start])
+				start++;
+			if (start < end && '\n' == buf[start])
+				start++;
+			if (start < end) 
+				goto again;
+			return;
+		}
+	}
+	
+	if (start == end)
+		return;
 	puts(".Bd -literal");
 	for (last = ' '; start < end; start++) {
 		/*
@@ -1325,8 +1377,8 @@ main(int argc, char *argv[])
 
 	/* Accept only a single input file. */
 
-	if (argc > 2)
-		return(EXIT_FAILURE);
+	if (argc > 1)
+		goto usage;
 	else if (1 == argc)
 		fname = *argv;
 
@@ -1335,7 +1387,7 @@ main(int argc, char *argv[])
 
 usage:
 	fprintf(stderr, "usage: %s [-d date] " 
-		"[-n title] [-s section]\n", name);
+	    "[-n title] [-s section] [file]\n", name);
 
 	return(EXIT_FAILURE);
 }