===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -c -r1.75 -r1.76
*** src/usr.bin/mandoc/mdoc_macro.c	2012/11/16 13:25:34	1.75
--- src/usr.bin/mandoc/mdoc_macro.c	2012/11/17 00:25:20	1.76
***************
*** 1,4 ****
! /*	$Id: mdoc_macro.c,v 1.75 2012/11/16 13:25:34 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_macro.c,v 1.76 2012/11/17 00:25:20 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 199,220 ****
   * are errors.
   */
  int
! mdoc_macroend(struct mdoc *m)
  {
  	struct mdoc_node *n;
  
  	/* Scan for open explicit scopes. */
  
! 	n = MDOC_VALID & m->last->flags ?  m->last->parent : m->last;
  
  	for ( ; n; n = n->parent)
  		if (MDOC_BLOCK == n->type &&
  		    MDOC_EXPLICIT & mdoc_macros[n->tok].flags)
! 			mdoc_nmsg(m, n, MANDOCERR_SCOPEEXIT);
  
  	/* Rewind to the first. */
  
! 	return(rew_last(m, m->first));
  }
  
  
--- 199,221 ----
   * are errors.
   */
  int
! mdoc_macroend(struct mdoc *mdoc)
  {
  	struct mdoc_node *n;
  
  	/* Scan for open explicit scopes. */
  
! 	n = MDOC_VALID & mdoc->last->flags ?
! 			mdoc->last->parent : mdoc->last;
  
  	for ( ; n; n = n->parent)
  		if (MDOC_BLOCK == n->type &&
  		    MDOC_EXPLICIT & mdoc_macros[n->tok].flags)
! 			mdoc_nmsg(mdoc, n, MANDOCERR_SCOPEEXIT);
  
  	/* Rewind to the first. */
  
! 	return(rew_last(mdoc, mdoc->first));
  }
  
  
***************
*** 259,266 ****
  	while (mdoc->last != to) {
  		/*
  		 * Save the parent here, because we may delete the
! 		 * m->last node in the post-validation phase and reset
! 		 * it to m->last->parent, causing a step in the closing
  		 * out to be lost.
  		 */
  		np = mdoc->last->parent;
--- 260,267 ----
  	while (mdoc->last != to) {
  		/*
  		 * Save the parent here, because we may delete the
! 		 * mdoc->last node in the post-validation phase and reset
! 		 * it to mdoc->last->parent, causing a step in the closing
  		 * out to be lost.
  		 */
  		np = mdoc->last->parent;
***************
*** 456,462 ****
   */
  static int
  make_pending(struct mdoc_node *broken, enum mdoct tok,
! 		struct mdoc *m, int line, int ppos)
  {
  	struct mdoc_node *breaker;
  
--- 457,463 ----
   */
  static int
  make_pending(struct mdoc_node *broken, enum mdoct tok,
! 		struct mdoc *mdoc, int line, int ppos)
  {
  	struct mdoc_node *breaker;
  
***************
*** 511,517 ****
  			taker->pending = broken->pending;
  		}
  		broken->pending = breaker;
! 		mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos,
  				"%s breaks %s", mdoc_macronames[tok],
  				mdoc_macronames[broken->tok]);
  		return(1);
--- 512,518 ----
  			taker->pending = broken->pending;
  		}
  		broken->pending = breaker;
! 		mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos,
  				"%s breaks %s", mdoc_macronames[tok],
  				mdoc_macronames[broken->tok]);
  		return(1);
***************
*** 526,537 ****
  
  
  static int
