===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.23
retrieving revision 1.27
diff -u -p -r1.23 -r1.27
--- mandoc/out.c	2010/07/22 23:03:15	1.23
+++ mandoc/out.c	2010/08/24 13:39:37	1.27
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.23 2010/07/22 23:03:15 kristaps Exp $ */
+/*	$Id: out.c,v 1.27 2010/08/24 13:39:37 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'):
@@ -240,12 +243,17 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 			break;
 		}
 		break;
+	case ('h'):
+		/* FALLTHROUGH */
+	case ('v'):
+		/* FALLTHROUGH */
 	case ('s'):
-		if ('+' == wp[i] || '-' == wp[i])
+		j = 0;
+		if ('+' == wp[i] || '-' == wp[i]) {
 			i++;
+			j = 1;
+		}
 
-		j = ('s' != wp[i - 1]);
-
 		switch (wp[i++]) {
 		case ('('):
 			lim = 2;
@@ -257,7 +265,7 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 			term = '\'';
 			break;
 		case ('0'):
-			j++;
+			j = 1;
 			/* FALLTHROUGH */
 		default:
 			i--;
@@ -266,13 +274,11 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 		}
 
 		if ('+' == wp[i] || '-' == wp[i]) {
-			if (j++)
+			if (j)
 				return(i);
 			i++;
 		} 
-		
-		if (0 == j)
-			return(i);
+
 		break;
 	case ('['):
 		*d = DECO_SPECIAL;
@@ -281,6 +287,20 @@ 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 ('w'):
+		if ('\'' == wp[i++]) {
+			term = '\'';
+			break;
+		} 
+		/* FALLTHROUGH */
 	default:
 		*d = DECO_SSPECIAL;
 		i--;