=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.81 retrieving revision 1.83 diff -u -p -r1.81 -r1.83 --- mandoc/mdoc_html.c 2010/06/12 11:58:22 1.81 +++ mandoc/mdoc_html.c 2010/06/12 12:38:01 1.83 @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.81 2010/06/12 11:58:22 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.83 2010/06/12 12:38:01 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -1035,12 +1035,14 @@ 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. */ + if (bl->data.Bl.offs) + a2offs(bl->data.Bl.offs, &offs); - SCALE_HS_INIT(&offs, 0); - switch (type) { case (LIST_enum): /* FALLTHROUGH */ @@ -1056,22 +1058,14 @@ mdoc_it_pre(MDOC_ARGS) break; } - /* Get width, offset, and compact arguments. */ - wp = -1; - for (comp = i = 0; bl->args && i < (int)bl->args->argc; i++) + for (i = 0; bl->args && i < (int)bl->args->argc; i++) switch (bl->args->argv[i].arg) { case (MDOC_Column): wp = i; /* Save for later. */ break; case (MDOC_Width): a2width(bl->args->argv[i].value[0], &width); - break; - case (MDOC_Offset): - a2offs(bl->args->argv[i].value[0], &offs); - break; - case (MDOC_Compact): - comp = 1; break; default: break;