===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.67
retrieving revision 1.77
diff -u -p -r1.67 -r1.77
--- mandoc/html.c	2009/10/27 04:50:14	1.67
+++ mandoc/html.c	2009/11/01 08:15:20	1.77
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.67 2009/10/27 04:50:14 kristaps Exp $ */
+/*	$Id: html.c,v 1.77 2009/11/01 08:15:20 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,9 +17,9 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <err.h>
-#include <stdio.h>
+#include <ctype.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -99,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) {
+		perror(NULL);
+		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):
@@ -190,15 +189,13 @@ static void
 print_spec(struct html *h, const char *p, int len)
 {
 	const char	*rhs;
-	int		 i;
 	size_t		 sz;
 
 	rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz);
 
 	if (NULL == rhs) 
 		return;
-	for (i = 0; i < (int)sz; i++) 
-		putchar(rhs[i]);
+	fwrite(rhs, 1, sz, stdout);
 }
 
 
@@ -206,15 +203,13 @@ static void
 print_res(struct html *h, const char *p, int len)
 {
 	const char	*rhs;
-	int		 i;
 	size_t		 sz;
 
 	rhs = chars_a2res(h->symtab, p, (size_t)len, &sz);
 
 	if (NULL == rhs)
 		return;
-	for (i = 0; i < (int)sz; i++) 
-		putchar(rhs[i]);
+	fwrite(rhs, 1, sz, stdout);
 }
 
 
@@ -321,26 +316,26 @@ print_escape(struct html *h, const char **p)
 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;
-		}
-		switch (*p) {
-		case ('<'):
-			printf("&lt;");
+		} else if ('\0' == *p)
 			break;
-		case ('>'):
+
+		if ('<' == *p)
+			printf("&lt;");
+		else if ('>' == *p)
 			printf("&gt;");
-			break;
-		case ('&'):
+		else if ('&' == *p)
 			printf("&amp;");
-			break;
-		default:
-			putchar(*p);
-			break;
-		}
 	}
 }
 
@@ -353,8 +348,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) {
+			perror(NULL);
+			exit(EXIT_FAILURE);
+		}
 		t->tag = tag;
 		t->next = h->tags.head;
 		h->tags.head = t;
@@ -390,11 +388,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;
 }
 
@@ -648,3 +646,30 @@ bufcat_su(struct html *h, const char *p, const struct 
 		buffmt(h, "%s: %d%s;", p, (int)v, u);
 }
 
+
+void
+html_idcat(char *dst, const char *src, int sz)
+{
+	int		 ssz;
+
+	assert(sz);
+
+	/* 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--;
+
+	for ( ; *src != '\0' && sz > 1; src++) {
+		ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
+		sz -= ssz;
+		dst += ssz;
+	}
+}