Remove enum mdocargerr from phrase() (unused).

Add `Ta' macro, which is basically a NULL case everywhere but in
mdoc_macro.c, where it closes out an existing `It' body scope and opens
a new one, then continues parsing as in phrase() (TODO: merge these
two?).

Fix where scope-breaking was silently just dying instead of printing an
error.

Fix where trailing `Ta' or tab weren't creating a new MDOC_BODY context.

We now support arbitrarily complex `It' contents for `Bl -column'.

1 files changed, 9 insertions, 1 deletions

diff --git a/mdoc_argv.c b/mdoc_argv.c
index a01791aa..ac344f44 100644
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -210,6 +210,7 @@ static	int mdoc_argflags[MDOC_MAX] = {
 	0, /* br */
 	0, /* sp */
 	0, /* %U */
+	0, /* Ta */
 };
 
 
@@ -347,6 +348,13 @@ mdoc_args(struct mdoc *m, int line, int *pos,
 	if (MDOC_It != tok)
 		return(args(m, line, pos, buf, fl, v));
 
+	/*
+	 * We know that we're in an `It', so it's reasonable to expect
+	 * us to be sitting in a `Bl'.  Someday this may not be the case
+	 * (if we allow random `It's sitting out there), so provide a
+	 * safe fall-back into the default behaviour.
+	 */
+
 	for (n = m->last; n; n = n->parent)
 		if (MDOC_Bl == n->tok)
 			break;
@@ -455,7 +463,7 @@ args(struct mdoc *m, int line, int *pos,
 					break;
 				if (pp > *v && ' ' != *(pp - 1))
 					continue;
-				if (' ' == *(pp + 2) || 0 == *(pp + 2))
+				if (' ' == *(pp + 2) || '\0' == *(pp + 2))
 					break;
 			}