=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.257 retrieving revision 1.260 diff -u -p -r1.257 -r1.260 --- mandoc/mdoc_html.c 2017/01/20 21:37:56 1.257 +++ mandoc/mdoc_html.c 2017/01/21 02:09:51 1.260 @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.257 2017/01/20 21:37:56 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.260 2017/01/21 02:09:51 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze @@ -70,6 +70,7 @@ static void mdoc_bk_post(MDOC_ARGS); static int mdoc_bk_pre(MDOC_ARGS); static int mdoc_bl_pre(MDOC_ARGS); static int mdoc_cd_pre(MDOC_ARGS); +static int mdoc_cm_pre(MDOC_ARGS); static int mdoc_d1_pre(MDOC_ARGS); static int mdoc_dv_pre(MDOC_ARGS); static int mdoc_fa_pre(MDOC_ARGS); @@ -135,7 +136,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_an_pre, NULL}, /* An */ {mdoc_ar_pre, NULL}, /* Ar */ {mdoc_cd_pre, NULL}, /* Cd */ - {mdoc_fl_pre, NULL}, /* Cm */ + {mdoc_cm_pre, NULL}, /* Cm */ {mdoc_dv_pre, NULL}, /* Dv */ {mdoc_er_pre, NULL}, /* Er */ {mdoc_ev_pre, NULL}, /* Ev */ @@ -545,13 +546,7 @@ mdoc_ss_pre(MDOC_ARGS) static int mdoc_fl_pre(MDOC_ARGS) { - print_otag(h, TAG_B, "c", "flag"); - - /* `Cm' has no leading hyphen. */ - - if (MDOC_Cm == n->tok) - return 1; - + print_otag(h, TAG_B, "c", "Fl"); print_text(h, "\\-"); if (!(n->child == NULL && @@ -564,6 +559,13 @@ mdoc_fl_pre(MDOC_ARGS) } static int +mdoc_cm_pre(MDOC_ARGS) +{ + print_otag(h, TAG_B, "c", "Cm"); + return 1; +} + +static int mdoc_nd_pre(MDOC_ARGS) { if (n->type != ROFFT_BODY) @@ -572,7 +574,7 @@ mdoc_nd_pre(MDOC_ARGS) /* XXX: this tag in theory can contain block elements. */ print_text(h, "\\(em"); - print_otag(h, TAG_SPAN, "c", "desc"); + print_otag(h, TAG_SPAN, "c", "Nd"); return 1; } @@ -586,7 +588,7 @@ mdoc_nm_pre(MDOC_ARGS) print_otag(h, TAG_TD, ""); /* FALLTHROUGH */ case ROFFT_ELEM: - print_otag(h, TAG_B, "c", "name"); + print_otag(h, TAG_B, "c", "Nm"); if (n->child == NULL && meta->name != NULL) print_text(h, meta->name); return 1; @@ -598,7 +600,7 @@ mdoc_nm_pre(MDOC_ARGS) } synopsis_pre(h, n); - print_otag(h, TAG_TABLE, "c", "synopsis"); + print_otag(h, TAG_TABLE, "c", "Nm"); for (len = 0, n = n->head->child; n; n = n->next) if (n->type == ROFFT_TEXT) @@ -654,14 +656,14 @@ mdoc_ns_pre(MDOC_ARGS) static int mdoc_ar_pre(MDOC_ARGS) { - print_otag(h, TAG_I, "c", "arg"); + print_otag(h, TAG_I, "c", "Ar"); return 1; } static int mdoc_xx_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "unix"); + print_otag(h, TAG_SPAN, "c", "Ux"); return 1; } @@ -723,8 +725,10 @@ mdoc_it_pre(MDOC_ARGS) case ROFFT_HEAD: return 0; case ROFFT_BODY: - print_otag(h, TAG_LI, "csvt", cattr, - !bl->norm->Bl.comp); + if (bl->norm->Bl.comp) + print_otag(h, TAG_LI, "csvt", cattr, 0); + else + print_otag(h, TAG_LI, "c", cattr); break; default: break; @@ -737,8 +741,10 @@ mdoc_it_pre(MDOC_ARGS) case LIST_tag: switch (n->type) { case ROFFT_HEAD: - print_otag(h, TAG_DT, "csvt", cattr, - !bl->norm->Bl.comp); + if (bl->norm->Bl.comp) + print_otag(h, TAG_DT, "csvt", cattr, 0); + else + print_otag(h, TAG_DT, "c", cattr); if (type == LIST_diag) print_otag(h, TAG_B, "c", cattr); break; @@ -758,8 +764,10 @@ mdoc_it_pre(MDOC_ARGS) case ROFFT_HEAD: break; case ROFFT_BODY: - print_otag(h, TAG_TD, "csvt", cattr, - !bl->norm->Bl.comp); + if (bl->norm->Bl.comp) + print_otag(h, TAG_TD, "csvt", cattr, 0); + else + print_otag(h, TAG_TD, "c", cattr); break; default: print_otag(h, TAG_TR, "c", cattr); @@ -849,10 +857,9 @@ mdoc_bl_pre(MDOC_ARGS) } if (n->norm->Bl.offs) - print_otag(h, elemtype, "csvtvbwl", cattr, 0, 0, - n->norm->Bl.offs); + print_otag(h, elemtype, "cswl", cattr, n->norm->Bl.offs); else - print_otag(h, elemtype, "csvtvb", cattr, 0, 0); + print_otag(h, elemtype, "c", cattr); return 1; } @@ -868,7 +875,7 @@ mdoc_ex_pre(MDOC_ARGS) static int mdoc_em_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "emph"); + print_otag(h, TAG_I, "c", "Em"); return 1; } @@ -991,14 +998,14 @@ mdoc_bd_pre(MDOC_ARGS) static int mdoc_pa_pre(MDOC_ARGS) { - print_otag(h, TAG_I, "c", "file"); + print_otag(h, TAG_I, "c", "Pa"); return 1; } static int mdoc_ad_pre(MDOC_ARGS) { - print_otag(h, TAG_I, "c", "addr"); + print_otag(h, TAG_I, "c", "Ad"); return 1; } @@ -1022,7 +1029,7 @@ mdoc_an_pre(MDOC_ARGS) if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT)) h->flags |= HTML_SPLIT; - print_otag(h, TAG_SPAN, "c", "author"); + print_otag(h, TAG_SPAN, "c", "An"); return 1; } @@ -1030,28 +1037,28 @@ static int mdoc_cd_pre(MDOC_ARGS) { synopsis_pre(h, n); - print_otag(h, TAG_B, "c", "config"); + print_otag(h, TAG_B, "c", "Cd"); return 1; } static int mdoc_dv_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "define"); + print_otag(h, TAG_CODE, "c", "Dv"); return 1; } static int mdoc_ev_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "env"); + print_otag(h, TAG_CODE, "c", "Ev"); return 1; } static int mdoc_er_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "errno"); + print_otag(h, TAG_CODE, "c", "Er"); return 1; } @@ -1062,12 +1069,12 @@ mdoc_fa_pre(MDOC_ARGS) struct tag *t; if (n->parent->tok != MDOC_Fo) { - print_otag(h, TAG_I, "c", "farg"); + print_otag(h, TAG_I, "c", "Fa"); return 1; } for (nn = n->child; nn; nn = nn->next) { - t = print_otag(h, TAG_I, "c", "farg"); + t = print_otag(h, TAG_I, "c", "Fa"); print_text(h, nn->string); print_tagq(h, t); if (nn->next) { @@ -1098,11 +1105,11 @@ mdoc_fd_pre(MDOC_ARGS) assert(n->type == ROFFT_TEXT); if (strcmp(n->string, "#include")) { - print_otag(h, TAG_B, "c", "macro"); + print_otag(h, TAG_B, "c", "Fd"); return 1; } - print_otag(h, TAG_B, "c", "includes"); + print_otag(h, TAG_B, "c", "In"); print_text(h, n->string); if (NULL != (n = n->next)) { @@ -1116,10 +1123,10 @@ mdoc_fd_pre(MDOC_ARGS) cp = strchr(buf, '\0') - 1; if (cp >= buf && (*cp == '>' || *cp == '"')) *cp = '\0'; - t = print_otag(h, TAG_A, "chI", "link-includes", buf); + t = print_otag(h, TAG_A, "chI", "In", buf); free(buf); } else - t = print_otag(h, TAG_A, "c", "link-includes"); + t = print_otag(h, TAG_A, "c", "In"); print_text(h, n->string); print_tagq(h, t); @@ -1146,7 +1153,7 @@ mdoc_vt_pre(MDOC_ARGS) } else if (n->type == ROFFT_HEAD) return 0; - print_otag(h, TAG_SPAN, "c", "type"); + print_otag(h, TAG_I, "c", "Vt"); return 1; } @@ -1154,7 +1161,7 @@ static int mdoc_ft_pre(MDOC_ARGS) { synopsis_pre(h, n); - print_otag(h, TAG_I, "c", "ftype"); + print_otag(h, TAG_I, "c", "Ft"); return 1; } @@ -1175,7 +1182,7 @@ mdoc_fn_pre(MDOC_ARGS) ep = strchr(sp, ' '); if (NULL != ep) { - t = print_otag(h, TAG_I, "c", "ftype"); + t = print_otag(h, TAG_I, "c", "Ft"); while (ep) { sz = MIN((int)(ep - sp), BUFSIZ - 1); @@ -1188,7 +1195,7 @@ mdoc_fn_pre(MDOC_ARGS) print_tagq(h, t); } - t = print_otag(h, TAG_B, "c", "fname"); + t = print_otag(h, TAG_B, "c", "Fn"); if (sp) print_text(h, sp); @@ -1201,10 +1208,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_I, "css?", "farg", + t = print_otag(h, TAG_I, "css?", "Fa", "white-space", "nowrap"); else - t = print_otag(h, TAG_I, "c", "farg"); + t = print_otag(h, TAG_I, "c", "Fa"); print_text(h, n->string); print_tagq(h, t); if (n->next) { @@ -1290,7 +1297,7 @@ mdoc_lk_pre(MDOC_ARGS) assert(n->type == ROFFT_TEXT); - print_otag(h, TAG_A, "ch", "link-ext", n->string); + print_otag(h, TAG_A, "ch", "Lk", n->string); if (NULL == n->next) print_text(h, n->string); @@ -1311,7 +1318,7 @@ mdoc_mt_pre(MDOC_ARGS) assert(n->type == ROFFT_TEXT); mandoc_asprintf(&cp, "mailto:%s", n->string); - t = print_otag(h, TAG_A, "ch", "link-mail", cp); + t = print_otag(h, TAG_A, "ch", "Mt", cp); print_text(h, n->string); print_tagq(h, t); free(cp); @@ -1339,7 +1346,7 @@ mdoc_fo_pre(MDOC_ARGS) return 0; assert(n->child->string); - t = print_otag(h, TAG_B, "c", "fname"); + t = print_otag(h, TAG_B, "c", "Fn"); print_text(h, n->child->string); print_tagq(h, t); return 0; @@ -1363,7 +1370,7 @@ mdoc_in_pre(MDOC_ARGS) struct tag *t; synopsis_pre(h, n); - print_otag(h, TAG_B, "c", "includes"); + print_otag(h, TAG_B, "c", "In"); /* * The first argument of the `In' gets special treatment as @@ -1382,10 +1389,9 @@ mdoc_in_pre(MDOC_ARGS) assert(n->type == ROFFT_TEXT); if (h->base_includes) - t = print_otag(h, TAG_A, "chI", "link-includes", - n->string); + t = print_otag(h, TAG_A, "chI", "In", n->string); else - t = print_otag(h, TAG_A, "c", "link-includes"); + t = print_otag(h, TAG_A, "c", "In"); print_text(h, n->string); print_tagq(h, t); @@ -1406,14 +1412,14 @@ mdoc_in_pre(MDOC_ARGS) static int mdoc_ic_pre(MDOC_ARGS) { - print_otag(h, TAG_B, "c", "cmd"); + print_otag(h, TAG_B, "c", "Ic"); return 1; } static int mdoc_va_pre(MDOC_ARGS) { - print_otag(h, TAG_B, "c", "var"); + print_otag(h, TAG_I, "c", "Va"); return 1; } @@ -1438,9 +1444,9 @@ mdoc_bf_pre(MDOC_ARGS) return 1; if (FONT_Em == n->norm->Bf.font) - cattr = "emph"; + cattr = "Em"; else if (FONT_Sy == n->norm->Bf.font) - cattr = "symb"; + cattr = "Sy"; else if (FONT_Li == n->norm->Bf.font) cattr = "Li"; else @@ -1458,7 +1464,7 @@ mdoc_bf_pre(MDOC_ARGS) static int mdoc_ms_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "symb"); + print_otag(h, TAG_B, "c", "Ms"); return 1; } @@ -1494,7 +1500,7 @@ mdoc_rs_pre(MDOC_ARGS) static int mdoc_no_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "none"); + print_otag(h, TAG_SPAN, "c", "No"); return 1; } @@ -1508,7 +1514,7 @@ mdoc_li_pre(MDOC_ARGS) static int mdoc_sy_pre(MDOC_ARGS) { - print_otag(h, TAG_SPAN, "c", "symb"); + print_otag(h, TAG_B, "c", "Sy"); return 1; } @@ -1518,7 +1524,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, "c", "lib"); + print_otag(h, TAG_SPAN, "c", "Lb"); return 1; } @@ -1657,7 +1663,7 @@ mdoc_quote_pre(MDOC_ARGS) case MDOC_Op: print_text(h, "\\(lB"); h->flags |= HTML_NOSPACE; - print_otag(h, TAG_SPAN, "c", "opt"); + print_otag(h, TAG_SPAN, "c", "Op"); break; case MDOC_En: if (NULL == n->norm->Es ||