In HTML output, allow switching the desired font for subsequent

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 2978f0c8911392fc1a32743bc89e4905804355cb..87bf42a72ba0a1d150c439323afadfcc315503aa 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_html.c,v 1.323 2019/01/07 07:26:29 schwarze Exp $ */
+/*     $Id: mdoc_html.c,v 1.328 2019/03/01 10:57:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014,2015,2016,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014-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
@@ -294,7 +294,7 @@ html_mdoc(void *arg, const struct roff_meta *mdoc)
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");
-               if (n->type == ROFFT_COMMENT)
+               if (n != NULL && n->type == ROFFT_COMMENT)
                        print_gen_comment(h, n);
                t = print_otag(h, TAG_HEAD, "");
                print_mdoc_head(mdoc, h);
@@ -354,13 +354,12 @@ print_mdoc_node(MDOC_ARGS)
        html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
 
        child = 1;
-       t = h->tag;
-       if (t->tag == TAG_P || t->tag == TAG_PRE)
-               t = t->next;
-
        n->flags &= ~NODE_ENDED;
        switch (n->type) {
        case ROFFT_TEXT:
+               t = h->tag;
+               t->refcnt++;
+
                /* No tables in this mode... */
                assert(NULL == h->tblt);
 
@@ -379,6 +378,8 @@ print_mdoc_node(MDOC_ARGS)
                        h->flags |= HTML_NOSPACE;
                break;
        case ROFFT_EQN:
+               t = h->tag;
+               t->refcnt++;
                print_eqn(h, n->eqn);
                break;
        case ROFFT_TBL:
@@ -395,13 +396,14 @@ print_mdoc_node(MDOC_ARGS)
                 * the "meta" table state.  This will be reopened on the
                 * next table element.
                 */
-               if (h->tblt != NULL) {
+               if (h->tblt != NULL)
                        print_tblclose(h);
-                       t = h->tag;
-               }
                assert(h->tblt == NULL);
+               t = h->tag;
+               t->refcnt++;
                if (n->tok < ROFF_MAX) {
                        roff_html_pre(h, n);
+                       t->refcnt--;
                        print_stagq(h, t);
                        return;
                }
@@ -421,6 +423,7 @@ print_mdoc_node(MDOC_ARGS)
        if (child && n->child != NULL)
                print_mdoc_nodelist(meta, n->child, h);
 
+       t->refcnt--;
        print_stagq(h, t);
 
        switch (n->type) {
@@ -528,8 +531,10 @@ mdoc_sh_pre(MDOC_ARGS)
                html_close_paragraph(h);
                if ((h->oflags & HTML_TOC) == 0 ||
                    h->flags & HTML_TOCDONE ||
-                   n->sec <= SEC_SYNOPSIS)
+                   n->sec <= SEC_SYNOPSIS) {
+                       print_otag(h, TAG_SECTION, "c", "Sh");
                        break;
+               }
                h->flags |= HTML_TOCDONE;
                sc = 0;
                for (sn = n->next; sn != NULL; sn = sn->next)
@@ -570,10 +575,11 @@ mdoc_sh_pre(MDOC_ARGS)
                        print_tagq(h, tsec);
                }
                print_tagq(h, t);
+               print_otag(h, TAG_SECTION, "c", "Sh");
                break;
        case ROFFT_HEAD:
                id = html_make_id(n, 1);
-               print_otag(h, TAG_H1, "cTi", "Sh", id);
+               print_otag(h, TAG_H1, "ci", "Sh", id);
                if (id != NULL)
                        print_otag(h, TAG_A, "chR", "permalink", id);
                break;
@@ -595,6 +601,7 @@ mdoc_ss_pre(MDOC_ARGS)
        switch (n->type) {
        case ROFFT_BLOCK:
                html_close_paragraph(h);
+               print_otag(h, TAG_SECTION, "c", "Ss");
                return 1;
        case ROFFT_HEAD:
                break;
@@ -605,7 +612,7 @@ mdoc_ss_pre(MDOC_ARGS)
        }
 
        id = html_make_id(n, 1);