! rew_sub(enum mdoc_type t, struct mdoc *m, 
  		enum mdoct tok, int line, int ppos)
  {
  	struct mdoc_node *n;
  
! 	n = m->last;
  	while (n) {
  		switch (rew_dohalt(tok, t, n)) {
  		case (REWIND_NONE):
--- 527,538 ----
  
  
  static int
! rew_sub(enum mdoc_type t, struct mdoc *mdoc, 
  		enum mdoct tok, int line, int ppos)
  {
  	struct mdoc_node *n;
  
! 	n = mdoc->last;
  	while (n) {
  		switch (rew_dohalt(tok, t, n)) {
  		case (REWIND_NONE):
***************
*** 539,545 ****
  		case (REWIND_THIS):
  			break;
  		case (REWIND_FORCE):
! 			mandoc_vmsg(MANDOCERR_SCOPEBROKEN, m->parse, 
  					line, ppos, "%s breaks %s", 
  					mdoc_macronames[tok],
  					mdoc_macronames[n->tok]);
--- 540,546 ----
  		case (REWIND_THIS):
  			break;
  		case (REWIND_FORCE):
! 			mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse, 
  					line, ppos, "%s breaks %s", 
  					mdoc_macronames[tok],
  					mdoc_macronames[n->tok]);
***************
*** 548,566 ****
  			n = n->parent;
  			continue;
  		case (REWIND_LATER):
! 			if (make_pending(n, tok, m, line, ppos) ||
  			    MDOC_BLOCK != t)
  				return(1);
  			/* FALLTHROUGH */
  		case (REWIND_ERROR):
! 			mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
  			return(1);
  		}
  		break;
  	}
  
  	assert(n);
! 	if ( ! rew_last(m, n))
  		return(0);
  
  	/*
--- 549,567 ----
  			n = n->parent;
  			continue;
  		case (REWIND_LATER):
! 			if (make_pending(n, tok, mdoc, line, ppos) ||
  			    MDOC_BLOCK != t)
  				return(1);
  			/* FALLTHROUGH */
  		case (REWIND_ERROR):
! 			mdoc_pmsg(mdoc, line, ppos, MANDOCERR_NOSCOPE);
  			return(1);
  		}
  		break;
  	}
  
  	assert(n);
! 	if ( ! rew_last(mdoc, n))
  		return(0);
  
  	/*
***************
*** 568,577 ****
  	 * Now that the current block ends, close the enclosing block, too.
  	 */
  	while (NULL != (n = n->pending)) {
! 		if ( ! rew_last(m, n))
  			return(0);
  		if (MDOC_HEAD == n->type &&
! 		    ! mdoc_body_alloc(m, n->line, n->pos, n->tok))
  			return(0);
  	}
  
--- 569,578 ----
  	 * Now that the current block ends, close the enclosing block, too.
  	 */
  	while (NULL != (n = n->pending)) {
! 		if ( ! rew_last(mdoc, n))
  			return(0);
  		if (MDOC_HEAD == n->type &&
! 		    ! mdoc_body_alloc(mdoc, n->line, n->pos, n->tok))
  			return(0);
  	}
  
***************
*** 583,600 ****
   * Punctuation consists of those tokens found in mdoc_isdelim().
   */
  static int
! dword(struct mdoc *m, int line, 
  		int col, const char *p, enum mdelim d)
  {
  	
  	if (DELIM_MAX == d)
  		d = mdoc_isdelim(p);
  
! 	if ( ! mdoc_word_alloc(m, line, col, p))
  		return(0);
  
  	if (DELIM_OPEN == d)
! 		m->last->flags |= MDOC_DELIMO;
  
  	/*
  	 * Closing delimiters only suppress the preceding space
--- 584,601 ----
   * Punctuation consists of those tokens found in mdoc_isdelim().
   */
  static int
! dword(struct mdoc *mdoc, int line, 
  		int col, const char *p, enum mdelim d)
  {
  	
  	if (DELIM_MAX == d)
  		d = mdoc_isdelim(p);
  
! 	if ( ! mdoc_word_alloc(mdoc, line, col, p))
  		return(0);
  
  	if (DELIM_OPEN == d)
! 		mdoc->last->flags |= MDOC_DELIMO;
  
  	/*
  	 * Closing delimiters only suppress the preceding space
***************
*** 606,620 ****
  	 *	and solve this in the code related to `No'!
  	 */
  
! 	else if (DELIM_CLOSE == d && m->last->prev &&
! 			m->last->prev->tok != MDOC_No)
! 		m->last->flags |= MDOC_DELIMC;
  
  	return(1);
  }
  
  static int
! append_delims(struct mdoc *m, int line, int *pos, char *buf)
  {
  	int		 la;
  	enum margserr	 ac;
--- 607,621 ----
  	 *	and solve this in the code related to `No'!
  	 */
  
! 	else if (DELIM_CLOSE == d && mdoc->last->prev &&
! 			mdoc->last->prev->tok != MDOC_No)
! 		mdoc->last->flags |= MDOC_DELIMC;
  
  	return(1);
  }
  
  static int
! append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
  {
  	int		 la;
  	enum margserr	 ac;
***************
*** 625,638 ****
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(m, line, pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
  		else if (ARGS_EOLN == ac)
  			break;
  
! 		dword(m, line, la, p, DELIM_MAX);
  
  		/*
  		 * If we encounter end-of-sentence symbols, then trigger
--- 626,639 ----
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(mdoc, line, pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
  		else if (ARGS_EOLN == ac)
  			break;
  
! 		dword(mdoc, line, la, p, DELIM_MAX);
  
  		/*
  		 * If we encounter end-of-sentence symbols, then trigger
***************
*** 646,652 ****
  		 * example, `.  ;' shouldn't propagate the double-space.
  		 */
  		if (mandoc_eos(p, strlen(p), 0))
! 			m->last->flags |= MDOC_EOS;
  	}
  
  	return(1);
--- 647,653 ----
  		 * example, `.  ;' shouldn't propagate the double-space.
  		 */
  		if (mandoc_eos(p, strlen(p), 0))
! 			mdoc->last->flags |= MDOC_EOS;
  	}
  
  	return(1);
***************
*** 668,674 ****
  	enum mdoct	 atok, ntok;
  	char		*p;
  
! 	nl = MDOC_NEWLINE & m->flags;
  
  	switch (tok) {
  	case (MDOC_Ec):
--- 669,675 ----
  	enum mdoct	 atok, ntok;
  	char		*p;
  
! 	nl = MDOC_NEWLINE & mdoc->flags;
  
  	switch (tok) {
  	case (MDOC_Ec):
***************
*** 685,691 ****
  	 */
  	atok = rew_alt(tok);
  	body = later = NULL;
! 	for (n = m->last; n; n = n->parent) {
  		if (MDOC_VALID & n->flags)
  			continue;
  
--- 686,692 ----
  	 */
  	atok = rew_alt(tok);
  	body = later = NULL;
! 	for (n = mdoc->last; n; n = n->parent) {
  		if (MDOC_VALID & n->flags)
  			continue;
  
***************
*** 714,726 ****
  			 * postpone closing out the current block
  			 * until the rew_sub() closing out the sub-block.
  			 */
! 			make_pending(later, tok, m, line, ppos);
  
  			/*
  			 * Mark the place where the formatting - but not
  			 * the scope - of the current block ends.
  			 */
! 			if ( ! mdoc_endbody_alloc(m, line, ppos,
  			    atok, body, ENDBODY_SPACE))
  				return(0);
  			break;
--- 715,727 ----
  			 * postpone closing out the current block
  			 * until the rew_sub() closing out the sub-block.
  			 */
! 			make_pending(later, tok, mdoc, line, ppos);
  
  			/*
  			 * Mark the place where the formatting - but not
  			 * the scope - of the current block ends.
  			 */
! 			if ( ! mdoc_endbody_alloc(mdoc, line, ppos,
  			    atok, body, ENDBODY_SPACE))
  				return(0);
  			break;
***************
*** 741,770 ****
  	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
  		/* FIXME: do this in validate */
  		if (buf[*pos]) 
! 			mdoc_pmsg(m, line, ppos, MANDOCERR_ARGSLOST);
  
! 		if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
  			return(0);
! 		return(rew_sub(MDOC_BLOCK, m, tok, line, ppos));
  	}
  
! 	if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
  		return(0);
  
  	if (NULL == later && maxargs > 0) 
! 		if ( ! mdoc_tail_alloc(m, line, ppos, rew_alt(tok)))
  			return(0);
  
  	for (flushed = j = 0; ; j++) {
  		lastarg = *pos;
  
  		if (j == maxargs && ! flushed) {
! 			if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
  				return(0);
  			flushed = 1;
  		}
  
! 		ac = mdoc_args(m, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 742,771 ----
  	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
  		/* FIXME: do this in validate */
  		if (buf[*pos]) 
! 			mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST);
  
! 		if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
  			return(0);
! 		return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos));
  	}
  
! 	if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
  		return(0);
  
  	if (NULL == later && maxargs > 0) 
! 		if ( ! mdoc_tail_alloc(mdoc, line, ppos, rew_alt(tok)))
  			return(0);
  
  	for (flushed = j = 0; ; j++) {
  		lastarg = *pos;
  
  		if (j == maxargs && ! flushed) {
! 			if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
  				return(0);
  			flushed = 1;
  		}
  
! 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 776,802 ****
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(m, line, lastarg, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
  		if ( ! flushed) {
! 			if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
  				return(0);
  			flushed = 1;
  		}
! 		if ( ! mdoc_macro(m, ntok, line, lastarg, pos, buf))
  			return(0);
  		break;
  	}
  
! 	if ( ! flushed && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
  		return(0);
  
  	if ( ! nl)
  		return(1);
! 	return(append_delims(m, line, pos, buf));
  }
  
  
--- 777,803 ----
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(mdoc, line, lastarg, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
  		if ( ! flushed) {
! 			if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
  				return(0);
  			flushed = 1;
  		}
! 		if ( ! mdoc_macro(mdoc, ntok, line, lastarg, pos, buf))
  			return(0);
  		break;
  	}
  
! 	if ( ! flushed && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
  		return(0);
  
  	if ( ! nl)
  		return(1);
! 	return(append_delims(mdoc, line, pos, buf));
  }
  
  
***************
*** 811,817 ****
  	struct mdoc_arg	*arg;
  	char		*p;
  
! 	nl = MDOC_NEWLINE & m->flags;
  
  	/*
  	 * Whether we allow ignored elements (those without content,
--- 812,818 ----
  	struct mdoc_arg	*arg;
  	char		*p;
  
! 	nl = MDOC_NEWLINE & mdoc->flags;
  
  	/*
  	 * Whether we allow ignored elements (those without content,
***************
*** 839,845 ****
  
  	for (arg = NULL;; ) {
  		la = *pos;
! 		av = mdoc_argv(m, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
--- 840,846 ----
  
  	for (arg = NULL;; ) {
  		la = *pos;
! 		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
***************
*** 856,862 ****
  
  	for (cnt = scope = 0;; ) {
  		la = *pos;
! 		ac = mdoc_args(m, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 857,863 ----
  
  	for (cnt = scope = 0;; ) {
  		la = *pos;
! 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 875,897 ****
  		 */
  
  		if (MDOC_MAX != ntok) {
! 			if (scope && ! rew_elem(m, tok))
  				return(0);
  			if (nc && 0 == cnt) {
! 				if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
  					return(0);
! 				if ( ! rew_last(m, m->last))
  					return(0);
  			} else if ( ! nc && 0 == cnt) {
  				mdoc_argv_free(arg);
! 				mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY);
  			}
  
! 			if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
  				return(0);
  			if ( ! nl)
  				return(1);
! 			return(append_delims(m, line, pos, buf));
  		} 
  
  		/* 
--- 876,900 ----
  		 */
  
  		if (MDOC_MAX != ntok) {
! 			if (scope && ! rew_elem(mdoc, tok))
  				return(0);
  			if (nc && 0 == cnt) {
! 				if ( ! mdoc_elem_alloc(mdoc, line,
! 						ppos, tok, arg))
  					return(0);
! 				if ( ! rew_last(mdoc, mdoc->last))
  					return(0);
  			} else if ( ! nc && 0 == cnt) {
  				mdoc_argv_free(arg);
! 				mdoc_pmsg(mdoc, line, ppos,
! 					MANDOCERR_MACROEMPTY);
  			}
  
! 			if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
  				return(0);
  			if ( ! nl)
  				return(1);
! 			return(append_delims(mdoc, line, pos, buf));
  		} 
  
  		/* 
***************
*** 913,919 ****
  			 */
  			if (0 == cnt && (nc || MDOC_Li == tok) && 
  					DELIM_CLOSE == d && ! scope) {
! 				if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
  					return(0);
  				if (MDOC_Ar == tok || MDOC_Li == tok || 
  						MDOC_Fl == tok)
--- 916,923 ----
  			 */
  			if (0 == cnt && (nc || MDOC_Li == tok) && 
  					DELIM_CLOSE == d && ! scope) {
! 				if ( ! mdoc_elem_alloc(mdoc, line,
! 						ppos, tok, arg))
  					return(0);
  				if (MDOC_Ar == tok || MDOC_Li == tok || 
  						MDOC_Fl == tok)
***************
*** 924,934 ****
  			 * Close out our scope, if one is open, before
  			 * any punctuation.
  			 */
! 			if (scope && ! rew_elem(m, tok))
  				return(0);
  			scope = 0;
  		} else if ( ! scope) {
! 			if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
  				return(0);
  			scope = 1;
  		}
--- 928,938 ----
  			 * Close out our scope, if one is open, before
  			 * any punctuation.
  			 */
! 			if (scope && ! rew_elem(mdoc, tok))
  				return(0);
  			scope = 0;
  		} else if ( ! scope) {
! 			if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
  				return(0);
  			scope = 1;
  		}
***************
*** 936,942 ****
  		if (DELIM_NONE == d)
  			cnt++;
  
! 		if ( ! dword(m, line, la, p, d))
  			return(0);
  
  		/*
--- 940,946 ----
  		if (DELIM_NONE == d)
  			cnt++;
  
! 		if ( ! dword(mdoc, line, la, p, d))
  			return(0);
  
  		/*
***************
*** 945,957 ****
  		 * having to parse out spaces.
  		 */
  		if (scope && MDOC_Fl == tok) {
! 			if ( ! rew_elem(m, tok))
  				return(0);
  			scope = 0;
  		}
  	}
  
! 	if (scope && ! rew_elem(m, tok))
  		return(0);
  
  	/*
--- 949,961 ----
  		 * having to parse out spaces.
  		 */
  		if (scope && MDOC_Fl == tok) {
! 			if ( ! rew_elem(mdoc, tok))
  				return(0);
  			scope = 0;
  		}
  	}
  
! 	if (scope && ! rew_elem(mdoc, tok))
  		return(0);
  
  	/*
***************
*** 961,978 ****
  	 */
  
  	if (nc && 0 == cnt) {
! 		if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
  			return(0);
! 		if ( ! rew_last(m, m->last))
  			return(0);
  	} else if ( ! nc && 0 == cnt) {
  		mdoc_argv_free(arg);
! 		mdoc_pmsg(m, line, ppos, MANDOCERR_MACROEMPTY);
  	}
  
  	if ( ! nl)
  		return(1);
! 	return(append_delims(m, line, pos, buf));
  }
  
  
--- 965,982 ----
  	 */
  
  	if (nc && 0 == cnt) {
! 		if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
  			return(0);
! 		if ( ! rew_last(mdoc, mdoc->last))
  			return(0);
  	} else if ( ! nc && 0 == cnt) {
  		mdoc_argv_free(arg);
! 		mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY);
  	}
  
  	if ( ! nl)
  		return(1);
! 	return(append_delims(mdoc, line, pos, buf));
  }
  
  
***************
*** 990,1003 ****
  	enum margverr	  av;
  	char		 *p;
  
! 	nl = MDOC_NEWLINE & m->flags;
  
  	/* Close out prior implicit scope. */
  
  	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
! 		if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
  			return(0);
! 		if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
  			return(0);
  	}
  
--- 994,1007 ----
  	enum margverr	  av;
  	char		 *p;
  
! 	nl = MDOC_NEWLINE & mdoc->flags;
  
  	/* Close out prior implicit scope. */
  
  	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
! 		if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
  			return(0);
! 		if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
  			return(0);
  	}
  
***************
*** 1012,1018 ****
  
  	for (arg = NULL;; ) {
  		la = *pos;
! 		av = mdoc_argv(m, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
--- 1016,1022 ----
  
  	for (arg = NULL;; ) {
  		la = *pos;
! 		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
***************
*** 1028,1034 ****
  		return(0);
  	}
  
! 	if ( ! mdoc_block_alloc(m, line, ppos, tok, arg))
  		return(0);
  
  	head = body = NULL;
--- 1032,1038 ----
  		return(0);
  	}
  
! 	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg))
  		return(0);
  
  	head = body = NULL;
***************
*** 1038,1045 ****
  	 * parsed, even though `It' macros in general are parsed.
  	 */
  	nparsed = MDOC_It == tok &&
! 		MDOC_Bl == m->last->parent->tok &&
! 		LIST_diag == m->last->parent->norm->Bl.type;
  
  	/*
  	 * The `Nd' macro has all arguments in its body: it's a hybrid
--- 1042,1049 ----
  	 * parsed, even though `It' macros in general are parsed.
  	 */
  	nparsed = MDOC_It == tok &&
! 		MDOC_Bl == mdoc->last->parent->tok &&
! 		LIST_diag == mdoc->last->parent->norm->Bl.type;
  
  	/*
  	 * The `Nd' macro has all arguments in its body: it's a hybrid
***************
*** 1047,1060 ****
  	 */
  
  	if (MDOC_Nd == tok) {
! 		if ( ! mdoc_head_alloc(m, line, ppos, tok))
  			return(0);
! 		head = m->last;
! 		if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
  			return(0);
! 		if ( ! mdoc_body_alloc(m, line, ppos, tok))
  			return(0);
! 		body = m->last;
  	} 
  
  	ac = ARGS_ERROR;
--- 1051,1064 ----
  	 */
  
  	if (MDOC_Nd == tok) {
! 		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
  			return(0);
! 		head = mdoc->last;
! 		if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
  			return(0);
! 		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  			return(0);
! 		body = mdoc->last;
  	} 
  
  	ac = ARGS_ERROR;
***************
*** 1063,1069 ****
  		la = *pos;
  		/* Initialise last-phrase-type with ARGS_PEND. */
  		lac = ARGS_ERROR == ac ? ARGS_PEND : ac;
! 		ac = mdoc_args(m, line, pos, buf, tok, &p);
  
  		if (ARGS_PUNCT == ac)
  			break;
--- 1067,1073 ----
  		la = *pos;
  		/* Initialise last-phrase-type with ARGS_PEND. */
  		lac = ARGS_ERROR == ac ? ARGS_PEND : ac;
! 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
  
  		if (ARGS_PUNCT == ac)
  			break;
***************
*** 1081,1091 ****
  			 * reopen our scope if the last parse was a
  			 * phrase or partial phrase.
  			 */
! 			if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
  				return(0);
! 			if ( ! mdoc_body_alloc(m, line, ppos, tok))
  				return(0);
! 			body = m->last;
  			break;
  		}
  
--- 1085,1095 ----
  			 * reopen our scope if the last parse was a
  			 * phrase or partial phrase.
  			 */
! 			if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
  				return(0);
! 			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  				return(0);
! 			body = mdoc->last;
  			break;
  		}
  
