===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.68
retrieving revision 1.74
diff -u -p -r1.68 -r1.74
--- mandoc/html.c	2009/10/28 05:08:17	1.68
+++ mandoc/html.c	2009/10/30 18:53:08	1.74
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.68 2009/10/28 05:08:17 kristaps Exp $ */
+/*	$Id: html.c,v 1.74 2009/10/30 18:53:08 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -18,7 +18,6 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdint.h>
@@ -100,17 +99,16 @@ html_alloc(char *outopts)
 	toks[2] = "includes";
 	toks[3] = NULL;
 
-	if (NULL == (h = calloc(1, sizeof(struct html))))
-		return(NULL);
+	h = calloc(1, sizeof(struct html));
+	if (NULL == h) {
+		fprintf(stderr, "memory exhausted\n");
+		exit(EXIT_FAILURE);
+	}
 
 	h->tags.head = NULL;
 	h->ords.head = NULL;
+	h->symtab = chars_init(CHARS_HTML);
 
-	if (NULL == (h->symtab = chars_init(CHARS_HTML))) {
-		free(h);
-		return(NULL);
-	}
-
 	while (outopts && *outopts)
 		switch (getsubopt(&outopts, UNCONST(toks), &v)) {
 		case (0):
@@ -354,8 +352,11 @@ print_otag(struct html *h, enum htmltag tag, 
 	struct tag	*t;
 
 	if ( ! (HTML_NOSTACK & htmltags[tag].flags)) {
-		if (NULL == (t = malloc(sizeof(struct tag))))
-			err(EXIT_FAILURE, "malloc");
+		t = malloc(sizeof(struct tag));
+		if (NULL == t) {
+			fprintf(stderr, "memory exhausted\n");
+			exit(EXIT_FAILURE);
+		}
 		t->tag = tag;
 		t->next = h->tags.head;
 		h->tags.head = t;
@@ -391,11 +392,11 @@ print_ctag(struct html *h, enum htmltag tag)
 {
 	
 	printf("</%s>", htmltags[tag].name);
-	if (HTML_CLRLINE & htmltags[tag].flags)
+	if (HTML_CLRLINE & htmltags[tag].flags) {
 		h->flags |= HTML_NOSPACE;
-	if (HTML_CLRLINE & htmltags[tag].flags)
 		h->flags |= HTML_NEWLINE;
-	else
+		printf("\n");
+	} else
 		h->flags &= ~HTML_NEWLINE;
 }
 
@@ -651,48 +652,28 @@ bufcat_su(struct html *h, const char *p, const struct 
 
 
 void
-html_idcpy(char *dst, const char *src, int sz)
+html_idcat(char *dst, const char *src, int sz)
 {
+	int		 ssz;
 
 	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++)
+	for ( ; *dst != '\0' && sz; dst++, sz--)
 		/* Jump to end. */ ;
 
-	for ( ; *src != '\0' && i < sz - 1; src++, i++) {
-		if (isalnum((u_char)*src)) {
-			*dst++ = *src;
-			continue;
-		}
+	assert(sz > 2);
 
-		switch (*src) {
-		case (';'):
-			*dst++ = ';';
-			break;
-		case ('-'):
-			*dst++ = '-';
-			break;
-		case (':'):
-			*dst++ = ':';
-			break;
-		case ('_'):
-			/* FALLTHROUGH */
-		default:
-			*dst++ = '_';
-			break;
-		}
-	}
+	/* We can't start with a number (bah). */
 
+	*dst++ = 'x';
 	*dst = '\0';
+	sz--;
+
+	for ( ; *src != '\0' && sz > 1; src++) {
+		ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
+		sz -= ssz;
+		dst += ssz;
+	}
 }