===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.58
retrieving revision 1.65
diff -u -p -r1.58 -r1.65
--- mandoc/Attic/macro.c	2009/03/08 11:41:22	1.58
+++ mandoc/Attic/macro.c	2009/03/10 15:01:54	1.65
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.58 2009/03/08 11:41:22 kristaps Exp $ */
+/* $Id: macro.c,v 1.65 2009/03/10 15:01:54 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,17 +21,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef	__linux__
-#include <time.h>
-#endif
 
+#include "private.h"
+
 /*
  * This has scanning/parsing routines, each of which extract a macro and
  * its arguments and parameters, then know how to progress to the next
  * macro. 
  */
 
-#include "private.h"
+/* FIXME: .Fl, .Ar, .Cd handling of `|'. */
 
 static int	  macro_obsolete(MACRO_PROT_ARGS);
 static int	  macro_constant(MACRO_PROT_ARGS);
@@ -60,6 +59,8 @@ static	int	  append_delims(struct mdoc *, int, int *, 
 static	int	  lookup(struct mdoc *, int, int, int, const char *);
 static	int	  pwarn(struct mdoc *, int, int, int);
 static	int	  perr(struct mdoc *, int, int, int);
+static	int	  scopewarn(struct mdoc *, enum mdoc_type, int, int, 
+			const struct mdoc_node *);
 
 #define	WMACPARM	(1)
 #define	WOBS		(2)
@@ -179,6 +180,10 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ macro_obsolete, 0 }, /* Fr */
 	{ macro_constant, 0 }, /* Ud */
 	{ macro_constant, 0 }, /* Lb */
+	{ macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */
+	{ macro_text, 0 }, /* Lp */ 
+	{ macro_text, MDOC_PARSED }, /* Lk */ 
+	{ macro_text, MDOC_PARSED }, /* Mt */ 
 };
 
 const	struct mdoc_macro * const mdoc_macros = __mdoc_macros;
@@ -192,7 +197,7 @@ perr(struct mdoc *mdoc, int line, int pos, int type)
 	switch (type) {
 	case (ENOCTX):
 		c = mdoc_perr(mdoc, line, pos, 
-				"closing macro has prior context");
+				"closing macro has no prior context");
 		break;
 	case (ENOPARMS):
 		c = mdoc_perr(mdoc, line, pos, 
@@ -228,6 +233,53 @@ pwarn(struct mdoc *mdoc, int line, int pos, int type)
 
 
 static int
+scopewarn(struct mdoc *mdoc, enum mdoc_type type, 
+		int line, int pos, const struct mdoc_node *p)
+{
+	const char	*n, *t, *tt;
+
+	n = t = "<root>";
+	tt = "block";
+
+	switch (type) {
+	case (MDOC_BODY):
+		tt = "multi-line";
+		break;
+	case (MDOC_HEAD):
+		tt = "line";
+		break;
+	default:
+		break;
+	}
+
+	switch (p->type) {
+	case (MDOC_BLOCK):
+		n = mdoc_macronames[p->tok];
+		t = "block";
+		break;
+	case (MDOC_BODY):
+		n = mdoc_macronames[p->tok];
+		t = "multi-line";
+		break;
+	case (MDOC_HEAD):
+		n = mdoc_macronames[p->tok];
+		t = "line";
+		break;
+	default:
+		break;
+	}
+
+	if ( ! (MDOC_IGN_SCOPE & mdoc->pflags))
+		return(mdoc_perr(mdoc, line, pos, 
+				"%s scope breaks %s scope of %s", 
+				tt, t, n));
+	return(mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX,
+				"%s scope breaks %s scope of %s", 
+				tt, t, n));
+}
+
+
+static int
 lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
 {
 	int		 res;
@@ -512,9 +564,8 @@ rewind_subblock(enum mdoc_type type, struct mdoc *mdoc
 			break;
 		else if (rewind_dobreak(tok, n))
 			continue;
-		return(mdoc_perr(mdoc, line, ppos, 
-			"scope breaks %s", MDOC_ROOT == n->type ?
-			"<root>" : mdoc_macronames[n->tok]));
+		if ( ! scopewarn(mdoc, type, line, ppos, n))
+			return(0);
 	}
 
 	assert(n);
@@ -537,9 +588,8 @@ rewind_expblock(struct mdoc *mdoc, int tok, int line, 
 			break;
 		else if (rewind_dobreak(tok, n))
 			continue;
-		return(mdoc_perr(mdoc, line, ppos, 
-			"scope breaks %s", MDOC_ROOT == n->type ?
-			"<root>" : mdoc_macronames[n->tok]));
+		if ( ! scopewarn(mdoc, MDOC_BLOCK, line, ppos, n))
+			return(0);
 	}
 
 	assert(n);
@@ -562,9 +612,8 @@ rewind_impblock(struct mdoc *mdoc, int tok, int line, 
 			break;
 		else if (rewind_dobreak(tok, n))
 			continue;
-		return(mdoc_perr(mdoc, line, ppos, 
-			"scope breaks %s", MDOC_ROOT == n->type ?
-			"<root>" : mdoc_macronames[n->tok]));
+		if ( ! scopewarn(mdoc, MDOC_BLOCK, line, ppos, n))
+			return(0);
 	}
 
 	assert(n);
@@ -751,7 +800,7 @@ macro_text(MACRO_PROT_ARGS)
 	for (;;) {
 		la = *pos;
 		w = mdoc_args(mdoc, line, pos, buf, tok, &p);
-		assert(ARGS_PHRASE != c);
+		assert(ARGS_PHRASE != w);
 
 		if (ARGS_ERROR == w)
 			return(0);
@@ -760,9 +809,13 @@ macro_text(MACRO_PROT_ARGS)
 		if (ARGS_PUNCT == w)
 			break;
 
+		/* Quoted words shouldn't be looked-up. */
+
 		c = ARGS_QWORD == w ? MDOC_MAX :
 			lookup(mdoc, line, la, tok, p);
 
+		/* MDOC_MAX (not a macro) or -1 (error). */
+
 		if (MDOC_MAX != c && -1 != c) {
 			if (0 == lastpunct && ! rewind_elem(mdoc, tok))
 				return(0);
@@ -775,7 +828,7 @@ macro_text(MACRO_PROT_ARGS)
 		} else if (-1 == c)
 			return(0);
 
-		/* FIXME: .Fl and .Ar handling of `|'. */
+		/* Non-quote-enclosed punctuation. */
 
 		if (ARGS_QWORD != w && mdoc_isdelim(p)) {
 			if (0 == lastpunct && ! rewind_elem(mdoc, tok))
@@ -1158,6 +1211,8 @@ macro_constant_delimited(MACRO_PROT_ARGS)
 	 */
 
 	switch (tok) {
+	case (MDOC_Ap):
+		/* FALLTHROUGH */
 	case (MDOC_No):
 		/* FALLTHROUGH */
 	case (MDOC_Ns):