diff options
| -rw-r--r-- | html.c | 8 | ||||
| -rw-r--r-- | mandoc.css | 34 | ||||
| -rw-r--r-- | mdoc_html.c | 22 |
3 files changed, 43 insertions, 21 deletions
@@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.222 2018/05/01 23:36:55 schwarze Exp $ */ +/* $Id: html.c,v 1.223 2018/05/08 17:52:55 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> @@ -186,6 +186,12 @@ print_gen_head(struct html *h) print_text(h, "td.head-vol { text-align: center; }"); print_endline(h); print_text(h, "div.Pp { margin: 1ex 0ex; }"); + print_endline(h); + print_text(h, "code.Nm, code.Fl, code.Cm, code.Ic, " + "code.In, code.Fd, code.Fn,"); + print_endline(h); + print_text(h, "code.Cd { font-weight: bold; " + "font-family: inherit; }"); print_tagq(h, t); } @@ -1,4 +1,4 @@ -/* $Id: mandoc.css,v 1.23 2018/04/24 00:36:52 schwarze Exp $ */ +/* $Id: mandoc.css,v 1.24 2018/05/08 17:52:55 schwarze Exp $ */ /* * Standard style sheet for mandoc(1) -Thtml and man.cgi(8). */ @@ -145,13 +145,21 @@ table.tbl { } /* Semantic markup for command line utilities. */ table.Nm { } -b.Nm { font-style: normal; } -b.Fl { font-style: normal; } -b.Cm { font-style: normal; } +code.Nm { font-style: normal; + font-weight: bold; + font-family: inherit; } +code.Fl { font-style: normal; + font-weight: bold; + font-family: inherit; } +code.Cm { font-style: normal; + font-weight: bold; + font-family: inherit; } var.Ar { font-style: italic; font-weight: normal; } span.Op { } -b.Ic { font-style: normal; } +code.Ic { font-style: normal; + font-weight: bold; + font-family: inherit; } code.Ev { font-style: normal; font-weight: normal; font-family: monospace; } @@ -160,12 +168,18 @@ i.Pa { font-weight: normal; } /* Semantic markup for function libraries. */ span.Lb { } -b.In { font-style: normal; } +code.In { font-style: normal; + font-weight: bold; + font-family: inherit; } a.In { } -b.Fd { font-style: normal; } +code.Fd { font-style: normal; + font-weight: bold; + font-family: inherit; } var.Ft { font-style: italic; font-weight: normal; } -b.Fn { font-style: normal; } +code.Fn { font-style: normal; + font-weight: bold; + font-family: inherit; } var.Fa { font-style: italic; font-weight: normal; } var.Vt { font-style: italic; @@ -184,7 +198,9 @@ code.Er { font-style: normal; span.An { } a.Lk { } a.Mt { } -b.Cd { font-style: normal; } +code.Cd { font-style: normal; + font-weight: bold; + font-family: inherit; } i.Ad { font-weight: normal; } b.Ms { font-style: normal; } span.St { } diff --git a/mdoc_html.c b/mdoc_html.c index a6df4700..9c7c0ec2 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.297 2018/04/24 00:36:52 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.298 2018/05/08 17:52:55 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -552,7 +552,7 @@ mdoc_fl_pre(MDOC_ARGS) if ((id = cond_id(n)) != NULL) print_otag(h, TAG_A, "chR", "permalink", id); - print_otag(h, TAG_B, "cTi", "Fl", id); + print_otag(h, TAG_CODE, "cTi", "Fl", id); free(id); print_text(h, "\\-"); @@ -572,7 +572,7 @@ mdoc_cm_pre(MDOC_ARGS) if ((id = cond_id(n)) != NULL) print_otag(h, TAG_A, "chR", "permalink", id); - print_otag(h, TAG_B, "cTi", "Cm", id); + print_otag(h, TAG_CODE, "cTi", "Cm", id); free(id); return 1; } @@ -598,7 +598,7 @@ mdoc_nm_pre(MDOC_ARGS) print_otag(h, TAG_TD, ""); /* FALLTHROUGH */ case ROFFT_ELEM: - print_otag(h, TAG_B, "cT", "Nm"); + print_otag(h, TAG_CODE, "cT", "Nm"); return 1; case ROFFT_BODY: print_otag(h, TAG_TD, ""); @@ -1060,7 +1060,7 @@ static int mdoc_cd_pre(MDOC_ARGS) { synopsis_pre(h, n); - print_otag(h, TAG_B, "cT", "Cd"); + print_otag(h, TAG_CODE, "cT", "Cd"); return 1; } @@ -1149,11 +1149,11 @@ mdoc_fd_pre(MDOC_ARGS) assert(n->type == ROFFT_TEXT); if (strcmp(n->string, "#include")) { - print_otag(h, TAG_B, "cT", "Fd"); + print_otag(h, TAG_CODE, "cT", "Fd"); return 1; } - print_otag(h, TAG_B, "cT", "In"); + print_otag(h, TAG_CODE, "cT", "In"); print_text(h, n->string); if (NULL != (n = n->next)) { @@ -1239,7 +1239,7 @@ mdoc_fn_pre(MDOC_ARGS) print_tagq(h, t); } - t = print_otag(h, TAG_B, "cT", "Fn"); + t = print_otag(h, TAG_CODE, "cT", "Fn"); if (sp) print_text(h, sp); @@ -1382,7 +1382,7 @@ mdoc_fo_pre(MDOC_ARGS) return 0; assert(n->child->string); - t = print_otag(h, TAG_B, "cT", "Fn"); + t = print_otag(h, TAG_CODE, "cT", "Fn"); print_text(h, n->child->string); print_tagq(h, t); return 0; @@ -1406,7 +1406,7 @@ mdoc_in_pre(MDOC_ARGS) struct tag *t; synopsis_pre(h, n); - print_otag(h, TAG_B, "cT", "In"); + print_otag(h, TAG_CODE, "cT", "In"); /* * The first argument of the `In' gets special treatment as @@ -1452,7 +1452,7 @@ mdoc_ic_pre(MDOC_ARGS) if ((id = cond_id(n)) != NULL) print_otag(h, TAG_A, "chR", "permalink", id); - print_otag(h, TAG_B, "cTi", "Ic", id); + print_otag(h, TAG_CODE, "cTi", "Ic", id); free(id); return 1; } |