summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-12-15 15:59:23 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-12-15 15:59:23 +0000
commitbcfe212950ee8771555fb62a002b3dac21750c10 (patch)
treeb142010a1e9117ca2fb601b6d9a73c649b823fcf
parent47ae77e2bde036d218817f41efc1263bf5b315a8 (diff)
downloadmandoc-bcfe212950ee8771555fb62a002b3dac21750c10.tar.gz
Remove stupid outer DIV tag in favour of regular BODY and HTML that can
be handled in CSS. Clarified "lit" tag (will be the subject of future clarification). Removed CSS2 note in mandoc.1, which is no longer the case.
-rw-r--r--example.style.css9
-rw-r--r--html.c1
-rw-r--r--html.h1
-rw-r--r--mandoc.19
-rw-r--r--mdoc_html.c6
5 files changed, 7 insertions, 19 deletions
diff --git a/example.style.css b/example.style.css
index 8c4b24ac..e6d8b847 100644
--- a/example.style.css
+++ b/example.style.css
@@ -1,7 +1,8 @@
/* $Id$ */
-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. */
diff --git a/html.c b/html.c
index 2f496565..761dbf9e 100644
--- a/html.c
+++ b/html.c
@@ -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] = {
diff --git a/html.h b/html.h
index 2dbf44fd..cf94206c 100644
--- a/html.h
+++ b/html.h
@@ -43,6 +43,7 @@ enum htmltag {
TAG_DL,
TAG_DT,
TAG_DD,
+ TAG_BLOCKQUOTE,
TAG_MAX
};
diff --git a/mandoc.1 b/mandoc.1
index 58a6c7a3..46877db4 100644
--- a/mandoc.1
+++ b/mandoc.1
@@ -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 6ba07e90..791a072b 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -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) {