If man(7) next-line scope is open and the line ends with \c,

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 4e72f123aa746010979fb9283dbf3b2471df0008..238fc799340716e95ba593fb3581791bd256bea4 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.301 2018/05/21 00:00:37 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.311 2018/08/17 20:33:37 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,8 +34,6 @@
 #include "html.h"
 #include "main.h"
 
-#define        INDENT           5
-
 #define        MDOC_ARGS         const struct roff_meta *meta, \
                          struct roff_node *n, \
                          struct html *h
@@ -44,7 +42,7 @@
 #define        MIN(a,b)        ((/*CONSTCOND*/(a)<(b))?(a):(b))
 #endif
 
-struct htmlmdoc {
+struct mdoc_html_act {
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);
 };
@@ -121,7 +119,7 @@ static      int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 
-static const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = {
+static const struct mdoc_html_act mdoc_html_acts[MDOC_MAX - MDOC_Dd] = {
        {NULL, NULL}, /* Dd */
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */
@@ -243,7 +241,6 @@ static      const struct htmlmdoc __mdocs[MDOC_MAX - MDOC_Dd] = {
        {mdoc__x_pre, mdoc__x_post}, /* %U */
        {NULL, NULL}, /* Ta */
 };
-static const struct htmlmdoc *const mdocs = __mdocs - MDOC_Dd;
 
 
 /*
@@ -404,9 +401,10 @@ print_mdoc_node(MDOC_ARGS)
                        break;
                }
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
-               if (mdocs[n->tok].pre != NULL &&
+               if (mdoc_html_acts[n->tok - MDOC_Dd].pre != NULL &&
                    (n->end == ENDBODY_NOT || n->child != NULL))
-                       child = (*mdocs[n->tok].pre)(meta, n, h);
+                       child = (*mdoc_html_acts[n->tok - MDOC_Dd].pre)(meta,
+                           n, h);
                break;
        }
 
@@ -425,10 +423,10 @@ print_mdoc_node(MDOC_ARGS)
                break;
        default:
                if (n->tok < ROFF_MAX ||
-                   mdocs[n->tok].post == NULL ||
+                   mdoc_html_acts[n->tok - MDOC_Dd].post == NULL ||
                    n->flags & NODE_ENDED)
                        break;
-               (*mdocs[n->tok].post)(meta, n, h);
+               (*mdoc_html_acts[n->tok - MDOC_Dd].post)(meta, n, h);
                if (n->end != ENDBODY_NOT)
                        n->body->flags |= NODE_ENDED;
                break;
@@ -502,7 +500,7 @@ cond_id(const struct roff_node *n)
             (n->parent->tok == MDOC_Xo &&
              n->parent->parent->prev == NULL &&
              n->parent->parent->parent->tok == MDOC_It)))
-               return html_make_id(n);
+               return html_make_id(n, 1);
        return NULL;
 }
 
@@ -513,11 +511,10 @@ mdoc_sh_pre(MDOC_ARGS)
 
        switch (n->type) {
        case ROFFT_HEAD:
-               id = html_make_id(n);
+               id = html_make_id(n, 1);
                print_otag(h, TAG_H1, "cTi", "Sh", id);
                if (id != NULL)
                        print_otag(h, TAG_A, "chR", "permalink", id);
-               free(id);
                break;
        case ROFFT_BODY:
                if (n->sec == SEC_AUTHORS)
@@ -537,11 +534,10 @@ mdoc_ss_pre(MDOC_ARGS)
        if (n->type != ROFFT_HEAD)
                return 1;
 
-       id = html_make_id(n);
+       id = html_make_id(n, 1);
        print_otag(h, TAG_H2, "cTi", "Ss", id);
        if (id != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
-       free(id);
        return 1;
 }
 
@@ -553,7 +549,6 @@ mdoc_fl_pre(MDOC_ARGS)
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_CODE, "cTi", "Fl", id);
-       free(id);
 
        print_text(h, "\\-");
        if (!(n->child == NULL &&
@@ -573,7 +568,6 @@ mdoc_cm_pre(MDOC_ARGS)
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_CODE, "cTi", "Cm", id);
-       free(id);
        return 1;
 }
 
@@ -699,7 +693,7 @@ mdoc_it_pre(MDOC_ARGS)
                        print_otag(h, TAG_DT, "");
                        break;
                case ROFFT_BODY:
-                       print_otag(h, TAG_DD, "sw*+l", bl->norm->Bl.width);
+                       print_otag(h, TAG_DD, "");
                        break;
                default:
                        break;
@@ -712,20 +706,18 @@ mdoc_it_pre(MDOC_ARGS)
                            (n->parent->prev == NULL ||
                             n->parent->prev->body == NULL ||
                             n->parent->prev->body->child != NULL)) {
-                               t = print_otag(h, TAG_DT, "sw*+-l",
-                                   bl->norm->Bl.width);
+                               t = print_otag(h, TAG_DT, "");
                                print_text(h, "\\ ");
                                print_tagq(h, t);
                                t = print_otag(h, TAG_DD, "");
                                print_text(h, "\\ ");
                                print_tagq(h, t);
                        }
-                       print_otag(h, TAG_DT, "sw*+-l", bl->norm->Bl.width);
+                       print_otag(h, TAG_DT, "");
                        break;
                case ROFFT_BODY:
                        if (n->child == NULL) {
-                               print_otag(h, TAG_DD, "ss?",
-                                   "width", "auto");
+                               print_otag(h, TAG_DD, "s", "width", "auto");
                                print_text(h, "\\ ");
                        } else
                                print_otag(h, TAG_DD, "");
@@ -754,40 +746,20 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
-       char             cattr[21];
-       struct tag      *t;
+       char             cattr[28];
        struct mdoc_bl  *bl;
-       size_t           i;
        enum htmltag     elemtype;
 
-       bl = &n->norm->Bl;
-
        switch (n->type) {
        case ROFFT_BODY:
                return 1;
-
        case ROFFT_HEAD:
-               if (bl->type != LIST_column || bl->ncols == 0)
-                       return 0;
-
-               /*
-                * For each column, print out the <COL> tag with our
-                * suggested width.  The last column gets min-width, as
-                * in terminal mode it auto-sizes to the width of the
-                * screen and we want to preserve that behaviour.
-                */
-
-               t = print_otag(h, TAG_COLGROUP, "");
-               for (i = 0; i < bl->ncols - 1; i++)
-                       print_otag(h, TAG_COL, "sw+w", bl->cols[i]);
-               print_otag(h, TAG_COL, "swW", bl->cols[i]);
-               print_tagq(h, t);
                return 0;
-
        default:
                break;
        }
 
+       bl = &n->norm->Bl;
        switch (bl->type) {
        case LIST_bullet:
                elemtype = TAG_UL;
@@ -824,9 +796,9 @@ mdoc_bl_pre(MDOC_ARGS)
                break;
        case LIST_tag:
                if (bl->offs)
-                       print_otag(h, TAG_DIV, "cswl", "Bl-tag", bl->offs);
-               print_otag(h, TAG_DL, "csw*+l", bl->comp ?
-                   "Bl-tag Bl-compact" : "Bl-tag", bl->width);
+                       print_otag(h, TAG_DIV, "c", "Bd-indent");
+               print_otag(h, TAG_DL, "c", bl->comp ?
+                   "Bl-tag Bl-compact" : "Bl-tag");
                return 1;
        case LIST_column:
                elemtype = TAG_TABLE;
@@ -835,9 +807,11 @@ mdoc_bl_pre(MDOC_ARGS)
        default:
                abort();
        }
+       if (bl->offs != NULL)
+               (void)strlcat(cattr, " Bd-indent", sizeof(cattr));
        if (bl->comp)
                (void)strlcat(cattr, " Bl-compact", sizeof(cattr));
-       print_otag(h, elemtype, "cswl", cattr, bl->offs);
+       print_otag(h, elemtype, "c", cattr);
        return 1;
 }
 
