===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.24
retrieving revision 1.29
diff -u -p -r1.24 -r1.29
--- mandoc/out.c	2010/08/16 09:37:58	1.24
+++ mandoc/out.c	2010/08/29 11:28:09	1.29
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.24 2010/08/16 09:37:58 kristaps Exp $ */
+/*	$Id: out.c,v 1.29 2010/08/29 11:28:09 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -172,6 +172,7 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 	int		 i, j, lim;
 	char		 term, c;
 	const char	*wp;
+	enum roffdeco	 dd;
 
 	*d = DECO_NONE;
 	lim = i = 0;
@@ -219,6 +220,8 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 			break;
 		}
 		break;
+	case ('k'):
+		/* FALLTHROUGH */
 	case ('M'):
 		/* FALLTHROUGH */
 	case ('m'):
@@ -275,7 +278,27 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 				return(i);
 			i++;
 		} 
-		
+
+		/* Handle embedded numerical subexp or escape. */
+
+		if ('(' == wp[i]) {
+			while (wp[i] && ')' != wp[i])
+				if ('\\' == wp[i++]) {
+					/* Handle embedded escape. */
+					*word = &wp[i];
+					i += a2roffdeco(&dd, word, sz);
+				}
+
+			if (')' == wp[i++])
+				break;
+
+			*d = DECO_NONE;
+			return(i - 1);
+		} else if ('\\' == wp[i]) {
+			*word = &wp[++i];
+			i += a2roffdeco(&dd, word, sz);
+		}
+
 		break;
 	case ('['):
 		*d = DECO_SPECIAL;
@@ -284,6 +307,22 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 	case ('c'):
 		*d = DECO_NOSPACE;
 		return(i);
+	case ('z'):
+		*d = DECO_NONE;
+		if ('\\' == wp[i]) {
+			*word = &wp[++i];
+			return(i + a2roffdeco(&dd, word, sz));
+		} else
+			lim = 1;
+		break;
+	case ('o'):
+		/* FALLTHROUGH */
+	case ('w'):
+		if ('\'' == wp[i++]) {
+			term = '\'';
+			break;
+		} 
+		/* FALLTHROUGH */
 	default:
 		*d = DECO_SSPECIAL;
 		i--;