===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.141
retrieving revision 1.145
diff -u -p -r1.141 -r1.145
--- mandoc/html.c	2011/05/17 11:19:45	1.141
+++ mandoc/html.c	2011/05/18 23:59:08	1.145
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.141 2011/05/17 11:19:45 kristaps Exp $ */
+/*	$Id: html.c,v 1.145 2011/05/18 23:59:08 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -272,6 +272,8 @@ print_metaf(struct html *h, enum mandoc_esc deco)
 	case (ESCAPE_FONTBOLD):
 		font = HTMLFONT_BOLD;
 		break;
+	case (ESCAPE_FONT):
+		/* FALLTHROUGH */
 	case (ESCAPE_FONTROMAN):
 		font = HTMLFONT_NONE;
 		break;
@@ -315,6 +317,8 @@ html_strlen(const char *cp)
 		switch (mandoc_escape(&cp, &seq, &ssz)) {
 		case (ESCAPE_ERROR):
 			return(sz);
+		case (ESCAPE_UNICODE):
+			/* FALLTHROUGH */
 		case (ESCAPE_NUMBERED):
 			/* FALLTHROUGH */
 		case (ESCAPE_PREDEF):
@@ -373,6 +377,12 @@ print_encode(struct html *h, const char *p, int norecu
 			break;
 
 		switch (esc) {
+		case (ESCAPE_UNICODE):
+			/* Skip passed "u" header. */
+			c = mchars_num2uc(seq + 1, len - 1);
+			if ('\0' != c)
+				printf("&#x%x;", c);
+			break;
 		case (ESCAPE_NUMBERED):
 			c = mchars_num2char(seq, len);
 			if ('\0' != c)
@@ -384,6 +394,8 @@ print_encode(struct html *h, const char *p, int norecu
 		case (ESCAPE_SPECIAL):
 			print_spec(h, seq, len);
 			break;
+		case (ESCAPE_FONT):
+			/* FALLTHROUGH */
 		case (ESCAPE_FONTPREV):
 			/* FALLTHROUGH */
 		case (ESCAPE_FONTBOLD):
@@ -656,6 +668,7 @@ buffmt_includes(struct html *h, const char *name)
 
 	pp = h->base_includes;
 	
+	bufinit(h);
 	while (NULL != (p = strchr(pp, '%'))) {
 		bufncat(h, pp, (size_t)(p - pp));
 		switch (*(p + 1)) {
@@ -680,7 +693,7 @@ buffmt_man(struct html *h, 
 
 	pp = h->base_man;
 	
-	/* LINTED */
+	bufinit(h);
 	while (NULL != (p = strchr(pp, '%'))) {
 		bufncat(h, pp, (size_t)(p - pp));
 		switch (*(p + 1)) {
@@ -713,32 +726,11 @@ bufcat_su(struct html *h, const char *p, const struct 
 }
 
 void
-html_idcat(char *dst, const char *src, int sz)
+bufcat_id(struct html *h, const char *src)
 {
-	int		 ssz;
 
-	assert(sz > 2);
-
 	/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
-	/* We can't start with a number (bah). */
-
-	if ('#' == *dst) {
-		dst++;
-		sz--;
-	}
-	if ('\0' == *dst) {
-		*dst++ = 'x';
-		*dst = '\0';
-		sz--;
-	}
-
-	for ( ; *dst != '\0' && sz; dst++, sz--)
-		/* Jump to end. */ ;
-
-	for ( ; *src != '\0' && sz > 1; src++) {
-		ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
-		sz -= ssz;
-		dst += ssz;
-	}
+	while ('\0' != *src)
+		bufcat_fmt(h, "%.2x", *src++);
 }