===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_macro.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -c -r1.27 -r1.28
*** src/usr.bin/mandoc/man_macro.c	2011/01/16 19:27:25	1.27
--- src/usr.bin/mandoc/man_macro.c	2011/04/21 22:59:54	1.28
***************
*** 1,4 ****
! /*	$Id: man_macro.c,v 1.27 2011/01/16 19:27:25 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: man_macro.c,v 1.28 2011/04/21 22:59:54 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 39,45 ****
  				const struct man_node *);
  static	enum rew	 rew_block(enum mant, enum man_type, 
  				const struct man_node *);
! static	int		 rew_warn(struct man *, 
  				struct man_node *, enum mandocerr);
  
  const	struct man_macro __man_macros[MAN_MAX] = {
--- 39,45 ----
  				const struct man_node *);
  static	enum rew	 rew_block(enum mant, enum man_type, 
  				const struct man_node *);
! static	void		 rew_warn(struct man *, 
  				struct man_node *, enum mandocerr);
  
  const	struct man_macro __man_macros[MAN_MAX] = {
***************
*** 84,100 ****
  /*
   * Warn when "n" is an explicit non-roff macro.
   */
! static int
  rew_warn(struct man *m, struct man_node *n, enum mandocerr er)
  {
  
  	if (er == MANDOCERR_MAX || MAN_BLOCK != n->type)
! 		return(1);
  	if (MAN_VALID & n->flags)
! 		return(1);
  	if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
! 		return(1);
! 	return(man_nmsg(m, n, er));
  }
  
  
--- 84,102 ----
  /*
   * Warn when "n" is an explicit non-roff macro.
   */
! static void
  rew_warn(struct man *m, struct man_node *n, enum mandocerr er)
  {
  
  	if (er == MANDOCERR_MAX || MAN_BLOCK != n->type)
! 		return;
  	if (MAN_VALID & n->flags)
! 		return;
  	if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
! 		return;
! 
! 	assert(er < MANDOCERR_FATAL);
! 	man_nmsg(m, n, er);
  }
  
  
***************
*** 119,134 ****
  		 * out to be lost.
  		 */
  		n = m->last->parent;
! 		if ( ! rew_warn(m, m->last, er))
! 			return(0);
  		if ( ! man_valid_post(m))
  			return(0);
  		m->last = n;
  		assert(m->last);
  	}
  
! 	if ( ! rew_warn(m, m->last, er))
! 		return(0);
  	if ( ! man_valid_post(m))
  		return(0);
  
--- 121,134 ----
  		 * out to be lost.
  		 */
  		n = m->last->parent;
! 		rew_warn(m, m->last, er);
  		if ( ! man_valid_post(m))
  			return(0);
  		m->last = n;
  		assert(m->last);
  	}
  
! 	rew_warn(m, m->last, er);
  	if ( ! man_valid_post(m))
  		return(0);
  
***************
*** 275,282 ****
  			break;
  
  	if (NULL == nn)
! 		if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE))
! 			return(0);
  
  	if ( ! rew_scope(MAN_BODY, m, ntok))
  		return(0);
--- 275,281 ----
  			break;
  
  	if (NULL == nn)
! 		man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
  
  	if ( ! rew_scope(MAN_BODY, m, ntok))
  		return(0);