===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -c -r1.107 -r1.108
*** src/usr.bin/mandoc/mdoc_macro.c	2014/11/28 04:46:30	1.107
--- src/usr.bin/mandoc/mdoc_macro.c	2014/11/28 23:20:55	1.108
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.107 2014/11/28 04:46:30 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.108 2014/11/28 23:20:55 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 841,847 ****
  in_line(MACRO_PROT_ARGS)
  {
  	int		 la, scope, cnt, firstarg, mayopen, nc, nl;
- 	enum margverr	 av;
  	enum mdoct	 ntok;
  	enum margserr	 ac;
  	enum mdelim	 d;
--- 841,846 ----
***************
*** 874,888 ****
  		break;
  	}
  
! 	for (arg = NULL;; ) {
! 		la = *pos;
! 		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
! 		if (av == ARGV_ARG)
! 			continue;
! 		if (av == ARGV_WORD)
! 			*pos = la;
! 		break;
! 	}
  
  	d = DELIM_NONE;
  	firstarg = 1;
--- 873,879 ----
  		break;
  	}
  
! 	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
  	d = DELIM_NONE;
  	firstarg = 1;
***************
*** 1039,1045 ****
  	struct mdoc_node *n;
  	enum mdoct	  ntok;
  	enum margserr	  ac, lac;
- 	enum margverr	  av;
  	char		 *p;
  
  	nl = MDOC_NEWLINE & mdoc->flags;
--- 1030,1035 ----
***************
*** 1076,1091 ****
  	 * regular child nodes.
  	 */
  
! 	for (arg = NULL;; ) {
! 		la = *pos;
! 		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
! 		if (av == ARGV_ARG)
! 			continue;
! 		if (av == ARGV_WORD)
! 			*pos = la;
! 		break;
! 	}
! 
  	mdoc_block_alloc(mdoc, line, ppos, tok, arg);
  	head = body = NULL;
  
--- 1066,1072 ----
  	 * regular child nodes.
  	 */
  
! 	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  	mdoc_block_alloc(mdoc, line, ppos, tok, arg);
  	head = body = NULL;
  
***************
*** 1400,1406 ****
  {
  	int		 la, flushed, j, maxargs, nl;
  	enum margserr	 ac;
- 	enum margverr	 av;
  	struct mdoc_arg	*arg;
  	char		*p;
  	enum mdoct	 ntok;
--- 1381,1386 ----
***************
*** 1435,1449 ****
  		break;
  	}
  
! 	for (arg = NULL; ; ) {
! 		la = *pos;
! 		av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
! 		if (av == ARGV_ARG)
! 			continue;
! 		if (av == ARGV_WORD)
! 			*pos = la;
! 		break;
! 	}
  
  	for (flushed = j = 0; ; ) {
  		la = *pos;
--- 1415,1421 ----
  		break;
  	}
  
! 	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  
  	for (flushed = j = 0; ; ) {
  		la = *pos;
***************
*** 1500,1506 ****
  {
  	int		 la;
  	enum margserr	 ac;
- 	enum margverr	 av;
  	struct mdoc_arg	*arg;
  	char		*p;
  	enum mdoct	 ntok;
--- 1472,1477 ----
***************
*** 1510,1529 ****
  	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 (av == ARGV_ARG)
! 			continue;
! 		if (av == ARGV_WORD)
! 			*pos = la;
! 		break;
! 	}
! 
! 	/* Open element scope. */
! 
  	mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
  
  	/* Parse argument terms. */
--- 1481,1487 ----
  	if (tok == MDOC_Pp)
  		rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos);
  
! 	mdoc_argv(mdoc, line, tok, &arg, pos, buf);
  	mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
  
  	/* Parse argument terms. */