diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-15 16:08:18 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-15 16:08:18 +0000 |
| commit | b45f50fbb653e0e6080651278cdf0815edaaad2b (patch) | |
| tree | 056ed822a9007732e10451671455d0525604040e | |
| parent | bcfe212950ee8771555fb62a002b3dac21750c10 (diff) | |
| download | mandoc-b45f50fbb653e0e6080651278cdf0815edaaad2b.tar.gz | |
Clarify purpose of "lit".
Make `Dl' and `D1' both use BLOCKQUOTE instead of DIVs.
| -rw-r--r-- | example.style.css | 8 | ||||
| -rw-r--r-- | mdoc_html.c | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/example.style.css b/example.style.css index e6d8b847..14d7ffe8 100644 --- a/example.style.css +++ b/example.style.css @@ -12,6 +12,12 @@ div.ssec-head { font-weight: bold; font-style: normal; } /* Sub-sections (Ss). * div.ssec-body { } div.ssec-block { } +/* General font modes. */ + +.lit { } /* "Literal" text: Dl, Li, Bf -literal, Bl -literal, Bl -unfilled. */ + +/* Context-specific modes. */ + span.addr { font-style: italic; font-weight: normal; } /* Address (Ad). */ span.arg { font-style: italic; font-weight: normal; } /* Command argument (Ar). */ span.author { } /* Author name (An). */ @@ -32,7 +38,6 @@ 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 (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). */ @@ -66,7 +71,6 @@ 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 (Bf -literal, Bd -literal, Bd -unfilled). */ div.symb { font-weight: bold; font-style: normal; } /* Symbols (Bl -symbolic). */ table.footer { } /* Document footer. */ diff --git a/mdoc_html.c b/mdoc_html.c index 791a072b..73b2ad5d 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1133,13 +1133,17 @@ mdoc_d1_pre(MDOC_ARGS) if (MDOC_BLOCK != n->type) return(1); - /* FIXME: D1 shouldn't be literal. */ + SCALE_VS_INIT(&su, 0); + bufcat_su(h, "margin-top", &su); + bufcat_su(h, "margin-bottom", &su); + PAIR_STYLE_INIT(&tag[0], h); + + if (MDOC_Dl == n->tok) { + PAIR_CLASS_INIT(&tag[1], "lit"); + print_otag(h, TAG_BLOCKQUOTE, 2, tag); + } else + print_otag(h, TAG_BLOCKQUOTE, 1, tag); - SCALE_VS_INIT(&su, INDENT - 2); - bufcat_su(h, "margin-left", &su); - PAIR_CLASS_INIT(&tag[0], "lit"); - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, tag); return(1); } |