Ignore unreasonably large spacing modifiers in tbl layouts.

[mandoc.git] / roff_term.c

diff --git a/roff_term.c b/roff_term.c
index 7574102b85aae6d526323b7319bd0719e15094cd..9b251f49a32223b1d6de194a5e7d99c431f4c6aa 100644 (file)
--- a/roff_term.c
+++ b/roff_term.c
@@ -1,6 +1,6 @@
-/*     $Id: roff_term.c,v 1.10 2017/06/08 12:54:58 schwarze Exp $ */
+/* $Id: roff_term.c,v 1.20 2020/06/22 19:20:40 schwarze Exp $ */
 /*
- * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010,2014,2015,2017-2019 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,11 +14,15 @@
  * 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 <assert.h>
-#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "mandoc.h"
 #include "roff.h"
 #include "out.h"
 #include "term.h"
@@ -32,6 +36,7 @@ static        void      roff_term_pre_ce(ROFF_TERM_ARGS);
 static void      roff_term_pre_ft(ROFF_TERM_ARGS);
 static void      roff_term_pre_ll(ROFF_TERM_ARGS);
 static void      roff_term_pre_mc(ROFF_TERM_ARGS);
+static void      roff_term_pre_po(ROFF_TERM_ARGS);
 static void      roff_term_pre_sp(ROFF_TERM_ARGS);
 static void      roff_term_pre_ta(ROFF_TERM_ARGS);
 static void      roff_term_pre_ti(ROFF_TERM_ARGS);
@@ -39,9 +44,13 @@ static       void      roff_term_pre_ti(ROFF_TERM_ARGS);
 static const roff_term_pre_fp roff_term_pre_acts[ROFF_MAX] = {
        roff_term_pre_br,  /* br */
        roff_term_pre_ce,  /* ce */
+       roff_term_pre_br,  /* fi */
        roff_term_pre_ft,  /* ft */
        roff_term_pre_ll,  /* ll */
        roff_term_pre_mc,  /* mc */
+       roff_term_pre_br,  /* nf */
+       roff_term_pre_po,  /* po */
+       roff_term_pre_ce,  /* rj */
        roff_term_pre_sp,  /* sp */
        roff_term_pre_ta,  /* ta */
        roff_term_pre_ti,  /* ti */
@@ -62,66 +71,60 @@ roff_term_pre_br(ROFF_TERM_ARGS)
        if (p->flags & TERMP_BRIND) {
                p->tcol->offset = p->tcol->rmargin;
                p->tcol->rmargin = p->maxrmargin;
+               p->trailspace = 0;
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
+               p->flags |= TERMP_NOSPACE;
        }
 }
 
 static void
 roff_term_pre_ce(ROFF_TERM_ARGS)
 {
-       const struct roff_node  *nch;
-       size_t                   len, lm;
+       const struct roff_node  *nc1, *nc2;
 
        roff_term_pre_br(p, n);
-       lm = p->tcol->offset;
-       n = n->child->next;
-       while (n != NULL) {
-               nch = n;
-               len = 0;
+       p->flags |= n->tok == ROFF_ce ? TERMP_CENTER : TERMP_RIGHT;
+       nc1 = n->child->next;
+       while (nc1 != NULL) {
+               nc2 = nc1;
                do {
-                       if (n->type == ROFFT_TEXT) {
-                               if (len)
-                                       len++;
-                               len += term_strlen(p, nch->string);
-                       }
-                       nch = nch->next;
-               } while (nch != NULL && (n->type != ROFFT_TEXT ||
-                   (n->flags & NODE_LINE) == 0));
-               p->tcol->offset = len >= p->tcol->rmargin ? 0 :
-                   lm + len >= p->tcol->rmargin ? p->tcol->rmargin - len :
-                   (lm + p->tcol->rmargin - len) / 2;
-               while (n != nch) {
-                       if (n->type == ROFFT_TEXT)
-                               term_word(p, n->string);
+                       nc2 = nc2->next;
+               } while (nc2 != NULL && (nc2->type != ROFFT_TEXT ||
+                   (nc2->flags & NODE_LINE) == 0));
+               while (nc1 != nc2) {
+                       if (nc1->type == ROFFT_TEXT)
+                               term_word(p, nc1->string);
                        else
-                               roff_term_pre(p, n);
-                       n = n->next;
+                               roff_term_pre(p, nc1);
+                       nc1 = nc1->next;
                }
                p->flags |= TERMP_NOSPACE;
                term_flushln(p);
        }
-       p->tcol->offset = lm;
+       p->flags &= ~(TERMP_CENTER | TERMP_RIGHT);
 }
 
 static void
 roff_term_pre_ft(ROFF_TERM_ARGS)
 {
-       switch (*n->child->string) {
-       case '4':
-       case '3':
-       case 'B':
+       const char      *cp;
+
+       cp = n->child->string;
+       switch (mandoc_font(cp, (int)strlen(cp))) {
+       case ESCAPE_FONTBOLD:
                term_fontrepl(p, TERMFONT_BOLD);
                break;
-       case '2':
-       case 'I':
+       case ESCAPE_FONTITALIC:
                term_fontrepl(p, TERMFONT_UNDER);
                break;
-       case 'P':
+       case ESCAPE_FONTBI:
+               term_fontrepl(p, TERMFONT_BI);
+               break;
+       case ESCAPE_FONTPREV:
                term_fontlast(p);
                break;
-       case '1':
-       case 'C':
-       case 'R':
+       case ESCAPE_FONTROMAN:
+       case ESCAPE_FONTCW:
                term_fontrepl(p, TERMFONT_NONE);
                break;
        default:
@@ -150,6 +153,28 @@ roff_term_pre_mc(ROFF_TERM_ARGS)
                p->flags |= TERMP_ENDMC;
 }
 
+static void
+roff_term_pre_po(ROFF_TERM_ARGS)
+{
+       struct roffsu    su;
+       static int       po, polast;
+       int              ponew;
+
+       if (n->child != NULL &&
+           a2roffsu(n->child->string, &su, SCALE_EM) != NULL) {
+               ponew = term_hen(p, &su);
+               if (*n->child->string == '+' ||
+                   *n->child->string == '-')
+                       ponew += po;
+       } else
+               ponew = polast;
+       polast = po;
+       po = ponew;
+
+       ponew = po - polast + (int)p->tcol->offset;
+       p->tcol->offset = ponew > 0 ? ponew : 0;
+}
+
 static void
 roff_term_pre_sp(ROFF_TERM_ARGS)
 {
@@ -203,7 +228,7 @@ roff_term_pre_ti(ROFF_TERM_ARGS)
 
        if (a2roffsu(cp, &su, SCALE_EM) == NULL)
                return;
-       len = term_hspan(p, &su) / 24;
+       len = term_hen(p, &su);
 
        if (sign == 0) {
                p->ti = len - p->tcol->offset;