aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--table.c8
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 507be1c..b6227d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+ * [w3m-dev 03512] Re: HTML parser
+ * table.c (feed_table_tag): HTML_N_SELECT, HTML_N_CAPTION
+
+2002-12-04 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 03510] waiting time when cookie was rejected.
* file.c (readHeader): display cookie warnings for only 1 sec
@@ -5356,4 +5361,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.577 2002/12/03 15:47:38 ukai Exp $
+$Id: ChangeLog,v 1.578 2002/12/03 15:49:52 ukai Exp $
diff --git a/table.c b/table.c
index 7d01674..5065eaf 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.33 2002/12/03 15:45:34 ukai Exp $ */
+/* $Id: table.c,v 1.34 2002/12/03 15:49:56 ukai Exp $ */
/*
* HTML table
*/
@@ -2521,6 +2521,8 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
case HTML_N_FORM:
case HTML_N_SELECT: /* mode->end_tag */
table_close_select(tbl, mode, width);
+ if (cmd == HTML_N_SELECT)
+ return TAG_ACTION_NONE;
break;
default:
return TAG_ACTION_FEED;
@@ -2531,6 +2533,8 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
CASE_TABLE_TAG:
case HTML_N_CAPTION:
mode->caption = 0;
+ if (cmd == HTML_N_CAPTION)
+ return TAG_ACTION_NONE;
break;
default:
return TAG_ACTION_FEED;
@@ -2920,6 +2924,7 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
mode->pre_mode |= TBLM_INSELECT;
mode->end_tag = HTML_N_SELECT;
break;
+ case HTML_N_SELECT:
case HTML_OPTION:
/* nothing */
break;
@@ -3014,6 +3019,7 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
case HTML_CAPTION:
mode->caption = 1;
break;
+ case HTML_N_CAPTION:
case HTML_THEAD:
case HTML_N_THEAD:
case HTML_TBODY: