Abolish struct tbl_head and replace it by an "int col" member in

struct tbl_cell.  No functional change, minus 40 lines of code.

1 files changed, 7 insertions, 7 deletions

diff --git a/tbl_html.c b/tbl_html.c
index 08dc1c7a..617ade75 100644
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -49,10 +49,10 @@ html_tbl_strlen(const char *p, void *arg)
 static void
 html_tblopen(struct html *h, const struct tbl_span *sp)
 {
-	const struct tbl_head *hp;
 	struct htmlpair	 tag;
 	struct roffsu	 su;
 	struct roffcol	*col;
+	int		 ic;
 
 	if (sp->flags & TBL_SPAN_FIRST) {
 		h->tbl.len = html_tbl_len;
@@ -64,9 +64,9 @@ html_tblopen(struct html *h, const struct tbl_span *sp)
 	PAIR_CLASS_INIT(&tag, "tbl");
 	h->tblt = print_otag(h, TAG_TABLE, 1, &tag);
 
-	for (hp = sp->head; hp; hp = hp->next) {
+	for (ic = 0; ic < sp->opts->cols; ic++) {
 		bufinit(h);
-		col = &h->tbl.cols[hp->ident];
+		col = h->tbl.cols + ic;
 		SCALE_HS_INIT(&su, col->width);
 		bufcat_su(h, "width", &su);
 		PAIR_STYLE_INIT(&tag, h);
@@ -88,10 +88,10 @@ print_tblclose(struct html *h)
 void
 print_tbl(struct html *h, const struct tbl_span *sp)
 {
-	const struct tbl_head *hp;
 	const struct tbl_dat *dp;
 	struct htmlpair	 tag;
 	struct tag	*tt;
+	int		 ic;
 
 	/* Inhibit printing of spaces: we do padding ourselves. */
 
@@ -114,12 +114,12 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 		break;
 	default:
 		dp = sp->first;
-		for (hp = sp->head; hp; hp = hp->next) {
+		for (ic = 0; ic < sp->opts->cols; ic++) {
 			print_stagq(h, tt);
 			print_otag(h, TAG_TD, 0, NULL);
 
-			if (dp == NULL)
-				break;
+			if (dp == NULL || dp->layout->col > ic)
+				continue;
 			if (dp->layout->pos != TBL_CELL_DOWN)
 				if (dp->string != NULL)
 					print_text(h, dp->string);