w3m

commit 5d40c4b31dbc3dd4b4f5239563255d55d97adc1f
parent 3dc4f0675520daac1e7b23912396dcce3d73ff14
Author: ukai <ukai>
Date:   Fri, 25 Jan 2002 15:20:34 +0000

[w3m-dev 02875] rendering a table with inconsistent colspan,rowspan
* table.c (feed_table_tag): don't clear HTT_X|HTT_Y,
	instead, if set these flags, break the loop
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
table.c
 | 
4
++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,11 @@
 2002-01-26  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 02875] rendering a table with inconsistent colspan,rowspan
+	* table.c (feed_table_tag): don't clear HTT_X|HTT_Y 
+		instead, if set these flags, break the loop
+
+2002-01-26  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 02909] wrong table width calculation (sf.net Bug#506949)
 	* table.c (correct_table_matrix4): added
 	* table.c (set_table_matrix0): use correct_table_matrix4()
diff --git a/table.c b/table.c
@@ -2656,7 +2656,11 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
 	for (i = 0; i < rowspan; i++) {
 	    check_row(tbl, tbl->row + i);
 	    for (j = 0; j < colspan; j++) {
+#if 0
 		tbl->tabattr[tbl->row + i][tbl->col + j] &= ~(HTT_X | HTT_Y);
+#endif
+		if (tbl->tabattr[tbl->row + i][tbl->col + j] & (HTT_X | HTT_Y))
+		    break;
 		tbl->tabattr[tbl->row + i][tbl->col + j] |=
 		    ((i > 0) ? HTT_Y : 0) | ((j > 0) ? HTT_X : 0);
 		if (tbl->col + j > tbl->maxcol) {