-       print_otag(h, TAG_H2, "cTi", "Ss", id);
+       print_otag(h, TAG_H2, "ci", "Ss", id);
        if (id != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
        return 1;
@@ -618,7 +625,7 @@ 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);
+       print_otag(h, TAG_CODE, "ci", "Fl", id);
 
        print_text(h, "\\-");
        if (!(n->child == NULL &&
@@ -637,7 +644,7 @@ 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);
+       print_otag(h, TAG_CODE, "ci", "Cm", id);
        return 1;
 }
 
@@ -657,7 +664,7 @@ mdoc_nd_pre(MDOC_ARGS)
        }
        print_text(h, "\\(em");
        /* Cannot use TAG_SPAN because it may contain blocks. */
-       print_otag(h, TAG_DIV, "cT", "Nd");
+       print_otag(h, TAG_DIV, "c", "Nd");
        return 1;
 }
 
@@ -671,7 +678,7 @@ mdoc_nm_pre(MDOC_ARGS)
                print_otag(h, TAG_TD, "");
                /* FALLTHROUGH */
        case ROFFT_ELEM:
-               print_otag(h, TAG_CODE, "cT", "Nm");
+               print_otag(h, TAG_CODE, "c", "Nm");
                return 1;
        case ROFFT_BODY:
                print_otag(h, TAG_TD, "");
@@ -693,11 +700,11 @@ mdoc_xr_pre(MDOC_ARGS)
                return 0;
 
        if (h->base_man1)
-               print_otag(h, TAG_A, "cThM", "Xr",
+               print_otag(h, TAG_A, "chM", "Xr",
                    n->child->string, n->child->next == NULL ?
                    NULL : n->child->next->string);
        else
-               print_otag(h, TAG_A, "cT", "Xr");
+               print_otag(h, TAG_A, "c", "Xr");
 
        n = n->child;
        print_text(h, n->string);
@@ -726,7 +733,7 @@ mdoc_ns_pre(MDOC_ARGS)
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
-       print_otag(h, TAG_VAR, "cT", "Ar");
+       print_otag(h, TAG_VAR, "c", "Ar");
        return 1;
 }
 
@@ -741,7 +748,6 @@ static int
 mdoc_it_pre(MDOC_ARGS)
 {
        const struct roff_node  *bl;
-       struct tag              *t;
        enum mdoc_list           type;
 
        bl = n->parent;
@@ -783,17 +789,6 @@ mdoc_it_pre(MDOC_ARGS)
        case LIST_tag:
                switch (n->type) {
                case ROFFT_HEAD:
-                       if (h->style != NULL && !bl->norm->Bl.comp &&
-                           (n->parent->prev == NULL ||
-                            n->parent->prev->body == NULL ||
-                            n->parent->prev->body->child != NULL)) {
-                               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, "");
                        break;
                case ROFFT_BODY:
@@ -910,14 +905,14 @@ mdoc_ex_pre(MDOC_ARGS)
 static int
 mdoc_st_pre(MDOC_ARGS)
 {
-       print_otag(h, TAG_SPAN, "cT", "St");
+       print_otag(h, TAG_SPAN, "c", "St");
        return 1;
 }
 
 static int
 mdoc_em_pre(MDOC_ARGS)
 {
-       print_otag(h, TAG_I, "cT", "Em");
+       print_otag(h, TAG_I, "c", "Em");
        return 1;
 }
 
@@ -947,7 +942,7 @@ mdoc_sx_pre(MDOC_ARGS)
        char    *id;
 
        id = html_make_id(n, 0);
-       print_otag(h, TAG_A, "cThR", "Sx", id);
+       print_otag(h, TAG_A, "chR", "Sx", id);
        free(id);
        return 1;
 }
@@ -999,7 +994,7 @@ mdoc_bd_pre(MDOC_ARGS)
 static int
 mdoc_pa_pre(MDOC_ARGS)
 {
-       print_otag(h, TAG_SPAN, "cT", "Pa");
+       print_otag(h, TAG_SPAN, "c", "Pa");
        return 1;
 }
 
@@ -1030,7 +1025,7 @@ mdoc_an_pre(MDOC_ARGS)
        if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
                h->flags |= HTML_SPLIT;
 
-       print_otag(h, TAG_SPAN, "cT", "An");
+       print_otag(h, TAG_SPAN, "c", "An");
        return 1;
 }
 
