===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_layout.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/mandoc/tbl_layout.c	2018/12/14 01:17:46	1.34
--- src/usr.bin/mandoc/tbl_layout.c	2018/12/14 05:17:45	1.35
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_layout.c,v 1.34 2018/12/14 01:17:46 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_layout.c,v 1.35 2018/12/14 05:17:45 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2012, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 84,91 ****
  			(*pos)++;
  			goto mod;
  		}
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, tbl->parse,
! 		    ln, *pos, NULL);
  		return;
  	}
  
--- 84,90 ----
  			(*pos)++;
  			goto mod;
  		}
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, ln, *pos, NULL);
  		return;
  	}
  
***************
*** 113,120 ****
  		cp->flags |= TBL_CELL_ITALIC;
  		goto mod;
  	case 'm':
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse,
! 		    ln, *pos, "m");
  		goto mod;
  	case 'p':
  	case 'v':
--- 112,118 ----
  		cp->flags |= TBL_CELL_ITALIC;
  		goto mod;
  	case 'm':
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, ln, *pos, "m");
  		goto mod;
  	case 'p':
  	case 'v':
***************
*** 157,166 ****
  			cp->vert++;
  		else
  			mandoc_msg(MANDOCERR_TBLLAYOUT_VERT,
! 			    tbl->parse, ln, *pos - 1, NULL);
  		goto mod;
  	default:
! 		mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse,
  		    ln, *pos - 1, "%c", p[*pos - 1]);
  		goto mod;
  	}
--- 155,164 ----
  			cp->vert++;
  		else
  			mandoc_msg(MANDOCERR_TBLLAYOUT_VERT,
! 			    ln, *pos - 1, NULL);
  		goto mod;
  	default:
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR,
  		    ln, *pos - 1, "%c", p[*pos - 1]);
  		goto mod;
  	}
***************
*** 173,179 ****
  	/* Support only one-character font-names for now. */
  
  	if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) {
! 		mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
  		    ln, *pos, "TS %s", p + *pos - 1);
  		if (p[*pos] != '\0')
  			(*pos)++;
--- 171,177 ----
  	/* Support only one-character font-names for now. */
  
  	if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) {
! 		mandoc_msg(MANDOCERR_FT_BAD,
  		    ln, *pos, "TS %s", p + *pos - 1);
  		if (p[*pos] != '\0')
  			(*pos)++;
***************
*** 195,201 ****
  	case 'R':
  		goto mod;
  	default:
! 		mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse,
  		    ln, *pos - 1, "TS f%c", p[*pos - 1]);
  		goto mod;
  	}
--- 193,199 ----
  	case 'R':
  		goto mod;
  	default:
! 		mandoc_msg(MANDOCERR_FT_BAD,
  		    ln, *pos - 1, "TS f%c", p[*pos - 1]);
  		goto mod;
  	}
***************
*** 216,222 ****
  				rp->vert++;
  			else
  				mandoc_msg(MANDOCERR_TBLLAYOUT_VERT,
! 				    tbl->parse, ln, *pos, NULL);
  		}
  		(*pos)++;
  	}
--- 214,220 ----
  				rp->vert++;
  			else
  				mandoc_msg(MANDOCERR_TBLLAYOUT_VERT,
! 				    ln, *pos, NULL);
  		}
  		(*pos)++;
  	}
***************
*** 235,241 ****
  			break;
  
  	if (i == KEYS_MAX) {
! 		mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse,
  		    ln, *pos, "%c", p[*pos]);
  		(*pos)++;
  		goto again;
--- 233,239 ----
  			break;
  
  	if (i == KEYS_MAX) {
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR,
  		    ln, *pos, "%c", p[*pos]);
  		(*pos)++;
  		goto again;
***************
*** 246,259 ****
  
  	if (c == TBL_CELL_SPAN) {
  		if (rp->last == NULL)
! 			mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN,
! 			    tbl->parse, ln, *pos, NULL);
  		else if (rp->last->pos == TBL_CELL_HORIZ ||
  		    rp->last->pos == TBL_CELL_DHORIZ)
  			c = rp->last->pos;
  	} else if (c == TBL_CELL_DOWN && rp == tbl->first_row)
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN,
! 		    tbl->parse, ln, *pos, NULL);
  
  	(*pos)++;
  
--- 244,255 ----
  
  	if (c == TBL_CELL_SPAN) {
  		if (rp->last == NULL)
! 			mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, ln, *pos, NULL);
  		else if (rp->last->pos == TBL_CELL_HORIZ ||
  		    rp->last->pos == TBL_CELL_DHORIZ)
  			c = rp->last->pos;
  	} else if (c == TBL_CELL_DOWN && rp == tbl->first_row)
! 		mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, ln, *pos, NULL);
  
  	(*pos)++;
  
***************
*** 296,302 ****
  			}
  			if (tbl->first_row->first == NULL) {
  				mandoc_msg(MANDOCERR_TBLLAYOUT_NONE,
! 				    tbl->parse, ln, pos, NULL);
  				cell_alloc(tbl, tbl->first_row,
  				    TBL_CELL_LEFT);
  				if (tbl->opts.lvert < tbl->first_row->vert)
--- 292,298 ----
  			}
  			if (tbl->first_row->first == NULL) {
  				mandoc_msg(MANDOCERR_TBLLAYOUT_NONE,
! 				    ln, pos, NULL);
  				cell_alloc(tbl, tbl->first_row,
  				    TBL_CELL_LEFT);
  				if (tbl->opts.lvert < tbl->first_row->vert)