===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.77
retrieving revision 1.83
diff -u -p -r1.77 -r1.83
--- mandoc/mdoc.c	2009/06/12 12:52:51	1.77
+++ mandoc/mdoc.c	2009/06/16 20:22:23	1.83
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.77 2009/06/12 12:52:51 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.83 2009/06/16 20:22:23 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -34,7 +34,7 @@ enum	merr {
 };
 
 const	char *const __mdoc_macronames[MDOC_MAX] = {		 
-	"\\\"",		"Dd",		"Dt",		"Os",
+	"Ap",		"Dd",		"Dt",		"Os",
 	"Sh",		"Ss",		"Pp",		"D1",
 	"Dl",		"Bd",		"Ed",		"Bl",
 	"El",		"It",		"Ad",		"An",
@@ -63,12 +63,12 @@ const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	"Tn",		"Ux",		"Xc",		"Xo",
 	"Fo",		"Fc",		"Oo",		"Oc",
 	"Bk",		"Ek",		"Bt",		"Hf",
-	"Fr",		"Ud",		"Lb",		"Ap",
-	"Lp",		"Lk",		"Mt",		"Brq",
+	"Fr",		"Ud",		"Lb",		"Lp",
+	"Lk",		"Mt",		"Brq",		"Bro",
 	/* LINTED */
-	"Bro",		"Brc",		"\%C",		"Es",
+	"Brc",		"\%C",		"Es",		"En",
 	/* LINTED */
-	"En",		"Dx",		"\%Q"
+	"Dx",		"\%Q"
 	};
 
 const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
@@ -99,9 +99,6 @@ static	int		  perr(struct mdoc *, int, int, enum merr)
 
 #define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t))
 
-/*
- * Get the first (root) node of the parse tree.
- */
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)
 {
@@ -242,42 +239,58 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf)
 }
 
 
-void
-mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
+int
+mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
+		const char *fmt, ...)
 {
-	char		  buf[256];
-	va_list		  ap;
+	char		 buf[256];
+	va_list		 ap;
 
-	if (NULL == mdoc->cb.mdoc_msg)
-		return;
+	if (NULL == mdoc->cb.mdoc_err)
+		return(0);
 
 	va_start(ap, fmt);
 	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
 	va_end(ap);
-	(*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf);
+	return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
 }
 
 
 int
-mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
-		const char *fmt, ...)
+mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, 
+		enum mdoc_warn type, const char *fmt, ...)
 {
 	char		 buf[256];
 	va_list		 ap;
 
+	if (NULL == mdoc->cb.mdoc_warn)
+		return(0);
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf));
+}
+
+
+int
+mdoc_nerr(struct mdoc *mdoc, const struct mdoc_node *node, const char *fmt, ...)
+{
+	char		 buf[256];
+	va_list		 ap;
+
 	if (NULL == mdoc->cb.mdoc_err)
 		return(0);
 
 	va_start(ap, fmt);
 	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
 	va_end(ap);
-	return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
+	return((*mdoc->cb.mdoc_err)(mdoc->data, node->line, node->pos, buf));
 }
 
 
 int
-mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, 
-		enum mdoc_warn type, const char *fmt, ...)
+mdoc_warn(struct mdoc *mdoc, enum mdoc_warn type, const char *fmt, ...)
 {
 	char		 buf[256];
 	va_list		 ap;
@@ -288,11 +301,61 @@ mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, 
 	va_start(ap, fmt);
 	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
 	va_end(ap);
-	return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf));
+	return((*mdoc->cb.mdoc_warn)(mdoc->data, mdoc->last->line,
+	    mdoc->last->pos, type, buf));
 }
 
 
 int
+mdoc_err(struct mdoc *mdoc, const char *fmt, ...)
+{
+	char		 buf[256];
+	va_list		 ap;
+
+	if (NULL == mdoc->cb.mdoc_err)
+		return(0);
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*mdoc->cb.mdoc_err)(mdoc->data, mdoc->last->line,
+	    mdoc->last->pos, buf));
+}
+
+
+int
+mdoc_pwarn(struct mdoc *mdoc, int line, int pos, enum mdoc_warn type,
+		const char *fmt, ...)
+{
+	char		 buf[256];
+	va_list		 ap;
+
+	if (NULL == mdoc->cb.mdoc_warn)
+		return(0);
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*mdoc->cb.mdoc_warn)(mdoc->data, line, pos, type, buf));
+}
+
+int
+mdoc_perr(struct mdoc *mdoc, int line, int pos, const char *fmt, ...)
+{
+	char		 buf[256];
+	va_list		 ap;
+
+	if (NULL == mdoc->cb.mdoc_err)
+		return(0);
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*mdoc->cb.mdoc_err)(mdoc->data, line, pos, buf));
+}
+
+
+int
 mdoc_macro(struct mdoc *m, int tok, 
 		int ln, int pp, int *pos, char *buf)
 {
@@ -580,7 +643,6 @@ macrowarn(struct mdoc *m, int ln, const char *buf)
 }
 
 
-
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
@@ -591,7 +653,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 	int		  i, c;
 	char		  mac[5];
 
-	/* Comments and empties are quickly ignored. */
+	/* Empty lines are ignored. */
 
 	if (0 == buf[1])
 		return(1);
@@ -604,10 +666,6 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 			return(1);
 		return(perr(m, ln, 1, ESPACE));
 	}
-
-	if (buf[1] && '\\' == buf[1])
-		if (buf[2] && '\"' == buf[2])
-			return(1);
 
 	/* Copy the first word into a nil-terminated buffer. */