summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-12-17 10:37:26 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-12-17 10:37:26 +0000
commit8e9871ce2a8bd34b5605daa76493d575ba648258 (patch)
treef5bd30cc6f7700624fd3d8469445e378fb4ef131
parent7dc51f1e214bb0510007c81786e5a9121214baaf (diff)
downloadmandoc-8e9871ce2a8bd34b5605daa76493d575ba648258.tar.gz
Make literal `Bd' use a PRE in -Thtml. Make `Bd' output in general use
only a single DIV or PRE. Tag all displays with display class.
-rw-r--r--example.style.css4
-rw-r--r--html.c1
-rw-r--r--html.h1
-rw-r--r--mdoc_html.c50
4 files changed, 27 insertions, 29 deletions
diff --git a/example.style.css b/example.style.css
index e6525f08..c0ddd82b 100644
--- a/example.style.css
+++ b/example.style.css
@@ -38,6 +38,10 @@ table { margin-top: 0px; margin-bottom: 0px; }
.roman { font-style: normal; font-weight: normal; } /* Roman: (implicit). */
.small { font-style: normal; font-weight: normal; font-size: smaller; } /* Small: SB, SM. */
+/* Block modes. */
+
+.display { }
+
/* Context-specific modes. */
span.addr { font-style: italic; font-weight: normal; } /* Address (Ad). */
diff --git a/html.c b/html.c
index 6e2bf063..cfe5da16 100644
--- a/html.c
+++ b/html.c
@@ -69,6 +69,7 @@ static const struct htmldata htmltags[TAG_MAX] = {
{"dd", HTML_CLRLINE}, /* TAG_DD */
{"blockquote", HTML_CLRLINE}, /* TAG_BLOCKQUOTE */
{"p", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */
+ {"pre", HTML_CLRLINE }, /* TAG_PRE */
};
static const char *const htmlfonts[HTMLFONT_MAX] = {
diff --git a/html.h b/html.h
index d348c186..4c2b933d 100644
--- a/html.h
+++ b/html.h
@@ -45,6 +45,7 @@ enum htmltag {
TAG_DD,
TAG_BLOCKQUOTE,
TAG_P,
+ TAG_PRE,
TAG_MAX
};
diff --git a/mdoc_html.c b/mdoc_html.c
index a1ac1662..e4040328 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1059,10 +1059,11 @@ mdoc_d1_pre(MDOC_ARGS)
/* BLOCKQUOTE needs a block body. */
if (MDOC_Dl == n->tok) {
- PAIR_CLASS_INIT(&tag[1], "lit");
+ PAIR_CLASS_INIT(&tag[0], "lit display");
print_otag(h, TAG_DIV, 1, tag);
} else
- print_otag(h, TAG_DIV, 0, tag);
+ PAIR_CLASS_INIT(&tag[0], "display");
+ print_otag(h, TAG_DIV, 1, tag);
return(1);
}
@@ -1103,19 +1104,8 @@ mdoc_bd_pre(MDOC_ARGS)
if (MDOC_HEAD == n->type)
return(0);
- SCALE_VS_INIT(&su, 0);
-
- assert(n->data.Bd);
- if (n->data.Bd->offs)
- a2offs(n->data.Bd->offs, &su);
-
- comp = n->data.Bd->comp;
-
- /* FIXME: -centered, etc. formatting. */
- /* FIXME: does not respect -offset ??? */
-
if (MDOC_BLOCK == n->type) {
- bufcat_su(h, "margin-left", &su);
+ comp = n->data.Bd->comp;
for (nn = n; nn && ! comp; nn = nn->parent) {
if (MDOC_BLOCK != nn->type)
continue;
@@ -1124,26 +1114,27 @@ mdoc_bd_pre(MDOC_ARGS)
if (nn->prev)
break;
}
- if (comp) {
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_DIV, 1, tag);
- return(1);
- }
- SCALE_VS_INIT(&su, 1);
- bufcat_su(h, "margin-top", &su);
- PAIR_STYLE_INIT(&tag[0], h);
- print_otag(h, TAG_DIV, 1, tag);
+ if ( ! comp)
+ print_otag(h, TAG_P, 0, NULL);
return(1);
}
+ SCALE_HS_INIT(&su, 0);
+ if (n->data.Bd->offs)
+ a2offs(n->data.Bd->offs, &su);
+
+ bufcat_su(h, "margin-left", &su);
+ PAIR_STYLE_INIT(&tag[0], h);
+
if (DISP_unfilled != n->data.Bd->type &&
- DISP_literal != n->data.Bd->type)
+ DISP_literal != n->data.Bd->type) {
+ PAIR_CLASS_INIT(&tag[1], "display");
+ print_otag(h, TAG_DIV, 2, tag);
return(1);
+ }
- PAIR_CLASS_INIT(&tag[0], "lit");
- bufcat_style(h, "white-space", "pre");
- PAIR_STYLE_INIT(&tag[1], h);
- print_otag(h, TAG_DIV, 2, tag);
+ PAIR_CLASS_INIT(&tag[1], "lit display");
+ print_otag(h, TAG_PRE, 2, tag);
for (nn = n->child; nn; nn = nn->next) {
print_mdoc_node(m, nn, h);
@@ -1175,8 +1166,9 @@ mdoc_bd_pre(MDOC_ARGS)
}
if (nn->next && nn->next->line == nn->line)
continue;
+ else if (nn->next)
+ print_text(h, "\n");
- print_text(h, "\n");
h->flags |= HTML_NOSPACE;
}