===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.18
retrieving revision 1.22
diff -u -p -r1.18 -r1.22
--- mandoc/out.c	2010/07/18 22:55:06	1.18
+++ mandoc/out.c	2010/07/22 14:03:50	1.22
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.18 2010/07/18 22:55:06 kristaps Exp $ */
+/*	$Id: out.c,v 1.22 2010/07/22 14:03:50 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -218,8 +218,14 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 			break;
 		}
 		break;
+	case ('M'):
+		/* FALLTHROUGH */
+	case ('m'):
+		/* FALLTHROUGH */
 	case ('*'):
-		*d = DECO_RESERVED;
+		if ('*' == c)
+			*d = DECO_RESERVED;
+
 		switch (wp[i++]) {
 		case ('('):
 			lim = 2;
@@ -249,6 +255,9 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 		case ('\''):
 			term = '\'';
 			break;
+		case ('0'):
+			j++;
+			/* FALLTHROUGH */
 		default:
 			i--;
 			lim = 1;
@@ -272,7 +281,7 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t
 		*d = DECO_NOSPACE;
 		return(i);
 	default:
-		*d = DECO_SPECIAL;
+		*d = DECO_SSPECIAL;
 		i--;
 		lim = 1;
 		break;