***************
*** 1100,1106 ****
  				ARGS_PPHRASE != ac &&
  				ARGS_QWORD != ac &&
  				DELIM_OPEN == mdoc_isdelim(p)) {
! 			if ( ! dword(m, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		}
--- 1104,1110 ----
  				ARGS_PPHRASE != ac &&
  				ARGS_QWORD != ac &&
  				DELIM_OPEN == mdoc_isdelim(p)) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		}
***************
*** 1108,1116 ****
  		/* Open a head if one hasn't been opened. */
  
  		if (NULL == head) {
! 			if ( ! mdoc_head_alloc(m, line, ppos, tok))
  				return(0);
! 			head = m->last;
  		}
  
  		if (ARGS_PHRASE == ac || 
--- 1112,1120 ----
  		/* Open a head if one hasn't been opened. */
  
  		if (NULL == head) {
! 			if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
  				return(0);
! 			head = mdoc->last;
  		}
  
  		if (ARGS_PHRASE == ac || 
***************
*** 1122,1135 ****
  			 */
  
  			mtt = body ? MDOC_BODY : MDOC_HEAD;
! 			if ( ! rew_sub(mtt, m, tok, line, ppos))
  				return(0);
  			
  			/* Then allocate our body context. */
  
! 			if ( ! mdoc_body_alloc(m, line, ppos, tok))
  				return(0);
! 			body = m->last;
  
  			/*
  			 * Process phrases: set whether we're in a
--- 1126,1139 ----
  			 */
  
  			mtt = body ? MDOC_BODY : MDOC_HEAD;
! 			if ( ! rew_sub(mtt, mdoc, tok, line, ppos))
  				return(0);
  			
  			/* Then allocate our body context. */
  
! 			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  				return(0);
! 			body = mdoc->last;
  
  			/*
  			 * Process phrases: set whether we're in a
***************
*** 1138,1151 ****
  			 */
  
  			if (ARGS_PPHRASE == ac)
! 				m->flags |= MDOC_PPHRASE;
  			if (ARGS_PEND == ac && ARGS_PPHRASE == lac)
! 				m->flags |= MDOC_PPHRASE;
  
! 			if ( ! phrase(m, line, la, buf))
  				return(0);
  
! 			m->flags &= ~MDOC_PPHRASE;
  			continue;
  		}
  
--- 1142,1155 ----
  			 */
  
  			if (ARGS_PPHRASE == ac)
! 				mdoc->flags |= MDOC_PPHRASE;
  			if (ARGS_PEND == ac && ARGS_PPHRASE == lac)
! 				mdoc->flags |= MDOC_PPHRASE;
  
! 			if ( ! phrase(mdoc, line, la, buf))
  				return(0);
  
! 			mdoc->flags &= ~MDOC_PPHRASE;
  			continue;
  		}
  
