===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -c -r1.259 -r1.260
*** src/usr.bin/mandoc/mdoc_validate.c	2017/06/27 12:17:35	1.259
--- src/usr.bin/mandoc/mdoc_validate.c	2017/06/29 15:21:46	1.260
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_validate.c,v 1.259 2017/06/27 12:17:35 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_validate.c,v 1.260 2017/06/29 15:21:46 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1445,1459 ****
  
  		assert(nit->head->child == NULL);
  
! 		i = 0;
! 		for (nch = nit->child; nch != NULL; nch = nch->next)
! 			if (nch->type == ROFFT_BODY)
! 				i++;
  
  		if (i < cols || i > cols + 1)
  			mandoc_vmsg(MANDOCERR_BL_COL,
  			    mdoc->parse, nit->line, nit->pos,
  			    "%d columns, %d cells", cols, i);
  		break;
  	default:
  		abort();
--- 1445,1474 ----
  
  		assert(nit->head->child == NULL);
  
! 		if (nit->head->next->child == NULL &&
! 		    nit->head->next->next == NULL) {
! 			mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
! 			    nit->line, nit->pos, "It");
! 			roff_node_delete(mdoc, nit);
! 			break;
! 		}
  
+ 		i = 0;
+ 		for (nch = nit->child; nch != NULL; nch = nch->next) {
+ 			if (nch->type != ROFFT_BODY)
+ 				continue;
+ 			if (i++ && nch->flags & NODE_LINE)
+ 				mandoc_msg(MANDOCERR_TA_LINE, mdoc->parse,
+ 				    nch->line, nch->pos, "Ta");
+ 		}
  		if (i < cols || i > cols + 1)
  			mandoc_vmsg(MANDOCERR_BL_COL,
  			    mdoc->parse, nit->line, nit->pos,
  			    "%d columns, %d cells", cols, i);
+ 		else if (nit->head->next->child != NULL &&
+ 		    nit->head->next->child->line > nit->line)
+ 			mandoc_msg(MANDOCERR_IT_NOARG, mdoc->parse,
+ 			    nit->line, nit->pos, "Bl -column It");
  		break;
  	default:
  		abort();