===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_macro.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -c -r1.67 -r1.68
*** src/usr.bin/mandoc/man_macro.c	2015/04/18 16:04:40	1.67
--- src/usr.bin/mandoc/man_macro.c	2015/04/19 13:50:10	1.68
***************
*** 1,4 ****
! /*	$OpenBSD: man_macro.c,v 1.67 2015/04/18 16:04:40 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man_macro.c,v 1.68 2015/04/19 13:50:10 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 27,32 ****
--- 27,33 ----
  #include "roff.h"
  #include "man.h"
  #include "libmandoc.h"
+ #include "roff_int.h"
  #include "libman.h"
  
  static	void		 blk_close(MACRO_PROT_ARGS);
***************
*** 108,114 ****
  				}
  				man->last = n;
  				n = n->parent;
! 				man_node_delete(man, man->last);
  				continue;
  			}
  			if (n->type == ROFFT_BLOCK &&
--- 109,115 ----
  				}
  				man->last = n;
  				n = n->parent;
! 				roff_node_delete(man, man->last);
  				continue;
  			}
  			if (n->type == ROFFT_BLOCK &&
***************
*** 257,264 ****
  
  	rew_scope(man, tok);
  	man_block_alloc(man, line, ppos, tok);
! 	man_head_alloc(man, line, ppos, tok);
! 	head = man->last;
  
  	la = *pos;
  	if (man_args(man, line, pos, buf, &p))
--- 258,264 ----
  
  	rew_scope(man, tok);
  	man_block_alloc(man, line, ppos, tok);
! 	head = roff_head_alloc(man, line, ppos, tok);
  
  	la = *pos;
  	if (man_args(man, line, pos, buf, &p))
***************
*** 270,276 ****
  		    man_macronames[tok], buf + *pos);
  
  	man_unscope(man, head);
! 	man_body_alloc(man, line, ppos, tok);
  }
  
  /*
--- 270,276 ----
  		    man_macronames[tok], buf + *pos);
  
  	man_unscope(man, head);
! 	roff_body_alloc(man, line, ppos, tok);
  }
  
  /*
***************
*** 288,295 ****
  
  	rew_scope(man, tok);
  	man_block_alloc(man, line, ppos, tok);
- 	man_head_alloc(man, line, ppos, tok);
  	n = man->last;
  
  	/* Add line arguments. */
  
--- 288,297 ----
  
  	rew_scope(man, tok);
  	man_block_alloc(man, line, ppos, tok);
  	n = man->last;
+ 	if (n->tok == MAN_SH || n->tok == MAN_SS)
+ 		man->flags &= ~MAN_LITERAL;
+ 	n = roff_head_alloc(man, line, ppos, tok);
  
  	/* Add line arguments. */
  
***************
*** 315,321 ****
  	/* Close out the head and open the body. */
  
  	man_unscope(man, n);
! 	man_body_alloc(man, line, ppos, tok);
  }
  
  void
--- 317,323 ----
  	/* Close out the head and open the body. */
  
  	man_unscope(man, n);
! 	roff_body_alloc(man, line, ppos, tok);
  }
  
  void