===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_macro.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -c -r1.63 -r1.64
*** src/usr.bin/mandoc/man_macro.c	2015/04/02 21:03:18	1.63
--- src/usr.bin/mandoc/man_macro.c	2015/04/02 22:06:17	1.64
***************
*** 1,4 ****
! /*	$OpenBSD: man_macro.c,v 1.63 2015/04/02 21:03:18 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.64 2015/04/02 22:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 42,53 ****
  static	int		 man_args(struct man *, int,
  				int *, char *, char **);
  
! static	void		 rew_scope(enum roff_type,
! 				struct man *, enum mant);
! static	enum rew	 rew_dohalt(enum mant, enum roff_type,
! 				const struct man_node *);
! static	enum rew	 rew_block(enum mant, enum roff_type,
! 				const struct man_node *);
  
  const	struct man_macro __man_macros[MAN_MAX] = {
  	{ in_line_eoln, MAN_NSCOPED }, /* br */
--- 42,52 ----
  static	int		 man_args(struct man *, int,
  				int *, char *, char **);
  
! static	void		 rew_scope(enum roff_type, struct man *, int);
! static	enum rew	 rew_dohalt(int, enum roff_type,
! 				const struct roff_node *);
! static	enum rew	 rew_block(int, enum roff_type,
! 				const struct roff_node *);
  
  const	struct man_macro __man_macros[MAN_MAX] = {
  	{ in_line_eoln, MAN_NSCOPED }, /* br */
***************
*** 94,102 ****
  
  
  void
! man_unscope(struct man *man, const struct man_node *to)
  {
! 	struct man_node	*n;
  
  	to = to->parent;
  	n = man->last;
--- 93,101 ----
  
  
  void
! man_unscope(struct man *man, const struct roff_node *to)
  {
! 	struct roff_node *n;
  
  	to = to->parent;
  	n = man->last;
***************
*** 154,160 ****
  }
  
  static enum rew
! rew_block(enum mant ntok, enum roff_type type, const struct man_node *n)
  {
  
  	if (type == ROFFT_BLOCK && n->parent->tok == ntok &&
--- 153,159 ----
  }
  
  static enum rew
! rew_block(int ntok, enum roff_type type, const struct roff_node *n)
  {
  
  	if (type == ROFFT_BLOCK && n->parent->tok == ntok &&
***************
*** 169,175 ****
   * sections and subsections).
   */
  static enum rew
! rew_dohalt(enum mant tok, enum roff_type type, const struct man_node *n)
  {
  	enum rew	 c;
  
--- 168,174 ----
   * sections and subsections).
   */
  static enum rew
! rew_dohalt(int tok, enum roff_type type, const struct roff_node *n)
  {
  	enum rew	 c;
  
***************
*** 242,250 ****
   * scopes.  When a scope is closed, it must be validated and actioned.
   */
  static void
! rew_scope(enum roff_type type, struct man *man, enum mant tok)
  {
! 	struct man_node	*n;
  	enum rew	 c;
  
  	for (n = man->last; n; n = n->parent) {
--- 241,249 ----
   * scopes.  When a scope is closed, it must be validated and actioned.
   */
  static void
! rew_scope(enum roff_type type, struct man *man, int tok)
  {
! 	struct roff_node *n;
  	enum rew	 c;
  
  	for (n = man->last; n; n = n->parent) {
***************
*** 275,282 ****
  void
  blk_close(MACRO_PROT_ARGS)
  {
! 	enum mant		 ntok;
! 	const struct man_node	*nn;
  	char			*p;
  	int			 nrew, target;
  
--- 274,281 ----
  void
  blk_close(MACRO_PROT_ARGS)
  {
! 	int			 ntok;
! 	const struct roff_node	*nn;
  	char			*p;
  	int			 nrew, target;
  
***************
*** 336,342 ****
  void
  blk_exp(MACRO_PROT_ARGS)
  {
! 	struct man_node	*head;
  	char		*p;
  	int		 la;
  
--- 335,341 ----
  void
  blk_exp(MACRO_PROT_ARGS)
  {
! 	struct roff_node *head;
  	char		*p;
  	int		 la;
  
***************
*** 369,375 ****
  {
  	int		 la;
  	char		*p;
! 	struct man_node	*n;
  
  	rew_scope(ROFFT_BODY, man, tok);
  	rew_scope(ROFFT_BLOCK, man, tok);
--- 368,374 ----
  {
  	int		 la;
  	char		*p;
! 	struct roff_node *n;
  
  	rew_scope(ROFFT_BODY, man, tok);
  	rew_scope(ROFFT_BLOCK, man, tok);
***************
*** 409,415 ****
  {
  	int		 la;
  	char		*p;
! 	struct man_node	*n;
  
  	man_elem_alloc(man, line, ppos, tok);
  	n = man->last;
--- 408,414 ----
  {
  	int		 la;
  	char		*p;
! 	struct roff_node *n;
  
  	man_elem_alloc(man, line, ppos, tok);
  	n = man->last;