diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | table.c | 6 |
2 files changed, 12 insertions, 2 deletions
@@ -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() @@ -2297,4 +2303,4 @@ * release-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 $ @@ -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 */ @@ -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) { |