Implement centering and adjustment to the right margin directly in

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index d2983b0ea4009048c48fdc4618deac846f0dbee8..e06576a60a4bf33b6e254e5c216b66700106ebde 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.365 2018/01/13 05:23:18 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.371 2018/12/30 00:49:55 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
-#include "mandoc.h"
 #include "roff.h"
 #include "mdoc.h"
 #include "out.h"
@@ -47,7 +46,7 @@ struct        termpair {
                  const struct roff_meta *meta, \
                  struct roff_node *n
 
-struct termact {
+struct mdoc_term_act {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
@@ -84,6 +83,7 @@ static        void      termp_xx_post(DECL_ARGS);
 
 static int       termp__a_pre(DECL_ARGS);
 static int       termp__t_pre(DECL_ARGS);
+static int       termp_abort_pre(DECL_ARGS);
 static int       termp_an_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
@@ -124,7 +124,7 @@ static      int       termp_vt_pre(DECL_ARGS);
 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
 
-static const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
+static const struct mdoc_term_act mdoc_term_acts[MDOC_MAX - MDOC_Dd] = {
        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
@@ -159,7 +159,7 @@ static      const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
        { termp_nd_pre, NULL }, /* Nd */
        { termp_nm_pre, termp_nm_post }, /* Nm */
        { termp_quote_pre, termp_quote_post }, /* Op */
-       { termp_ft_pre, NULL }, /* Ot */
+       { termp_abort_pre, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */
        { termp_ex_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */
@@ -232,7 +232,7 @@ static      const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
        { termp_under_pre, NULL }, /* Fr */
        { NULL, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */
-       { termp_pp_pre, NULL }, /* Lp */
+       { termp_abort_pre, NULL }, /* Lp */
        { termp_lk_pre, NULL }, /* Lk */
        { termp_under_pre, NULL }, /* Mt */
        { termp_quote_pre, termp_quote_post }, /* Brq */
@@ -246,13 +246,12 @@ static    const struct termact __termacts[MDOC_MAX - MDOC_Dd] = {
        { NULL, termp____post }, /* %U */
        { NULL, NULL }, /* Ta */
 };
-static const struct termact *const termacts = __termacts - MDOC_Dd;
 
 static int      fn_prio;
 
 
 void
-terminal_mdoc(void *arg, const struct roff_man *mdoc)
+terminal_mdoc(void *arg, const struct roff_meta *mdoc)
 {
        struct roff_node        *n;
        struct termp            *p;
@@ -270,8 +269,7 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                        if (n->tok == MDOC_Sh && n->sec == SEC_SYNOPSIS) {
                                if (n->child->next->child != NULL)
                                        print_mdoc_nodelist(p, NULL,
-                                           &mdoc->meta,
-                                           n->child->next->child);
+                                           mdoc, n->child->next->child);
                                term_newln(p);
                                break;
                        }
@@ -281,14 +279,15 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                save_defindent = p->defindent;
                if (p->defindent == 0)
                        p->defindent = 5;
-               term_begin(p, print_mdoc_head, print_mdoc_foot,
-                   &mdoc->meta);
-               while (n != NULL && n->flags & NODE_NOPRT)
+               term_begin(p, print_mdoc_head, print_mdoc_foot, mdoc);
+               while (n != NULL &&
+                   (n->type == ROFFT_COMMENT ||
+                    n->flags & NODE_NOPRT))
                        n = n->next;
                if (n != NULL) {
                        if (n->tok != MDOC_Sh)
                                term_vspace(p);
-                       print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
+                       print_mdoc_nodelist(p, NULL, mdoc, n);
                }
                term_end(p);
                p->defindent = save_defindent;
@@ -308,11 +307,12 @@ print_mdoc_nodelist(DECL_ARGS)
 static void
 print_mdoc_node(DECL_ARGS)
 {
-       int              chld;
+       const struct mdoc_term_act *act;
        struct termpair  npair;
        size_t           offset, rmargin;
+       int              chld;
 
-       if (n->flags & NODE_NOPRT)
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
                return;
 
        chld = 1;
@@ -368,10 +368,10 @@ print_mdoc_node(DECL_ARGS)
                        return;
                }
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
-               if (termacts[n->tok].pre != NULL &&
+               act = mdoc_term_acts + (n->tok - MDOC_Dd);
+               if (act->pre != NULL &&
                    (n->end == ENDBODY_NOT || n->child != NULL))
-                       chld = (*termacts[n->tok].pre)
-                               (p, &npair, meta, n);
+                       chld = (*act->pre)(p, &npair, meta, n);
                break;
        }
 
@@ -389,9 +389,9 @@ print_mdoc_node(DECL_ARGS)
        case ROFFT_EQN:
                break;
        default:
-               if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED)
+               if (act->post == NULL || n->flags & NODE_ENDED)
                        break;
-               (void)(*termacts[n->tok].post)(p, &npair, meta, n);
+               (void)(*act->post)(p, &npair, meta, n);
 
                /*
                 * Explicit end tokens not only call the post
@@ -567,7 +567,9 @@ print_bvspace(struct termp *p,
        /* Do not vspace directly after Ss/Sh. */
 
        nn = n;
-       while (nn->prev != NULL && nn->prev->flags & NODE_NOPRT)
+       while (nn->prev != NULL &&
+           (nn->prev->type == ROFFT_COMMENT ||
+            nn->prev->flags & NODE_NOPRT))
                nn = nn->prev;
        while (nn->prev == NULL) {
                do {
@@ -1489,7 +1491,6 @@ termp_bd_pre(DECL_ARGS)
                case MDOC_Bl:
                case MDOC_D1:
                case MDOC_Dl:
-               case MDOC_Lp:
                case MDOC_Pp:
                        continue;
                default:
@@ -1550,7 +1551,8 @@ termp_ss_pre(DECL_ARGS)
        case ROFFT_BLOCK:
                term_newln(p);
                for (nn = n->prev; nn != NULL; nn = nn->prev)
-                       if ((nn->flags & NODE_NOPRT) == 0)
+                       if (nn->type != ROFFT_COMMENT &&
+                           (nn->flags & NODE_NOPRT) == 0)
                                break;
                if (nn != NULL)
                        term_vspace(p);
@@ -1664,7 +1666,7 @@ termp_quote_pre(DECL_ARGS)
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:
-               term_word(p, "\\(Lq");
+               term_word(p, "\\(lq");
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
@@ -1722,7 +1724,7 @@ termp_quote_post(DECL_ARGS)
                /* FALLTHROUGH */
        case MDOC_Do:
        case MDOC_Dq:
-               term_word(p, "\\(Rq");
+               term_word(p, "\\(rq");
                break;
        case MDOC_En:
                if (n->norm->Es == NULL ||
@@ -2093,3 +2095,9 @@ termp_tag_pre(DECL_ARGS)
                tag_put(n->child->string, 1, p->line);
        return 1;
 }
+
+static int
+termp_abort_pre(DECL_ARGS)
+{
+       abort();
+}