diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | file.c | 5 | ||||
| -rw-r--r-- | fm.h | 7 | ||||
| -rw-r--r-- | table.c | 3 |
4 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,12 @@ +2002-03-13 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> + + * [w3m-dev 03116] Re: aligned block in <td align="center"> + * file.c (flushline): align if align="align" + * fm.h (RB_LEFT): change value + (RB_ALIGN): include RB_LEFT + (RB_INTABLE): added + * table.c (do_refill): obuf.flag |= RB_INTABLE + 2002-03-11 WATANABE Katsuyuki <katsuyuki_1.watanabe@toppan.co.jp> * [w3m-dev 03110] Re: gopher broken @@ -3118,4 +3127,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.343 2002/03/11 16:02:41 ukai Exp $ +$Id: ChangeLog,v 1.344 2002/03/12 16:59:50 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.81 2002/03/11 16:02:42 ukai Exp $ */ +/* $Id: file.c,v 1.82 2002/03/12 16:59:50 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -2470,6 +2470,9 @@ flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, else if (RB_GET_ALIGN(obuf) == RB_RIGHT) { align(lbuf, width, ALIGN_RIGHT); } + else if (RB_GET_ALIGN(obuf) == RB_LEFT && obuf->flag & RB_INTABLE) { + align(lbuf, width, ALIGN_LEFT); + } #ifdef FORMAT_NICE else if (obuf->flag & RB_FILL) { char *p; @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.53 2002/02/28 16:15:41 ukai Exp $ */ +/* $Id: fm.h,v 1.54 2002/03/12 16:59:50 ukai Exp $ */ /* * w3m: WWW wo Miru utility * @@ -517,10 +517,10 @@ struct readbuffer { #define RB_XMPMODE 0x02 #define RB_LSTMODE 0x04 #define RB_PLAIN 0x08 -#define RB_LEFT 0x00 +#define RB_LEFT 0x80000 #define RB_CENTER 0x10 #define RB_RIGHT 0x20 -#define RB_ALIGN (RB_CENTER | RB_RIGHT) +#define RB_ALIGN (RB_LEFT| RB_CENTER | RB_RIGHT) #define RB_NOBR 0x40 #define RB_P 0x80 #define RB_PRE_INT 0x100 @@ -537,6 +537,7 @@ struct readbuffer { #define RB_TITLE 0x8000 #define RB_NFLUSHED 0x10000 #define RB_NOFRAMES 0x20000 +#define RB_INTABLE 0x40000 #ifdef FORMAT_NICE #define RB_FILL 0x200000 @@ -1,4 +1,4 @@ -/* $Id: table.c,v 1.21 2002/02/22 17:55:17 ukai Exp $ */ +/* $Id: table.c,v 1.22 2002/03/12 16:59:50 ukai Exp $ */ /* * HTML table */ @@ -758,6 +758,7 @@ do_refill(struct table *tbl, int row, int col, int maxlimit) init_henv(&h_env, &obuf, envs, MAX_ENV_LEVEL, (TextLineList *)tbl->tabdata[row][col], get_spec_cell_width(tbl, row, col), 0); + obuf.flag |= RB_INTABLE; if (h_env.limit > maxlimit) h_env.limit = maxlimit; if (tbl->border_mode != BORDER_NONE && tbl->vcellpadding > 0) |