Merge from upstream on 2012-05-22

ChangeLog

@@ -1,3 +1,18 @@
+2012-05-22  Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
+
+	* [w3m-dev 04451] w3m/entity.h should be removed when `make clean'
+	* Makefile.in: add entity.h to "make clean" target.
+
+2012-05-22  Tatsuya Kinoshita <tats@vega.ocn.ne.jp>
+
+	* [w3m-dev 04452] Re: w3m on macosx 10.6.6
+	* doc/w3m.1, doc/STORY.html, doc-jp/STORY.html: 
+	  delete words about formerly included Boehm GC library.
+
+2012-05-22  Enu <theme.of.n@gmail.com>
+
+	* file.c, HTML.c: parse META CHARSET.
+
 2011-01-17  Dai Sato <satodai@w3m.jp>
 
 	* correction: ChangeLog of 2011-01-15 (0.5.2 -> 0.5.3)
@@ -9304,4 +9319,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.1051 2011/01/17 11:53:57 inu Exp $
+$Id: ChangeLog,v 1.1055 2012/05/22 10:20:45 inu Exp $

Makefile.in

@@ -288,8 +288,7 @@ uninstall:
 clean: sweep
 	-$(RM) -f *.o *.a $(TARGETS) mktable$(EXT)
 	-$(RM) -f funcname.tab
-	-$(RM) -f entity.h
+	-$(RM) -f entity.h funcname.c funcname1.h funcname2.h tagtable.c functable.c
-	-$(RM) -f funcname.c funcname1.h funcname2.h tagtable.c functable.c
 	-for dir in w3mimg libwc; \
 	do \
 		(cd $$dir && $(MAKE) clean RM="$(RM)"); \

doc-jp/STORY.html

@@ -158,6 +158,9 @@ w3m
 <a href="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">Boehm GC</a>
 というライブラリを利用している．これは私が書いたものではないが，
 コンパイル時の便宜を考えて配布パッケージに含めている．
+<P>
+# Boehm GC は、w3m-0.4.2 以降のパッケージには含まれていません。
+<P>
 なお，libwww は使っていない．
 <P>
 Boehm GCは，Cから使えるガベージコレクタだ．table を実装したあたりにこれを

doc/STORY.html

@@ -182,6 +182,10 @@ library. This library was written by H. Boehm and A. Demers.
 I could distribute w3m without this library because one can
 get the library separately, but I decided to contain it in the
 w3m distribution for the convenience of an installer.
+<P>
+# Boehm GC library is no longer included into w3m packages
+# after w3m-0.4.2.
+<P>
 W3m doesn't use libwww.
 <P>
 Boehm GC is a garbage collector for C and C++. I began to use this

doc/w3m.1

@@ -245,8 +245,6 @@ or on its English version of the site at:
 .I
 w3m
 has incorporated code from several sources.
-Hans J. Boehm, Alan J. Demers, Xerox Corp. and Silicon Graphics
-have the copyright of the GC library comes with w3m package.
 Users have contributed patches and suggestions over time.
 .SH AUTHOR
 Akinori ITO <aito@fw.ipsj.or.jp>

file.c

@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.265 2010/12/15 10:50:24 htrb Exp $ */
+/* $Id: file.c,v 1.266 2012/05/22 09:45:56 inu Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -5137,10 +5137,17 @@ HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env)
 	HTMLlineproc1(tmp->ptr, h_env);
 	return 1;
     case HTML_META:
-	p = q = NULL;
+	p = q = r = NULL;
 	parsedtag_get_value(tag, ATTR_HTTP_EQUIV, &p);
 	parsedtag_get_value(tag, ATTR_CONTENT, &q);
 #ifdef USE_M17N
+	parsedtag_get_value(tag, ATTR_CHARSET, &r);
+	if (r) {
+	    /* <meta charset=""> */
+	    SKIP_BLANKS(r);
+	    meta_charset = wc_guess_charset(r, 0);
+	}
+	else
 	if (p && q && !strcasecmp(p, "Content-Type") &&
 	    (q = strcasestr(q, "charset")) != NULL) {
 	    q += 7;

html.c

@@ -1,4 +1,4 @@
-/* $Id: html.c,v 1.32 2010/08/14 01:29:40 htrb Exp $ */
+/* $Id: html.c,v 1.33 2012/05/22 09:45:56 inu Exp $ */
 #include "html.h"
 
 /* Define HTML Tag Infomation Table */
@@ -37,8 +37,8 @@ unsigned char ALST_TABLE[] =
     ATTR_CELLPADDING, ATTR_VSPACE, ATTR_CORE
 };
 #define MAXA_TABLE	MAXA_CORE + 6
-unsigned char ALST_META[] = { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_CORE };
+unsigned char ALST_META[] = { ATTR_HTTP_EQUIV, ATTR_CONTENT, ATTR_CHARSET, ATTR_CORE };
-#define MAXA_META	MAXA_CORE + 2
+#define MAXA_META	MAXA_CORE + 3
 unsigned char ALST_FRAME[] = { ATTR_SRC, ATTR_NAME, ATTR_CORE };
 #define MAXA_FRAME	MAXA_CORE + 2
 unsigned char ALST_FRAMESET[] = { ATTR_COLS, ATTR_ROWS, ATTR_CORE };

version.c.in

@@ -1,5 +1,5 @@
-/* $Id: version.c.in,v 1.48 2011/01/15 07:52:48 inu Exp $ */
+/* $Id: version.c.in,v 1.49 2012/05/22 09:45:56 inu Exp $ */
-#define CURRENT_VERSION "w3m/0.5.3"
+#define CURRENT_VERSION "w3m/0.5.3+cvs"
 
 #ifndef FM_H
 char *w3m_version = CURRENT_VERSION;