For -man -Thtml, ignore author-specified .HP widths because they

[mandoc.git] / roff_term.c

diff --git a/roff_term.c b/roff_term.c
index 9786e0a62fe43d3bea21cd622497276009c07e66..b5ec764963ea8f9e4a2576c3873143cd844c0914 100644 (file)
--- a/roff_term.c
+++ b/roff_term.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD$ */
+/*     $Id: roff_term.c,v 1.14 2017/06/24 14:38:33 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <stddef.h>
 
+#include "mandoc.h"
 #include "roff.h"
 #include "out.h"
 #include "term.h"
@@ -28,17 +29,26 @@
 typedef        void    (*roff_term_pre_fp)(ROFF_TERM_ARGS);
 
 static void      roff_term_pre_br(ROFF_TERM_ARGS);
+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);
 
 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_ft,  /* ft */
-       roff_term_pre_ll,  /* ft */
+       roff_term_pre_ll,  /* ll */
+       roff_term_pre_mc,  /* mc */
+       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 */
 };
 
 
@@ -54,12 +64,50 @@ roff_term_pre_br(ROFF_TERM_ARGS)
 {
        term_newln(p);
        if (p->flags & TERMP_BRIND) {
-               p->offset = p->rmargin;
-               p->rmargin = p->maxrmargin;
+               p->tcol->offset = p->tcol->rmargin;
+               p->tcol->rmargin = p->maxrmargin;
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
        }
 }
 
+static void
+roff_term_pre_ce(ROFF_TERM_ARGS)
+{
+       const struct roff_node  *nc1, *nc2;
+       size_t                   len, lm;
+
+       roff_term_pre_br(p, n);
+       lm = p->tcol->offset;
+       nc1 = n->child->next;
+       while (nc1 != NULL) {
+               nc2 = nc1;
+               len = 0;
+               do {
+                       if (nc2->type == ROFFT_TEXT) {
+                               if (len)
+                                       len++;
+                               len += term_strlen(p, nc2->string);
+                       }
+                       nc2 = nc2->next;
+               } while (nc2 != NULL && (nc2->type != ROFFT_TEXT ||
+                   (nc2->flags & NODE_LINE) == 0));
+               p->tcol->offset = len >= p->tcol->rmargin ? 0 :
+                   lm + len >= p->tcol->rmargin ? p->tcol->rmargin - len :
+                   n->tok == ROFF_rj ? p->tcol->rmargin - len :
+                   (lm + p->tcol->rmargin - len) / 2;
+               while (nc1 != nc2) {
+                       if (nc1->type == ROFFT_TEXT)
+                               term_word(p, nc1->string);
+                       else
+                               roff_term_pre(p, nc1);
+                       nc1 = nc1->next;
+               }
+               p->flags |= TERMP_NOSPACE;
+               term_flushln(p);
+       }
+       p->tcol->offset = lm;
+}
+
 static void
 roff_term_pre_ft(ROFF_TERM_ARGS)
 {
@@ -92,6 +140,43 @@ roff_term_pre_ll(ROFF_TERM_ARGS)
        term_setwidth(p, n->child != NULL ? n->child->string : NULL);
 }
 
+static void
+roff_term_pre_mc(ROFF_TERM_ARGS)
+{
+       if (p->col) {
+               p->flags |= TERMP_NOBREAK;
+               term_flushln(p);
+               p->flags &= ~(TERMP_NOBREAK | TERMP_NOSPACE);
+       }
+       if (n->child != NULL) {
+               p->mc = n->child->string;
+               p->flags |= TERMP_NEWMC;
+       } else
+               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)
 {
@@ -99,7 +184,7 @@ roff_term_pre_sp(ROFF_TERM_ARGS)
        int              len;
 
        if (n->child != NULL) {
-               if (a2roffsu(n->child->string, &su, SCALE_VS) == 0)
+               if (a2roffsu(n->child->string, &su, SCALE_VS) == NULL)
                        su.scale = 1.0;
                len = term_vspan(p, &su);
        } else
@@ -121,3 +206,43 @@ roff_term_pre_ta(ROFF_TERM_ARGS)
        for (n = n->child; n != NULL; n = n->next)
                term_tab_set(p, n->string);
 }
+
+static void
+roff_term_pre_ti(ROFF_TERM_ARGS)
+{
+       struct roffsu    su;
+       const char      *cp;
+       int              len, sign;
+
+       roff_term_pre_br(p, n);
+
+       if (n->child == NULL)
+               return;
+       cp = n->child->string;
+       if (*cp == '+') {
+               sign = 1;
+               cp++;
+       } else if (*cp == '-') {
+               sign = -1;
+               cp++;
+       } else
+               sign = 0;
+
+       if (a2roffsu(cp, &su, SCALE_EM) == NULL)
+               return;
+       len = term_hen(p, &su);
+
+       if (sign == 0) {
+               p->ti = len - p->tcol->offset;
+               p->tcol->offset = len;
+       } else if (sign == 1) {
+               p->ti = len;
+               p->tcol->offset += len;
+       } else if ((size_t)len < p->tcol->offset) {
+               p->ti = -len;
+               p->tcol->offset -= len;
+       } else {
+               p->ti = -p->tcol->offset;
+               p->tcol->offset = 0;
+       }
+}