===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.3
retrieving revision 1.15
diff -u -p -r1.3 -r1.15
--- mandoc/man_macro.c	2009/03/23 15:20:51	1.3
+++ mandoc/man_macro.c	2009/06/10 20:18:43	1.15
@@ -1,33 +1,58 @@
-/* $Id: man_macro.c,v 1.3 2009/03/23 15:20:51 kristaps Exp $ */
+/*	$Id: man_macro.c,v 1.15 2009/06/10 20:18:43 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
 #include <ctype.h>
-#include <err.h> /* XXX */
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 
 #include "libman.h"
 
+#define	FL_NLINE	(1 << 0)
+#define	FL_TLINE	(1 << 1)
+
 static	int		 man_args(struct man *, int, 
 				int *, char *, char **);
 
+static	int man_flags[MAN_MAX] = {
+	0, /* __ */
+	0, /* TH */
+	0, /* SH */
+	0, /* SS */
+	FL_TLINE, /* TP */
+	0, /* LP */
+	0, /* PP */
+	0, /* P */
+	0, /* IP */
+	0, /* HP */
+	FL_NLINE, /* SM */
+	FL_NLINE, /* SB */
+	FL_NLINE, /* BI */
+	FL_NLINE, /* IB */
+	FL_NLINE, /* BR */
+	FL_NLINE, /* RB */
+	FL_NLINE, /* R */
+	FL_NLINE, /* B */
+	FL_NLINE, /* I */
+	FL_NLINE, /* IR */
+	FL_NLINE, /* RI */
+	0, /* br */
+	0, /* na */
+	FL_NLINE, /* i */
+};
 
 int
 man_macro(struct man *man, int tok, int line, 
@@ -56,19 +81,80 @@ man_macro(struct man *man, int tok, int line, 
 		man->next = MAN_NEXT_SIBLING;
 	}
 
-	/* TODO: validate. */
-	/* TODO: validate. */
+	if (n == man->last && (FL_NLINE & man_flags[tok])) {
+		if (MAN_NLINE & man->flags) 
+			return(man_verr(man, line, ppos, 
+				"next-line scope already open"));
+		man->flags |= MAN_NLINE;
+		return(1);
+	}
 
-	man->last = n;
-	man->next = MAN_NEXT_SIBLING;
+	if (FL_TLINE & man_flags[tok]) {
+		if (MAN_NLINE & man->flags) 
+			return(man_verr(man, line, ppos, 
+				"next-line scope already open"));
+		man->flags |= MAN_NLINE;
+		return(1);
+	}
 
+	/*
+	 * Note that when TH is pruned, we'll be back at the root, so
+	 * make sure that we don't clobber as its sibling.
+	 */
+
+	for ( ; man->last; man->last = man->last->parent) {
+		if (man->last == n)
+			break;
+		if (man->last->type == MAN_ROOT)
+			break;
+		if ( ! man_valid_post(man))
+			return(0);
+		if ( ! man_action_post(man))
+			return(0);
+	}
+
+	assert(man->last);
+
+	/*
+	 * Same here regarding whether we're back at the root. 
+	 */
+
+	if (man->last->type != MAN_ROOT && ! man_valid_post(man))
+		return(0);
+	if (man->last->type != MAN_ROOT && ! man_action_post(man))
+		return(0);
+	if (man->last->type != MAN_ROOT)
+		man->next = MAN_NEXT_SIBLING;
+
 	return(1);
 }
 
 
-/* ARGSUSED */
 int
-man_args(struct man *man, int line, 
+man_macroend(struct man *m)
+{
+
+	for ( ; m->last && m->last != m->first; 
+			m->last = m->last->parent) {
+		if ( ! man_valid_post(m))
+			return(0);
+		if ( ! man_action_post(m))
+			return(0);
+	}
+	assert(m->last == m->first);
+
+	if ( ! man_valid_post(m))
+		return(0);
+	if ( ! man_action_post(m))
+		return(0);
+
+	return(1);
+}
+
+
+/* ARGSUSED */
+static int
+man_args(struct man *m, int line, 
 		int *pos, char *buf, char **v)
 {
 
@@ -101,8 +187,10 @@ man_args(struct man *man, int line, 
 		if (buf[*pos])
 			return(1);
 
-		warnx("tail whitespace");
-		return(-1);
+		if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+			return(-1);
+
+		return(1);
 	}
 
 	/*
@@ -117,8 +205,9 @@ man_args(struct man *man, int line, 
 		(*pos)++;
 
 	if (0 == buf[*pos]) {
-		warnx("unterminated quotation");
-		return(-1);
+		if ( ! man_vwarn(m, line, *pos, "unterminated quote"))
+			return(-1);
+		return(1);
 	}
 
 	buf[(*pos)++] = 0;
@@ -131,6 +220,7 @@ man_args(struct man *man, int line, 
 	if (buf[*pos])
 		return(1);
 
-	warnx("tail whitespace");
-	return(-1);
+	if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+		return(-1);
+	return(1);
 }