diff options
| -rw-r--r-- | example.style.css | 11 | ||||
| -rw-r--r-- | html.c | 3 | ||||
| -rw-r--r-- | html.h | 3 | ||||
| -rw-r--r-- | mandoc.1 | 13 | ||||
| -rw-r--r-- | mdoc_html.c | 8 |
5 files changed, 13 insertions, 25 deletions
diff --git a/example.style.css b/example.style.css index a75d0197..947a2546 100644 --- a/example.style.css +++ b/example.style.css @@ -1,7 +1,8 @@ -/* $Id: example.style.css,v 1.22 2010/12/15 15:32:01 kristaps Exp $ */ +/* $Id: example.style.css,v 1.23 2010/12/15 15:59:23 kristaps Exp $ */ -div.body { font-family: monospace; - min-width: 580px; width: 580px; } /* Top-most div tag. */ +html { min-width: 580px; width: 580px; } + +body { font-family: monospace; } div.sec-head { font-weight: bold; font-style: normal; } /* Sections (Sh). */ div.sec-body { } @@ -31,7 +32,7 @@ span.ftype { font-style: italic; font-weight: normal; } /* Function types (Ft, F span.includes { font-weight: bold; font-style: normal; } /* Header includes (In). */ span.italic { font-style: italic; font-weight: normal; } /* Generically italic (BI, IB, I). */ span.lib { } /* Library (Lb). */ -span.lit { } /* Literals (Bf -literal). */ +span.lit { } /* Literals (Dl). */ span.macro { font-weight: bold; font-style: normal; } /* Macro-ish thing (Fd). */ span.name { font-weight: bold; font-style: normal; } /* Name of utility (Nm). */ span.opt { } /* Options (Op, Oo/Oc). */ @@ -65,7 +66,7 @@ a.link-ref { } /* Reference section links (%Q). */ a.link-sec { } /* Section links (Sx). */ div.emph { font-style: italic; font-weight: normal; } /* Emphasis (Bl -emphasis). */ -div.lit { } /* Literal (D1, Bd -literal, Dl, Bd -literal). */ +div.lit { } /* Literal (Bf -literal, Bd -literal, Bd -unfilled). */ div.symb { font-weight: bold; font-style: normal; } /* Symbols (Bl -symbolic). */ table.footer { } /* Document footer. */ @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.114 2010/12/15 14:52:16 kristaps Exp $ */ +/* $Id: html.c,v 1.115 2010/12/15 15:59:23 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -67,6 +67,7 @@ static const struct htmldata htmltags[TAG_MAX] = { {"dl", HTML_CLRLINE}, /* TAG_DL */ {"dt", HTML_CLRLINE}, /* TAG_DT */ {"dd", HTML_CLRLINE}, /* TAG_DD */ + {"blockquote", HTML_CLRLINE}, /* TAG_BLOCKQUOTE */ }; static const char *const htmlfonts[HTMLFONT_MAX] = { @@ -1,4 +1,4 @@ -/* $Id: html.h,v 1.28 2010/12/15 14:52:16 kristaps Exp $ */ +/* $Id: html.h,v 1.29 2010/12/15 15:59:23 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -43,6 +43,7 @@ enum htmltag { TAG_DL, TAG_DT, TAG_DD, + TAG_BLOCKQUOTE, TAG_MAX }; @@ -1,4 +1,4 @@ -.\" $Id: mandoc.1,v 1.78 2010/09/26 23:05:46 schwarze Exp $ +.\" $Id: mandoc.1,v 1.79 2010/12/15 15:59:23 kristaps Exp $ .\" .\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: September 26 2010 $ +.Dd $Mdocdate: December 15 2010 $ .Dt MANDOC 1 .Os .Sh NAME @@ -541,15 +541,6 @@ The utility was written by .An Kristaps Dzonsons Aq kristaps@bsd.lv . .Sh CAVEATS -The -.Fl T Ns Cm html -and -.Fl T Ns Cm xhtml -CSS2 styling used for -.Fl m Ns Cm doc -input lists does not render properly in older browsers, such as Internet -Explorer 6 and earlier. -.Pp In .Fl T Ns Cm html and diff --git a/mdoc_html.c b/mdoc_html.c index a49598b1..138e36e6 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.116 2010/12/15 15:32:01 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.117 2010/12/15 15:59:23 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -369,7 +369,6 @@ static void print_mdoc(MDOC_ARGS) { struct tag *t; - struct htmlpair tag; t = print_otag(h, TAG_HEAD, 0, NULL); print_mdoc_head(m, n, h); @@ -377,10 +376,6 @@ print_mdoc(MDOC_ARGS) t = print_otag(h, TAG_BODY, 0, NULL); - tag.key = ATTR_CLASS; - tag.val = "body"; - print_otag(h, TAG_DIV, 1, &tag); - print_mdoc_nodelist(m, n, h); print_tagq(h, t); } @@ -1043,7 +1038,6 @@ mdoc_bl_pre(MDOC_ARGS) bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag[1], h); i = 2; - } switch (n->data.Bl->type) { |