===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.56
retrieving revision 1.63
diff -u -p -r1.56 -r1.63
--- mandoc/mdoc.c	2009/03/08 20:50:12	1.56
+++ mandoc/mdoc.c	2009/03/12 15:55:11	1.63
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.56 2009/03/08 20:50:12 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.63 2009/03/12 15:55:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -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,9 @@ const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	"Tn",		"Ux",		"Xc",		"Xo",
 	"Fo",		"Fc",		"Oo",		"Oc",
 	"Bk",		"Ek",		"Bt",		"Hf",
-	"Fr",		"Ud",		"Lb",		"Ap"
+	"Fr",		"Ud",		"Lb",		"Ap",
+	"Lp",		"Lk",		"Mt",		"Brq",
+	"Bro",		"Brc"
 	};
 
 const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
@@ -494,6 +497,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 +520,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 (isspace((unsigned char)buf[1])) {
+		i = 2;
+		while (buf[i] && isspace((unsigned char)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);
@@ -519,19 +547,18 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 			break;
 	}
 
-	/* FIXME: be able to skip unknown macro lines! */
-
 	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. */