@@ -1038,7 +1033,7 @@ static int
 mdoc_cd_pre(MDOC_ARGS)
 {
        synopsis_pre(h, n);
-       print_otag(h, TAG_CODE, "cT", "Cd");
+       print_otag(h, TAG_CODE, "c", "Cd");
        return 1;
 }
 
@@ -1049,7 +1044,7 @@ 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);
+       print_otag(h, TAG_CODE, "ci", "Dv", id);
        return 1;
 }
 
@@ -1060,7 +1055,7 @@ 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);
+       print_otag(h, TAG_CODE, "ci", "Ev", id);
        return 1;
 }
 
@@ -1077,7 +1072,7 @@ mdoc_er_pre(MDOC_ARGS)
 
        if (id != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
-       print_otag(h, TAG_CODE, "cTi", "Er", id);
+       print_otag(h, TAG_CODE, "ci", "Er", id);
        return 1;
 }
 
@@ -1088,12 +1083,12 @@ mdoc_fa_pre(MDOC_ARGS)
        struct tag              *t;
 
        if (n->parent->tok != MDOC_Fo) {
-               print_otag(h, TAG_VAR, "cT", "Fa");
+               print_otag(h, TAG_VAR, "c", "Fa");
                return 1;
        }
 
        for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_VAR, "cT", "Fa");
+               t = print_otag(h, TAG_VAR, "c", "Fa");
                print_text(h, nn->string);
                print_tagq(h, t);
                if (nn->next) {
@@ -1124,11 +1119,11 @@ mdoc_fd_pre(MDOC_ARGS)
        assert(n->type == ROFFT_TEXT);
 
        if (strcmp(n->string, "#include")) {
-               print_otag(h, TAG_CODE, "cT", "Fd");
+               print_otag(h, TAG_CODE, "c", "Fd");
                return 1;
        }
 
-       print_otag(h, TAG_CODE, "cT", "In");
+       print_otag(h, TAG_CODE, "c", "In");
        print_text(h, n->string);
 
        if (NULL != (n = n->next)) {
@@ -1142,10 +1137,10 @@ mdoc_fd_pre(MDOC_ARGS)
                        cp = strchr(buf, '\0') - 1;
                        if (cp >= buf && (*cp == '>' || *cp == '"'))
                                *cp = '\0';
-                       t = print_otag(h, TAG_A, "cThI", "In", buf);
+                       t = print_otag(h, TAG_A, "chI", "In", buf);
                        free(buf);
                } else
-                       t = print_otag(h, TAG_A, "cT", "In");
+                       t = print_otag(h, TAG_A, "c", "In");
 
                print_text(h, n->string);
                print_tagq(h, t);
@@ -1172,7 +1167,7 @@ mdoc_vt_pre(MDOC_ARGS)
        } else if (n->type == ROFFT_HEAD)
                return 0;
 
-       print_otag(h, TAG_VAR, "cT", "Vt");
+       print_otag(h, TAG_VAR, "c", "Vt");
        return 1;
 }
 
@@ -1180,7 +1175,7 @@ static int
 mdoc_ft_pre(MDOC_ARGS)
 {
        synopsis_pre(h, n);
-       print_otag(h, TAG_VAR, "cT", "Ft");
+       print_otag(h, TAG_VAR, "c", "Ft");
        return 1;
 }
 
