===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/mandoc/tbl.c	2017/06/08 18:11:15	1.22
--- src/usr.bin/mandoc/tbl.c	2017/07/08 17:52:42	1.23
***************
*** 1,4 ****
! /*	$OpenBSD: tbl.c,v 1.22 2017/06/08 18:11:15 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl.c,v 1.23 2017/07/08 17:52:42 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 29,35 ****
  #include "libroff.h"
  
  
! enum rofferr
  tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
  {
  	const char	*cp;
--- 29,35 ----
  #include "libroff.h"
  
  
! void
  tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
  {
  	const char	*cp;
***************
*** 64,70 ****
  		if (*cp == ';') {
  			tbl_option(tbl, ln, p, &pos);
  			if (p[pos] == '\0')
! 				return ROFF_IGN;
  		}
  	}
  
--- 64,70 ----
  		if (*cp == ';') {
  			tbl_option(tbl, ln, p, &pos);
  			if (p[pos] == '\0')
! 				return;
  		}
  	}
  
***************
*** 73,87 ****
  	switch (tbl->part) {
  	case TBL_PART_LAYOUT:
  		tbl_layout(tbl, ln, p, pos);
! 		return ROFF_IGN;
  	case TBL_PART_CDATA:
! 		return tbl_cdata(tbl, ln, p, pos) ? ROFF_TBL : ROFF_IGN;
  	default:
  		break;
  	}
- 
- 	tbl_data(tbl, ln, p, pos);
- 	return ROFF_TBL;
  }
  
  struct tbl_node *
--- 73,86 ----
  	switch (tbl->part) {
  	case TBL_PART_LAYOUT:
  		tbl_layout(tbl, ln, p, pos);
! 		break;
  	case TBL_PART_CDATA:
! 		tbl_cdata(tbl, ln, p, pos);
! 		break;
  	default:
+ 		tbl_data(tbl, ln, p, pos);
  		break;
  	}
  }
  
  struct tbl_node *
***************
*** 158,170 ****
  }
  
  int
! tbl_end(struct tbl_node **tblp)
  {
- 	struct tbl_node	*tbl;
  	struct tbl_span *sp;
- 
- 	tbl = *tblp;
- 	*tblp = NULL;
  
  	if (tbl->part == TBL_PART_CDATA)
  		mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,
--- 157,165 ----
  }
  
  int
! tbl_end(struct tbl_node *tbl)
  {
  	struct tbl_span *sp;
  
  	if (tbl->part == TBL_PART_CDATA)
  		mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse,