===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.25
retrieving revision 1.32
diff -u -p -r1.25 -r1.32
--- mandoc/mandoc.c	2010/07/21 20:35:03	1.25
+++ mandoc/mandoc.c	2010/08/24 13:39:37	1.32
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.25 2010/07/21 20:35:03 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.32 2010/08/24 13:39:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -55,10 +55,6 @@ mandoc_special(char *p)
 		/* FALLTHROUGH */
 	case ('x'):
 		/* FALLTHROUGH */
-	case ('w'):
-		/* FALLTHROUGH */
-	case ('v'):
-		/* FALLTHROUGH */
 	case ('S'):
 		/* FALLTHROUGH */
 	case ('R'):
@@ -91,14 +87,20 @@ mandoc_special(char *p)
 		term = '\'';
 		break;
 #endif
+	case ('h'):
+		/* FALLTHROUGH */
+	case ('v'):
+		/* FALLTHROUGH */
 	case ('s'):
 		if (ASCII_HYPH == *p)
 			*p = '-';
-		if ('+' == *p || '-' == *p)
+
+		i = 0;
+		if ('+' == *p || '-' == *p) {
 			p++;
+			i = 1;
+		}
 
-		i = ('s' != *(p - 1));
-
 		switch (*p++) {
 		case ('('):
 			len = 2;
@@ -109,6 +111,9 @@ mandoc_special(char *p)
 		case ('\''):
 			term = '\'';
 			break;
+		case ('0'):
+			i = 1;
+			/* FALLTHROUGH */
 		default:
 			len = 1;
 			p--;
@@ -118,13 +123,11 @@ mandoc_special(char *p)
 		if (ASCII_HYPH == *p)
 			*p = '-';
 		if ('+' == *p || '-' == *p) {
-			if (i++)
+			if (i)
 				return(0);
 			p++;
 		} 
 		
-		if (0 == i)
-			return(0);
 		break;
 #if 0
 	case ('Y'):
@@ -135,9 +138,9 @@ mandoc_special(char *p)
 		/* FALLTHROUGH */
 	case ('n'):
 		/* FALLTHROUGH */
+#endif
 	case ('k'):
 		/* FALLTHROUGH */
-#endif
 	case ('M'):
 		/* FALLTHROUGH */
 	case ('m'):
@@ -166,6 +169,19 @@ mandoc_special(char *p)
 	case ('['):
 		term = ']';
 		break;
+	case ('z'):
+		len = 1;
+		if ('\\' == *p) {
+			p += mandoc_special(p);
+			return(*p ? (int)(p - sv) : 0);
+		}
+		break;
+	case ('w'):
+		if ('\'' == *p++) {
+			term = '\'';
+			break;
+		}
+		/* FALLTHROUGH */
 	default:
 		len = 1;
 		p--;
@@ -194,7 +210,7 @@ mandoc_calloc(size_t num, size_t size)
 	ptr = calloc(num, size);
 	if (NULL == ptr) {
 		perror(NULL);
-		exit(EXIT_FAILURE);
+		exit(MANDOCLEVEL_SYSERR);
 	}
 
 	return(ptr);
@@ -209,7 +225,7 @@ mandoc_malloc(size_t size)
 	ptr = malloc(size);
 	if (NULL == ptr) {
 		perror(NULL);
-		exit(EXIT_FAILURE);
+		exit(MANDOCLEVEL_SYSERR);
 	}
 
 	return(ptr);
@@ -223,7 +239,7 @@ mandoc_realloc(void *ptr, size_t size)
 	ptr = realloc(ptr, size);
 	if (NULL == ptr) {
 		perror(NULL);
-		exit(EXIT_FAILURE);
+		exit(MANDOCLEVEL_SYSERR);
 	}
 
 	return(ptr);
@@ -238,7 +254,7 @@ mandoc_strdup(const char *ptr)
 	p = strdup(ptr);
 	if (NULL == p) {
 		perror(NULL);
-		exit(EXIT_FAILURE);
+		exit(MANDOCLEVEL_SYSERR);
 	}
 
 	return(p);
@@ -334,7 +350,7 @@ mandoc_eos(const char *p, size_t sz, int enclosed)
 			found = 1;
 			break;
 		default:
-			return(found && (!enclosed || isalnum(*q)));
+			return(found && (!enclosed || isalnum((unsigned char)*q)));
 		}
 	}