=================================================================== RCS file: /cvs/mandoc/man_html.c,v retrieving revision 1.183 retrieving revision 1.186 diff -u -p -r1.183 -r1.186 --- mandoc/man_html.c 2022/07/06 14:34:59 1.183 +++ mandoc/man_html.c 2023/10/18 16:11:33 1.186 @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.183 2022/07/06 14:34:59 schwarze Exp $ */ +/* $Id: man_html.c,v 1.186 2023/10/18 16:11:33 schwarze Exp $ */ /* * Copyright (c) 2013-2015,2017-2020,2022 Ingo Schwarze * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons @@ -60,7 +60,6 @@ static int man_SH_pre(MAN_ARGS); static int man_SM_pre(MAN_ARGS); static int man_SY_pre(MAN_ARGS); static int man_UR_pre(MAN_ARGS); -static int man_abort_pre(MAN_ARGS); static int man_alt_pre(MAN_ARGS); static int man_ign_pre(MAN_ARGS); static int man_in_pre(MAN_ARGS); @@ -75,9 +74,9 @@ static const struct man_html_act man_html_acts[MAN_MAX { man_SH_pre, NULL }, /* SS */ { man_IP_pre, NULL }, /* TP */ { man_IP_pre, NULL }, /* TQ */ - { man_abort_pre, NULL }, /* LP */ + { man_PP_pre, NULL }, /* LP */ { man_PP_pre, NULL }, /* PP */ - { man_abort_pre, NULL }, /* P */ + { man_PP_pre, NULL }, /* P */ { man_IP_pre, NULL }, /* IP */ { man_PP_pre, NULL }, /* HP */ { man_SM_pre, NULL }, /* SM */ @@ -271,7 +270,7 @@ man_root_pre(const struct roff_meta *man, struct html mandoc_asprintf(&title, "%s(%s)", man->title, man->msec); t = print_otag(h, TAG_DIV, "cr?", "head", "doc-pageheader", - "aria-label", "manual header line"); + "aria-label", "Manual header line"); print_otag(h, TAG_SPAN, "c", "head-ltitle"); print_text(h, title); @@ -294,7 +293,7 @@ man_root_post(const struct roff_meta *man, struct html struct tag *t; t = print_otag(h, TAG_DIV, "cr?", "foot", "doc-pagefooter", - "aria-label", "manual footer line"); + "aria-label", "Manual footer line"); print_otag(h, TAG_SPAN, "c", "foot-left"); print_stagq(h, t); @@ -406,7 +405,7 @@ man_PP_pre(MAN_ARGS) if (n->child != NULL && (n->child->flags & NODE_NOFILL) == 0) print_otag(h, TAG_P, "c", - n->tok == MAN_PP ? "Pp" : "Pp HP"); + n->tok == MAN_HP ? "Pp HP" : "Pp"); break; default: abort(); @@ -434,10 +433,12 @@ list_continues(const struct roff_node *n1, const struc s2 = n2 == NULL ? "" : n2->string; c1 = strcmp(s1, "*") == 0 ? '*' : strcmp(s1, "\\-") == 0 ? '-' : - strcmp(s1, "\\(bu") == 0 ? 'b' : ' '; + strcmp(s1, "\\(bu") == 0 ? 'b' : + strcmp(s1, "\\[bu]") == 0 ? 'b' : ' '; c2 = strcmp(s2, "*") == 0 ? '*' : strcmp(s2, "\\-") == 0 ? '-' : - strcmp(s2, "\\(bu") == 0 ? 'b' : ' '; + strcmp(s2, "\\(bu") == 0 ? 'b' : + strcmp(s2, "\\[bu]") == 0 ? 'b' : ' '; return c1 != c2 ? '\0' : c1 == 'b' ? '*' : c1; } @@ -634,10 +635,4 @@ man_UR_pre(MAN_ARGS) print_man_nodelist(man, n->child, h); return 0; -} - -static int -man_abort_pre(MAN_ARGS) -{ - abort(); }