diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | file.c | 16 |
2 files changed, 19 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03522] newline around <pre>..</pre> + * file.c (HTMLtagproc1): break before <pre>/after </pre> if necessary + +2002-12-05 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03521] sync option * display.c (redrawNLine): calcTabPos() * func.c (initKeymap): return if keymap_initialized @@ -5415,4 +5420,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.584 2002/12/04 16:45:40 ukai Exp $ +$Id: ChangeLog,v 1.585 2002/12/04 16:55:04 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.143 2002/12/03 15:47:39 ukai Exp $ */ +/* $Id: file.c,v 1.144 2002/12/04 16:55:06 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -4321,10 +4321,15 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env) close_anchor(h_env, obuf); return 1; case HTML_PRE: - if (!parsedtag_exists(tag, ATTR_FOR_TABLE)) + x = parsedtag_exists(tag, ATTR_FOR_TABLE); + if (!x) CLOSE_P; - if (!(obuf->flag & RB_IGNORE_P)) + if (!(obuf->flag & RB_IGNORE_P)) { flushline(h_env, obuf, envs[h_env->envc].indent, 0, h_env->limit); + if (!x) + do_blankline(h_env, obuf, envs[h_env->envc].indent, 0, + h_env->limit); + } else fillline(obuf, envs[h_env->envc].indent); obuf->flag |= (RB_PRE | RB_IGNORE_P); @@ -4332,6 +4337,11 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env) return 1; case HTML_N_PRE: flushline(h_env, obuf, envs[h_env->envc].indent, 0, h_env->limit); + if (!(obuf->flag & RB_IGNORE_P)) { + do_blankline(h_env, obuf, envs[h_env->envc].indent, 0, + h_env->limit); + obuf->flag |= RB_IGNORE_P; + } obuf->flag &= ~RB_PRE; close_anchor(h_env, obuf); return 1; |