-Tascii now correctly ignores \s clauses.

2 files changed, 95 insertions, 16 deletions

diff --git a/mdoc.7 b/mdoc.7
index 46e550d7..481d6f06 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$Id: mdoc.7,v 1.74 2009/11/05 08:40:16 kristaps Exp $
+.\"	$Id: mdoc.7,v 1.75 2009/11/06 10:31:31 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: November 5 2009 $
+.Dd $Mdocdate: November 6 2009 $
 .Dt MDOC 7
 .Os
 .
@@ -133,8 +133,9 @@ Terms may be text-decorated using the
 .Sq \ef
 escape followed by an indicator: B (bold), I, (italic), R (Roman), or P
 (revert to previous mode).  A numerical representation 3, 2, or 1
-(bold, italic, and Roman, respectively) may be used instead.  This form
-is not recommended for 
+(bold, italic, and Roman, respectively) may be used instead.  
+.Pp
+These form is not recommended for 
 .Nm ,
 which encourages semantic annotation.
 .
diff --git a/term.c b/term.c
index d7d7b5d3..937d2526 100644
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.122 2009/11/05 08:40:16 kristaps Exp $ */
+/*	$Id: term.c,v 1.123 2009/11/06 10:31:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -374,21 +374,21 @@ do_reserved(struct termp *p, const char *word, size_t len)
 static void
 do_escaped(struct termp *p, const char **word)
 {
-	int		 j, type, sv;
+	int		 j, type, sv, t, lim;
 	const char	*wp;
 
 	wp = *word;
 	type = 1;
 
-	if (0 == *(++wp)) {
+	if ('\0' == *(++wp)) {
 		*word = wp;
 		return;
 	}
 
 	if ('(' == *wp) {
 		wp++;
-		if (0 == *wp || 0 == *(wp + 1)) {
-			*word = 0 == *wp ? wp : wp + 1;
+		if ('\0' == *wp || '\0' == *(wp + 1)) {
+			*word = '\0' == *wp ? wp : wp + 1;
 			return;
 		}
 
@@ -397,7 +397,7 @@ do_escaped(struct termp *p, const char **word)
 		return;
 
 	} else if ('*' == *wp) {
-		if (0 == *(++wp)) {
+		if ('\0' == *(++wp)) {
 			*word = wp;
 			return;
 		}
@@ -405,8 +405,8 @@ do_escaped(struct termp *p, const char **word)
 		switch (*wp) {
 		case ('('):
 			wp++;
-			if (0 == *wp || 0 == *(wp + 1)) {
-				*word = 0 == *wp ? wp : wp + 1;
+			if ('\0' == *wp || '\0' == *(wp + 1)) {
+				*word = '\0' == *wp ? wp : wp + 1;
 				return;
 			}
 
@@ -421,9 +421,87 @@ do_escaped(struct termp *p, const char **word)
 			*word = wp;
 			return;
 		}
-	
+
+	} else if ('s' == *wp) {
+		/* This closely follows mandoc_special(). */
+		if ('\0' == *(++wp)) {
+			*word = wp;
+			return;
+		}
+
+		t = 0;
+		lim = 1;
+
+		if (*wp == '\'') {
+			lim = 0;
+			t = 1;
+			++wp;
+		} else if (*wp == '[') {
+			lim = 0;
+			t = 2;
+			++wp;
+		} else if (*wp == '(') {
+			lim = 2;
+			t = 3;
+			++wp;
+		}
+
+		if (*wp == '+' || *wp == '-')
+			++wp;
+
+		if (*wp == '\'') {
+			if (t) {
+				*word = wp;
+				return;
+			}
+			lim = 0;
+			t = 1;
+			++wp;
+		} else if (*wp == '[') {
+			if (t) {
+				*word = wp;
+				return;
+			}
+			lim = 0;
+			t = 2;
+			++wp;
+		} else if (*wp == '(') {
+			if (t) {
+				*word = wp;
+				return;
+			}
+			lim = 2;
+			t = 3;
+			++wp;
+		}
+
+		if ( ! isdigit((u_char)*wp)) {
+			*word = --wp;
+			return;
+		}
+
+		for (j = 0; isdigit((u_char)*wp); j++) {
+			if (lim && j >= lim)
+				break;
+			++wp;
+		}
+
+		if (t && t < 3) {
+			if (1 == t && *wp != '\'') {
+				*word = --wp;
+				return;
+			}
+			if (2 == t && *wp != ']') {
+				*word = --wp;
+				return;
+			}
+			++wp;
+		}
+		*word = --wp;
+		return;
+
 	} else if ('f' == *wp) {
-		if (0 == *(++wp)) {
+		if ('\0' == *(++wp)) {
 			*word = wp;
 			return;
 		}
@@ -470,7 +548,7 @@ do_escaped(struct termp *p, const char **word)
 	for (j = 0; *wp && ']' != *wp; wp++, j++)
 		/* Loop... */ ;
 
-	if (0 == *wp) {
+	if ('\0' == *wp) {
 		*word = wp;
 		return;
 	}
@@ -495,7 +573,7 @@ term_word(struct termp *p, const char *word)
 
 	sv = word;
 
-	if (word[0] && 0 == word[1])
+	if (word[0] && '\0' == word[1])
 		switch (word[0]) {
 		case('.'):
 			/* FALLTHROUGH */