***************
*** 1153,1175 ****
  			MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(m, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
  			return(0);
  		break;
  	}
  
  	if (NULL == head) {
! 		if ( ! mdoc_head_alloc(m, line, ppos, tok))
  			return(0);
! 		head = m->last;
  	}
  	
! 	if (nl && ! append_delims(m, line, pos, buf))
  		return(0);
  
  	/* If we've already opened our body, exit now. */
--- 1157,1179 ----
  			MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
  			return(0);
  		break;
  	}
  
  	if (NULL == head) {
! 		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
  			return(0);
! 		head = mdoc->last;
  	}
  	
! 	if (nl && ! append_delims(mdoc, line, pos, buf))
  		return(0);
  
  	/* If we've already opened our body, exit now. */
***************
*** 1183,1189 ****
  	 * head to body until the rew_sub() call closing out that
  	 * sub-block.
  	 */
! 	for (n = m->last; n && n != head; n = n->parent) {
  		if (MDOC_BLOCK == n->type && 
  				MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
  				! (MDOC_VALID & n->flags)) {
--- 1187,1193 ----
  	 * head to body until the rew_sub() call closing out that
  	 * sub-block.
  	 */
! 	for (n = mdoc->last; n && n != head; n = n->parent) {
  		if (MDOC_BLOCK == n->type && 
  				MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
  				! (MDOC_VALID & n->flags)) {
***************
*** 1194,1214 ****
  
  	/* Close out scopes to remain in a consistent state. */
  
! 	if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
  		return(0);
! 	if ( ! mdoc_body_alloc(m, line, ppos, tok))
  		return(0);
  
  out:
! 	if ( ! (MDOC_FREECOL & m->flags))
  		return(1);
  
! 	if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
  		return(0);
! 	if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
  		return(0);
  
! 	m->flags &= ~MDOC_FREECOL;
  	return(1);
  }
  
--- 1198,1218 ----
  
  	/* Close out scopes to remain in a consistent state. */
  
! 	if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
  		return(0);
! 	if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  		return(0);
  
  out:
! 	if ( ! (MDOC_FREECOL & mdoc->flags))
  		return(1);
  
! 	if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
  		return(0);
! 	if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
  		return(0);
  
! 	mdoc->flags &= ~MDOC_FREECOL;
  	return(1);
  }
  
***************
*** 1224,1230 ****
  	struct mdoc_node *body; /* saved body context */
  	struct mdoc_node *n;
  
! 	nl = MDOC_NEWLINE & m->flags;
  
  	/*
  	 * A macro that spans to the end of the line.  This is generally
--- 1228,1234 ----
  	struct mdoc_node *body; /* saved body context */
  	struct mdoc_node *n;
  
! 	nl = MDOC_NEWLINE & mdoc->flags;
  
  	/*
  	 * A macro that spans to the end of the line.  This is generally
***************
*** 1235,1248 ****
  	 * or more closing punctuation nodes.
  	 */
  
! 	if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL))
  		return(0);
  
