===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.103
retrieving revision 1.112
diff -u -p -r1.103 -r1.112
--- mandoc/mdoc.c	2009/08/20 11:44:47	1.103
+++ mandoc/mdoc.c	2009/10/27 08:26:12	1.112
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.103 2009/08/20 11:44:47 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.112 2009/10/27 08:26:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
@@ -74,7 +76,9 @@ const	char *const __mdoc_merrnames[MERRMAX] = {		 
 	"unclosed explicit scope", /* EOPEN */
 	"unterminated quoted phrase", /* EQUOTPHR */
 	"closure macro without prior context", /* ENOCTX */
-	"no description found for library" /* ELIB */
+	"no description found for library", /* ELIB */
+	"bad child for parent context", /* EBADCHILD */
+	"list arguments preceding type", /* ENOTYPE */
 };
 
 const	char *const __mdoc_macronames[MDOC_MAX] = {		 
@@ -112,7 +116,9 @@ const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	/* LINTED */
 	"Brc",		"\%C",		"Es",		"En",
 	/* LINTED */
-	"Dx",		"\%Q",		"br",		"sp"
+	"Dx",		"\%Q",		"br",		"sp",
+	/* LINTED */
+	"\%U"
 	};
 
 const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
@@ -124,7 +130,7 @@ const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
 	"ohang",		"inset",		"column",	 
 	"width",		"compact",		"std",	 
 	"filled",		"words",		"emphasis",
-	"symbolic",		"nested"
+	"symbolic",		"nested",		"centered"
 	};
 
 const	char * const *mdoc_macronames = __mdoc_macronames;
@@ -192,7 +198,7 @@ static int
 mdoc_alloc1(struct mdoc *mdoc)
 {
 
-	bzero(&mdoc->meta, sizeof(struct mdoc_meta));
+	memset(&mdoc->meta, 0, sizeof(struct mdoc_meta));
 	mdoc->flags = 0;
 	mdoc->lastnamed = mdoc->lastsec = SEC_NONE;
 	mdoc->last = calloc(1, sizeof(struct mdoc_node));
@@ -230,8 +236,6 @@ mdoc_free(struct mdoc *mdoc)
 {
 
 	mdoc_free1(mdoc);
-	if (mdoc->htab)
-		mdoc_hash_free(mdoc->htab);
 	free(mdoc);
 }
 
@@ -249,13 +253,12 @@ mdoc_alloc(void *data, int pflags, const struct mdoc_c
 	if (cb)
 		(void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
 
+	mdoc_hash_init();
+
 	p->data = data;
 	p->pflags = pflags;
 
-	if (NULL == (p->htab = mdoc_hash_alloc())) {
-		free(p);
-		return(NULL);
-	} else if (mdoc_alloc1(p))
+	if (mdoc_alloc1(p))
 		return(p);
 
 	free(p);
@@ -662,7 +665,6 @@ parsetext(struct mdoc *m, int line, char *buf)
 
 
 
-
 static int
 macrowarn(struct mdoc *m, int ln, const char *buf)
 {
@@ -709,6 +711,12 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 			break;
 		else if (' ' == buf[i])
 			break;
+
+		/* Check for invalid characters. */
+
+		if (isgraph((u_char)buf[i]))
+			continue;
+		return(mdoc_perr(m, ln, i, EPRINT));
 	}
 
 	mac[j] = 0;
@@ -719,7 +727,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 		return(1);
 	} 
 	
-	if (MDOC_MAX == (c = mdoc_hash_find(m->htab, mac))) {
+	if (MDOC_MAX == (c = mdoc_hash_find(mac))) {
 		if ( ! macrowarn(m, ln, mac))
 			goto err;
 		return(1);