===================================================================
RCS file: /cvs/mandoc/tbl_opts.c,v
retrieving revision 1.19
retrieving revision 1.24
diff -u -p -r1.19 -r1.24
--- mandoc/tbl_opts.c	2015/01/28 15:03:45	1.19
+++ mandoc/tbl_opts.c	2018/12/14 05:18:03	1.24
@@ -1,4 +1,4 @@
-/*	$Id: tbl_opts.c,v 1.19 2015/01/28 15:03:45 schwarze Exp $ */
+/*	$Id: tbl_opts.c,v 1.24 2018/12/14 05:18:03 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -25,8 +25,9 @@
 #include <string.h>
 
 #include "mandoc.h"
+#include "tbl.h"
 #include "libmandoc.h"
-#include "libroff.h"
+#include "tbl_int.h"
 
 #define	KEY_DPOINT	0
 #define	KEY_DELIM	1
@@ -80,7 +81,8 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *
 
 	switch (key) {
 	case KEY_DELIM:
-		mandoc_msg(MANDOCERR_TBLEQN, tbl->parse, ln, *pos, NULL);
+		mandoc_msg(MANDOCERR_TBLOPT_EQN,
+		    ln, *pos, "%.*s", len, p + *pos);
 		want = 2;
 		break;
 	case KEY_TAB:
@@ -98,16 +100,14 @@ arg(struct tbl_node *tbl, int ln, const char *p, int *
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (len == 0)
-		mandoc_msg(MANDOCERR_TBLOPT_NOARG,
-		    tbl->parse, ln, *pos, keys[key].name);
+		mandoc_msg(MANDOCERR_TBLOPT_NOARG, ln, *pos,
+		    "%s", keys[key].name);
 	else if (want && len != want)
-		mandoc_vmsg(MANDOCERR_TBLOPT_ARGSZ,
-		    tbl->parse, ln, *pos, "%s want %d have %d",
-		    keys[key].name, want, len);
+		mandoc_msg(MANDOCERR_TBLOPT_ARGSZ, ln, *pos,
+		    "%s want %d have %d", keys[key].name, want, len);
 
 	*pos += len;
 	if (p[*pos] == ')')
@@ -141,8 +141,8 @@ tbl_option(struct tbl_node *tbl, int ln, const char *p
 			len++;
 
 		if (len == 0) {
-			mandoc_vmsg(MANDOCERR_TBLOPT_ALPHA,
-			    tbl->parse, ln, pos, "%c", p[pos]);
+			mandoc_msg(MANDOCERR_TBLOPT_ALPHA,
+			    ln, pos, "%c", p[pos]);
 			pos++;
 			continue;
 		}
@@ -156,7 +156,7 @@ tbl_option(struct tbl_node *tbl, int ln, const char *p
 			i++;
 
 		if (i == KEY_MAXKEYS) {
-			mandoc_vmsg(MANDOCERR_TBLOPT_BAD, tbl->parse,
+			mandoc_msg(MANDOCERR_TBLOPT_BAD,
 			    ln, pos, "%.*s", len, p + pos);
 			pos += len;
 			continue;