===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.19
retrieving revision 1.25
diff -u -p -r1.19 -r1.25
--- mandoc/out.c	2010/07/18 23:06:18	1.19
+++ mandoc/out.c	2010/08/24 12:18:49	1.25
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.19 2010/07/18 23:06:18 kristaps Exp $ */
+/*	$Id: out.c,v 1.25 2010/08/24 12:18:49 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -116,6 +116,7 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 		return(0);
 	}
 
+	/* FIXME: do this in the caller. */
 	if ((dst->scale = atof(buf)) < 0)
 		dst->scale = 0;
 	dst->unit = unit;
@@ -171,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;
@@ -218,24 +220,14 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 			break;
 		}
 		break;
-	case ('*'):
-		*d = DECO_RESERVED;
-		switch (wp[i++]) {
-		case ('('):
-			lim = 2;
-			break;
-		case ('['):
-			term = ']';
-			break;
-		default:
-			i--;
-			lim = 1;
-			break;
-		}
-		break;
 	case ('M'):
 		/* FALLTHROUGH */
 	case ('m'):
+		/* FALLTHROUGH */
+	case ('*'):
+		if ('*' == c)
+			*d = DECO_RESERVED;
+
 		switch (wp[i++]) {
 		case ('('):
 			lim = 2;
@@ -249,12 +241,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;
@@ -265,6 +262,9 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 		case ('\''):
 			term = '\'';
 			break;
+		case ('0'):
+			j = 1;
+			/* FALLTHROUGH */
 		default:
 			i--;
 			lim = 1;
@@ -272,13 +272,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;
@@ -287,8 +285,16 @@ 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;
 	default:
-		*d = DECO_SPECIAL;
+		*d = DECO_SSPECIAL;
 		i--;
 		lim = 1;
 		break;