diff options
| author |   schwarze <schwarze@openbsd.org> | 2014-08-13 15:19:24 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2014-08-13 15:19:24 +0000 |
| commit | 5d6b7137ad10cef1b5e64adf4d0c24267248bc7c (patch) | |
| tree | f239539e1183c5a753e4f517a1f411256842710e /usr.bin/mandoc/mdoc_html.c | |
| parent | Correctly set the rtable ID of the packet header when sending (diff) | |
| download | wireguard-openbsd-5d6b7137ad10cef1b5e64adf4d0c24267248bc7c.tar.xz wireguard-openbsd-5d6b7137ad10cef1b5e64adf4d0c24267248bc7c.zip | |
Use <em> for .Em and .Bf -emphasis.
The vast majority of .Em in real-world manuals is stress emphasis,
for which <em> is the correct markup. Admittedly, there are some
instances of .Em usage for alternate quality, for which <i> would
be a better match. Most of these are technical terms that neither
allow semantic markup nor are keywords - for the latter, .Sy would
be preferable. A typical example is that the shell breaks input into
.Em words .
Alternate voice or mood, which would also require <i>, is almost
absent from manuals.
We cannot satisfy both stress emphasis and alternate quality, so
pick the one that fits more often and looks less wrong when off.
Patch from Guy Harris <guy at alum dot mit dot edu>.
ok bentley@ joerg@NetBSD
Diffstat (limited to 'usr.bin/mandoc/mdoc_html.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc_html.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c index 2f5bb1e8400..6e754e07f24 100644 --- a/usr.bin/mandoc/mdoc_html.c +++ b/usr.bin/mandoc/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.78 2014/08/08 16:17:09 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.79 2014/08/13 15:19:24 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1081,10 +1081,8 @@ mdoc_ex_pre(MDOC_ARGS) static int mdoc_em_pre(MDOC_ARGS) { - struct htmlpair tag; - PAIR_CLASS_INIT(&tag, "emph"); - print_otag(h, TAG_SPAN, 1, &tag); + print_otag(h, TAG_EM, 0, NULL); return(1); } @@ -1820,9 +1818,7 @@ mdoc_bf_pre(MDOC_ARGS) else if (MDOC_BODY != n->type) return(1); - if (FONT_Em == n->norm->Bf.font) - PAIR_CLASS_INIT(&tag[0], "emph"); - else if (FONT_Sy == n->norm->Bf.font) + if (FONT_Sy == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "symb"); else if (FONT_Li == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "lit"); @@ -1840,6 +1836,8 @@ mdoc_bf_pre(MDOC_ARGS) bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_DIV, 2, tag); + if (FONT_Em == n->norm->Bf.font) + print_otag(h, TAG_EM, 0, NULL); return(1); } |