1 files changed, 10 insertions, 7 deletions

diff --git a/out.c b/out.c
index 746d6020..15ffd5e4 100644
--- a/out.c
+++ b/out.c
@@ -240,11 +240,16 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
 			break;
 		}
 		break;
+	case ('h'):
+		/* FALLTHROUGH */
+	case ('v'):
+		/* FALLTHROUGH */
 	case ('s'):
-		if ('+' == wp[i] || '-' == wp[i])
+		j = 0;
+		if ('+' == wp[i] || '-' == wp[i]) {
 			i++;
-
-		j = ('s' != wp[i - 1]);
+			j = 1;
+		}
 
 		switch (wp[i++]) {
 		case ('('):
@@ -257,7 +262,7 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
 			term = '\'';
 			break;
 		case ('0'):
-			j++;
+			j = 1;
 			/* FALLTHROUGH */
 		default:
 			i--;
@@ -266,13 +271,11 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
 		}
 
 		if ('+' == wp[i] || '-' == wp[i]) {
-			if (j++)
+			if (j)
 				return(i);
 			i++;
 		} 
 		
-		if (0 == j)
-			return(i);
 		break;
 	case ('['):
 		*d = DECO_SPECIAL;