@@ -869,7 +843,7 @@ mdoc_d1_pre(MDOC_ARGS)
        if (n->type != ROFFT_BLOCK)
                return 1;
 
-       print_otag(h, TAG_DIV, "c", "D1");
+       print_otag(h, TAG_DIV, "c", "Bd Bd-indent");
 
        if (n->tok == MDOC_Dl)
                print_otag(h, TAG_CODE, "c", "Li");
@@ -882,7 +856,7 @@ mdoc_sx_pre(MDOC_ARGS)
 {
        char    *id;
 
-       id = html_make_id(n);
+       id = html_make_id(n, 0);
        print_otag(h, TAG_A, "cThR", "Sx", id);
        free(id);
        return 1;
@@ -891,7 +865,7 @@ mdoc_sx_pre(MDOC_ARGS)
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {
-       int                      comp, offs, sv;
+       int                      comp, sv;
        struct roff_node        *nn;
 
        if (n->type == ROFFT_HEAD)
@@ -916,18 +890,9 @@ mdoc_bd_pre(MDOC_ARGS)
 
        if (n->norm->Bd.offs == NULL ||
            ! strcmp(n->norm->Bd.offs, "left"))
-               offs = 0;
-       else if ( ! strcmp(n->norm->Bd.offs, "indent"))
-               offs = INDENT;
-       else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
-               offs = INDENT * 2;
+               print_otag(h, TAG_DIV, "c", "Bd");
        else
-               offs = -1;
-
-       if (offs == -1)
-               print_otag(h, TAG_DIV, "cswl", "Bd", n->norm->Bd.offs);
-       else
-               print_otag(h, TAG_DIV, "cshl", "Bd", offs);
+               print_otag(h, TAG_DIV, "c", "Bd Bd-indent");
 
        if (n->norm->Bd.type != DISP_unfilled &&
            n->norm->Bd.type != DISP_literal)
@@ -986,7 +951,7 @@ mdoc_pa_pre(MDOC_ARGS)
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {
-       print_otag(h, TAG_I, "c", "Ad");
+       print_otag(h, TAG_SPAN, "c", "Ad");
        return 1;
 }
 
@@ -1030,7 +995,6 @@ mdoc_dv_pre(MDOC_ARGS)
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_CODE, "cTi", "Dv", id);
-       free(id);
        return 1;
 }
 
