diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-25 16:39:52 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-25 16:39:52 +0000 |
| commit | d7b9195c5cf53fc7f0357a69f2651d61ff010fba (patch) | |
| tree | ec25a26a0d8a37ff2de82a75d6cb34a5fc410f96 /file.c | |
| parent | update TODO (diff) | |
| download | w3m-d7b9195c5cf53fc7f0357a69f2651d61ff010fba.tar.gz w3m-d7b9195c5cf53fc7f0357a69f2651d61ff010fba.zip | |
[w3m-dev 03476] Re: Bug#170506: w3m: Unable to use mozilla bugzilla
* file.c (HTMLtagproc1): initialize ignore_tag in table_mode
(HTMLtagproc0): check table_level
* table.c (feed_table_tag): set mode->ignore_tag
* table.h (struct table_mode): add ignore_tag
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.127 2002/11/24 16:02:22 ukai Exp $ */ +/* $Id: file.c,v 1.128 2002/11/25 16:39:52 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -4467,6 +4467,7 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env) table_mode[obuf->table_level].indent_level = 0; table_mode[obuf->table_level].nobr_level = 0; table_mode[obuf->table_level].caption = 0; + table_mode[obuf->table_level].ignore_tag = NULL; #ifndef TABLE_EXPAND tables[obuf->table_level]->total_width = width; #else @@ -5452,7 +5453,8 @@ HTMLlineproc0(char *str, struct html_feed_environ *h_env, int internal) read_token(h_env->tagbuf, &str, &obuf->status, pre_mode, 0); } if (ST_IS_COMMENT(obuf->status)) { - if (obuf->flag & RB_IGNORE) + if ((obuf->table_level >= 0) ? tbl_mode->pre_mode & TBLM_IGNORE + : obuf->flag & RB_IGNORE) /* within ignored tag, such as * * <script>..</script>, don't process comment. */ obuf->status = R_ST_NORMAL; @@ -5467,9 +5469,13 @@ HTMLlineproc0(char *str, struct html_feed_environ *h_env, int internal) if (ST_IS_REAL_TAG(obuf->status)) Strcat_char(h_env->tagbuf, ' '); } - if ((obuf->flag & RB_IGNORE) && - !TAG_IS(h_env->tagbuf->ptr, obuf->ignore_tag->ptr, - obuf->ignore_tag->length - 1)) + if ((obuf->table_level >= 0) + ? ((tbl_mode->pre_mode & TBLM_IGNORE) && + !TAG_IS(h_env->tagbuf->ptr, tbl_mode->ignore_tag->ptr, + tbl_mode->ignore_tag->length - 1)) + : ((obuf->flag & RB_IGNORE) && + !TAG_IS(h_env->tagbuf->ptr, obuf->ignore_tag->ptr, + obuf->ignore_tag->length - 1))) /* within ignored tag, such as * * <script>..</script>, don't process tag. */ obuf->status = R_ST_NORMAL; |