===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.53
retrieving revision 1.66
diff -u -p -r1.53 -r1.66
--- mandoc/mdoc.c	2009/03/08 11:41:22	1.53
+++ mandoc/mdoc.c	2009/03/16 23:37:28	1.66
@@ -1,6 +1,6 @@
-/* $Id: mdoc.c,v 1.53 2009/03/08 11:41:22 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.66 2009/03/16 23:37:28 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the
@@ -38,6 +38,7 @@ static	int		  mdoc_node_append(struct mdoc *, 
 
 static	int		  parsetext(struct mdoc *, int, char *);
 static	int		  parsemacro(struct mdoc *, int, char *);
+static	int		  macrowarn(struct mdoc *, int, const char *);
 
 
 const	char *const __mdoc_macronames[MDOC_MAX] = {		 
@@ -70,7 +71,11 @@ const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	"Tn",		"Ux",		"Xc",		"Xo",
 	"Fo",		"Fc",		"Oo",		"Oc",
 	"Bk",		"Ek",		"Bt",		"Hf",
-	"Fr",		"Ud",		"Lb",
+	"Fr",		"Ud",		"Lb",		"Ap",
+	"Lp",		"Lk",		"Mt",		"Brq",
+	/* LINTED */
+	"Bro",		"Brc",		"\%C",		"Es",
+	"En",		"Dx"
 	};
 
 const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
@@ -82,7 +87,7 @@ const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
 	"ohang",		"inset",		"column",	 
 	"width",		"compact",		"std",	 
 	"filled",		"words",		"emphasis",
-	"symbolic"
+	"symbolic",		"nested"
 	};
 
 const	char * const *mdoc_macronames = __mdoc_macronames;
@@ -129,7 +134,7 @@ mdoc_free(struct mdoc *mdoc)
 
 
 struct mdoc *
-mdoc_alloc(void *data, const struct mdoc_cb *cb)
+mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)
 {
 	struct mdoc	*p;
 
@@ -142,7 +147,7 @@ mdoc_alloc(void *data, const struct mdoc_cb *cb)
 	p->last = xcalloc(1, sizeof(struct mdoc_node));
 	p->last->type = MDOC_ROOT;
 	p->first = p->last;
-
+	p->pflags = pflags;
 	p->next = MDOC_NEXT_CHILD;
 	p->htab = mdoc_tokhash_alloc();
 
@@ -254,7 +259,8 @@ mdoc_macro(struct mdoc *m, int tok, 
 				"disallowed in prologue"));
 
 	if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
-		return(mdoc_perr(m, ln, pp, "not callable"));
+		return(mdoc_perr(m, ln, pp, "%s not callable",
+					mdoc_macronames[tok]));
 
 	return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }
@@ -494,6 +500,19 @@ parsetext(struct mdoc *mdoc, int line, char *buf)
 }
 
 
+static int
+macrowarn(struct mdoc *m, int ln, const char *buf)
+{
+	if ( ! (MDOC_IGN_MACRO & m->pflags))
+		return(mdoc_perr(m, ln, 1, "unknown macro: %s%s", 
+				buf, strlen(buf) > 3 ? "..." : ""));
+	return(mdoc_pwarn(m, ln, 1, WARN_SYNTAX,
+				"unknown macro: %s%s",
+				buf, strlen(buf) > 3 ? "..." : ""));
+}
+
+
+
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
@@ -504,8 +523,20 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 	int		  i, c;
 	char		  mac[5];
 
-	/* Comments are quickly ignored. */
+	/* Comments and empties are quickly ignored. */
 
+	if (0 == buf[1])
+		return(1);
+
+	if (' ' == buf[1]) {
+		i = 2;
+		while (buf[i] && ' ' == buf[i])
+			i++;
+		if (0 == buf[i])
+			return(1);
+		return(mdoc_perr(m, ln, 1, "invalid syntax"));
+	}
+
 	if (buf[1] && '\\' == buf[1])
 		if (buf[2] && '\"' == buf[2])
 			return(1);
@@ -515,26 +546,27 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 	for (i = 1; i < 5; i++) {
 		if (0 == (mac[i - 1] = buf[i]))
 			break;
-		else if (isspace((unsigned char)buf[i]))
+		else if (' ' == buf[i])
 			break;
 	}
 
 	mac[i - 1] = 0;
 
 	if (i == 5 || i <= 2) {
-		(void)mdoc_perr(m, ln, 1, "unknown macro: %s%s", 
-				mac, i == 5 ? "..." : "");
-		goto err;
+		if ( ! macrowarn(m, ln, mac))
+			goto err;
+		return(1);
 	} 
 	
 	if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) {
-		(void)mdoc_perr(m, ln, 1, "unknown macro: %s", mac);
-		goto err;
+		if ( ! macrowarn(m, ln, mac))
+			goto err;
+		return(1);
 	}
 
 	/* The macro is sane.  Jump to the next word. */
 
-	while (buf[i] && isspace((unsigned char)buf[i]))
+	while (buf[i] && ' ' == buf[i])
 		i++;
 
 	/* Begin recursive parse sequence. */