===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.336
retrieving revision 1.338
diff -u -p -r1.336 -r1.338
--- mandoc/roff.c	2018/08/19 17:46:14	1.336
+++ mandoc/roff.c	2018/08/21 18:15:22	1.338
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.336 2018/08/19 17:46:14 schwarze Exp $ */
+/*	$Id: roff.c,v 1.338 2018/08/21 18:15:22 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -107,7 +107,6 @@ struct	roff {
 	int		 rstacksz; /* current size limit of rstack */
 	int		 rstackpos; /* position in rstack */
 	int		 format; /* current file in mdoc or man format */
-	int		 argc; /* number of args of the last macro */
 	char		 control; /* control character */
 	char		 escape; /* escape character */
 };
@@ -2663,7 +2662,7 @@ roff_getregro(const struct roff *r, const char *name)
 
 	switch (*name) {
 	case '$':  /* Number of arguments of the last macro evaluated. */
-		return r->argc;
+		return 0;
 	case 'A':  /* ASCII approximation mode is always off. */
 		return 0;
 	case 'g':  /* Groff compatibility mode is always on. */
@@ -3157,7 +3156,7 @@ roff_als(ROFF_ARGS)
 	if (oldsz == 0)
 		return ROFF_IGN;
 
-	valsz = mandoc_asprintf(&value, ".%.*s \\$*\\\"\n",
+	valsz = mandoc_asprintf(&value, ".%.*s \\$@\\\"\n",
 	    (int)oldsz, oldn);
 	roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0);
 	roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0);
@@ -3381,22 +3380,22 @@ roff_userdef(ROFF_ARGS)
 {
 	const char	 *arg[16], *ap;
 	char		 *cp, *n1, *n2;
-	int		  expand_count, i, ib, ie;
-	size_t		  asz, rsz;
+	int		  argc, expand_count, i, ib, ie, quote_args;
+	size_t		  asz, esz, rsz;
 
 	/*
 	 * Collect pointers to macro argument strings
 	 * and NUL-terminate them.
 	 */
 
-	r->argc = 0;
+	argc = 0;
 	cp = buf->buf + pos;
 	for (i = 0; i < 16; i++) {
 		if (*cp == '\0')
 			arg[i] = "";
 		else {
 			arg[i] = mandoc_getarg(r->parse, &cp, ln, &pos);
-			r->argc = i + 1;
+			argc = i + 1;
 		}
 	}
 
@@ -3416,13 +3415,21 @@ roff_userdef(ROFF_ARGS)
 			continue;
 		if (*cp++ != '$')
 			continue;
-		if (*cp == '*') {  /* \\$* inserts all arguments */
+
+		quote_args = 0;
+		switch (*cp) {
+		case '@':  /* \\$@ inserts all arguments, quoted */
+			quote_args = 1;
+			/* FALLTHROUGH */
+		case '*':  /* \\$* inserts all arguments, unquoted */
 			ib = 0;
-			ie = r->argc - 1;
-		} else {  /* \\$1 .. \\$9 insert one argument */
+			ie = argc - 1;
+			break;
+		default:  /* \\$1 .. \\$9 insert one argument */
 			ib = ie = *cp - '1';
 			if (ib < 0 || ib > 8)
 				continue;
+			break;
 		}
 		cp -= 2;
 
@@ -3448,6 +3455,8 @@ roff_userdef(ROFF_ARGS)
 
 		asz = ie > ib ? ie - ib : 0;  /* for blanks */
 		for (i = ib; i <= ie; i++) {
+			if (quote_args)
+				asz += 2;
 			for (ap = arg[i]; *ap != '\0'; ap++) {
 				asz++;
 				if (*ap == '"')
@@ -3494,6 +3503,8 @@ roff_userdef(ROFF_ARGS)
 
 		n2 = cp;
 		for (i = ib; i <= ie; i++) {
+			if (quote_args)
+				*n2++ = '"';
 			for (ap = arg[i]; *ap != '\0'; ap++) {
 				if (*ap == '"') {
 					memcpy(n2, "\\(dq", 4);
@@ -3501,9 +3512,39 @@ roff_userdef(ROFF_ARGS)
 				} else
 					*n2++ = *ap;
 			}
+			if (quote_args)
+				*n2++ = '"';
 			if (i < ie)
 				*n2++ = ' ';
 		}
+	}
+
+	/*
+	 * Expand the number of arguments, if it is used.
+	 * This never makes the expanded macro longer.
+	 */
+
+	for (cp = n1; *cp != '\0'; cp++) {
+		if (cp[0] != '\\')
+			continue;
+		if (cp[1] == '\\') {
+			cp++;
+			continue;
+		}
+		if (strncmp(cp + 1, "n(.$", 4) == 0)
+			esz = 5;
+		else if (strncmp(cp + 1, "n[.$]", 5) == 0)
+			esz = 6;
+		else
+			continue;
+		asz = snprintf(cp, esz, "%d", argc);
+		assert(asz < esz);
+		rsz = buf->sz - (cp - n1) - esz;
+		memmove(cp + asz, cp + esz, rsz);
+		buf->sz -= esz - asz;
+		n2 = mandoc_realloc(n1, buf->sz);
+		cp = n2 + (cp - n1) + asz;
+		n1 = n2;
 	}
 
 	/*