diff options
| author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-08-18 09:16:01 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-08-18 09:16:01 +0000 |
| commit | 9349ecb7e09b4765bdc532b9f91cff348dc1525b (patch) | |
| tree | bdbde476c85da0d7c1c688d0c57598149ebe324c | |
| parent | 38ad67c3a787994738cf6778016cb7174ed79e4e (diff) | |
| download | mandoc-9349ecb7e09b4765bdc532b9f91cff348dc1525b.tar.gz | |
Align `-offset indent' and `D1' by forcing BLOCKQUOTE to have a 5ex
margin. This is dubious: the HTML4 spec specifically says that
BLOCKQUOTE shouldn't be abused for indentation, which is exactly what we
do. However, `D1' needs indentation and it's the only way to force text
browsers to do so. Alternatives?
Also remove the unused HALFINDENT defines while here.
| -rw-r--r-- | example.style.css | 2 | ||||
| -rw-r--r-- | man_html.c | 1 | ||||
| -rw-r--r-- | mdoc_html.c | 7 | ||||
| -rw-r--r-- | style.css | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/example.style.css b/example.style.css index 8d55c647..9f0ce4b2 100644 --- a/example.style.css +++ b/example.style.css @@ -16,7 +16,7 @@ h2 { margin-bottom: 0ex; font-size: inherit; margin-left: -2ex; } /* Sub-sectio table { width: 100%; margin-top: 0ex; margin-bottom: 0ex; } /* All tables. */ td { vertical-align: top; } /* All table cells. */ p { } /* Paragraph: Pp, Lp. */ -blockquote { margin-top: 0ex; margin-bottom: 0ex; } /* D1. */ +blockquote { margin-left: 5ex; margin-top: 0ex; margin-bottom: 0ex; } /* D1. */ div.section { margin-bottom: 2ex; margin-left: 5ex; } /* Sections (Sh, SH). */ div.subsection { } /* Sub-sections (Ss, SS). */ table.synopsis { } /* SYNOPSIS section table. */ @@ -36,7 +36,6 @@ /* FIXME: have PD set the default vspace width. */ #define INDENT 5 -#define HALFINDENT 3 #define MAN_ARGS const struct man_meta *m, \ const struct man_node *n, \ diff --git a/mdoc_html.c b/mdoc_html.c index 281f557c..bde42bc3 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -34,7 +34,6 @@ #include "main.h" #define INDENT 5 -#define HALFINDENT 3 #define MDOC_ARGS const struct mdoc_meta *m, \ const struct mdoc_node *n, \ @@ -353,10 +352,8 @@ a2offs(const char *p, struct roffsu *su) SCALE_HS_INIT(su, INDENT); else if (0 == strcmp(p, "indent-two")) SCALE_HS_INIT(su, INDENT * 2); - else if ( ! a2roffsu(p, su, SCALE_MAX)) { - su->unit = SCALE_BU; - su->scale = html_strlen(p); - } + else if ( ! a2roffsu(p, su, SCALE_MAX)) + SCALE_HS_INIT(su, html_strlen(p)); } @@ -16,7 +16,7 @@ h2 { margin-bottom: 1ex; font-size: 105%; margin-left: -2ex; } /* Sub-section h table { width: 100%; margin-top: 0ex; margin-bottom: 0ex; } /* All tables. */ td { vertical-align: top; } /* All table cells. */ p { } /* Paragraph: Pp, Lp. */ -blockquote { margin-top: 0ex; margin-bottom: 0ex; } /* D1. */ +blockquote { margin-left: 5ex; margin-top: 0ex; margin-bottom: 0ex; } /* D1. */ div.section { margin-bottom: 2ex; margin-left: 5ex; } /* Sections (Sh, SH). */ div.subsection { } /* Sub-sections (Ss, SS). */ table.synopsis { } /* SYNOPSIS section table. */ |