! 	blk = m->last;
  
! 	if ( ! mdoc_head_alloc(m, line, ppos, tok))
  		return(0);
! 	if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
  		return(0);
  
  	/*
--- 1239,1252 ----
  	 * or more closing punctuation nodes.
  	 */
  
! 	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
  		return(0);
  
! 	blk = mdoc->last;
  
! 	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
  		return(0);
! 	if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
  		return(0);
  
  	/*
***************
*** 1253,1259 ****
  
  	for (body = NULL; ; ) {
  		la = *pos;
! 		ac = mdoc_args(m, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1257,1263 ----
  
  	for (body = NULL; ; ) {
  		la = *pos;
! 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 1264,1289 ****
  
  		if (NULL == body && ARGS_QWORD != ac &&
  				DELIM_OPEN == mdoc_isdelim(p)) {
! 			if ( ! dword(m, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		} 
  
  		if (NULL == body) {
! 		       if ( ! mdoc_body_alloc(m, line, ppos, tok))
  			       return(0);
! 			body = m->last;
  		}
  
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(m, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
  			return(0);
  		break;
  	}
--- 1268,1293 ----
  
  		if (NULL == body && ARGS_QWORD != ac &&
  				DELIM_OPEN == mdoc_isdelim(p)) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		} 
  
  		if (NULL == body) {
! 		       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  			       return(0);
! 			body = mdoc->last;
  		}
  
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
  			return(0);
  		break;
  	}
***************
*** 1291,1299 ****
  	/* Clean-ups to leave in a consistent state. */
  
  	if (NULL == body) {
! 		if ( ! mdoc_body_alloc(m, line, ppos, tok))
  			return(0);
! 		body = m->last;
  	}
  
  	for (n = body->child; n && n->next; n = n->next)
