===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.65
retrieving revision 1.68
diff -u -p -r1.65 -r1.68
--- mandoc/html.c	2009/10/20 05:45:21	1.65
+++ mandoc/html.c	2009/10/28 05:08:17	1.68
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.65 2009/10/20 05:45:21 kristaps Exp $ */
+/*	$Id: html.c,v 1.68 2009/10/28 05:08:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -15,9 +15,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/types.h>
-#include <sys/queue.h>
 
 #include <assert.h>
+#include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -81,6 +81,7 @@ static	const char	 *const htmlattrs[ATTR_MAX] = {
 	"valign",
 	"target",
 	"id",
+	"summary",
 };
 
 #ifdef __linux__
@@ -102,8 +103,8 @@ html_alloc(char *outopts)
 	if (NULL == (h = calloc(1, sizeof(struct html))))
 		return(NULL);
 
-	SLIST_INIT(&h->tags);
-	SLIST_INIT(&h->ords);
+	h->tags.head = NULL;
+	h->ords.head = NULL;
 
 	if (NULL == (h->symtab = chars_init(CHARS_HTML))) {
 		free(h);
@@ -138,15 +139,13 @@ html_free(void *p)
 
 	h = (struct html *)p;
 
-	while ( ! SLIST_EMPTY(&h->ords)) {
-		ord = SLIST_FIRST(&h->ords);
-		SLIST_REMOVE_HEAD(&h->ords, entry);
+	while ((ord = h->ords.head) != NULL) { 
+		h->ords.head = ord->next;
 		free(ord);
 	}
 
-	while ( ! SLIST_EMPTY(&h->tags)) {
-		tag = SLIST_FIRST(&h->tags);
-		SLIST_REMOVE_HEAD(&h->tags, entry);
+	while ((tag = h->tags.head) != NULL) {
+		h->tags.head = tag->next;	
 		free(tag);
 	}
 	
@@ -358,7 +357,8 @@ print_otag(struct html *h, enum htmltag tag, 
 		if (NULL == (t = malloc(sizeof(struct tag))))
 			err(EXIT_FAILURE, "malloc");
 		t->tag = tag;
-		SLIST_INSERT_HEAD(&h->tags, t, entry);
+		t->next = h->tags.head;
+		h->tags.head = t;
 	} else
 		t = NULL;
 
@@ -468,10 +468,9 @@ print_tagq(struct html *h, const struct tag *until)
 {
 	struct tag	*tag;
 
-	while ( ! SLIST_EMPTY(&h->tags)) {
-		tag = SLIST_FIRST(&h->tags);
+	while ((tag = h->tags.head) != NULL) {
 		print_ctag(h, tag->tag);
-		SLIST_REMOVE_HEAD(&h->tags, entry);
+		h->tags.head = tag->next;
 		free(tag);
 		if (until && tag == until)
 			return;
@@ -484,12 +483,11 @@ print_stagq(struct html *h, const struct tag *suntil)
 {
 	struct tag	*tag;
 
-	while ( ! SLIST_EMPTY(&h->tags)) {
-		tag = SLIST_FIRST(&h->tags);
+	while ((tag = h->tags.head) != NULL) {
 		if (suntil && tag == suntil)
 			return;
 		print_ctag(h, tag->tag);
-		SLIST_REMOVE_HEAD(&h->tags, entry);
+		h->tags.head = tag->next;
 		free(tag);
 	}
 }
@@ -651,3 +649,50 @@ bufcat_su(struct html *h, const char *p, const struct 
 		buffmt(h, "%s: %d%s;", p, (int)v, u);
 }
 
+
+void
+html_idcpy(char *dst, const char *src, int sz)
+{
+
+	assert(sz);
+	dst[0] = '\0';
+	html_idcat(dst, src, sz);
+}
+
+
+void
+html_idcat(char *dst, const char *src, int sz)
+{
+	int		 i;
+
+	/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
+
+	for (i = 0; *dst != '\0' && i < sz - 1; dst++, i++)
+		/* Jump to end. */ ;
+
+	for ( ; *src != '\0' && i < sz - 1; src++, i++) {
+		if (isalnum((u_char)*src)) {
+			*dst++ = *src;
+			continue;
+		}
+
+		switch (*src) {
+		case (';'):
+			*dst++ = ';';
+			break;
+		case ('-'):
+			*dst++ = '-';
+			break;
+		case (':'):
+			*dst++ = ':';
+			break;
+		case ('_'):
+			/* FALLTHROUGH */
+		default:
+			*dst++ = '_';
+			break;
+		}
+	}
+
+	*dst = '\0';
+}