If the layout or data of an individual cell in a tbl(7) contains

[mandoc.git] / term_tab.c

diff --git a/term_tab.c b/term_tab.c
index 3e6fa5c119d1da85ea5cc687ad71a8a41012f1b8..84b4c00c6e65f13bee9d8f885392f3b90b287edb 100644 (file)
--- a/term_tab.c
+++ b/term_tab.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: term.c,v 1.119 2017/01/08 18:08:44 schwarze Exp $ */
+/* $Id: term_tab.c,v 1.6 2020/06/22 19:20:40 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -14,6 +14,8 @@
  * 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>
@@ -52,7 +54,7 @@ term_tab_set(const struct termp *p, const char *arg)
                recording_period = 0;
                if (tabs.d == 0) {
                        a2roffsu(".8i", &su, SCALE_IN);
-                       tabs.d = term_hspan(p, &su) / 24;
+                       tabs.d = term_hen(p, &su);
                }
                return;
        }
@@ -68,7 +70,7 @@ 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. */
@@ -81,13 +83,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 +114,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 +124,7 @@ 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];
        }
 }