Finally, represent the man(7) .PP and .HP macros by the natural

[mandoc.git] / roff_term.c

diff --git a/roff_term.c b/roff_term.c
index a4d48812d085af9dd1165cd6647c251609697f98..f10bb61d2cddbacc4d4948df92ef34a09bd946d0 100644 (file)
--- a/roff_term.c
+++ b/roff_term.c
@@ -1,6 +1,6 @@
-/*     $Id: roff_term.c,v 1.7 2017/06/04 22:44:15 schwarze Exp $ */
+/*     $Id: roff_term.c,v 1.19 2019/01/04 03:24:33 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -17,8 +17,10 @@
 #include <sys/types.h>
 
 #include <assert.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"
 #include "roff.h"
 #include "out.h"
 #include "term.h"


@@ -28,18 +30,25 @@
 typedef        void    (*roff_term_pre_fp)(ROFF_TERM_ARGS);
 
 static void      roff_term_pre_br(ROFF_TERM_ARGS);
 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_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 */
 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_br,  /* fi */

        roff_term_pre_ft,  /* ft */
        roff_term_pre_ll,  /* ll */
        roff_term_pre_mc,  /* mc */
        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 */
        roff_term_pre_sp,  /* sp */
        roff_term_pre_ta,  /* ta */
        roff_term_pre_ti,  /* ti */


@@ -58,31 +67,62 @@ roff_term_pre_br(ROFF_TERM_ARGS)
 {
        term_newln(p);
        if (p->flags & TERMP_BRIND) {
 {
        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->trailspace = 0;

                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);

+               p->flags |= TERMP_NOSPACE;

        }
 }
 
        }
 }
 

+static void
+roff_term_pre_ce(ROFF_TERM_ARGS)
+{
+       const struct roff_node  *nc1, *nc2;
+
+       roff_term_pre_br(p, n);
+       p->flags |= n->tok == ROFF_ce ? TERMP_CENTER : TERMP_RIGHT;
+       nc1 = n->child->next;
+       while (nc1 != NULL) {
+               nc2 = nc1;
+               do {
+                       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, nc1);
+                       nc1 = nc1->next;
+               }
+               p->flags |= TERMP_NOSPACE;
+               term_flushln(p);
+       }
+       p->flags &= ~(TERMP_CENTER | TERMP_RIGHT);
+}
+

 static void
 roff_term_pre_ft(ROFF_TERM_ARGS)
 {
 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;
                term_fontrepl(p, TERMFONT_BOLD);
                break;

-       case '2':
-       case 'I':
+       case ESCAPE_FONTITALIC:

                term_fontrepl(p, TERMFONT_UNDER);
                break;
                term_fontrepl(p, TERMFONT_UNDER);
                break;

-       case 'P':
+       case ESCAPE_FONTBI:
+               term_fontrepl(p, TERMFONT_BI);
+               break;
+       case ESCAPE_FONTPREV:

                term_fontlast(p);
                break;
                term_fontlast(p);
                break;

-       case '1':
-       case 'C':
-       case 'R':
+       case ESCAPE_FONTROMAN:
+       case ESCAPE_FONTCW:

                term_fontrepl(p, TERMFONT_NONE);
                break;
        default:
                term_fontrepl(p, TERMFONT_NONE);
                break;
        default:


@@ -111,6 +151,28 @@ roff_term_pre_mc(ROFF_TERM_ARGS)
                p->flags |= TERMP_ENDMC;
 }
 
                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)
 {
 static void
 roff_term_pre_sp(ROFF_TERM_ARGS)
 {


@@ -118,7 +180,7 @@ roff_term_pre_sp(ROFF_TERM_ARGS)
        int              len;
 
        if (n->child != NULL) {
        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
                        su.scale = 1.0;
                len = term_vspan(p, &su);
        } else


@@ -162,21 +224,21 @@ roff_term_pre_ti(ROFF_TERM_ARGS)
        } else
                sign = 0;
 
        } else
                sign = 0;
 

-       if (a2roffsu(cp, &su, SCALE_EM) == 0)
+       if (a2roffsu(cp, &su, SCALE_EM) == NULL)

                return;
                return;

-       len = term_hspan(p, &su) / 24;
+       len = term_hen(p, &su);

 
        if (sign == 0) {
 
        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;
        } 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->ti = -len;

-               p->offset -= len;
+               p->tcol->offset -= len;

        } else {
        } else {

-               p->ti = -p->offset;
-               p->offset = 0;
+               p->ti = -p->tcol->offset;
+               p->tcol->offset = 0;

        }
 }
        }
 }