===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -c -r1.179 -r1.180
*** src/usr.bin/mandoc/mdoc_validate.c	2014/11/30 05:28:00	1.179
--- src/usr.bin/mandoc/mdoc_validate.c	2014/12/18 19:22:47	1.180
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_validate.c,v 1.179 2014/11/30 05:28:00 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_validate.c,v 1.180 2014/12/18 19:22:47 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1188,1194 ****
  	struct mdoc_node *nbl, *nit, *nch;
  
  	nit = mdoc->last;
! 	if (MDOC_BLOCK != nit->type)
  		return;
  
  	nbl = nit->parent->parent;
--- 1188,1194 ----
  	struct mdoc_node *nbl, *nit, *nch;
  
  	nit = mdoc->last;
! 	if (nit->type != MDOC_BLOCK)
  		return;
  
  	nbl = nit->parent->parent;
***************
*** 1204,1210 ****
  	case LIST_inset:
  		/* FALLTHROUGH */
  	case LIST_diag:
! 		if (NULL == nit->head->child)
  			mandoc_vmsg(MANDOCERR_IT_NOHEAD,
  			    mdoc->parse, nit->line, nit->pos,
  			    "Bl -%s It",
--- 1204,1210 ----
  	case LIST_inset:
  		/* FALLTHROUGH */
  	case LIST_diag:
! 		if (nit->head->child == NULL)
  			mandoc_vmsg(MANDOCERR_IT_NOHEAD,
  			    mdoc->parse, nit->line, nit->pos,
  			    "Bl -%s It",
***************
*** 1217,1230 ****
  	case LIST_enum:
  		/* FALLTHROUGH */
  	case LIST_hyphen:
! 		if (NULL == nit->body->child)
  			mandoc_vmsg(MANDOCERR_IT_NOBODY,
  			    mdoc->parse, nit->line, nit->pos,
  			    "Bl -%s It",
  			    mdoc_argnames[nbl->args->argv[0].arg]);
  		/* FALLTHROUGH */
  	case LIST_item:
! 		if (NULL != nit->head->child)
  			mandoc_vmsg(MANDOCERR_ARG_SKIP,
  			    mdoc->parse, nit->line, nit->pos,
  			    "It %s", nit->head->child->string);
--- 1217,1230 ----
  	case LIST_enum:
  		/* FALLTHROUGH */
  	case LIST_hyphen:
! 		if (nit->body == NULL || nit->body->child == NULL)
  			mandoc_vmsg(MANDOCERR_IT_NOBODY,
  			    mdoc->parse, nit->line, nit->pos,
  			    "Bl -%s It",
  			    mdoc_argnames[nbl->args->argv[0].arg]);
  		/* FALLTHROUGH */
  	case LIST_item:
! 		if (nit->head->child != NULL)
  			mandoc_vmsg(MANDOCERR_ARG_SKIP,
  			    mdoc->parse, nit->line, nit->pos,
  			    "It %s", nit->head->child->string);
***************
*** 1232,1241 ****
  	case LIST_column:
  		cols = (int)nbl->norm->Bl.ncols;
  
! 		assert(NULL == nit->head->child);
  
  		for (i = 0, nch = nit->child; nch; nch = nch->next)
! 			if (MDOC_BODY == nch->type)
  				i++;
  
  		if (i < cols || i > cols + 1)
--- 1232,1241 ----
  	case LIST_column:
  		cols = (int)nbl->norm->Bl.ncols;
  
! 		assert(nit->head->child == NULL);
  
  		for (i = 0, nch = nit->child; nch; nch = nch->next)
! 			if (nch->type == MDOC_BODY)
  				i++;
  
  		if (i < cols || i > cols + 1)