===================================================================
RCS file: /cvs/mandoc/term_tab.c,v
retrieving revision 1.1
retrieving revision 1.7
diff -u -p -r1.1 -r1.7
--- mandoc/term_tab.c	2017/05/07 17:31:45	1.1
+++ mandoc/term_tab.c	2021/10/04 18:56:31	1.7
@@ -1,6 +1,6 @@
-/*	$OpenBSD: term_tab.c,v 1.1 2017/05/07 17:31:45 schwarze Exp $ */
+/* $Id: term_tab.c,v 1.7 2021/10/04 18:56:31 schwarze Exp $ */
 /*
- * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2017, 2021 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,9 +14,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "mandoc_aux.h"
 #include "out.h"
@@ -31,6 +35,7 @@ struct tablist {
 static struct {
 	struct tablist	 a;	/* All tab positions for lookup. */
 	struct tablist	 p;	/* Periodic tab positions to add. */
+	struct tablist	*r;	/* Tablist currently being recorded. */
 	size_t		 d;	/* Default tab width in units of n. */
 } tabs;
 
@@ -38,8 +43,6 @@ static struct {
 void
 term_tab_set(const struct termp *p, const char *arg)
 {
-	static int	 recording_period;
-
 	struct roffsu	 su;
 	struct tablist	*tl;
 	size_t		 pos;
@@ -49,15 +52,15 @@ term_tab_set(const struct termp *p, const char *arg)
 
 	if (arg == NULL) {
 		tabs.a.n = tabs.p.n = 0;
-		recording_period = 0;
+		tabs.r = &tabs.a;
 		if (tabs.d == 0) {
 			a2roffsu(".8i", &su, SCALE_IN);
-			tabs.d = term_hspan(p, &su) / 24;
+			tabs.d = term_hen(p, &su);
 		}
 		return;
 	}
 	if (arg[0] == 'T' && arg[1] == '\0') {
-		recording_period = 1;
+		tabs.r = &tabs.p;
 		return;
 	}
 
@@ -68,12 +71,12 @@ term_tab_set(const struct termp *p, const char *arg)
 		arg++;
 	} else
 		add = 0;
-	if (a2roffsu(arg, &su, SCALE_EM) == 0)
+	if (a2roffsu(arg, &su, SCALE_EM) == NULL)
 		return;
 
 	/* Select the list, and extend it if it is full. */
 
-	tl = recording_period ? &tabs.p : &tabs.a;
+	tl = tabs.r;
 	if (tl->n >= tl->s) {
 		tl->s += 8;
 		tl->t = mandoc_reallocarray(tl->t, tl->s, sizeof(*tl->t));
@@ -81,13 +84,28 @@ term_tab_set(const struct termp *p, const char *arg)
 
 	/* Append the new position. */
 
-	pos = term_hspan(p, &su);
+	pos = term_hen(p, &su);
 	tl->t[tl->n] = pos;
 	if (add && tl->n)
 		tl->t[tl->n] += tl->t[tl->n - 1];
 	tl->n++;
 }
 
+/*
+ * Simplified version without a parser,
+ * never incremental, never periodic, for use by tbl(7).
+ */
+void
+term_tab_iset(size_t inc)
+{
+	if (tabs.a.n >= tabs.a.s) {
+		tabs.a.s += 8;
+		tabs.a.t = mandoc_reallocarray(tabs.a.t, tabs.a.s,
+		    sizeof(*tabs.a.t));
+	}
+	tabs.a.t[tabs.a.n++] = inc;
+}
+
 size_t
 term_tab_next(size_t prev)
 {
@@ -97,10 +115,6 @@ term_tab_next(size_t prev)
 		if (i == tabs.a.n) {
 			if (tabs.p.n == 0)
 				return prev;
-/*
-				return i ? prev :
-				    (prev / tabs.d + 1) * tabs.d;
- */
 			tabs.a.n += tabs.p.n;
 			if (tabs.a.s < tabs.a.n) {
 				tabs.a.s = tabs.a.n;
@@ -111,7 +125,16 @@ term_tab_next(size_t prev)
 				tabs.a.t[i + j] = tabs.p.t[j] +
 				    (i ? tabs.a.t[i - 1] : 0);
 		}
-		if (prev < tabs.a.t[i] / 24)
-			return tabs.a.t[i] / 24;
+		if (prev < tabs.a.t[i])
+			return tabs.a.t[i];
 	}
+}
+
+void
+term_tab_free(void)
+{
+	free(tabs.a.t);
+	free(tabs.p.t);
+	memset(&tabs, 0, sizeof(tabs));
+	tabs.r = &tabs.a;
 }