From ad3e117e029160522db79d6d01fdb041f48f3ed9 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 28 Jan 2017 22:36:38 +0000 Subject: Simplify usage of print_otag() even more: accept NULL to skip the attribute or format. --- mdoc_html.c | 67 ++++++++++++++++++------------------------------------------- 1 file changed, 20 insertions(+), 47 deletions(-) (limited to 'mdoc_html.c') diff --git a/mdoc_html.c b/mdoc_html.c index ff635059..158c1e7f 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -507,22 +507,18 @@ mdoc_sh_pre(MDOC_ARGS) char *id; switch (n->type) { - case ROFFT_BLOCK: - return 1; + case ROFFT_HEAD: + id = make_id(n); + print_otag(h, TAG_H1, "ci", "Sh", id); + free(id); + break; case ROFFT_BODY: if (n->sec == SEC_AUTHORS) h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT); - return 1; + break; default: break; } - - if ((id = make_id(n)) != NULL) { - print_otag(h, TAG_H1, "ci", "Sh", id); - free(id); - } else - print_otag(h, TAG_H1, "c", "Sh"); - return 1; } @@ -534,12 +530,9 @@ mdoc_ss_pre(MDOC_ARGS) if (n->type != ROFFT_HEAD) return 1; - if ((id = make_id(n)) != NULL) { - print_otag(h, TAG_H2, "ci", "Ss", id); - free(id); - } else - print_otag(h, TAG_H2, "c", "Ss"); - + id = make_id(n); + print_otag(h, TAG_H2, "ci", "Ss", id); + free(id); return 1; } @@ -749,11 +742,8 @@ mdoc_it_pre(MDOC_ARGS) print_otag(h, TAG_B, "c", cattr); break; case ROFFT_BODY: - if (bl->norm->Bl.width == NULL) - print_otag(h, TAG_DD, "c", cattr); - else - print_otag(h, TAG_DD, "cswl", cattr, - bl->norm->Bl.width); + print_otag(h, TAG_DD, "cswl", cattr, + bl->norm->Bl.width); break; default: break; @@ -765,22 +755,16 @@ mdoc_it_pre(MDOC_ARGS) if (h->style != NULL && !bl->norm->Bl.comp && (n->parent->prev == NULL || n->parent->prev->body->child != NULL)) { - if (bl->norm->Bl.width == NULL) - t = print_otag(h, TAG_DT, "c", cattr); - else - t = print_otag(h, TAG_DT, "csWl", - cattr, bl->norm->Bl.width); + t = print_otag(h, TAG_DT, "csWl", + cattr, bl->norm->Bl.width); print_text(h, "\\ "); print_tagq(h, t); t = print_otag(h, TAG_DD, "c", cattr); print_text(h, "\\ "); print_tagq(h, t); } - if (bl->norm->Bl.width == NULL) - print_otag(h, TAG_DT, "c", cattr); - else - print_otag(h, TAG_DT, "csWl", cattr, - bl->norm->Bl.width); + print_otag(h, TAG_DT, "csWl", cattr, + bl->norm->Bl.width); break; case ROFFT_BODY: if (n->child == NULL) { @@ -885,10 +869,7 @@ mdoc_bl_pre(MDOC_ARGS) cattr = "Bl-tag"; if (bl->offs) print_otag(h, TAG_DIV, "cswl", cattr, bl->offs); - if (bl->width == NULL) - print_otag(h, TAG_DL, "c", cattr); - else - print_otag(h, TAG_DL, "cswl", cattr, bl->width); + print_otag(h, TAG_DL, "cswl", cattr, bl->width); return 1; case LIST_column: elemtype = TAG_TABLE; @@ -897,12 +878,7 @@ mdoc_bl_pre(MDOC_ARGS) default: abort(); } - - if (bl->offs) - print_otag(h, elemtype, "cswl", cattr, bl->offs); - else - print_otag(h, elemtype, "c", cattr); - + print_otag(h, elemtype, "cswl", cattr, bl->offs); return 1; } @@ -940,12 +916,9 @@ mdoc_sx_pre(MDOC_ARGS) { char *id; - if ((id = make_id(n)) != NULL) { - print_otag(h, TAG_A, "chR", "Sx", id); - free(id); - } else - print_otag(h, TAG_A, "c", "Sx"); - + id = make_id(n); + print_otag(h, TAG_A, "chR", "Sx", id); + free(id); return 1; } -- cgit