===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.36
retrieving revision 1.44
diff -u -p -r1.36 -r1.44
--- mandoc/man_macro.c	2010/03/25 07:28:16	1.36
+++ mandoc/man_macro.c	2010/05/15 22:44:04	1.44
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.36 2010/03/25 07:28:16 kristaps Exp $ */
+/*	$Id: man_macro.c,v 1.44 2010/05/15 22:44:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -28,11 +28,10 @@
 enum	rew {
 	REW_REWIND,
 	REW_NOHALT,
-	REW_HALT,
+	REW_HALT
 };
 
 static	int		 blk_close(MACRO_PROT_ARGS);
-static	int		 blk_dotted(MACRO_PROT_ARGS);
 static	int		 blk_exp(MACRO_PROT_ARGS);
 static	int		 blk_imp(MACRO_PROT_ARGS);
 static	int		 in_line_eoln(MACRO_PROT_ARGS);
@@ -43,6 +42,8 @@ static	enum rew	 rew_dohalt(enum mant, enum man_type, 
 				const struct man_node *);
 static	enum rew	 rew_block(enum mant, enum man_type, 
 				const struct man_node *);
+static	int		 rew_warn(struct man *, 
+				struct man_node *, enum merr);
 
 const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, MAN_NSCOPED }, /* br */
@@ -80,25 +81,42 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, MAN_NSCOPED }, /* Sp */
 	{ in_line_eoln, 0 }, /* Vb */
 	{ in_line_eoln, 0 }, /* Ve */
-	{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* de */
-	{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* dei */
-	{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* am */
-	{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ami */
-	{ blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ig */
-	{ blk_dotted, 0 }, /* . */
 };
 
 const	struct man_macro * const man_macros = __man_macros;
 
 
+/*
+ * Warn when "n" is an explicit non-roff macro.
+ */
+static int
+rew_warn(struct man *m, struct man_node *n, enum merr er)
+{
+
+	if (er == WERRMAX || MAN_BLOCK != n->type)
+		return(1);
+	if (MAN_VALID & n->flags)
+		return(1);
+	if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
+		return(1);
+	return(man_nwarn(m, n, er));
+}
+
+
+/*
+ * Rewind scope.  If a code "er" != WERRMAX has been provided, it will
+ * be used if an explicit block scope is being closed out.
+ */
 int
-man_unscope(struct man *m, const struct man_node *n)
+man_unscope(struct man *m, const struct man_node *n, enum merr er)
 {
 
 	assert(n);
 
 	/* LINTED */
 	while (m->last != n) {
+		if ( ! rew_warn(m, m->last, er))
+			return(0);
 		if ( ! man_valid_post(m))
 			return(0);
 		if ( ! man_action_post(m))
@@ -107,6 +125,8 @@ man_unscope(struct man *m, const struct man_node *n)
 		assert(m->last);
 	}
 
+	if ( ! rew_warn(m, m->last, er))
+		return(0);
 	if ( ! man_valid_post(m))
 		return(0);
 	if ( ! man_action_post(m))
@@ -140,18 +160,29 @@ rew_dohalt(enum mant tok, enum man_type type, const st
 {
 	enum rew	 c;
 
+	/* We cannot progress beyond the root ever. */
 	if (MAN_ROOT == n->type)
 		return(REW_HALT);
+
 	assert(n->parent);
+
+	/* Normal nodes shouldn't go to the level of the root. */
 	if (MAN_ROOT == n->parent->type)
 		return(REW_REWIND);
+
+	/* Already-validated nodes should be closed out. */
 	if (MAN_VALID & n->flags)
 		return(REW_NOHALT);
 
-	/* Rewind to ourselves, first. */
+	/* First: rewind to ourselves. */
 	if (type == n->type && tok == n->tok)
 		return(REW_REWIND);
 
+	/* 
+	 * Next follow the implicit scope-smashings as defined by man.7:
+	 * section, sub-section, etc.
+	 */
+
 	switch (tok) {
 	case (MAN_SH):
 		break;
@@ -210,51 +241,20 @@ rew_scope(enum man_type type, struct man *m, enum mant
 			break;
 	}
 
-	/* Rewind until the current point. */
-
+	/* 
+	 * Rewind until the current point.  Warn if we're a roff
+	 * instruction that's mowing over explicit scopes.
+	 */
 	assert(n);
-	return(man_unscope(m, n));
-}
 
-
-/*
- * Closure for dotted macros (de, dei, am, ami, ign).  This must handle
- * any of these as the parent node, so it needs special handling.
- * Beyond this, it's the same as blk_close().
- */
-int
-blk_dotted(MACRO_PROT_ARGS)
-{
-	enum mant	 ntok;
-	struct man_node	*nn;
-
-	for (nn = m->last->parent; nn; nn = nn->parent)
-		if (nn->tok == MAN_de || nn->tok == MAN_dei ||
-				nn->tok == MAN_am ||
-				nn->tok == MAN_ami ||
-				nn->tok == MAN_ig) {
-			ntok = nn->tok;
-			break;
-		}
-
-	if (NULL == nn) {
-		if ( ! man_pwarn(m, line, ppos, WNOSCOPE))
-			return(0);
-		return(1);
-	}
-
-	if ( ! rew_scope(MAN_BODY, m, ntok))
-		return(0);
-	if ( ! rew_scope(MAN_BLOCK, m, ntok))
-		return(0);
-
-	return(1);
+	return(man_unscope(m, n, WERRMAX));
 }
 
 
 /*
  * Close out a generic explicit macro.
  */
+/* ARGSUSED */
 int
 blk_close(MACRO_PROT_ARGS)
 {
@@ -299,12 +299,10 @@ blk_exp(MACRO_PROT_ARGS)
 	 * anywhere.
 	 */
 
-	if ( ! (MAN_NOCLOSE & man_macros[tok].flags)) {
-		if ( ! rew_scope(MAN_BODY, m, tok))
-			return(0);
-		if ( ! rew_scope(MAN_BLOCK, m, tok))
-			return(0);
-	}
+	if ( ! rew_scope(MAN_BODY, m, tok))
+		return(0);
+	if ( ! rew_scope(MAN_BLOCK, m, tok))
+		return(0);
 
 	if ( ! man_block_alloc(m, line, ppos, tok))
 		return(0);
@@ -478,20 +476,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 int
 man_macroend(struct man *m)
 {
-	struct man_node	*n;
 
-	n = MAN_VALID & m->last->flags ?
-		m->last->parent : m->last;
-
-	for ( ; n; n = n->parent) {
-		if (MAN_BLOCK != n->type)
-			continue;
-		if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
-			continue;
-		if ( ! man_nwarn(m, n, WEXITSCOPE))
-			return(0);
-	}
-
-	return(man_unscope(m, m->first));
+	return(man_unscope(m, m->first, WEXITSCOPE));
 }