===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.80
retrieving revision 1.86
diff -u -p -r1.80 -r1.86
--- mandoc/mdoc_html.c	2010/06/12 11:21:44	1.80
+++ mandoc/mdoc_html.c	2010/06/26 15:36:37	1.86
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_html.c,v 1.80 2010/06/12 11:21:44 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.86 2010/06/26 15:36:37 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,6 +30,7 @@
 #include "mandoc.h"
 #include "out.h"
 #include "html.h"
+#include "regs.h"
 #include "mdoc.h"
 #include "main.h"
 
@@ -1035,11 +1036,13 @@ mdoc_it_pre(MDOC_ARGS)
 	if (MDOC_BLOCK != n->type)
 		bl = bl->parent;
 
-	type = bl->data.list;
+	SCALE_HS_INIT(&offs, 0);
 
-	/* Set default width and offset. */
+	type = bl->data.Bl.type;
+	comp = bl->data.Bl.comp;
 
-	SCALE_HS_INIT(&offs, 0);
+	if (bl->data.Bl.offs)
+		a2offs(bl->data.Bl.offs, &offs);
 
 	switch (type) {
 	case (LIST_enum):
@@ -1056,23 +1059,15 @@ mdoc_it_pre(MDOC_ARGS)
 		break;
 	}
 
-	/* Get width, offset, and compact arguments. */
+	if (bl->data.Bl.width)
+		a2width(bl->data.Bl.width, &width);
 
 	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;
 		}
@@ -1123,7 +1118,7 @@ mdoc_bl_pre(MDOC_ARGS)
 		return(0);
 	if (MDOC_BLOCK != n->type)
 		return(1);
-	if (LIST_enum != n->data.list)
+	if (LIST_enum != n->data.Bl.type)
 		return(1);
 
 	ord = malloc(sizeof(struct ord));
@@ -1147,7 +1142,7 @@ mdoc_bl_post(MDOC_ARGS)
 
 	if (MDOC_BLOCK != n->type)
 		return;
-	if (LIST_enum != n->data.list)
+	if (LIST_enum != n->data.Bl.type)
 		return;
 
 	ord = h->ords.head;