diff options
| -rw-r--r-- | example.style.css | 4 | ||||
| -rw-r--r-- | html.c | 3 | ||||
| -rw-r--r-- | html.h | 3 | ||||
| -rw-r--r-- | mdoc_html.c | 12 | ||||
| -rw-r--r-- | style.css | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/example.style.css b/example.style.css index e17af922..b1a925ae 100644 --- a/example.style.css +++ b/example.style.css @@ -1,4 +1,4 @@ -/* $Id: example.style.css,v 1.50 2014/08/13 15:25:22 schwarze Exp $ */ +/* $Id: example.style.css,v 1.51 2014/08/14 00:31:43 schwarze Exp $ */ /* * This is an example style-sheet provided for mandoc(1) and the -Thtml * or -Txhtml output mode. @@ -30,7 +30,7 @@ div.mandoc .list { } /* All Bl. */ div.mandoc i { } /* Italic: BI, IB, I, (implicit). */ div.mandoc b { } /* Bold: SB, BI, IB, BR, RB, B, (implicit). */ div.mandoc small { } /* Small: SB, SM. */ -div.mandoc em { font-style: italic; font-weight: normal; } /* Emphasis: Em, Bl -emphasis. */ +div.mandoc .emph { font-style: italic; font-weight: normal; } /* Emphasis: Em, Bl -emphasis. */ div.mandoc .symb { font-style: normal; font-weight: bold; } /* Symbolic: Sy, Ms, Bf -symbolic. */ div.mandoc .lit { font-style: normal; font-weight: normal; font-family: monospace; } /* Literal: Dl, Li, Ql, Bf -literal, Bl -literal, Bl -unfilled. */ div.mandoc i.addr { font-weight: normal; } /* Address (Ad). */ @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.162 2014/08/13 20:34:29 kristaps Exp $ */ +/* $Id: html.c,v 1.163 2014/08/14 00:31:43 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -74,7 +74,6 @@ static const struct htmldata htmltags[TAG_MAX] = { {"i", 0 }, /* TAG_I */ {"code", 0 }, /* TAG_CODE */ {"small", 0 }, /* TAG_SMALL */ - {"em", 0 }, /* TAG_EM */ }; static const char *const htmlattrs[ATTR_MAX] = { @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.52 2014/08/13 15:25:22 schwarze Exp $ */ +/* $Id: html.h,v 1.53 2014/08/14 00:31:43 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -50,7 +50,6 @@ enum htmltag { TAG_I, TAG_CODE, TAG_SMALL, - TAG_EM, TAG_MAX }; diff --git a/mdoc_html.c b/mdoc_html.c index a94d0c01..0dc32208 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.197 2014/08/13 15:25:22 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.198 2014/08/14 00:31:43 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1083,8 +1083,10 @@ mdoc_ex_pre(MDOC_ARGS) static int mdoc_em_pre(MDOC_ARGS) { + struct htmlpair tag; - print_otag(h, TAG_EM, 0, NULL); + PAIR_CLASS_INIT(&tag, "emph"); + print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1820,7 +1822,9 @@ mdoc_bf_pre(MDOC_ARGS) else if (MDOC_BODY != n->type) return(1); - if (FONT_Sy == n->norm->Bf.font) + if (FONT_Em == n->norm->Bf.font) + PAIR_CLASS_INIT(&tag[0], "emph"); + else 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"); @@ -1838,8 +1842,6 @@ 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); } @@ -1,4 +1,4 @@ -/* $Id: style.css,v 1.26 2014/08/13 15:25:22 schwarze Exp $ */ +/* $Id: style.css,v 1.27 2014/08/14 00:31:43 schwarze Exp $ */ /* * This is an example style-sheet provided for mandoc(1) and the -Thtml @@ -34,7 +34,7 @@ td.head-rtitle { width: 10%; text-align: right; } /* Document header: right-titl /* General font modes. */ i { } /* Italic: BI, IB, I, (implicit). */ -em { font-style: italic; font-weight: normal; } /* Emphasis: Em, Bl -emphasis. */ +.emph { font-style: italic; font-weight: normal; } /* Emphasis: Em, Bl -emphasis. */ b { } /* Bold: SB, BI, IB, BR, RB, B, (implicit). */ .symb { font-style: normal; font-weight: bold; } /* Symbolic: Sy, Ms, Bf -symbolic. */ small { } /* Small: SB, SM. */ |