===================================================================
RCS file: /cvs/mandoc/Attic/macro.c,v
retrieving revision 1.73
retrieving revision 1.77
diff -u -p -r1.73 -r1.77
--- mandoc/Attic/macro.c	2009/03/16 23:37:28	1.73
+++ mandoc/Attic/macro.c	2009/03/22 19:01:11	1.77
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.73 2009/03/16 23:37:28 kristaps Exp $ */
+/* $Id: macro.c,v 1.77 2009/03/22 19:01:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -33,6 +33,7 @@
 /* FIXME: .Fl, .Ar, .Cd handling of `|'. */
 
 enum	mwarn {
+	WIMPBRK,
 	WMACPARM,
 	WOBS
 };
@@ -198,6 +199,7 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ obsolete, 0 }, /* Es */
 	{ obsolete, 0 }, /* En */
 	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
+	{ in_line_eoln, 0 }, /* %Q */
 };
 
 const	struct mdoc_macro * const mdoc_macros = __mdoc_macros;
@@ -235,6 +237,9 @@ pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn
 
 	p = NULL;
 	switch (type) {
+	case (WIMPBRK):
+		p = "crufty end-of-line scope violation";
+		break;
 	case (WMACPARM):
 		p = "macro-like parameter";
 		break;
@@ -406,7 +411,13 @@ rew_alt(int tok)
 }
 
 
-static int
+/* 
+ * Rewind rules.  This indicates whether to stop rewinding
+ * (REWIND_HALT) without touching our current scope, stop rewinding and
+ * close our current scope (REWIND_REWIND), or continue (REWIND_NOHALT).
+ * The scope-closing and so on occurs in the various rew_* routines.
+ */
+static int 
 rew_dohalt(int tok, enum mdoc_type type, const struct mdoc_node *p)
 {
 
@@ -416,7 +427,6 @@ rew_dohalt(int tok, enum mdoc_type type, const struct 
 		return(REWIND_NOHALT);
 
 	switch (tok) {
-	/* One-liner implicit-scope. */
 	case (MDOC_Aq):
 		/* FALLTHROUGH */
 	case (MDOC_Bq):
@@ -443,8 +453,6 @@ rew_dohalt(int tok, enum mdoc_type type, const struct 
 		if (type == p->type && tok == p->tok)
 			return(REWIND_REWIND);
 		break;
-
-	/* Multi-line implicit-scope. */
 	case (MDOC_It):
 		assert(MDOC_TAIL != type);
 		if (type == p->type && tok == p->tok)
@@ -463,8 +471,6 @@ rew_dohalt(int tok, enum mdoc_type type, const struct 
 		if (MDOC_BODY == p->type && MDOC_Sh == p->tok)
 			return(REWIND_HALT);
 		break;
-	
-	/* Multi-line explicit scope start. */
 	case (MDOC_Ao):
 		/* FALLTHROUGH */
 	case (MDOC_Bd):
@@ -544,6 +550,10 @@ rew_dohalt(int tok, enum mdoc_type type, const struct 
 }
 
 
+/*
+ * See if we can break an encountered scope (the rew_dohalt has returned
+ * REWIND_NOHALT). 
+ */
 static int
 rew_dobreak(int tok, const struct mdoc_node *p)
 {
@@ -557,7 +567,6 @@ rew_dobreak(int tok, const struct mdoc_node *p)
 		return(1);
 
 	switch (tok) {
-	/* Implicit rules. */
 	case (MDOC_It):
 		return(MDOC_It == p->tok);
 	case (MDOC_Ss):
@@ -566,12 +575,15 @@ rew_dobreak(int tok, const struct mdoc_node *p)
 		if (MDOC_Ss == p->tok)
 			return(1);
 		return(MDOC_Sh == p->tok);
-
-	/* Extra scope rules. */
 	case (MDOC_El):
 		if (MDOC_It == p->tok)
 			return(1);
 		break;
+	case (MDOC_Oc):
+		/* XXX - experimental! */
+		if (MDOC_Op == p->tok)
+			return(1);
+		break;
 	default:
 		break;
 	}
@@ -995,18 +1007,22 @@ static int
 blk_part_imp(MACRO_PROT_ARGS)
 {
 	int		  lastarg, c;
-	char		  *p;
+	char		 *p;
+	struct mdoc_node *blk, *body, *n;
 
 	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
 		return(0);
 	mdoc->next = MDOC_NEXT_CHILD;
+	blk = mdoc->last;
 
 	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
 		return(0);
 	mdoc->next = MDOC_NEXT_SIBLING;
+
 	if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
 		return(0);
 	mdoc->next = MDOC_NEXT_CHILD;
+	body = mdoc->last;
 
 	/* XXX - no known argument macros. */
 
@@ -1036,14 +1052,29 @@ blk_part_imp(MACRO_PROT_ARGS)
 		break;
 	}
 
-	if (1 == ppos) {
-		if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+	/*
+	 * Since we know what our context is, we can rewind directly to
+	 * it.  This allows us to accomodate for our scope being
+	 * violated by another token.
+	 */
+
+	for (n = mdoc->last; n; n = n->parent)
+		if (body == n)
+			break;
+
+	if (NULL == n && ! pwarn(mdoc, body->line, body->pos, WIMPBRK))
 			return(0);
-		if ( ! append_delims(mdoc, line, pos, buf))
-			return(0);
-	} else if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+
+	if (n && ! rew_last(mdoc, body))
 		return(0);
-	return(rew_impblock(mdoc, tok, line, ppos));
+
+	if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
+		return(0);
+
+	if (n && ! rew_last(mdoc, blk))
+		return(0);
+
+	return(1);
 }