]> git.cameronkatri.com Git - mandoc.git/blobdiff - roff_term.c
If man(7) next-line scope is open and the line ends with \c,
[mandoc.git] / roff_term.c
index eaade486fc7fd593259c7b1b6c30a5dcdc65512c..ba673307f083722aaf6a9e3e6b8e5de0e5a059db 100644 (file)
@@ -1,6 +1,6 @@
-/*     $Id: roff_term.c,v 1.8 2017/06/06 15:01:04 schwarze Exp $ */
+/*     $Id: roff_term.c,v 1.15 2018/08/10 20:40:45 schwarze Exp $ */
 /*
- * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010,2014,2015,2017,2018 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
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <stddef.h>
 
+#include "mandoc.h"
 #include "roff.h"
 #include "out.h"
 #include "term.h"
@@ -32,6 +33,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);
@@ -42,6 +44,8 @@ static        const roff_term_pre_fp roff_term_pre_acts[ROFF_MAX] = {
        roff_term_pre_ft,  /* 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 */
@@ -60,8 +64,8 @@ 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);
        }
 }
@@ -69,44 +73,50 @@ roff_term_pre_br(ROFF_TERM_ARGS)
 static void
 roff_term_pre_ce(ROFF_TERM_ARGS)
 {
-       const struct roff_node  *nch;
+       const struct roff_node  *nc1, *nc2;
        size_t                   len, lm;
 
        roff_term_pre_br(p, n);
-       lm = p->offset;
-       n = n->child->next;
-       while (n != NULL) {
-               nch = n;
+       lm = p->tcol->offset;
+       nc1 = n->child->next;
+       while (nc1 != NULL) {
+               nc2 = nc1;
                len = 0;
                do {
-                       if (n->type == ROFFT_TEXT) {
+                       if (nc2->type == ROFFT_TEXT) {
                                if (len)
                                        len++;
-                               len += term_strlen(p, nch->string);
+                               len += term_strlen(p, nc2->string);
                        }
-                       nch = nch->next;
-               } while (nch != NULL && (n->type != ROFFT_TEXT ||
-                   (n->flags & NODE_LINE) == 0));
-               p->offset = len >= p->rmargin ? 0 :
-                   lm + len >= p->rmargin ? p->rmargin - len :
-                   (lm + p->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));
+               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, n);
-                       n = n->next;
+                               roff_term_pre(p, nc1);
+                       nc1 = nc1->next;
                }
                p->flags |= TERMP_NOSPACE;
                term_flushln(p);
        }
-       p->offset = lm;
+       p->tcol->offset = lm;
 }
 
 static void
 roff_term_pre_ft(ROFF_TERM_ARGS)
 {
-       switch (*n->child->string) {
+       const char      *cp;
+
+       if (*(cp = n->child->string) == 'C')
+               cp++;
+
+       switch (*cp) {
        case '4':
        case '3':
        case 'B':
@@ -150,6 +160,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)
 {
@@ -157,7 +189,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
@@ -201,21 +233,21 @@ roff_term_pre_ti(ROFF_TERM_ARGS)
        } else
                sign = 0;
 
-       if (a2roffsu(cp, &su, SCALE_EM) == 0)
+       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->offset;
-               p->offset = len;
+               p->ti = len - p->tcol->offset;
+               p->tcol->offset = len;
        } else if (sign == 1) {
                p->ti = len;
-               p->offset += len;
-       } else if ((size_t)len < p->offset) {
+               p->tcol->offset += len;
+       } else if ((size_t)len < p->tcol->offset) {
                p->ti = -len;
-               p->offset -= len;
+               p->tcol->offset -= len;
        } else {
-               p->ti = -p->offset;
-               p->offset = 0;
+               p->ti = -p->tcol->offset;
+               p->tcol->offset = 0;
        }
 }