===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.122
retrieving revision 1.124
diff -u -p -r1.122 -r1.124
--- mandoc/html.c	2010/12/24 00:46:49	1.122
+++ mandoc/html.c	2010/12/27 21:41:05	1.124
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.122 2010/12/24 00:46:49 kristaps Exp $ */
+/*	$Id: html.c,v 1.124 2010/12/27 21:41:05 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -72,7 +72,6 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"pre",		HTML_CLRLINE }, /* TAG_PRE */
 	{"b",		0 }, /* TAG_B */
 	{"i",		0 }, /* TAG_I */
-	{"u",		0 }, /* TAG_U */
 	{"code",	0 }, /* TAG_CODE */
 	{"small",	0 }, /* TAG_SMALL */
 };
@@ -772,20 +771,24 @@ html_idcat(char *dst, const char *src, int sz)
 {
 	int		 ssz;
 
-	assert(sz);
+	assert(sz > 2);
 
 	/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
-	for ( ; *dst != '\0' && sz; dst++, sz--)
-		/* Jump to end. */ ;
-
-	assert(sz > 2);
-
 	/* We can't start with a number (bah). */
 
-	*dst++ = 'x';
-	*dst = '\0';
-	sz--;
+	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);