===================================================================
RCS file: /cvs/mandoc/out.c,v
retrieving revision 1.12
retrieving revision 1.20
diff -u -p -r1.12 -r1.20
--- mandoc/out.c	2010/01/01 17:14:30	1.12
+++ mandoc/out.c	2010/07/19 07:53:40	1.20
@@ -1,6 +1,6 @@
-/*	$Id: out.c,v 1.12 2010/01/01 17:14:30 kristaps Exp $ */
+/*	$Id: out.c,v 1.20 2010/07/19 07:53:40 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,26 +29,6 @@
 
 #include "out.h"
 
-/* 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.
@@ -139,8 +119,6 @@ a2roffsu(const char *src, struct roffsu *dst, enum rof
 	if ((dst->scale = atof(buf)) < 0)
 		dst->scale = 0;
 	dst->unit = unit;
-	dst->pt = hasd;
-
 	return(1);
 }
 
@@ -187,170 +165,150 @@ time2a(time_t t, char *dst, size_t sz)
 }
 
 
-/* 
- * 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)
+a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
 {
-	int		 j, type, term, lim;
-	const char	*wp, *sp;
+	int		 i, j, lim;
+	char		 term, c;
+	const char	*wp;
 
 	*d = DECO_NONE;
+	lim = i = 0;
+	term = '\0';
 	wp = *word;
-	type = 1;
 
-	switch (*wp) {
-	case ('\0'):
-		return(0);
-
+	switch ((c = wp[i++])) {
 	case ('('):
-		if ('\0' == *(++wp))
-			return(1);
-		if ('\0' == *(wp + 1))
-			return(2);
-
 		*d = DECO_SPECIAL;
-		*sz = 2;
-		*word = wp;
-		return(3);
+		lim = 2;
+		break;
+	case ('F'):
+		/* FALLTHROUGH */
+	case ('f'):
+		*d = 'F' == c ? DECO_FFONT : DECO_FONT;
 
-	case ('*'):
-		switch (*(++wp)) {
-		case ('\0'):
-			return(1);
-
+		switch (wp[i++]) {
 		case ('('):
-			if ('\0' == *(++wp))
-				return(2);
-			if ('\0' == *(wp + 1))
-				return(3);
-
-			*d = DECO_RESERVED;
-			*sz = 2;
-			*word = wp;
-			return(4);
-
-		case ('['):
-			type = 0;
+			lim = 2;
 			break;
-
-		default:
-			*d = DECO_RESERVED;
-			*sz = 1;
-			*word = wp;
-			return(2);
-		}
-		break;
-
-	case ('s'):
-		sp = wp;
-		if ('\0' == *(++wp))
-			return(1);
-
-		C2LIM(*wp, lim);
-		C2TERM(*wp, term);
-
-		if (term) 
-			wp++;
-
-		*word = wp;
-
-		if (*wp == '+' || *wp == '-')
-			++wp;
-
-		switch (*wp) {
-		case ('\''):
-			/* FALLTHROUGH */
 		case ('['):
-			/* FALLTHROUGH */
-		case ('('):
-			if (term) 
-				return((int)(wp - sp));
-
-			C2LIM(*wp, lim);
-			C2TERM(*wp, term);
-			wp++;
+			term = ']';
 			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 (term && term < 3) {
-			if (1 == term && *wp != '\'')
-				return((int)(wp - sp));
-			if (2 == term && *wp != ']')
-				return((int)(wp - sp));
-			++wp;
-		}
-
-		*d = DECO_SIZE;
-		return((int)(wp - sp));
-
-	case ('f'):
-		switch (*(++wp)) {
-		case ('\0'):
-			return(1);
 		case ('3'):
 			/* FALLTHROUGH */
 		case ('B'):
 			*d = DECO_BOLD;
-			break;
+			return(i);
 		case ('2'):
 			/* FALLTHROUGH */
 		case ('I'):
 			*d = DECO_ITALIC;
-			break;
+			return(i);
 		case ('P'):
 			*d = DECO_PREVIOUS;
-			break;
+			return(i);
 		case ('1'):
 			/* FALLTHROUGH */
 		case ('R'):
 			*d = DECO_ROMAN;
+			return(i);
+		default:
+			i--;
+			lim = 1;
 			break;
+		}
+		break;
+	case ('M'):
+		/* FALLTHROUGH */
+	case ('m'):
+		/* FALLTHROUGH */
+	case ('*'):
+		if ('*' == c)
+			*d = DECO_RESERVED;
+
+		switch (wp[i++]) {
+		case ('('):
+			lim = 2;
+			break;
+		case ('['):
+			term = ']';
+			break;
 		default:
+			i--;
+			lim = 1;
 			break;
 		}
+		break;
+	case ('s'):
+		if ('+' == wp[i] || '-' == wp[i])
+			i++;
 
-		return(2);
+		j = ('s' != wp[i - 1]);
 
+		switch (wp[i++]) {
+		case ('('):
+			lim = 2;
+			break;
+		case ('['):
+			term = ']';
+			break;
+		case ('\''):
+			term = '\'';
+			break;
+		default:
+			i--;
+			lim = 1;
+			break;
+		}
+
+		if ('+' == wp[i] || '-' == wp[i]) {
+			if (j++)
+				return(i);
+			i++;
+		} 
+		
+		if (0 == j)
+			return(i);
+		break;
 	case ('['):
+		*d = DECO_SPECIAL;
+		term = ']';
 		break;
-
 	case ('c'):
 		*d = DECO_NOSPACE;
-		*sz = 1;
-		return(1);
-
+		return(i);
 	default:
 		*d = DECO_SPECIAL;
-		*word = wp;
-		*sz = 1;
-		return(1);
+		i--;
+		lim = 1;
+		break;
 	}
 
-	*word = ++wp;
-	for (j = 0; *wp && ']' != *wp; wp++, j++)
-		/* Loop... */ ;
+	assert(term || lim);
+	*word = &wp[i];
 
-	if ('\0' == *wp)
-		return(j + 1);
+	if (term) {
+		j = i;
+		while (wp[i] && wp[i] != term)
+			i++;
+		if ('\0' == wp[i]) {
+			*d = DECO_NONE;
+			return(i);
+		}
 
-	*d = type ? DECO_SPECIAL : DECO_RESERVED;
-	*sz = (size_t)j;
-	return (j + 2);
+		assert(i >= j);
+		*sz = (size_t)(i - j);
+
+		return(i + 1);
+	}
+
+	assert(lim > 0);
+	*sz = (size_t)lim;
+
+	for (j = 0; wp[i] && j < lim; j++)
+		i++;
+	if (j < lim)
+		*d = DECO_NONE;
+
+	return(i);
 }