From b061871474a3aefa9a428ac188fc709ad58dd641 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Wed, 4 Dec 2002 16:55:04 +0000
Subject: [w3m-dev 03522] newline around <pre>..</pre> * file.c (HTMLtagproc1):
 break before <pre>/after </pre> if necessary From: Hironori SAKAMOTO
 <hsaka@mth.biglobe.ne.jp>

---
 ChangeLog |  7 ++++++-
 file.c    | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 653b53c..85978a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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
@@ -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 $
diff --git a/file.c b/file.c
index a0401a6..8b17e05 100644
--- a/file.c
+++ b/file.c
@@ -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;
-- 
cgit v1.2.3