===================================================================
RCS file: /cvs/texi2mdoc/util.c,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -p -r1.9 -r1.11
--- texi2mdoc/util.c	2015/02/23 14:36:03	1.9
+++ texi2mdoc/util.c	2015/02/23 17:24:51	1.11
@@ -1,4 +1,4 @@
-/*	$Id: util.c,v 1.9 2015/02/23 14:36:03 kristaps Exp $ */
+/*	$Id: util.c,v 1.11 2015/02/23 17:24:51 kristaps Exp $ */
 /*
  * Copyright (c) 2015 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -170,6 +170,8 @@ texiputchar(struct texi *p, char c)
 
 	if ('.' == c && 0 == p->outcol)
 		fputs("\\&", stdout);
+	if ('\'' == c && 0 == p->outcol)
+		fputs("\\&", stdout);
 
 	putchar(c);
 	p->seenvs = 0;
@@ -419,10 +421,11 @@ static void
 texiexecmacro(struct texi *p, struct teximacro *m,
 	const char *buf, size_t sz, size_t *pos)
 {
-	size_t	  valsz, realsz, aasz, asz, 
-		  ssz, i, j, k, start, end;
-	char	 *val;
-	char	**args;
+	size_t		  valsz, realsz, aasz, asz, 
+			   ssz, i, j, k, start, end;
+	char		 *val;
+	char		**args;
+	const char	 *cp;
 
 	args = argparse(p, buf, sz, pos, &asz, m->argsz);
 	if (asz != m->argsz)
@@ -492,7 +495,10 @@ texiexecmacro(struct texi *p, struct teximacro *m,
 				texiabort(p, NULL);
 		}
 
-		j = strlcat(val, args[k], valsz + 1);
+		for (cp = args[k]; '\0' != *cp; cp++) 
+			val[j++] = *cp;
+
+		val[j] = '\0';
 		i = end;
 	}
 
@@ -542,6 +548,9 @@ texiword(struct texi *p, const char *buf, 
 			 '\'' == buf[*pos + 1]) {
 			texiputchars(p, "\\(rq");
 			advance(p, buf, pos);
+		} else if ('\\' == buf[*pos]) {
+			texiputchar(p, buf[*pos]);
+			texiputchar(p, 'e');
 		} else
 			texiputchar(p, buf[*pos]);
 		advance(p, buf, pos);
@@ -1158,9 +1167,31 @@ argparse(struct texi *p, const char *buf, 
 	args = NULL;
 	*argsz = 0;
 
-	/* Check for no arguments. */
-	if ('{' != buf[*pos])
+	if ('{' != buf[*pos] && hint) {
+		/*
+		 * Special case: if we encounter an unbracketed argument
+		 * and we're being invoked with non-zero arguments
+		 * (versus being set, i.e., hint>0), then parse until
+		 * the end of line.
+		 */
+		*argsz = 1;
+		args = calloc(1, sizeof(char *));
+		if (NULL == args)
+			texiabort(p, NULL);
+		start = *pos;
+		while (*pos < sz) {
+			if ('\n' == buf[*pos])
+				break;
+			advance(p, buf, pos);
+		}
+		args[0] = malloc(*pos - start + 1);
+		memcpy(args[0], &buf[start], *pos - start);
+		args[0][*pos - start] = '\0';
+		if (*pos < sz && '\n' == buf[*pos])
+			advance(p, buf, pos);
 		return(args);
+	} else if ('{' != buf[*pos])
+		return(args);
 
 	/* Parse til the closing '}', putting into the array. */
 	advance(p, buf, pos);
@@ -1194,8 +1225,6 @@ argparse(struct texi *p, const char *buf, 
 		/* Test for zero-length '{  }'. */
 		if (start == end && '}' == buf[*pos] && 0 == *argsz)
 			break;
-		if (start == end)
-			texierr(p, "zero-length argument");
 		/* FIXME: use reallocarray. */
 		args = realloc
 			(args, sizeof(char *) *