===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.30
retrieving revision 1.33
diff -u -p -r1.30 -r1.33
--- mandoc/mandoc.c	2010/08/24 12:18:48	1.30
+++ mandoc/mandoc.c	2010/08/24 13:56:51	1.33
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.30 2010/08/24 12:18:48 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.33 2010/08/24 13:56:51 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -55,8 +55,6 @@ mandoc_special(char *p)
 		/* FALLTHROUGH */
 	case ('x'):
 		/* FALLTHROUGH */
-	case ('w'):
-		/* FALLTHROUGH */
 	case ('S'):
 		/* FALLTHROUGH */
 	case ('R'):
@@ -130,6 +128,27 @@ mandoc_special(char *p)
 			p++;
 		} 
 		
+		/* Handle embedded numerical subexp or escape. */
+
+		if ('(' == *p) {
+			while (*p && ')' != *p)
+				if ('\\' == *p++) {
+					i = mandoc_special(--p);
+					if (0 == i)
+						return(0);
+					p += i;
+				}
+
+			if (')' == *p++)
+				break;
+
+			return(0);
+		} else if ('\\' == *p) {
+			if (0 == (i = mandoc_special(p)))
+				return(0);
+			p += i;
+		}
+
 		break;
 #if 0
 	case ('Y'):
@@ -140,9 +159,9 @@ mandoc_special(char *p)
 		/* FALLTHROUGH */
 	case ('n'):
 		/* FALLTHROUGH */
+#endif
 	case ('k'):
 		/* FALLTHROUGH */
-#endif
 	case ('M'):
 		/* FALLTHROUGH */
 	case ('m'):
@@ -174,10 +193,18 @@ mandoc_special(char *p)
 	case ('z'):
 		len = 1;
 		if ('\\' == *p) {
-			p += mandoc_special(p);
+			if (0 == (i = mandoc_special(p)))
+				return(0);
+			p += i;
 			return(*p ? (int)(p - sv) : 0);
 		}
 		break;
+	case ('w'):
+		if ('\'' == *p++) {
+			term = '\'';
+			break;
+		}
+		/* FALLTHROUGH */
 	default:
 		len = 1;
 		p--;