@@ -1201,7 +1196,7 @@ mdoc_fn_pre(MDOC_ARGS)
 
        ep = strchr(sp, ' ');
        if (NULL != ep) {
-               t = print_otag(h, TAG_VAR, "cT", "Ft");
+               t = print_otag(h, TAG_VAR, "c", "Ft");
 
                while (ep) {
                        sz = MIN((int)(ep - sp), BUFSIZ - 1);
@@ -1214,7 +1209,7 @@ mdoc_fn_pre(MDOC_ARGS)
                print_tagq(h, t);
        }
 
-       t = print_otag(h, TAG_CODE, "cT", "Fn");
+       t = print_otag(h, TAG_CODE, "c", "Fn");
 
        if (sp)
                print_text(h, sp);
@@ -1227,10 +1222,10 @@ 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, "cTs", "Fa",
+                       t = print_otag(h, TAG_VAR, "cs", "Fa",
                            "white-space", "nowrap");
                else
-                       t = print_otag(h, TAG_VAR, "cT", "Fa");
+                       t = print_otag(h, TAG_VAR, "c", "Fa");
                print_text(h, n->string);
                print_tagq(h, t);
                if (n->next) {
@@ -1303,7 +1298,7 @@ mdoc_lk_pre(MDOC_ARGS)
        descr = link->next;
        if (descr == punct)
                descr = link;  /* no text */
-       t = print_otag(h, TAG_A, "cTh", "Lk", link->string);
+       t = print_otag(h, TAG_A, "ch", "Lk", link->string);
        do {
                if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
                        h->flags |= HTML_NOSPACE;
@@ -1331,7 +1326,7 @@ mdoc_mt_pre(MDOC_ARGS)
                assert(n->type == ROFFT_TEXT);
 
                mandoc_asprintf(&cp, "mailto:%s", n->string);
-               t = print_otag(h, TAG_A, "cTh", "Mt", cp);
+               t = print_otag(h, TAG_A, "ch", "Mt", cp);
                print_text(h, n->string);
                print_tagq(h, t);
                free(cp);
@@ -1359,7 +1354,7 @@ mdoc_fo_pre(MDOC_ARGS)
                return 0;
 
        assert(n->child->string);
-       t = print_otag(h, TAG_CODE, "cT", "Fn");
+       t = print_otag(h, TAG_CODE, "c", "Fn");
        print_text(h, n->child->string);
        print_tagq(h, t);
        return 0;
@@ -1383,7 +1378,7 @@ mdoc_in_pre(MDOC_ARGS)
        struct tag      *t;
 
        synopsis_pre(h, n);
-       print_otag(h, TAG_CODE, "cT", "In");
+       print_otag(h, TAG_CODE, "c", "In");
 
        /*
         * The first argument of the `In' gets special treatment as
@@ -1402,9 +1397,9 @@ mdoc_in_pre(MDOC_ARGS)
                assert(n->type == ROFFT_TEXT);
 
                if (h->base_includes)
-                       t = print_otag(h, TAG_A, "cThI", "In", n->string);
+                       t = print_otag(h, TAG_A, "chI", "In", n->string);
                else
-                       t = print_otag(h, TAG_A, "cT", "In");
+                       t = print_otag(h, TAG_A, "c", "In");
                print_text(h, n->string);
                print_tagq(h, t);
 
@@ -1429,14 +1424,14 @@ 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);
+       print_otag(h, TAG_CODE, "ci", "Ic", id);
        return 1;
 }
 
 static int
 mdoc_va_pre(MDOC_ARGS)
 {
-       print_otag(h, TAG_VAR, "cT", "Va");
+       print_otag(h, TAG_VAR, "c", "Va");
        return 1;
 }
 
@@ -1488,7 +1483,7 @@ mdoc_ms_pre(MDOC_ARGS)
 
        if ((id = cond_id(n)) != NULL)
                print_otag(h, TAG_A, "chR", "permalink", id);
-       print_otag(h, TAG_SPAN, "cTi", "Ms", id);
+       print_otag(h, TAG_SPAN, "ci", "Ms", id);
        return 1;
 }
 
@@ -1521,7 +1516,7 @@ mdoc_rs_pre(MDOC_ARGS)
        case ROFFT_BODY:
                if (n->sec == SEC_SEE_ALSO)
                        print_otag(h, TAG_P, "c", "Pp");
-               print_otag(h, TAG_CITE, "cT", "Rs");
+               print_otag(h, TAG_CITE, "c", "Rs");
                break;
        default:
                abort();
@@ -1554,7 +1549,7 @@ mdoc_li_pre(MDOC_ARGS)
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {
-       print_otag(h, TAG_B, "cT", "Sy");
+       print_otag(h, TAG_B, "c", "Sy");
        return 1;
 }
 
@@ -1564,7 +1559,7 @@ mdoc_lb_pre(MDOC_ARGS)
        if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
                print_otag(h, TAG_BR, "");
 
-       print_otag(h, TAG_SPAN, "cT", "Lb");
+       print_otag(h, TAG_SPAN, "c", "Lb");
        return 1;
 }