--- 1295,1303 ----
  	/* Clean-ups to leave in a consistent state. */
  
  	if (NULL == body) {
! 		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  			return(0);
! 		body = mdoc->last;
  	}
  
  	for (n = body->child; n && n->next; n = n->next)
***************
*** 1320,1331 ****
  	 * postpone closing out the current block
  	 * until the rew_sub() call closing out the sub-block.
  	 */
! 	for (n = m->last; n && n != body && n != blk->parent; n = n->parent) {
  		if (MDOC_BLOCK == n->type &&
  		    MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
  		    ! (MDOC_VALID & n->flags)) {
! 			make_pending(n, tok, m, line, ppos);
! 			if ( ! mdoc_endbody_alloc(m, line, ppos,
  			    tok, body, ENDBODY_NOSPACE))
  				return(0);
  			return(1);
--- 1324,1336 ----
  	 * postpone closing out the current block
  	 * until the rew_sub() call closing out the sub-block.
  	 */
! 	for (n = mdoc->last; n && n != body && n != blk->parent;
! 			n = n->parent) {
  		if (MDOC_BLOCK == n->type &&
  		    MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
  		    ! (MDOC_VALID & n->flags)) {
! 			make_pending(n, tok, mdoc, line, ppos);
! 			if ( ! mdoc_endbody_alloc(mdoc, line, ppos,
  			    tok, body, ENDBODY_NOSPACE))
  				return(0);
  			return(1);
***************
*** 1339,1358 ****
  	 * crufty use of `Op' breakage.
  	 */
  	if (n != body)
! 		mandoc_vmsg(MANDOCERR_SCOPENEST, m->parse, line, ppos, 
  				"%s broken", mdoc_macronames[tok]);
  
! 	if (n && ! rew_sub(MDOC_BODY, m, tok, line, ppos))
  		return(0);
  
  	/* Standard appending of delimiters. */
  
! 	if (nl && ! append_delims(m, line, pos, buf))
  		return(0);
  
  	/* Rewind scope, if applicable. */
  
! 	if (n && ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
  		return(0);
  
  	/* Move trailing .Ns out of scope. */
--- 1344,1363 ----
  	 * crufty use of `Op' breakage.
  	 */
  	if (n != body)
! 		mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, 
  				"%s broken", mdoc_macronames[tok]);
  
! 	if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
  		return(0);
  
  	/* Standard appending of delimiters. */
  
! 	if (nl && ! append_delims(mdoc, line, pos, buf))
  		return(0);
  
  	/* Rewind scope, if applicable. */
  
! 	if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
  		return(0);
  
  	/* Move trailing .Ns out of scope. */
***************
*** 1360,1366 ****
  	for (n = body->child; n && n->next; n = n->next)
  		/* Do nothing. */ ;
  	if (n && MDOC_Ns == n->tok)
! 		mdoc_node_relink(m, n);
  
  	return(1);
  }
--- 1365,1371 ----
  	for (n = body->child; n && n->next; n = n->next)
  		/* Do nothing. */ ;
  	if (n && MDOC_Ns == n->tok)
! 		mdoc_node_relink(mdoc, n);
  
  	return(1);
  }
***************
*** 1376,1382 ****
  	char		 *p;
  	enum mdoct	  ntok;
  
! 	nl = MDOC_NEWLINE & m->flags;
  
  	/*
  	 * The opening of an explicit macro having zero or more leading
--- 1381,1387 ----
  	char		 *p;
  	enum mdoct	  ntok;
  
! 	nl = MDOC_NEWLINE & mdoc->flags;
  
  	/*
  	 * The opening of an explicit macro having zero or more leading
***************
*** 1384,1395 ****
  	 * case of `Eo'); and a body that may be empty.
  	 */
  
! 	if ( ! mdoc_block_alloc(m, line, ppos, tok, NULL))
  		return(0); 
  
  	for (head = body = NULL; ; ) {
  		la = *pos;
! 		ac = mdoc_args(m, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1389,1400 ----
  	 * case of `Eo'); and a body that may be empty.
  	 */
  
! 	if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
  		return(0); 
  
  	for (head = body = NULL; ; ) {
  		la = *pos;
! 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 1403,1418 ****
  		if (NULL == head && ARGS_QWORD != ac &&
  				DELIM_OPEN == mdoc_isdelim(p)) {
  			assert(NULL == body);
! 			if ( ! dword(m, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		} 
  
  		if (NULL == head) {
  			assert(NULL == body);
! 			if ( ! mdoc_head_alloc(m, line, ppos, tok))
  				return(0);
! 			head = m->last;
  		}
  
  		/*
--- 1408,1423 ----
  		if (NULL == head && ARGS_QWORD != ac &&
  				DELIM_OPEN == mdoc_isdelim(p)) {
  			assert(NULL == body);
! 			if ( ! dword(mdoc, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		} 
  
  		if (NULL == head) {
  			assert(NULL == body);
! 			if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
  				return(0);
! 			head = mdoc->last;
  		}
  
  		/*
***************
*** 1424,1437 ****
  			assert(head);
  			/* No check whether it's a macro! */
  			if (MDOC_Eo == tok)
! 				if ( ! dword(m, line, la, p, DELIM_MAX))
  					return(0);
  
! 			if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
  				return(0);
! 			if ( ! mdoc_body_alloc(m, line, ppos, tok))
  				return(0);
! 			body = m->last;
  
  			if (MDOC_Eo == tok)
  				continue;
--- 1429,1442 ----
  			assert(head);
  			/* No check whether it's a macro! */
  			if (MDOC_Eo == tok)
! 				if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  					return(0);
  
! 			if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
  				return(0);
! 			if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  				return(0);
! 			body = mdoc->last;
  
  			if (MDOC_Eo == tok)
  				continue;
***************
*** 1442,1453 ****
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(m, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
  			return(0);
  		break;
  	}
--- 1447,1458 ----
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
  			return(0);
  		break;
  	}
***************
*** 1455,1467 ****
  	/* Clean-up to leave in a consistent state. */
  
  	if (NULL == head)
! 		if ( ! mdoc_head_alloc(m, line, ppos, tok))
  			return(0);
  
  	if (NULL == body) {
! 		if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
  			return(0);
! 		if ( ! mdoc_body_alloc(m, line, ppos, tok))
  			return(0);
  	}
  
--- 1460,1472 ----
  	/* Clean-up to leave in a consistent state. */
  
  	if (NULL == head)
! 		if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
  			return(0);
  
  	if (NULL == body) {
! 		if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
  			return(0);
! 		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
  			return(0);
  	}
  
***************
*** 1469,1475 ****
  
  	if ( ! nl)
  		return(1);
! 	return(append_delims(m, line, pos, buf));
  }
  
  
--- 1474,1480 ----
  
  	if ( ! nl)
  		return(1);
! 	return(append_delims(mdoc, line, pos, buf));
  }
  
  
***************
*** 1484,1490 ****
  	char		*p;
  	enum mdoct	 ntok;
  
! 	nl = MDOC_NEWLINE & m->flags;
  
  	/*
  	 * A line macro that has a fixed number of arguments (maxargs).
--- 1489,1495 ----
  	char		*p;
  	enum mdoct	 ntok;
  
! 	nl = MDOC_NEWLINE & mdoc->flags;
  
  	/*
  	 * A line macro that has a fixed number of arguments (maxargs).
***************
*** 1516,1522 ****
  
  	for (arg = NULL; ; ) {
  		la = *pos;
! 		av = mdoc_argv(m, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
--- 1521,1527 ----
  
  	for (arg = NULL; ; ) {
  		la = *pos;
! 		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
***************
*** 1534,1540 ****
  
  	for (flushed = j = 0; ; ) {
  		la = *pos;
! 		ac = mdoc_args(m, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1539,1545 ----
  
  	for (flushed = j = 0; ; ) {
  		la = *pos;
! 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 1546,1560 ****
  		if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && 
  				ARGS_QWORD != ac && 0 == j && 
  				DELIM_OPEN == mdoc_isdelim(p)) {
! 			if ( ! dword(m, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		} else if (0 == j)
! 		       if ( ! mdoc_elem_alloc(m, line, la, tok, arg))
  			       return(0);
  
  		if (j == maxargs && ! flushed) {
! 			if ( ! rew_elem(m, tok))
  				return(0);
  			flushed = 1;
  		}
--- 1551,1565 ----
  		if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && 
  				ARGS_QWORD != ac && 0 == j && 
  				DELIM_OPEN == mdoc_isdelim(p)) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_OPEN))
  				return(0);
  			continue;
  		} else if (0 == j)
! 		       if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg))
  			       return(0);
  
  		if (j == maxargs && ! flushed) {
! 			if ( ! rew_elem(mdoc, tok))
  				return(0);
  			flushed = 1;
  		}
***************
*** 1562,1571 ****
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX != ntok) {
! 			if ( ! flushed && ! rew_elem(m, tok))
  				return(0);
  			flushed = 1;
! 			if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
  				return(0);
  			j++;
  			break;
--- 1567,1576 ----
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX != ntok) {
! 			if ( ! flushed && ! rew_elem(mdoc, tok))
  				return(0);
  			flushed = 1;
! 			if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
  				return(0);
  			j++;
  			break;
***************
*** 1575,1600 ****
  				ARGS_QWORD != ac &&
  				! flushed &&
  				DELIM_NONE != mdoc_isdelim(p)) {
! 			if ( ! rew_elem(m, tok))
  				return(0);
  			flushed = 1;
  		}
  
! 		if ( ! dword(m, line, la, p, DELIM_MAX))
  			return(0);
  		j++;
  	}
  
! 	if (0 == j && ! mdoc_elem_alloc(m, line, la, tok, arg))
  	       return(0);
  
  	/* Close out in a consistent state. */
  
! 	if ( ! flushed && ! rew_elem(m, tok))
  		return(0);
  	if ( ! nl)
  		return(1);
! 	return(append_delims(m, line, pos, buf));
  }
  
  
--- 1580,1605 ----
  				ARGS_QWORD != ac &&
  				! flushed &&
  				DELIM_NONE != mdoc_isdelim(p)) {
! 			if ( ! rew_elem(mdoc, tok))
  				return(0);
  			flushed = 1;
  		}
  
! 		if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  			return(0);
  		j++;
  	}
  
! 	if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg))
  	       return(0);
  
  	/* Close out in a consistent state. */
  
! 	if ( ! flushed && ! rew_elem(mdoc, tok))
  		return(0);
  	if ( ! nl)
  		return(1);
! 	return(append_delims(mdoc, line, pos, buf));
  }
  
  
***************
*** 1611,1623 ****
  	assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));
  
  	if (tok == MDOC_Pp)
! 		rew_sub(MDOC_BLOCK, m, MDOC_Nm, line, ppos);
  
  	/* Parse macro arguments. */
  
  	for (arg = NULL; ; ) {
  		la = *pos;
! 		av = mdoc_argv(m, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
--- 1616,1628 ----
  	assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));
  
  	if (tok == MDOC_Pp)
! 		rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos);
  
  	/* Parse macro arguments. */
  
  	for (arg = NULL; ; ) {
  		la = *pos;
! 		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
  		if (ARGV_WORD == av) {
  			*pos = la;
***************
*** 1634,1647 ****
  
  	/* Open element scope. */
  
! 	if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
  		return(0);
  
  	/* Parse argument terms. */
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_args(m, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1639,1652 ----
  
  	/* Open element scope. */
  
! 	if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
  		return(0);
  
  	/* Parse argument terms. */
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 1651,1669 ****
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(m, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! rew_elem(m, tok))
  			return(0);
! 		return(mdoc_macro(m, ntok, line, la, pos, buf));
  	}
  
  	/* Close out (no delimiters). */
  
! 	return(rew_elem(m, tok));
  }
  
  
--- 1656,1674 ----
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! rew_elem(mdoc, tok))
  			return(0);
! 		return(mdoc_macro(mdoc, ntok, line, la, pos, buf));
  	}
  
  	/* Close out (no delimiters). */
  
! 	return(rew_elem(mdoc, tok));
  }
  
  
***************
*** 1673,1687 ****
  {
  	int		 nl;
  
! 	nl = MDOC_NEWLINE & m->flags;
  
  	/* If we're not in the SYNOPSIS, go straight to in-line. */
! 	if ( ! (MDOC_SYNOPSIS & m->flags))
! 		return(in_line(m, tok, line, ppos, pos, buf));
  
  	/* If we're a nested call, same place. */
  	if ( ! nl)
! 		return(in_line(m, tok, line, ppos, pos, buf));
  
  	/*
  	 * XXX: this will open a block scope; however, if later we end
--- 1678,1692 ----
  {
  	int		 nl;
  
! 	nl = MDOC_NEWLINE & mdoc->flags;
  
  	/* If we're not in the SYNOPSIS, go straight to in-line. */
! 	if ( ! (MDOC_SYNOPSIS & mdoc->flags))
! 		return(in_line(mdoc, tok, line, ppos, pos, buf));
  
  	/* If we're a nested call, same place. */
  	if ( ! nl)
! 		return(in_line(mdoc, tok, line, ppos, pos, buf));
  
  	/*
  	 * XXX: this will open a block scope; however, if later we end
***************
*** 1689,1697 ****
  	 * the formatting.  Be careful.
  	 */
  	if (MDOC_Nm == tok)
! 		return(blk_full(m, tok, line, ppos, pos, buf));
  	assert(MDOC_Vt == tok);
! 	return(blk_part_imp(m, tok, line, ppos, pos, buf));
  }
  
  
--- 1694,1702 ----
  	 * the formatting.  Be careful.
  	 */
  	if (MDOC_Nm == tok)
! 		return(blk_full(mdoc, tok, line, ppos, pos, buf));
  	assert(MDOC_Vt == tok);
! 	return(blk_part_imp(mdoc, tok, line, ppos, pos, buf));
  }
  
  
***************
*** 1700,1706 ****
  obsolete(MACRO_PROT_ARGS)
  {
  
! 	mdoc_pmsg(m, line, ppos, MANDOCERR_MACROOBS);
  	return(1);
  }
  
--- 1705,1711 ----
  obsolete(MACRO_PROT_ARGS)
  {
  
! 	mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS);
  	return(1);
  }
  
***************
*** 1711,1717 ****
   * macro is encountered.
   */
  static int
! phrase(struct mdoc *m, int line, int ppos, char *buf)
  {
  	int		 la, pos;
  	enum margserr	 ac;
--- 1716,1722 ----
   * macro is encountered.
   */
  static int
! phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
  {
  	int		 la, pos;
  	enum margserr	 ac;
***************
*** 1721,1727 ****
  	for (pos = ppos; ; ) {
  		la = pos;
  
! 		ac = mdoc_zargs(m, line, &pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1726,1732 ----
  	for (pos = ppos; ; ) {
  		la = pos;
  
! 		ac = mdoc_zargs(mdoc, line, &pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 1731,1744 ****
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(m, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(m, ntok, line, la, &pos, buf))
  			return(0);
! 		return(append_delims(m, line, &pos, buf));
  	}
  
  	return(1);
--- 1736,1749 ----
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(mdoc, ntok, line, la, &pos, buf))
  			return(0);
! 		return(append_delims(mdoc, line, &pos, buf));
  	}
  
  	return(1);
***************
*** 1759,1772 ****
  	 * it should simply error out with ARGSLOST.
  	 */
  
! 	if ( ! rew_sub(MDOC_BODY, m, MDOC_It, line, ppos))
  		return(0);
! 	if ( ! mdoc_body_alloc(m, line, ppos, MDOC_It))
  		return(0);
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(m, line, pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
--- 1764,1777 ----
  	 * it should simply error out with ARGSLOST.
  	 */
  
! 	if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos))
  		return(0);
! 	if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It))
  		return(0);
  
  	for (;;) {
  		la = *pos;
! 		ac = mdoc_zargs(mdoc, line, pos, buf, &p);
  
  		if (ARGS_ERROR == ac)
  			return(0);
***************
*** 1776,1789 ****
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(m, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(m, ntok, line, la, pos, buf))
  			return(0);
! 		return(append_delims(m, line, pos, buf));
  	}
  
  	return(1);
--- 1781,1794 ----
  		ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
  
  		if (MDOC_MAX == ntok) {
! 			if ( ! dword(mdoc, line, la, p, DELIM_MAX))
  				return(0);
  			continue;
  		}
  
! 		if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
  			return(0);
! 		return(append_delims(mdoc, line, pos, buf));
  	}
  
  	return(1);