===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_validate.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/mandoc/man_validate.c	2009/08/22 20:14:37	1.7
--- src/usr.bin/mandoc/man_validate.c	2009/08/22 23:17:40	1.8
***************
*** 1,4 ****
! /*	$Id: man_validate.c,v 1.7 2009/08/22 20:14:37 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: man_validate.c,v 1.8 2009/08/22 23:17:40 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 36,47 ****
  };
  
  static	int	  check_bline(CHKARGS);
- static	int	  check_eline(CHKARGS);
  static	int	  check_eq0(CHKARGS);
  static	int	  check_eq1(CHKARGS);
  static	int	  check_ge2(CHKARGS);
  static	int	  check_le5(CHKARGS);
  static	int	  check_par(CHKARGS);
  static	int	  check_root(CHKARGS);
  static	int	  check_sec(CHKARGS);
  static	int	  check_sp(CHKARGS);
--- 36,47 ----
  };
  
  static	int	  check_bline(CHKARGS);
  static	int	  check_eq0(CHKARGS);
  static	int	  check_eq1(CHKARGS);
  static	int	  check_ge2(CHKARGS);
  static	int	  check_le5(CHKARGS);
  static	int	  check_par(CHKARGS);
+ static	int	  check_part(CHKARGS);
  static	int	  check_root(CHKARGS);
  static	int	  check_sec(CHKARGS);
  static	int	  check_sp(CHKARGS);
***************
*** 50,58 ****
  static	v_check	  posts_eq0[] = { check_eq0, NULL };
  static	v_check	  posts_ge2_le5[] = { check_ge2, check_le5, NULL };
  static	v_check	  posts_par[] = { check_par, NULL };
  static	v_check	  posts_sec[] = { check_sec, NULL };
  static	v_check	  posts_sp[] = { check_sp, NULL };
- static	v_check	  pres_eline[] = { check_eline, NULL };
  static	v_check	  pres_bline[] = { check_bline, NULL };
  
  static	const struct man_valid man_valids[MAN_MAX] = {
--- 50,58 ----
  static	v_check	  posts_eq0[] = { check_eq0, NULL };
  static	v_check	  posts_ge2_le5[] = { check_ge2, check_le5, NULL };
  static	v_check	  posts_par[] = { check_par, NULL };
+ static	v_check	  posts_part[] = { check_part, NULL };
  static	v_check	  posts_sec[] = { check_sec, NULL };
  static	v_check	  posts_sp[] = { check_sp, NULL };
  static	v_check	  pres_bline[] = { check_bline, NULL };
  
  static	const struct man_valid man_valids[MAN_MAX] = {
***************
*** 66,80 ****
  	{ pres_bline, posts_par }, /* P */
  	{ pres_bline, posts_par }, /* IP */
  	{ pres_bline, posts_par }, /* HP */
! 	{ pres_eline, NULL }, /* SM */
! 	{ pres_eline, NULL }, /* SB */
  	{ NULL, NULL }, /* BI */
  	{ NULL, NULL }, /* IB */
  	{ NULL, NULL }, /* BR */
  	{ NULL, NULL }, /* RB */
! 	{ pres_eline, NULL }, /* R */
! 	{ pres_eline, NULL }, /* B */
! 	{ pres_eline, NULL }, /* I */
  	{ NULL, NULL }, /* IR */
  	{ NULL, NULL }, /* RI */
  	{ pres_bline, posts_eq0 }, /* na */
--- 66,80 ----
  	{ pres_bline, posts_par }, /* P */
  	{ pres_bline, posts_par }, /* IP */
  	{ pres_bline, posts_par }, /* HP */
! 	{ NULL, NULL }, /* SM */
! 	{ NULL, NULL }, /* SB */
  	{ NULL, NULL }, /* BI */
  	{ NULL, NULL }, /* IB */
  	{ NULL, NULL }, /* BR */
  	{ NULL, NULL }, /* RB */
! 	{ NULL, NULL }, /* R */
! 	{ NULL, NULL }, /* B */
! 	{ NULL, NULL }, /* I */
  	{ NULL, NULL }, /* IR */
  	{ NULL, NULL }, /* RI */
  	{ pres_bline, posts_eq0 }, /* na */
***************
*** 83,88 ****
--- 83,91 ----
  	{ pres_bline, posts_eq0 }, /* nf */
  	{ pres_bline, posts_eq0 }, /* fi */
  	{ NULL, NULL }, /* r */
+ 	{ NULL, NULL }, /* RE */
+ 	{ NULL, posts_part }, /* RS */
+ 	{ NULL, NULL }, /* DT */
  };
  
  
***************
*** 137,149 ****
  check_root(CHKARGS) 
  {
  
- 	/* XXX - make this into a warning? */
  	if (MAN_BLINE & m->flags)
! 		return(man_nerr(m, n, WEXITSCOPE));
! 	/* XXX - make this into a warning? */
  	if (MAN_ELINE & m->flags)
! 		return(man_nerr(m, n, WEXITSCOPE));
  
  	if (NULL == m->first->child)
  		return(man_nerr(m, n, WNODATA));
  	if (NULL == m->meta.title)
--- 140,153 ----
  check_root(CHKARGS) 
  {
  
  	if (MAN_BLINE & m->flags)
! 		return(man_nwarn(m, n, WEXITSCOPE));
  	if (MAN_ELINE & m->flags)
! 		return(man_nwarn(m, n, WEXITSCOPE));
  
+ 	m->flags &= ~MAN_BLINE;
+ 	m->flags &= ~MAN_ELINE;
+ 
  	if (NULL == m->first->child)
  		return(man_nerr(m, n, WNODATA));
  	if (NULL == m->meta.title)
***************
*** 248,253 ****
--- 252,267 ----
  
  
  static int
+ check_part(CHKARGS)
+ {
+ 
+ 	if (MAN_BODY == n->type && 0 == n->nchild)
+ 		return(man_nwarn(m, n, WBODYARGS));
+ 	return(1);
+ }
+ 
+ 
+ static int
  check_par(CHKARGS)
  {
  
***************
*** 286,307 ****
  
  
  static int
- check_eline(CHKARGS)
- {
- 
- 	if (MAN_ELINE & m->flags)
- 		return(man_nerr(m, n, WLNSCOPE));
- 	return(1);
- }
- 
- 
- static int
  check_bline(CHKARGS)
  {
  
  	if (MAN_BLINE & m->flags)
- 		return(man_nerr(m, n, WLNSCOPE));
- 	if (MAN_ELINE & m->flags)
  		return(man_nerr(m, n, WLNSCOPE));
  	return(1);
  }
--- 300,310 ----
  
  
  static int
  check_bline(CHKARGS)
  {
  
+ 	assert( ! (MAN_ELINE & m->flags));
  	if (MAN_BLINE & m->flags)
  		return(man_nerr(m, n, WLNSCOPE));
  	return(1);
  }