===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.8
retrieving revision 1.13
diff -u -p -r1.8 -r1.13
--- mandoc/out.c	2009/11/07 08:26:45	1.8
+++ mandoc/out.c	2010/04/07 07:49:38	1.13
@@ -1,4 +1,4 @@
-/*	$Id: out.c,v 1.8 2009/11/07 08:26:45 kristaps Exp $ */
+/*	$Id: out.c,v 1.13 2010/04/07 07:49:38 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -25,10 +29,26 @@
 
 #include "out.h"
 
-#ifdef __linux__
-extern	size_t	  strlcat(char *, const char *, size_t);
-#endif
+/* See a2roffdeco(). */
+#define	C2LIM(c, l) do { \
+	(l) = 1; \
+	if ('[' == (c) || '\'' == (c)) \
+		(l) = 0; \
+	else if ('(' == (c)) \
+		(l) = 2; } \
+	while (/* CONSTCOND */ 0)
 
+/* See a2roffdeco(). */
+#define	C2TERM(c, t) do { \
+	(t) = 0; \
+	if ('\'' == (c)) \
+		(t) = 1; \
+	else if ('[' == (c)) \
+		(t) = 2; \
+	else if ('(' == (c)) \
+		(t) = 3; } \
+	while (/* CONSTCOND */ 0)
+
 /* 
  * Convert a `scaling unit' to a consistent form, or fail.  Scaling
  * units are documented in groff.7, mdoc.7, man.7.
@@ -167,26 +187,29 @@ time2a(time_t t, char *dst, size_t sz)
 }
 
 
-/* Returns length of parsed string. */
+/* 
+ * Returns length of parsed string (the leading "\" should NOT be
+ * included).  This can be zero if the current character is the nil
+ * terminator.  "d" is set to the type of parsed decorator, which may
+ * have an adjoining "word" of size "sz" (e.g., "(ab" -> "ab", 2).
+ */
 int
 a2roffdeco(enum roffdeco *d,
 		const char **word, size_t *sz)
 {
-	int		 j, type, sv, t, lim;
-	const char	*wp;
+	int		 j, offs, term, lim;
+	const char	*wp, *sp;
 
 	*d = DECO_NONE;
-
 	wp = *word;
-	type = 1;
+	offs = 0;
 
 	switch (*wp) {
 	case ('\0'):
 		return(0);
 
 	case ('('):
-		wp++;
-		if ('\0' == *wp)
+		if ('\0' == *(++wp))
 			return(1);
 		if ('\0' == *(wp + 1))
 			return(2);
@@ -197,15 +220,12 @@ a2roffdeco(enum roffdeco *d,
 		return(3);
 
 	case ('*'):
-		wp++;
-
-		switch (*wp) {
+		switch (*(++wp)) {
 		case ('\0'):
 			return(1);
 
 		case ('('):
-			wp++;
-			if ('\0' == *wp)
+			if ('\0' == *(++wp))
 				return(2);
 			if ('\0' == *(wp + 1))
 				return(3);
@@ -216,101 +236,72 @@ a2roffdeco(enum roffdeco *d,
 			return(4);
 
 		case ('['):
-			type = 0;
+			offs = 1;
 			break;
 
 		default:
 			*d = DECO_RESERVED;
 			*sz = 1;
 			*word = wp;
-			return(3);
+			return(2);
 		}
 		break;
 
-#if 0
 	case ('s'):
-		wp++;
-
-		/* This closely follows mandoc_special(). */
-		if ('\0' == *wp) 
+		sp = wp;
+		if ('\0' == *(++wp))
 			return(1);
 
-		t = 0;
-		lim = 1;
+		C2LIM(*wp, lim);
+		C2TERM(*wp, term);
 
-		if (*wp == '\'') {
-			lim = 0;
-			t = 1;
-			++wp;
-		} else if (*wp == '[') {
-			lim = 0;
-			t = 2;
-			++wp;
-		} else if (*wp == '(') {
-			lim = 2;
-			t = 3;
-			++wp;
-		}
+		if (term) 
+			wp++;
 
+		*word = 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;
-		}
+		switch (*wp) {
+		case ('\''):
+			/* FALLTHROUGH */
+		case ('['):
+			/* FALLTHROUGH */
+		case ('('):
+			if (term) 
+				return((int)(wp - sp));
 
-		if ( ! isdigit((u_char)*wp)) {
-			*word = --wp;
-			return;
+			C2LIM(*wp, lim);
+			C2TERM(*wp, term);
+			wp++;
+			break;
+		default:
+			break;
 		}
 
+		if ( ! isdigit((u_char)*wp))
+			return((int)(wp - sp));
+
 		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;
-			}
+		if (term && term < 3) {
+			if (1 == term && *wp != '\'')
+				return((int)(wp - sp));
+			if (2 == term && *wp != ']')
+				return((int)(wp - sp));
 			++wp;
 		}
-		*word = --wp;
-		return;
-#endif
 
-	case ('f'):
-		wp++;
+		*d = DECO_SIZE;
+		return((int)(wp - sp));
 
-		switch (*wp) {
+	case ('f'):
+		switch (*(++wp)) {
 		case ('\0'):
 			return(1);
 		case ('3'):
@@ -340,6 +331,11 @@ a2roffdeco(enum roffdeco *d,
 	case ('['):
 		break;
 
+	case ('c'):
+		*d = DECO_NOSPACE;
+		*sz = 1;
+		return(1);
+
 	default:
 		*d = DECO_SPECIAL;
 		*word = wp;
@@ -348,13 +344,15 @@ a2roffdeco(enum roffdeco *d,
 	}
 
 	*word = ++wp;
+
 	for (j = 0; *wp && ']' != *wp; wp++, j++)
 		/* Loop... */ ;
 
 	if ('\0' == *wp)
-		return(j + 1);
+		return(j + 1 + offs);
 
-	*d = type ? DECO_SPECIAL : DECO_RESERVED;
-	*sz = j;
-	return (j + 2);
+	*d = offs ? DECO_RESERVED : DECO_SPECIAL;
+	*sz = (size_t)j;
+
+	return (j + 2 + offs);
 }