summaryrefslogtreecommitdiffstats
path: root/mdoc_html.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-06-12 12:38:01 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-06-12 12:38:01 +0000
commitff7b52fc598055387eeb90035e1d6418b43d3c27 (patch)
treef4e4aac93954ad8c23c1b825da4207d9a3e82cd7 /mdoc_html.c
parentba4734a53e665e8062edb5784cf988d13c6ee165 (diff)
downloadmandoc-ff7b52fc598055387eeb90035e1d6418b43d3c27.tar.gz
Cached `Bl -offset' into mdoc_bl. Removed erroneous "-offset defaults
to 6n if no value is specified" and added regression tests for `Bl' testing against the empty -offset argument.
Diffstat (limited to 'mdoc_html.c')
-rw-r--r--mdoc_html.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/mdoc_html.c b/mdoc_html.c
index 98358c04..9a183dd0 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1035,12 +1035,13 @@ mdoc_it_pre(MDOC_ARGS)
if (MDOC_BLOCK != n->type)
bl = bl->parent;
+ SCALE_HS_INIT(&offs, 0);
+
type = bl->data.Bl.type;
comp = bl->data.Bl.comp;
- /* Set default width and offset. */
-
- SCALE_HS_INIT(&offs, 0);
+ if (bl->data.Bl.offs)
+ a2offs(bl->data.Bl.offs, &offs);
switch (type) {
case (LIST_enum):
@@ -1057,8 +1058,6 @@ mdoc_it_pre(MDOC_ARGS)
break;
}
- /* Get width, offset, and compact arguments. */
-
wp = -1;
for (i = 0; bl->args && i < (int)bl->args->argc; i++)
switch (bl->args->argv[i].arg) {
@@ -1068,9 +1067,6 @@ mdoc_it_pre(MDOC_ARGS)
case (MDOC_Width):
a2width(bl->args->argv[i].value[0], &width);
break;
- case (MDOC_Offset):
- a2offs(bl->args->argv[i].value[0], &offs);
- break;
default:
break;
}