Adding upstream version 0.5.3upstream/0.5.3

11 files changed, 185 insertions, 18 deletions

diff --git a/doc/CVS/Entries b/doc/CVS/Entries
new file mode 100644
index 0000000..8cae998
--- /dev/null
+++ b/doc/CVS/Entries
@@ -0,0 +1,21 @@
+/HISTORY/1.2/Tue Jul  9 05:54:46 2002//
+/README.cygwin/1.5/Sun Feb 23 16:00:16 2003//
+/README.dict/1.4/Wed Apr 24 18:46:48 2002//
+/README.func/1.21/Mon Sep 22 21:02:22 2003//
+/README.mouse/1.1/Mon Nov 25 17:23:45 2002//
+/README.pre_form/1.3/Mon May 12 16:24:53 2003//
+/README.tab/1.1/Tue Nov  5 17:24:47 2002//
+/STORY.html/1.3/Wed Nov 21 04:29:14 2001//
+/keymap.lynx/1.4/Fri Dec 13 03:02:04 2002//
+/menu.default/1.4/Fri Apr  7 15:05:49 2006//
+/menu.submenu/1.3/Fri Apr  7 15:05:49 2006//
+/keymap.default/1.8/Sat Jun 10 09:52:18 2006//
+/FAQ.html/1.9/Tue Jan  4 09:22:24 2011//
+/MANUAL.html/1.6/Tue Jan  4 09:22:24 2011//
+/README.img/1.6/Tue Jan  4 09:22:24 2011//
+/README.m17n/1.3/Tue Jan  4 09:22:24 2011//
+/README.passwd/1.1/Tue Aug  3 10:02:16 2010//
+/README.cookie/1.2/Sat Jan 15 01:57:39 2011//
+/README/1.26/Sat Jan 15 02:17:25 2011//
+/w3m.1/1.9/Sat Jan 15 06:37:24 2011//
+D
diff --git a/doc/CVS/Repository b/doc/CVS/Repository
new file mode 100644
index 0000000..5431c7e
--- /dev/null
+++ b/doc/CVS/Repository
@@ -0,0 +1 @@
+w3m/doc
diff --git a/doc/CVS/Root b/doc/CVS/Root
new file mode 100644
index 0000000..121fa06
--- /dev/null
+++ b/doc/CVS/Root
@@ -0,0 +1 @@
+:ext:inu@w3m.cvs.sourceforge.net:/cvsroot/w3m
diff --git a/doc/FAQ.html b/doc/FAQ.html
index 50478e3..ed2a704 100644
--- a/doc/FAQ.html
+++ b/doc/FAQ.html
@@ -54,7 +54,7 @@ Corrected by Tom Berger <tom.be@gmx.net>
 <li><h3>w3m appends a URL to the former one despite of having cleared the line with Ctrl-u. What to do?</h3>
 </ul>
 <br>
-<li><a href="other"><h2>Misc</a></h2>
+<li><a href="#other"><h2>Misc</a></h2>
 <ul>
 <li><h3>What is w3m's configuration file?</h3>
 <li><h3>What are these w3mxxxx files in my ~/.w3m directory for?</h3>
diff --git a/doc/MANUAL.html b/doc/MANUAL.html
index 4877f72..aff0189 100644
--- a/doc/MANUAL.html
+++ b/doc/MANUAL.html
@@ -103,8 +103,6 @@ same as that appears in ~/.w3m/config.
 <dd>Process cookies.
 <dt>-no-cookie
 <dd>Don't process cookies.
-<dt>-pauth username:password
-<dd>Set username and password for (basic) proxy authentication.
 <dt>-num
 <dd>Show linenumber.
 <dt>-dump
@@ -131,7 +129,7 @@ with -cols option.
 <dt>-no-proxy
 <dd>Don't use proxy server.
 <dt>-no-graph
-<dd>Don't use graphic character to draw frames.
+<dd>Use ASCII character to draw frames.
 <dt>-no-mouse
 <dd>Don't activate mouse.
 <dt>-config file
diff --git a/doc/README b/doc/README
index e696900..324ea3e 100644
--- a/doc/README
+++ b/doc/README
@@ -1,4 +1,4 @@
-	w3m: WWW wo Miru Tool  version 0.5.2	May 31, 2007
+	w3m: WWW wo Miru Tool  version 0.5.3	Jan 15, 2011
 		(C) Copyright Akinori ITO
 			      Hironori SAKAMOTO
 			      Fumitoshi UKAI
@@ -90,7 +90,7 @@ Windows
 3. Copyright
 
   (C) Copyright 1994-2002 by Akinori Ito
-  (C) Copyright 2002-2007 by Akinori Ito, Hironori Sakamoto, Fumitoshi Ukai
+  (C) Copyright 2002-2011 by Akinori Ito, Hironori Sakamoto, Fumitoshi Ukai
 
 4. License
 
