===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -c -r1.148 -r1.149
*** src/usr.bin/mandoc/mdoc_macro.c	2015/04/19 14:25:05	1.148
--- src/usr.bin/mandoc/mdoc_macro.c	2015/04/19 14:57:16	1.149
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.148 2015/04/19 14:25:05 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.149 2015/04/19 14:57:16 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 644,650 ****
  			 * Stray .Ec without previous .Eo:
  			 * Break the output line, keep the arguments.
  			 */
! 			mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
  			rew_elem(mdoc, MDOC_br);
  		}
  	} else if (endbody == NULL) {
--- 644,650 ----
  			 * Stray .Ec without previous .Eo:
  			 * Break the output line, keep the arguments.
  			 */
! 			roff_elem_alloc(mdoc, line, ppos, MDOC_br);
  			rew_elem(mdoc, MDOC_br);
  		}
  	} else if (endbody == NULL) {
***************
*** 988,994 ****
  		if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {
  			mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
  			    line, ppos, "It %s", buf + *pos);
! 			mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
  			rew_elem(mdoc, MDOC_br);
  			return;
  		}
--- 988,994 ----
  		if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {
  			mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
  			    line, ppos, "It %s", buf + *pos);
! 			roff_elem_alloc(mdoc, line, ppos, MDOC_br);
  			rew_elem(mdoc, MDOC_br);
  			return;
  		}
***************
*** 1221,1227 ****
  	 * case of `Eo'); and a body that may be empty.
  	 */
  
! 	mdoc_block_alloc(mdoc, line, ppos, tok, NULL);
  	head = NULL;
  	for (;;) {
  		la = *pos;
--- 1221,1227 ----
  	 * case of `Eo'); and a body that may be empty.
  	 */
  
! 	roff_block_alloc(mdoc, line, ppos, tok);
  	head = NULL;
  	for (;;) {
  		la = *pos;