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

[w3m-dev 03937] <center> in <table>

Browse Source 
* table.c (feed_table_tag): fix <center>,</center>,<div>,</div>,
			<p>,<br>,<nobr>,</nobr>,<wbr>
		check_rowcol() for <img>
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2003-07-13 16:13:28 +00:00
parent 5d34647d89
commit 810ca51cf3
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,4 +1,12 @@
2003-07-10 Fumitoshi UKAI <ukai@ukai.org> 2003-07-14 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03937] <center> in <table>
* table.c (feed_table_tag): fix <center>,</center>,<div>,</div>,
<p>,<br>,<nobr>,</nobr>,<wbr>
check_rowcol() for <img>
2003-07-10 Fumitoshi UKAI <ukai@debian.or.jp>
* w3mimg/fb/fb_img.h (get_image_size): add missing prototypes * w3mimg/fb/fb_img.h (get_image_size): add missing prototypes
* w3mimg/fb/fb.c (fb_clear): unused variable `j' * w3mimg/fb/fb.c (fb_clear): unused variable `j'
@@ -7916,4 +7924,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.849 2003/07/09 15:07:10 ukai Exp $ $Id: ChangeLog,v 1.850 2003/07/13 16:13:28 ukai Exp $

15
table.c
View File

@@ -1,4 +1,4 @@
/* $Id: table.c,v 1.45 2003/05/14 16:02:41 ukai Exp $ */ /* $Id: table.c,v 1.46 2003/07/13 16:13:29 ukai Exp $ */
/* /*
* HTML table * HTML table
*/ */
@@ -2799,12 +2799,14 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
return TAG_ACTION_NONE; return TAG_ACTION_NONE;
case HTML_P: case HTML_P:
case HTML_BR: case HTML_BR:
case HTML_DT:
case HTML_DD:
case HTML_CENTER: case HTML_CENTER:
case HTML_N_CENTER: case HTML_N_CENTER:
case HTML_DIV: case HTML_DIV:
case HTML_N_DIV: case HTML_N_DIV:
if (!(tbl->flag & TBL_IN_ROW))
break;
case HTML_DT:
case HTML_DD:
case HTML_H: case HTML_H:
case HTML_N_H: case HTML_N_H:
case HTML_LI: case HTML_LI:
@@ -2852,9 +2854,11 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
case HTML_N_UL: case HTML_N_UL:
feed_table_block_tag(tbl, line, mode, -1, cmd); feed_table_block_tag(tbl, line, mode, -1, cmd);
break; break;
case HTML_PRE_INT:
case HTML_NOBR: case HTML_NOBR:
case HTML_WBR: case HTML_WBR:
if (!(tbl->flag & TBL_IN_ROW))
break;
case HTML_PRE_INT:
feed_table_inline_tag(tbl, line, mode, -1); feed_table_inline_tag(tbl, line, mode, -1);
switch (cmd) { switch (cmd) {
case HTML_NOBR: case HTML_NOBR:
@@ -2877,6 +2881,8 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
} }
break; break;
case HTML_N_NOBR: case HTML_N_NOBR:
if (!(tbl->flag & TBL_IN_ROW))
break;
feed_table_inline_tag(tbl, line, mode, -1); feed_table_inline_tag(tbl, line, mode, -1);
if (mode->nobr_level > 0) if (mode->nobr_level > 0)
mode->nobr_level--; mode->nobr_level--;
@@ -2888,6 +2894,7 @@ feed_table_tag(struct table *tbl, char *line, struct table_mode *mode,
mode->pre_mode &= ~TBLM_PRE_INT; mode->pre_mode &= ~TBLM_PRE_INT;
break; break;
case HTML_IMG: case HTML_IMG:
check_rowcol(tbl, mode);
w = tbl->fixed_width[tbl->col]; w = tbl->fixed_width[tbl->col];
if (w < 0) { if (w < 0) {
if (tbl->total_width > 0) if (tbl->total_width > 0)