===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.252
retrieving revision 1.254
diff -u -p -r1.252 -r1.254
--- mandoc/roff.c	2015/01/21 02:16:52	1.252
+++ mandoc/roff.c	2015/01/23 00:42:00	1.254
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.252 2015/01/21 02:16:52 schwarze Exp $ */
+/*	$Id: roff.c,v 1.254 2015/01/23 00:42:00 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1004,8 +1004,9 @@ roff_res(struct roff *r, struct buf *buf, int ln, int 
 
 		/* Advance to the end of the name. */
 
+		naml = 0;
 		arg_complete = 1;
-		for (naml = 0; maxl == 0 || naml < maxl; naml++, cp++) {
+		while (maxl == 0 || naml < maxl) {
 			if (*cp == '\0') {
 				mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
 				    ln, (int)(stesc - buf->buf), stesc);
@@ -1016,6 +1017,23 @@ roff_res(struct roff *r, struct buf *buf, int ln, int 
 				cp++;
 				break;
 			}
+			if (*cp++ != '\\' || stesc[1] != 'w') {
+				naml++;
+				continue;
+			}
+			switch (mandoc_escape(&cp, NULL, NULL)) {
+			case ESCAPE_SPECIAL:
+				/* FALLTHROUGH */
+			case ESCAPE_UNICODE:
+				/* FALLTHROUGH */
+			case ESCAPE_NUMBERED:
+				/* FALLTHROUGH */
+			case ESCAPE_OVERSTRIKE:
+				naml++;
+				break;
+			default:
+				break;
+			}
 		}
 
 		/*
@@ -1623,8 +1641,46 @@ roff_getnum(const char *v, int *pos, int *res)
 	if (n)
 		*res = -*res;
 
-	*pos = p;
-	return 1;
+	/* Each number may be followed by one optional scaling unit. */
+
+	switch (v[p]) {
+	case 'f':
+		*res *= 65536;
+		break;
+	case 'i':
+		*res *= 240;
+		break;
+	case 'c':
+		*res *= 240;
+		*res /= 2.54;
+		break;
+	case 'v':
+		/* FALLTROUGH */
+	case 'P':
+		*res *= 40;
+		break;
+	case 'm':
+		/* FALLTROUGH */
+	case 'n':
+		*res *= 24;
+		break;
+	case 'p':
+		*res *= 10;
+		*res /= 3;
+		break;
+	case 'u':
+		break;
+	case 'M':
+		*res *= 6;
+		*res /= 25;
+		break;
+	default:
+		p--;
+		break;
+	}
+
+	*pos = p + 1;
+	return(1);
 }
 
 /*