storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 02875] rendering a table with inconsistent colspan,rowspan

Browse Source 
* 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>
This commit is contained in:
Fumitoshi UKAI
2002-01-25 15:20:34 +00:00
parent 556074e95e
commit 39ef0e6986
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+7 -1
View File
@@ -1,3 +1,9 @@
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> 2002-01-26 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02909] wrong table width calculation (sf.net Bug#506949) * [w3m-dev 02909] wrong table width calculation (sf.net Bug#506949)
@@ -2297,4 +2303,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.262 2002/01/25 15:10:14 ukai Exp $ $Id: ChangeLog,v 1.263 2002/01/25 15:20:34 ukai Exp $
table.c
+5 -1
View File
@@ -1,4 +1,4 @@
/* $Id: table.c,v 1.15 2002/01/25 15:10:14 ukai Exp $ */ /* $Id: table.c,v 1.16 2002/01/25 15:20:34 ukai Exp $ */
/* /*
* HTML table * HTML table
*/ */
@@ -2656,7 +2656,11 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
for (i = 0; i < rowspan; i++) { for (i = 0; i < rowspan; i++) {
check_row(tbl, tbl->row + i); check_row(tbl, tbl->row + i);
for (j = 0; j < colspan; j++) { for (j = 0; j < colspan; j++) {
#if 0
tbl->tabattr[tbl->row + i][tbl->col + j] &= ~(HTT_X | HTT_Y); 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] |= tbl->tabattr[tbl->row + i][tbl->col + j] |=
((i > 0) ? HTT_Y : 0) | ((j > 0) ? HTT_X : 0); ((i > 0) ? HTT_Y : 0) | ((j > 0) ? HTT_X : 0);
if (tbl->col + j > tbl->maxcol) { if (tbl->col + j > tbl->maxcol) {