===================================================================
RCS file: /cvs/pod2mdoc/pod2mdoc.c,v
retrieving revision 1.22
retrieving revision 1.28
diff -u -p -r1.22 -r1.28
--- pod2mdoc/pod2mdoc.c	2014/04/03 16:50:32	1.22
+++ pod2mdoc/pod2mdoc.c	2014/07/11 10:31:28	1.28
@@ -1,4 +1,4 @@
-/*	$Id: pod2mdoc.c,v 1.22 2014/04/03 16:50:32 kristaps Exp $ */
+/*	$Id: pod2mdoc.c,v 1.28 2014/07/11 10:31:28 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -181,18 +181,23 @@ trylink(const char *buf, size_t *start, size_t end, si
 {
 	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])
@@ -212,7 +217,6 @@ trylink(const char *buf, size_t *start, size_t end, si
 	linkend = dsz > 1 ? realend - 1 : realend;
 
 	/* Re-scan to see if we have a title or section. */
-	text = &buf[*start];
 	for (textsz = *start; textsz < linkend; textsz++)
 		if ('|' == buf[textsz] || '/' == buf[textsz])
 			break;
@@ -454,6 +458,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);
 	}
 
@@ -498,7 +509,12 @@ formatcode(struct state *st, const char *buf, size_t *
 					printf("Ar ");
 				break;
 			} 
-			printf("Sy ");
+			if (0 == strncmp(buf + *start, "NULL", 4) &&
+			    ('=' == buf[*start + 4] ||
+			     '>' == buf[*start + 4]))
+				printf("Dv ");
+			else
+				printf("Sy ");
 			break;
 		case (FMT_CODE):
 			printf("Qo Li ");
@@ -1257,8 +1273,6 @@ readfile(const struct args *args, const char *fname)
 	time_t		 ttm;
 	struct stat 	 st;
 
-	assert(NULL != fname);
-
 	fd = 0 != strcmp("-", fname) ? 
 		open(fname, O_RDONLY, 0) : STDIN_FILENO;
 
@@ -1364,8 +1378,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;
 
@@ -1374,7 +1388,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);
 }