diff --git a/doc/README.cookie b/doc/README.cookie
new file mode 100644
index 0000000..56cca50
--- /dev/null
+++ b/doc/README.cookie
@@ -0,0 +1,44 @@
+cookie support of w3m
+
+
+                                                         (2000/11/07)  K. Okada
+                                                        okabek@guitar.ocn.ne.jp
+
+ * Support of version 0 (http://www.netscape.com/newsref/std/cookie_spec.html)
+   and version 1 (http://www.ics.uci.edu/pub/ietf/http/rfc2109.txt,
+   http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-state-man-mec-12.txt)
+   cookie.
+   
+ * If you wont to disable cookie support, run configure script with
+    --disable-cookie option.
+   
+ * You can choose to use cookie or not on the Option Setting Panel or
+   -cookie and -no-cookie option.
+   
+ * You can disable cookie on the Option Setting Panel. In this case
+    all cookies are rejected, however, cookies which accepted before
+    disable cookie are used.
+   
+ * You can see list of accepted cookies with C-k. In this panel, you
+    can choose to use each cookie or not.
+   
+ * You can specify domains accept or not accept cookies on the Option
+    Setting Panel. Domains are specified with following format.
+   
+      domain-list = domains
+                  | ""
+      domains     = domain
+                  | domain + "," + domains
+      domain      = "." + domain-name      ; match with domain name
+                  | host-domain-name       ; match with HDN
+                  | ".local"               ; match with all HDN except which include  "."
+                  | "."                    ; match with all
+
+                              (HDN: host domain name)
+
+
+ ¡¦ If the number of "." in domain name is lesser than 2, it is
+    assumed as invalid cookie (cf. RFC 2109 4.3.2), however, you can
+    use cookie_avoid_wrong_number_of_dots to avoid this
+    restriction. You can set this in "Domains to avoid [wrong number
+    of dots]" on the Option Setting Panel.
diff --git a/doc/README.img b/doc/README.img
index 45eb338..0c10114 100644
--- a/doc/README.img
+++ b/doc/README.img
@@ -12,7 +12,8 @@ Introduction
 Support
 
   * Display inline image (GIF,PNG,JPEG, etc.) on terminals
-    (xterm,rxvt, etc.) of X11 or Linux framebuffer device.
+    (xterm,rxvt, etc.) of X11, Linux framebuffer device or
+    terminals of Windows.
   * Support inline image of <img> tag.
     Support of attributes "width", "height", and "align".
   * Direct display of image file which header is "Content-type: image/*"
@@ -42,7 +43,7 @@ Key functions
       keymap  C-c  STOP_IMAGE
       keyamp  t    SET_OPTION  display_image=toggle
 
-Comandline options
+Commandline options
 
   -ppc <pixel>
       # of pixels per character. The default value is automatically
@@ -70,7 +71,7 @@ Option panel
   ext_image_viewer
       Use external image viewer, when a command VIEW_IMAGE or
       view of image file which header is "Content-type: image/*".
-      The default is ON. If it is OFF, the image is directly displaied.
+      The default is ON. If it is OFF, the image is directly displayed.
   image_scale
       Scale of image (%). The default value is 100(%).
   imgdisplay
@@ -122,6 +123,12 @@ Setting w3mimgdisplay
       automatically detected.
       The default value for Linux framebuffer device is #000000 (black).
       When the color is specified as #RRGGBB, escape '#'.
+  -anim <n>
+      Maximum number of frames for animation. It means without limit
+      if the number is 0. Negative value count backward from the end
+      of the frames. The default value is 100.
+  -margin <n>
+      Margin of an area to clear an image. The default value is 0.
 
   ex.)
     w3m -o 'imgdisplay=w3mimgdisplay -x 5 -bg "#cccccc"'
@@ -134,6 +141,10 @@ Notice
     Some code in w3mimg/fb/fb.c was originally written by Mr. Yamasaki.
     http://www.sainet.or.jp/~yamasaki/download/fb-sample.tar.gz
 
+    On Windows, we check the behaver on standard console, Cygwin rxvt
+    and PuTTY.
+
+
 Change log
 
 2002/02/04
@@ -151,7 +162,7 @@ Change log
 2002/01/28	w3m-0.2.4-img-2.0
  * Based on w3m-0.2.4+cvs-1.265.
  * pixel_per_char and pixel_per_line are automatically detected.
- * The bckground color of terminal is automatically detected.
+ * The background color of terminal is automatically detected.
  * The source code to display images is moved to image.c
 
 2002/01/08	w3m-0.2.4-img-1.18
diff --git a/doc/README.m17n b/doc/README.m17n
index 0dd1b78..c064d76 100644
--- a/doc/README.m17n
+++ b/doc/README.m17n
@@ -197,12 +197,20 @@ Option pannel
        Strict ISO-2022-JP/KR/CN. (Default: ON)
        If it is OFF, all ISO 2022 base character set can be displayed
        with ISO-2022-JP/KR/CN.
+   east_asian_width
+       Use double width for some Unicode characters. (Default: OFF)
+       If it is ON, treat East Asian Ambiguous characters as double width.
+   gb18030_as_ucs
+       Treat 4 bytes char. of GB18030 as Unicode. (Default: OFF)
+   simple_preserve_space
+       Simple Preserve space.
+       If it is ON, a space is remained in Japanese and some other languages.
 
    alt_entity
        Use alternate expression with ASCII for entities. (Default: ON)
        If it is OFF, entities are treated as ISO 8859-1
    graphic_char