@@ -1042,7 +1006,6 @@ mdoc_ev_pre(MDOC_ARGS)
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_CODE, "cTi", "Ev", id);
-       free(id);
        return 1;
 }
 
@@ -1055,12 +1018,11 @@ mdoc_er_pre(MDOC_ARGS)
            (n->parent->tok == MDOC_It ||
             (n->parent->tok == MDOC_Bq &&
              n->parent->parent->parent->tok == MDOC_It)) ?
-           html_make_id(n) : NULL;
+           html_make_id(n, 1) : NULL;
 
        if (id != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_CODE, "cTi", "Er", id);
-       free(id);
        return 1;
 }
 
@@ -1210,7 +1172,7 @@ mdoc_fn_pre(MDOC_ARGS)
 
        for (n = n->child->next; n; n = n->next) {
                if (NODE_SYNPRETTY & n->flags)
-                       t = print_otag(h, TAG_VAR, "cTss?", "Fa",
+                       t = print_otag(h, TAG_VAR, "cTs", "Fa",
                            "white-space", "nowrap");
                else
                        t = print_otag(h, TAG_VAR, "cT", "Fa");
@@ -1411,7 +1373,6 @@ mdoc_ic_pre(MDOC_ARGS)
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_CODE, "cTi", "Ic", id);
-       free(id);
        return 1;
 }
 
@@ -1452,7 +1413,7 @@ mdoc_bf_pre(MDOC_ARGS)
                cattr = "Bf No";
 
        /* Cannot use TAG_SPAN because it may contain blocks. */
-       print_otag(h, TAG_DIV, "cshl", cattr, 1);
+       print_otag(h, TAG_DIV, "c", cattr);
        return 1;
 }
 
@@ -1463,8 +1424,7 @@ mdoc_ms_pre(MDOC_ARGS)
 
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
-       print_otag(h, TAG_B, "cTi", "Ms", id);
-       free(id);
+       print_otag(h, TAG_SPAN, "cTi", "Ms", id);
        return 1;
 }
 
@@ -1505,7 +1465,6 @@ mdoc_no_pre(MDOC_ARGS)
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_SPAN, "ci", "No", id);
-       free(id);
        return 1;
 }
 
@@ -1517,7 +1476,6 @@ mdoc_li_pre(MDOC_ARGS)
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        print_otag(h, TAG_CODE, "ci", "Li", id);
-       free(id);
        return 1;
 }