===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.77
retrieving revision 1.85
diff -u -p -r1.77 -r1.85
--- mandoc/html.c	2009/11/01 08:15:20	1.77
+++ mandoc/html.c	2009/11/14 11:58:36	1.85
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.77 2009/11/01 08:15:20 kristaps Exp $ */
+/*	$Id: html.c,v 1.85 2009/11/14 11:58:36 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -66,7 +66,7 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"base",	HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */
 };
 
-static	const char	 *const htmlattrs[ATTR_MAX] = {
+static	const char	*const htmlattrs[ATTR_MAX] = {
 	"http-equiv",
 	"content",
 	"name",
@@ -87,6 +87,13 @@ static	const char	 *const htmlattrs[ATTR_MAX] = {
 extern	int		  getsubopt(char **, char * const *, char **);
 #endif
 
+
+static	void		  print_spec(struct html *, const char *, size_t);
+static	void		  print_res(struct html *, const char *, size_t);
+static	void		  print_ctag(struct html *, enum htmltag);
+static	int		  print_encode(struct html *, const char *);
+
+
 void *
 html_alloc(char *outopts)
 {
@@ -186,12 +193,12 @@ print_gen_head(struct html *h)
 
 
 static void
-print_spec(struct html *h, const char *p, int len)
+print_spec(struct html *h, const char *p, size_t len)
 {
 	const char	*rhs;
 	size_t		 sz;
 
-	rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz);
+	rhs = chars_a2ascii(h->symtab, p, len, &sz);
 
 	if (NULL == rhs) 
 		return;
@@ -200,12 +207,12 @@ print_spec(struct html *h, const char *p, int len)
 
 
 static void
-print_res(struct html *h, const char *p, int len)
+print_res(struct html *h, const char *p, size_t len)
 {
 	const char	*rhs;
 	size_t		 sz;
 
-	rhs = chars_a2res(h->symtab, p, (size_t)len, &sz);
+	rhs = chars_a2res(h->symtab, p, len, &sz);
 
 	if (NULL == rhs)
 		return;
@@ -213,133 +220,59 @@ print_res(struct html *h, const char *p, int len)
 }
 
 
-static void
-print_escape(struct html *h, const char **p)
+static int
+print_encode(struct html *h, const char *p)
 {
-	int		 j, type;
-	const char	*wp;
+	size_t		 sz;
+	int		 len, nospace;
+	const char	*seq;
+	enum roffdeco	 deco;
 
-	wp = *p;
-	type = 1;
+	nospace = 0;
 
-	if (0 == *(++wp)) {
-		*p = wp;
-		return;
-	}
+	for (; *p; p++) {
+		sz = strcspn(p, "\\<>&");
 
-	if ('(' == *wp) {
-		wp++;
-		if (0 == *wp || 0 == *(wp + 1)) {
-			*p = 0 == *wp ? wp : wp + 1;
-			return;
-		}
+		fwrite(p, 1, sz, stdout);
+		p += /* LINTED */
+			sz;
 
-		print_spec(h, wp, 2);
-		*p = ++wp;
-		return;
+		if ('<' == *p) {
+			printf("&lt;");
+			continue;
+		} else if ('>' == *p) {
+			printf("&gt;");
+			continue;
+		} else if ('&' == *p) {
+			printf("&amp;");
+			continue;
+		} else if ('\0' == *p)
+			break;
 
-	} else if ('*' == *wp) {
-		if (0 == *(++wp)) {
-			*p = wp;
-			return;
-		}
+		seq = ++p;
+		len = a2roffdeco(&deco, &seq, &sz);
 
-		switch (*wp) {
-		case ('('):
-			wp++;
-			if (0 == *wp || 0 == *(wp + 1)) {
-				*p = 0 == *wp ? wp : wp + 1;
-				return;
-			}
-
-			print_res(h, wp, 2);
-			*p = ++wp;
-			return;
-		case ('['):
-			type = 0;
+		switch (deco) {
+		case (DECO_RESERVED):
+			print_res(h, seq, sz);
 			break;
-		default:
-			print_res(h, wp, 1);
-			*p = wp;
-			return;
-		}
-	
-	} else if ('f' == *wp) {
-		if (0 == *(++wp)) {
-			*p = wp;
-			return;
-		}
-
-		switch (*wp) {
-		case ('B'):
-			/* TODO */
+		case (DECO_SPECIAL):
+			print_spec(h, seq, sz);
 			break;
-		case ('I'):
-			/* TODO */
-			break;
-		case ('P'):
-			/* FALLTHROUGH */
-		case ('R'):
-			/* TODO */
-			break;
 		default:
 			break;
 		}
 
-		*p = wp;
-		return;
+		p += len - 1;
 
-	} else if ('[' != *wp) {
-		print_spec(h, wp, 1);
-		*p = wp;
-		return;
+		if (DECO_NOSPACE == deco && '\0' == *(p + 1))
+			nospace = 1;
 	}
 
-	wp++;
-	for (j = 0; *wp && ']' != *wp; wp++, j++)
-		/* Loop... */ ;
-
-	if (0 == *wp) {
-		*p = wp;
-		return;
-	}
-
-	if (type)
-		print_spec(h, wp - j, j);
-	else
-		print_res(h, wp - j, j);
-
-	*p = wp;
+	return(nospace);
 }
 
 
-static void
-print_encode(struct html *h, const char *p)
-{
-	size_t		 sz;
-
-	for (; *p; p++) {
-		sz = strcspn(p, "\\<>&");
-
-		fwrite(p, 1, sz, stdout);
-		p += sz;
-
-		if ('\\' == *p) {
-			print_escape(h, &p);
-			continue;
-		} else if ('\0' == *p)
-			break;
-
-		if ('<' == *p)
-			printf("&lt;");
-		else if ('>' == *p)
-			printf("&gt;");
-		else if ('&' == *p)
-			printf("&amp;");
-	}
-}
-
-
 struct tag *
 print_otag(struct html *h, enum htmltag tag, 
 		int sz, const struct htmlpair *p)
@@ -361,16 +294,16 @@ print_otag(struct html *h, enum htmltag tag, 
 
 	if ( ! (HTML_NOSPACE & h->flags))
 		if ( ! (HTML_CLRLINE & htmltags[tag].flags))
-			printf(" ");
+			putchar(' ');
 
 	printf("<%s", htmltags[tag].name);
 	for (i = 0; i < sz; i++) {
 		printf(" %s=\"", htmlattrs[p[i].key]);
 		assert(p->val);
-		print_encode(h, p[i].val);
-		printf("\"");
+		(void)print_encode(h, p[i].val);
+		putchar('\"');
 	}
-	printf(">");
+	putchar('>');
 
 	h->flags |= HTML_NOSPACE;
 	if (HTML_CLRLINE & htmltags[tag].flags)
@@ -391,7 +324,7 @@ print_ctag(struct html *h, enum htmltag tag)
 	if (HTML_CLRLINE & htmltags[tag].flags) {
 		h->flags |= HTML_NOSPACE;
 		h->flags |= HTML_NEWLINE;
-		printf("\n");
+		putchar('\n');
 	} else
 		h->flags &= ~HTML_NEWLINE;
 }
@@ -437,7 +370,7 @@ print_text(struct html *h, const char *p)
 		}
 
 	if ( ! (h->flags & HTML_NOSPACE))
-		printf(" ");
+		putchar(' ');
 
 	h->flags &= ~HTML_NOSPACE;
 	h->flags &= ~HTML_NEWLINE;