-       Use graphic char for border of table and menu.
+       Use DEC special graphics for border of table and menu.
        If it is OFF, ruled line is used with CJK charset or UTF-8.
 
 Code conversion
diff --git a/doc/README.passwd b/doc/README.passwd
new file mode 100644
index 0000000..f65fa77
--- /dev/null
+++ b/doc/README.passwd
@@ -0,0 +1,23 @@
+You can save your passwords and usernames for a web page which require
+HTTP certification or a proxy certification.
+
+The configuration file is designated in "passwd_file" parameter. The
+format of the configuration file is as follows
+
+machine hostname
+port port number
+path local part
+realm realm string
+login username
+passwd password
+proxy
+
+Each configuration is began with machine and ended before the next machine.
+You can omit port, path and realm.
+
+proxy means settings for proxy certification.
+
+If passwd_file is readable from other users, w3m shows a warning for
+that.  If you can not set the permission for the passwd_file because
+of the restriction of your OS, you can suppress the warning with the
+setting of disable_secret_security_check.
diff --git a/doc/w3m.1 b/doc/w3m.1
index 47b6cf1..aeb4a60 100644
--- a/doc/w3m.1
+++ b/doc/w3m.1
@@ -8,7 +8,6 @@ w3m \- a text based Web browser and pager
 .B w3m
 [options] [URL or filename]
 .PP
-Use "w3m -h" to display a complete list of current options.
 .SH DESCRIPTION
 .\" This defines appropriate quote strings for nroff and troff
 .ds lq \&"
@@ -53,6 +52,12 @@ ignore backspace effect
 .B -l line
 # of preserved line (default 10000)
 .TP
+.B -I charset
+document charset
+.TP
+.B -O charset
+display/output charset
+.TP
 .B -B
 load bookmark
 .TP
@@ -71,6 +76,9 @@ visual startup mode
 .B -M
 monochrome display
 .TP
+.B -N
+open URL of command line on each new tab
+.TP
 .B -F
 automatically render frame
 .TP
@@ -81,8 +89,11 @@ dump formatted page into stdout
 specify column width (used with -dump)
 .TP
 .B -ppc count
-specify the number of pixels per character (default 8.0)
-Larger values will make tables narrower.
+specify the number of pixels per character (4.0...32.0).
+Larger values will make tables narrower.  [default 8.0]
+.TP
+.B -ppl count
+specify the number of pixels per line (4.0...64.0)
 .TP
 .B -dump_source
 dump page source into stdout
@@ -111,6 +122,12 @@ show line number
 .B -no-proxy
 don't use proxy
 .TP
+.B -4
+IPv4 only (-o dns_order=4)
+.TP
+.B -6
+IPv6 only (-o dns_order=6)
+.TP
 .B -no-mouse
 don't use mouse
 .TP
@@ -120,8 +137,11 @@ use cookie.
 .B -no-cookie
 don't use cookie
 .TP
-.B -pauth user:pass
-proxy authentication
+.B -graph
+use graphic character
+.TP
+.B -no-graph
+don't use graphic character
 .TP
 .B -S
 squeeze multiple blank lines
@@ -133,7 +153,7 @@ toggle wrap search mode
 don't use termcap init/deinit
 .TP
 .B -title [=TERM]
-set buffer name to termianl title string. 
+set buffer name to terminal title string. 
 If TERM is specified, use the TERM style title configuration.
 .TP
 .B -o opt=value
@@ -151,6 +171,9 @@ show usage
 .B -version
 show w3m version
 .TP
+.B -reqlog
+write request logfile
+.TP
 .B -debug
 DO NOT USE
 .SH EXAMPLES
@@ -167,12 +190,49 @@ $ cat foo.html | w3m -T text/html
 or
 .br
 $ cat foo.html | w3m -dump -T text/html >foo.txt
+.SH FILES
+.TP
+.I ${HOME}/.w3m/config
+configuration file
+.TP
+.I ${HOME}/.w3m/keymap
+key binding configuration file
+.\" .TP
+.\" .I ${HOME}/.w3m/menu
+.\" ???
+.TP
+.I ${HOME}/.w3m/mouse
+mouse configuration file
+.TP
+.I ${HOME}/.w3m/cookie
+cookie file
+.TP
+.I ${HOME}/.w3m/history
+history file
+.TP
+.I ${HOME}/.w3m/passwd
+passowrd and username file
+.TP
+.I ${HOME}/.w3m/pre_form
+form parameters file
+.TP
+.I ${HOME}/.w3m/mailcap
+external viewer configuration file
+.TP
+.I ${HOME}/.w3m/mime.types
+MIME types file
+.\" .TP
+.\" .I ${HOME}/.w3m/urimethodmap
+.\" ???
 .SH NOTES
 This is the
 .I
 w3m
-0.2.1 Release.
+0.5.3 Release.
 .PP
+Please see the MANUAL.html file distributed with w3m for
+more detailed documentation.
+
 Additional information about
 .I
 w3m