diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2016-05-23 11:07:33 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2016-05-23 11:07:33 +0000 |
| commit | bd0812f69bc4946474e749dafefa20a6d6a99073 (patch) | |
| tree | 5068f5ea4135cb6850943dd36169d709038c81bd | |
| parent | Debian release 0.5.3-27 (diff) | |
| download | w3m-bd0812f69bc4946474e749dafefa20a6d6a99073.tar.gz w3m-bd0812f69bc4946474e749dafefa20a6d6a99073.zip | |
Update 020_debian.patch to v0.5.3+git20160511
- Fix crash with crafted html files (closes: #820162, #820373)
- Cleanup obsolete INIT_MAILCAP (closes: #820902)
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/020_debian.patch | 7684 |
1 files changed, 6753 insertions, 931 deletions
diff --git a/debian/patches/020_debian.patch b/debian/patches/020_debian.patch index ed91ddf..f322eb6 100644 --- a/debian/patches/020_debian.patch +++ b/debian/patches/020_debian.patch @@ -60,10 +60,128 @@ index 8f443c1..5fb6581 100755 $input = "w3m-control: GOTO_LINK"; } diff --git a/ChangeLog b/ChangeLog -index 88358ef..a95580f 100644 +index 88358ef..e166aa5 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,3 +1,882 @@ +@@ -1,3 +1,1000 @@ ++2016-05-11 Tatsuya Kinoshita <tats@debian.org> ++ ++ * config.guess, config.sub: ++ Update config.* with autotools-dev 20160430.1. ++ ++2016-04-14 Tatsuya Kinoshita <tats@debian.org> ++ ++ * doc-de/README.func, doc-jp/README.func, doc/README.func: ++ * w3m-doc/sample/keymap.cgi: Cleanup obsolete INIT_MAILCAP. ++ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820902 ++ ++ * NEWS: Update NEWS. ++ ++2016-04-08 Tatsuya Kinoshita <tats@debian.org> ++ ++ * libwc/johab.c: Fix segfault on bogus text for wc_N_to_johab1. ++ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820373 ++ ++2016-04-07 Tatsuya Kinoshita <tats@debian.org> ++ ++ * libwc/map/big5_ucs.map, libwc/map/cns11643_ucs.map: ++ * libwc/map/gb12345_ucs.map, libwc/map/gb2312_ucs.map: ++ * libwc/map/gbk_ucs.map, libwc/map/hkscs_ucs.map: ++ * libwc/map/jisx0208x0212x0213_ucs.map, libwc/map/ksx1001_ucs.map: ++ * libwc/map/sjis_ext_ucs.map, libwc/map/uhc_ucs.map, libwc/ucs.c: ++ * libwc/ucs.map: Fix segfault on bogus text for wc_any_to_ucs. ++ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=820162 ++ ++2016-04-03 Tatsuya Kinoshita <tats@debian.org> ++ ++ * doc/FAQ.html, doc/MANUAL.html: Update English documents. ++ ++2016-04-03 Markus Hiereth <markus.hiereth@freenet.de> ++ ++ * doc/FAQ.html, doc/MANUAL.html: Update English documents. ++ Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#25 ++ ++2016-04-02 Tatsuya Kinoshita <tats@debian.org> ++ ++ * configure, configure.ac, doc-de/README.func, scripts/Makefile.in: ++ * scripts/w3mhelp-funcdesc.de.pl.in, scripts/w3mhelp.cgi.in: ++ Support German translated help messages (translation is in progress). ++ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765682 ++ ++ * doc-jp/w3m.1, doc/w3m.1: Update manpage footers to w3m 0.5.3. ++ ++ * doc-jp/MANUAL.html, doc-jp/w3m.1, w3m-doc/outline.html.in: ++ * w3mhelp-lynx_ja.html.in, w3mhelp-w3m_ja.html.in: ++ Update Japanese documents for extbrowser4..9. ++ ++2016-04-02 Justin B Rye <justin.byam.rye@gmail.com> ++ ++ * doc/FAQ.html, doc/MANUAL.html, doc/README.func, doc/menu.submenu: ++ * main.c, menu.c, scripts/w3mhelp-funcdesc.ja.pl.in: ++ * scripts/w3mhelp.cgi.in, w3mhelp-lynx_en.html.in: ++ * w3mhelp-w3m_en.html.in: English fixes. ++ cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=772341#15 ++ Origin: https://lists.debian.org/debian-l10n-english/2014/12/msg00002.html ++ Origin: https://lists.debian.org/debian-l10n-english/2014/12/msg00030.html ++ Origin: https://lists.debian.org/debian-l10n-english/2015/02/msg00011.html ++ ++2016-03-30 Leo Famulari <leo@famulari.name> ++ ++ * url.c: Disable RC4. ++ Origin: http://git.savannah.gnu.org/cgit/guix.git/commit/?id=62339e2d493bf87a3aabe12e45458581e9705d83 ++ ++2016-03-29 Tatsuya Kinoshita <tats@debian.org> ++ ++ * url.c: Fix variable is reassigned a value before the old one has ++ been used. ++ ++ * regex.c: Fix printf format specifier mismatch when REGEX_DEBUG. ++ ++ * w3mimg/fb/fb.c: Fix invalid braces when not Linux or FreeBSD. ++ ++ * local.c: Fix uninitialized variable when not HAVE_PUTENV. ++ ++ * w3mimgdisplay.c: Fix realloc mistake for DrawImage. ++ ++ * file.c: Fix mistake of unescape spaces for _doFileCopy. ++ cf. [w3m-dev-en 00751], [w3m-dev-en 00752] on 2002-06-09 ++ ++ * url.c: Fix style of array index is used before limits check. ++ Bug: https://sourceforge.net/p/w3m/feature-requests/25/ ++ ++2016-03-22 Tatsuya Kinoshita <tats@debian.org> ++ ++ * menu.c, proto.h: Fix build failure when not USE_MOUSE for sgrmouse. ++ cf. https://twitter.com/naota344/status/711541592167854081 ++ ++2016-03-20 Tatsuya Kinoshita <tats@debian.org> ++ ++ * rc.c: Fix reverse ordered config parameters. ++ ++2016-03-19 Tatsuya Kinoshita <tats@debian.org> ++ ++ * doc/FAQ.html: Update FAQ for extbrowser. ++ ++2016-03-14 Tatsuya Kinoshita <tats@debian.org> ++ ++ * po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po, po/zh_TW.po, rc.c: ++ Update PO strings for extbrowser2..9. ++ ++2016-03-13 Tatsuya Kinoshita <tats@debian.org> ++ ++ * acinclude.m4, configure: ++ Set firefox instead of mozilla to default browser. ++ ++ * po/Makefile.in.in, po/de.po, po/ja.po, po/w3m.pot, po/zh_CN.po: ++ * po/zh_TW.po: Update PO strings for extbrowser4..9. ++ ++ * doc-jp/MANUAL.html, doc/MANUAL.html, fm.h, main.c, rc.c: ++ Add extbrowser4, extbrowser5, ..., and extbrowser9. ++ e.g. ++ - extbrowser8 url=%s && printf %s "$url" | xsel && printf %s "$url" | xsel -b ++ - extbrowser9 mpv %s & ++ cf. https://github.com/spcmd/w3m ++ +2016-02-28 Tatsuya Kinoshita <tats@debian.org> + + * menu.c: Fix SIGFPE for ACCESSKEY. @@ -968,6 +1086,48 @@ index 7d692f9..8fa799e 100644 for dir in $(SCRIPTSUBDIRS); \ do \ (cd $$dir && $(MAKE) $(MAKE_ARGS)); \ +diff --git a/NEWS b/NEWS +index 66e309d..b876c20 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,37 @@ ++w3m X.X.X - YYYY-MM-DD ++ ++* new features ++ - support OSC 5379 remote imaging and sixel graphics ++ - support SGR style mouse handler ++ - support 32-bit color images ++ - support FreeBSD framebuffer ++ - support button element ++ - support meta charset ++ - add extbrowser4..9 ++ - add display_borders to display 0 pixel table borders ++ - add siteconf feature ++ - add translations for de, zh_CN and zh_TW ++* bug fixes ++ - disable SSLv2 and SSLv3 by default [CVE-2014-3566] ++ - set ssl_verify_server to 1 by default ++ - disable RC4, export ciphers, and keys < 128 bits ++ - use SSL_OP_NO_COMPRESSION due to "CRIME attack" [CVE-2012-4929] ++ - use SSL_MODE_RELEASE_BUFFERS ++ - disable USE_EGD for LibreSSL ++ - appease gcc -Werror=format-security ++ - fix segfaults ++ - option -s is now "squeeze multiple blank lines" to work as pager, and ++ -j and -e are obsolete, so use -O{s|j|e} to specify display charset ++ - accept single quoted meta refresh URL ++ - assume "text" if a form input type is unknown ++ - accept cookies by default ++ - set argv_is_url to 1 by default ++ - set alt_entity to 0 by default ++ - fix build problems with Boehm GC 7.2, imlib2 1.4.6 and glibc 2.14 ++ - fix parallel make failure ++ - fix incorrect ucs_ambwidth_map ++ - and many fixes ++ + w3m 0.5.3 - 2011-01-15 + + * security fix diff --git a/README b/README index 8778d80..765c996 100644 --- a/README @@ -1133,7 +1293,7 @@ index f345c74..248815d 100644 void Strtruncate(Str, int); void Strlower(Str); diff --git a/acinclude.m4 b/acinclude.m4 -index e4ccc3d..60705f4 100644 +index e4ccc3d..ed1035d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -6,7 +6,8 @@ dnl w3m autoconf macros @@ -1146,6 +1306,19 @@ index e4ccc3d..60705f4 100644 CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c`]) # # ---------------------------------------------------------------- +@@ -330,10 +331,10 @@ AC_DEFINE_UNQUOTED(DEF_MAILER, "$w3m_mailer")]) + # ---------------------------------------------------------------- + AC_DEFUN([AC_W3M_EXT_BROWSER], + [AC_SUBST(DEF_EXT_BROWSER) +-w3m_browser="/usr/bin/mozilla" ++w3m_browser="/usr/bin/firefox" + AC_MSG_CHECKING(which external browser is used by default) + AC_ARG_WITH(browser, +- [ --with-browser=BROWSER default browser (/usr/bin/mozilla)], ++ [ --with-browser=BROWSER default browser (/usr/bin/firefox)], + [w3m_browser="$with_browser"]) + AC_MSG_RESULT($w3m_browser) + AC_DEFINE_UNQUOTED(DEF_EXT_BROWSER, "$w3m_browser")]) @@ -400,10 +401,10 @@ AC_DEFUN([AC_W3M_TERMLIB], AC_ARG_WITH(termlib, [ --with-termlib[=LIBS] terminal library @@ -1425,7 +1598,7 @@ index 5afc26a..3b2352a 100644 unlink(buf->savecache); buf->savecache = NULL; diff --git a/config.guess b/config.guess -index 51fab47..1659250 100755 +index 51fab47..0967f2a 100755 --- a/config.guess +++ b/config.guess @@ -1,13 +1,12 @@ @@ -1433,10 +1606,10 @@ index 51fab47..1659250 100755 # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# Copyright 1992-2015 Free Software Foundation, Inc. ++# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2004-03-12' -+timestamp='2015-08-20' ++timestamp='2016-04-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1471,7 +1644,7 @@ index 51fab47..1659250 100755 -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. @@ -1486,7 +1659,7 @@ index 51fab47..1659250 100755 Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -+Copyright 1992-2015 Free Software Foundation, Inc. ++Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1609,7 +1782,7 @@ index 51fab47..1659250 100755 ;; esac # The OS release -@@ -189,78 +221,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -189,78 +221,48 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in release='-gnu' ;; *) @@ -1679,6 +1852,10 @@ index 51fab47..1659250 100755 + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; ++ *:LibertyBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} ++ exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; @@ -1709,14 +1886,66 @@ index 51fab47..1659250 100755 ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -306,40 +304,46 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -270,76 +272,82 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV4.5 (21064)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "LCA4 (21066/21068)") +- UNAME_MACHINE="alpha" ;; ++ UNAME_MACHINE=alpha ;; + "EV5 (21164)") +- UNAME_MACHINE="alphaev5" ;; ++ UNAME_MACHINE=alphaev5 ;; + "EV5.6 (21164A)") +- UNAME_MACHINE="alphaev56" ;; ++ UNAME_MACHINE=alphaev56 ;; + "EV5.6 (21164PC)") +- UNAME_MACHINE="alphapca56" ;; ++ UNAME_MACHINE=alphapca56 ;; + "EV5.7 (21164PC)") +- UNAME_MACHINE="alphapca57" ;; ++ UNAME_MACHINE=alphapca57 ;; + "EV6 (21264)") +- UNAME_MACHINE="alphaev6" ;; ++ UNAME_MACHINE=alphaev6 ;; + "EV6.7 (21264A)") +- UNAME_MACHINE="alphaev67" ;; ++ UNAME_MACHINE=alphaev67 ;; + "EV6.8CB (21264C)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8AL (21264B)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.8CX (21264D)") +- UNAME_MACHINE="alphaev68" ;; ++ UNAME_MACHINE=alphaev68 ;; + "EV6.9A (21264/EV69A)") +- UNAME_MACHINE="alphaev69" ;; ++ UNAME_MACHINE=alphaev69 ;; + "EV7 (21364)") +- UNAME_MACHINE="alphaev7" ;; ++ UNAME_MACHINE=alphaev7 ;; + "EV7.9 (21364A)") +- UNAME_MACHINE="alphaev79" ;; ++ UNAME_MACHINE=alphaev79 ;; + esac + # A Pn.n version is a patched version. + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms - exit 0 ;; ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 @@ -1770,7 +1999,7 @@ index 51fab47..1659250 100755 Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then -@@ -347,32 +351,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -347,32 +355,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in else echo pyramid-pyramid-bsd fi @@ -1809,16 +2038,16 @@ index 51fab47..1659250 100755 + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build -+ SUN_ARCH="i386" ++ SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then -+ SUN_ARCH="x86_64" ++ SUN_ARCH=x86_64 + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -1833,7 +2062,7 @@ index 51fab47..1659250 100755 sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) -@@ -381,10 +404,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -381,13 +408,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` @@ -1845,8 +2074,12 @@ index 51fab47..1659250 100755 + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 -@@ -396,10 +419,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} +@@ -396,10 +423,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-sunos${UNAME_RELEASE} ;; esac @@ -1859,7 +2092,7 @@ index 51fab47..1659250 100755 # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor -@@ -409,41 +432,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -409,41 +436,41 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) @@ -1918,7 +2151,7 @@ index 51fab47..1659250 100755 mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -467,35 +490,36 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +@@ -467,35 +494,36 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit (-1); } EOF @@ -1968,7 +2201,7 @@ index 51fab47..1659250 100755 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -508,29 +532,29 @@ EOF +@@ -508,29 +536,29 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi @@ -2007,7 +2240,7 @@ index 51fab47..1659250 100755 ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` -@@ -538,7 +562,7 @@ EOF +@@ -538,7 +566,7 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} @@ -2016,7 +2249,7 @@ index 51fab47..1659250 100755 *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build -@@ -553,49 +577,54 @@ EOF +@@ -553,49 +581,54 @@ EOF exit(0); } EOF @@ -2085,7 +2318,7 @@ index 51fab47..1659250 100755 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in -@@ -604,52 +633,52 @@ EOF +@@ -604,74 +637,84 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` @@ -2097,17 +2330,18 @@ index 51fab47..1659250 100755 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; +- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac ++ 32) HP_ARCH=hppa2.0n ;; ++ 64) HP_ARCH=hppa2.0w ;; ++ '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 + esac ;; + esac fi @@ -2175,11 +2409,13 @@ index 51fab47..1659250 100755 + exit (0); + } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` +- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -657,9 +686,19 @@ EOF + fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] +- if [ ${HP_ARCH} = "hppa2.0w" ] ++ if [ ${HP_ARCH} = hppa2.0w ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build @@ -2195,12 +2431,14 @@ index 51fab47..1659250 100755 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + -+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then - HP_ARCH="hppa2.0w" +- HP_ARCH="hppa2.0w" ++ HP_ARCH=hppa2.0w else -@@ -667,11 +706,11 @@ EOF +- HP_ARCH="hppa64" ++ HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -2214,7 +2452,7 @@ index 51fab47..1659250 100755 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -699,340 +738,348 @@ EOF +@@ -699,340 +742,351 @@ EOF exit (0); } EOF @@ -2308,12 +2546,13 @@ index 51fab47..1659250 100755 + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; @@ -2322,8 +2561,8 @@ index 51fab47..1659250 100755 - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -2440,7 +2679,7 @@ index 51fab47..1659250 100755 # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -2464,7 +2703,7 @@ index 51fab47..1659250 100755 + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 -+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi ++ if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) @@ -2516,6 +2755,9 @@ index 51fab47..1659250 100755 - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; ++ k1om:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} ++ exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; @@ -2771,7 +3013,7 @@ index 51fab47..1659250 100755 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then -@@ -1040,15 +1087,16 @@ EOF +@@ -1040,15 +1094,16 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi @@ -2791,7 +3033,7 @@ index 51fab47..1659250 100755 i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` -@@ -1066,73 +1114,86 @@ EOF +@@ -1066,73 +1121,86 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv32 fi @@ -2806,7 +3048,7 @@ index 51fab47..1659250 100755 + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub -+ # prints for the "djgpp" host, or else GDB configury will decide that ++ # prints for the "djgpp" host, or else GDB configure will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; @@ -2905,7 +3147,7 @@ index 51fab47..1659250 100755 *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1140,68 +1201,109 @@ EOF +@@ -1140,278 +1208,203 @@ EOF else echo ns32k-sni-sysv fi @@ -2996,6 +3238,9 @@ index 51fab47..1659250 100755 + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; ++ SX-ACE:SUPER-UX:*:*) ++ echo sxace-nec-superux${UNAME_RELEASE} ++ exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; @@ -3015,9 +3260,9 @@ index 51fab47..1659250 100755 + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then -+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ -+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in @@ -3040,8 +3285,9 @@ index 51fab47..1659250 100755 + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then -@@ -1209,22 +1311,28 @@ EOF +- if test "$UNAME_PROCESSOR" = "x86"; then ++ if test "$UNAME_PROCESSOR" = x86; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} @@ -3076,7 +3322,11 @@ index 51fab47..1659250 100755 *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 -@@ -1235,183 +1343,55 @@ EOF + # operating systems. +- if test "$cputype" = "386"; then ++ if test "$cputype" = 386; then + UNAME_MACHINE=i386 + else UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 @@ -3126,7 +3376,7 @@ index 51fab47..1659250 100755 + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) -+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos @@ -3137,6 +3387,9 @@ index 51fab47..1659250 100755 + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; ++ amd64:Isilon\ OneFS:*:*) ++ echo x86_64-unknown-onefs ++ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 @@ -3292,14 +3545,14 @@ index 51fab47..1659250 100755 cat >&2 <<EOF $0: unable to guess system type -@@ -1419,7 +1399,9 @@ This script, last modified $timestamp, has failed to recognize +@@ -1419,7 +1412,9 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +and -+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be @@ -3336,7 +3589,7 @@ index 2f41eed..3b575e4 100644 #define DEFAULT_TERM "dosansi" #else diff --git a/config.sub b/config.sub -index ba33103..1acc966 100755 +index ba33103..8d39c4b 100755 --- a/config.sub +++ b/config.sub @@ -1,42 +1,40 @@ @@ -3344,10 +3597,10 @@ index ba33103..1acc966 100755 # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# Copyright 1992-2015 Free Software Foundation, Inc. ++# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2004-03-12' -+timestamp='2015-08-20' ++timestamp='2016-03-30' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software @@ -3396,22 +3649,32 @@ index ba33103..1acc966 100755 # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: -+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. -@@ -70,8 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>." +@@ -55,8 +53,7 @@ timestamp='2004-03-12' + me=`echo "$0" | sed -e 's,.*/,,'` + + usage="\ +-Usage: $0 [OPTION] CPU-MFR-OPSYS +- $0 [OPTION] ALIAS ++Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS + + Canonicalize a configuration name. + +@@ -70,8 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. -+Copyright 1992-2015 Free Software Foundation, Inc. ++Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -83,11 +80,11 @@ Try \`$me --help' for more information." +@@ -83,11 +79,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) @@ -3426,7 +3689,7 @@ index ba33103..1acc966 100755 -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. -@@ -99,7 +96,7 @@ while test $# -gt 0 ; do +@@ -99,7 +95,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. echo $1 @@ -3435,7 +3698,7 @@ index ba33103..1acc966 100755 * ) break ;; -@@ -118,11 +115,18 @@ esac +@@ -118,11 +114,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in @@ -3456,7 +3719,7 @@ index ba33103..1acc966 100755 *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] -@@ -145,10 +149,13 @@ case $os in +@@ -145,10 +148,13 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ @@ -3471,7 +3734,7 @@ index ba33103..1acc966 100755 -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 -@@ -163,13 +170,17 @@ case $os in +@@ -163,13 +169,17 @@ case $os in os=-chorusos basic_machine=$1 ;; @@ -3492,7 +3755,7 @@ index ba33103..1acc966 100755 -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -186,6 +197,10 @@ case $os in +@@ -186,6 +196,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -3503,7 +3766,7 @@ index ba33103..1acc966 100755 -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` -@@ -203,6 +218,12 @@ case $os in +@@ -203,6 +217,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; @@ -3516,7 +3779,7 @@ index ba33103..1acc966 100755 -lynx*) os=-lynxos ;; -@@ -227,57 +248,114 @@ case $basic_machine in +@@ -227,57 +247,114 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ @@ -3647,7 +3910,7 @@ index ba33103..1acc966 100755 # We use `pc' rather than `unknown' # because (1) that's what they normally are, and -@@ -293,59 +371,89 @@ case $basic_machine in +@@ -293,59 +370,89 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ @@ -3758,7 +4021,7 @@ index ba33103..1acc966 100755 ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. -@@ -363,7 +471,7 @@ case $basic_machine in +@@ -363,7 +470,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; @@ -3767,7 +4030,7 @@ index ba33103..1acc966 100755 basic_machine=abacus-unknown ;; adobe68k) -@@ -409,6 +517,13 @@ case $basic_machine in +@@ -409,6 +516,13 @@ case $basic_machine in basic_machine=m68k-apollo os=-bsd ;; @@ -3775,13 +4038,13 @@ index ba33103..1acc966 100755 + basic_machine=i386-pc + os=-aros + ;; -+ asmjs) ++ asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux -@@ -417,10 +532,35 @@ case $basic_machine in +@@ -417,10 +531,35 @@ case $basic_machine in basic_machine=ns32k-sequent os=-dynix ;; @@ -3817,7 +4080,7 @@ index ba33103..1acc966 100755 convex-c1) basic_machine=c1-convex os=-bsd -@@ -445,13 +585,20 @@ case $basic_machine in +@@ -445,13 +584,20 @@ case $basic_machine in basic_machine=j90-cray os=-unicos ;; @@ -3840,7 +4103,7 @@ index ba33103..1acc966 100755 cris | cris-* | etrax*) basic_machine=cris-axis ;; -@@ -481,6 +628,14 @@ case $basic_machine in +@@ -481,6 +627,14 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; @@ -3855,7 +4118,7 @@ index ba33103..1acc966 100755 dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx -@@ -592,7 +747,6 @@ case $basic_machine in +@@ -592,7 +746,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; @@ -3863,7 +4126,7 @@ index ba33103..1acc966 100755 i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 -@@ -631,6 +785,17 @@ case $basic_machine in +@@ -631,6 +784,17 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; @@ -3881,7 +4144,7 @@ index ba33103..1acc966 100755 m88k-omron*) basic_machine=m88k-omron ;; -@@ -642,10 +807,21 @@ case $basic_machine in +@@ -642,10 +806,21 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; @@ -3904,7 +4167,7 @@ index ba33103..1acc966 100755 miniframe) basic_machine=m68000-convergent ;; -@@ -659,10 +835,6 @@ case $basic_machine in +@@ -659,10 +834,6 @@ case $basic_machine in mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; @@ -3915,7 +4178,7 @@ index ba33103..1acc966 100755 monitor) basic_machine=m68k-rom68k os=-coff -@@ -671,14 +843,29 @@ case $basic_machine in +@@ -671,14 +842,29 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; @@ -3945,7 +4208,7 @@ index ba33103..1acc966 100755 ncr3000) basic_machine=i486-ncr os=-sysv4 -@@ -743,9 +930,11 @@ case $basic_machine in +@@ -743,9 +929,11 @@ case $basic_machine in np1) basic_machine=np1-gould ;; @@ -3960,7 +4223,7 @@ index ba33103..1acc966 100755 ;; nsr-tandem) basic_machine=nsr-tandem -@@ -754,9 +943,8 @@ case $basic_machine in +@@ -754,9 +942,8 @@ case $basic_machine in basic_machine=hppa1.1-oki os=-proelf ;; @@ -3971,7 +4234,7 @@ index ba33103..1acc966 100755 ;; os400) basic_machine=powerpc-ibm -@@ -778,6 +966,14 @@ case $basic_machine in +@@ -778,6 +965,14 @@ case $basic_machine in basic_machine=i860-intel os=-osf ;; @@ -3986,7 +4249,7 @@ index ba33103..1acc966 100755 pbd) basic_machine=sparc-tti ;; -@@ -787,6 +983,12 @@ case $basic_machine in +@@ -787,6 +982,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; @@ -3999,7 +4262,7 @@ index ba33103..1acc966 100755 pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; -@@ -816,9 +1018,10 @@ case $basic_machine in +@@ -816,9 +1017,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; @@ -4012,7 +4275,7 @@ index ba33103..1acc966 100755 ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown -@@ -843,6 +1046,14 @@ case $basic_machine in +@@ -843,6 +1045,14 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; @@ -4027,7 +4290,7 @@ index ba33103..1acc966 100755 rom68k) basic_machine=m68k-rom68k os=-coff -@@ -869,6 +1080,10 @@ case $basic_machine in +@@ -869,6 +1079,10 @@ case $basic_machine in sb1el) basic_machine=mipsisa64sb1el-unknown ;; @@ -4038,7 +4301,7 @@ index ba33103..1acc966 100755 sei) basic_machine=mips-sei os=-seiux -@@ -880,6 +1095,9 @@ case $basic_machine in +@@ -880,6 +1094,9 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; @@ -4048,7 +4311,7 @@ index ba33103..1acc966 100755 sh64) basic_machine=sh64-unknown ;; -@@ -901,6 +1119,9 @@ case $basic_machine in +@@ -901,6 +1118,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; @@ -4058,7 +4321,7 @@ index ba33103..1acc966 100755 sun2) basic_machine=m68000-sun ;; -@@ -957,17 +1178,9 @@ case $basic_machine in +@@ -957,17 +1177,9 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; @@ -4079,7 +4342,7 @@ index ba33103..1acc966 100755 ;; tx39) basic_machine=mipstx39-unknown -@@ -1029,9 +1242,16 @@ case $basic_machine in +@@ -1029,9 +1241,16 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; @@ -4096,7 +4359,7 @@ index ba33103..1acc966 100755 ymp) basic_machine=ymp-cray os=-unicos -@@ -1040,6 +1260,10 @@ case $basic_machine in +@@ -1040,6 +1259,10 @@ case $basic_machine in basic_machine=z8k-unknown os=-sim ;; @@ -4107,7 +4370,7 @@ index ba33103..1acc966 100755 none) basic_machine=none-none os=-none -@@ -1059,6 +1283,9 @@ case $basic_machine in +@@ -1059,6 +1282,9 @@ case $basic_machine in romp) basic_machine=romp-ibm ;; @@ -4117,7 +4380,7 @@ index ba33103..1acc966 100755 rs6000) basic_machine=rs6000-ibm ;; -@@ -1075,13 +1302,10 @@ case $basic_machine in +@@ -1075,13 +1301,10 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; @@ -4133,7 +4396,7 @@ index ba33103..1acc966 100755 basic_machine=sparc-sun ;; cydra) -@@ -1125,9 +1349,12 @@ esac +@@ -1125,9 +1348,12 @@ esac if [ x"$os" != x"" ] then case $os in @@ -4148,7 +4411,7 @@ index ba33103..1acc966 100755 -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -@@ -1148,26 +1375,31 @@ case $os in +@@ -1148,26 +1374,32 @@ case $os in # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ @@ -4164,7 +4427,7 @@ index ba33103..1acc966 100755 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ @@ -4184,7 +4447,8 @@ index ba33103..1acc966 100755 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ -+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ ++ | -onefs* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -4215,7 +4479,7 @@ index ba33103..1acc966 100755 os=-tpf ;; -triton*) -@@ -1291,8 +1523,13 @@ case $os in +@@ -1291,8 +1523,15 @@ case $os in -aros*) os=-aros ;; @@ -4228,10 +4492,12 @@ index ba33103..1acc966 100755 + os=-dicos + ;; + -nacl*) ++ ;; ++ -ios) ;; -none) ;; -@@ -1316,6 +1553,12 @@ else +@@ -1316,6 +1555,12 @@ else # system, and we'll never get to this point. case $basic_machine in @@ -4244,7 +4510,7 @@ index ba33103..1acc966 100755 *-acorn) os=-riscix1.2 ;; -@@ -1325,9 +1568,24 @@ case $basic_machine in +@@ -1325,9 +1570,24 @@ case $basic_machine in arm*-semi) os=-aout ;; @@ -4272,7 +4538,7 @@ index ba33103..1acc966 100755 # This must come before the *-dec entry. pdp10-*) os=-tops20 -@@ -1346,13 +1604,13 @@ case $basic_machine in +@@ -1346,13 +1606,13 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 @@ -4289,7 +4555,7 @@ index ba33103..1acc966 100755 mips*-cisco) os=-elf ;; -@@ -1371,9 +1629,15 @@ case $basic_machine in +@@ -1371,9 +1631,15 @@ case $basic_machine in *-be) os=-beos ;; @@ -4305,7 +4571,7 @@ index ba33103..1acc966 100755 *-wec) os=-proelf ;; -@@ -1476,7 +1740,7 @@ case $basic_machine in +@@ -1476,7 +1742,7 @@ case $basic_machine in -sunos*) vendor=sun ;; @@ -4314,7 +4580,7 @@ index ba33103..1acc966 100755 vendor=ibm ;; -beos*) -@@ -1539,7 +1803,7 @@ case $basic_machine in +@@ -1539,7 +1805,7 @@ case $basic_machine in esac echo $basic_machine$os @@ -4324,10 +4590,15 @@ index ba33103..1acc966 100755 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/configure b/configure -index 4c1bc06..c721825 100755 +index 4c1bc06..9cb3074 100755 --- a/configure +++ b/configure -@@ -1490,7 +1490,7 @@ Optional Packages: +@@ -1486,11 +1486,11 @@ Optional Packages: + --with-migemo=MIGEMO_COMMAND migemo command + --with-editor=EDITOR default editor (/usr/bin/vi) + --with-mailer=MAILER default mailer (/usr/bin/mail) +- --with-browser=BROWSER default browser (/usr/bin/mozilla) ++ --with-browser=BROWSER default browser (/usr/bin/firefox) --with-ssl=PREFIX support https protocol --with-termlib=LIBS terminal library LIBS is space separated list of: @@ -4404,6 +4675,15 @@ index 4c1bc06..c721825 100755 else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with FB support" >&5 $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;} +@@ -7344,7 +7345,7 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + +-w3m_browser="/usr/bin/mozilla" ++w3m_browser="/usr/bin/firefox" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which external browser is used by default" >&5 + $as_echo_n "checking which external browser is used by default... " >&6; } + @@ -7977,7 +7978,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_termlib" >&5 @@ -4422,6 +4702,15 @@ index 4c1bc06..c721825 100755 ; return 0; } +@@ -9076,7 +9077,7 @@ RC_DIR="~/.$PACKAGE" + $as_echo "#define RC_DIR \"\$RC_DIR\"" >>confdefs.h + + +-DOCDIRS="doc:en_English doc-jp:ja_Japanese" ++DOCDIRS="doc:en_English doc-jp:ja_Japanese doc-de:de_German" + cat >>confdefs.h <<_ACEOF + #define DOCDIRS "$DOCDIRS" + _ACEOF @@ -9084,7 +9085,8 @@ _ACEOF @@ -4432,6 +4721,19 @@ index 4c1bc06..c721825 100755 CURRENT_VERSION=`sed -n 's/.*define CURRENT_VERSION *"w3m\/\(.*\)".*$/\1/p' version.c` ac_config_files="$ac_config_files Makefile posubst po/Makefile.in scripts/Makefile scripts/dirlist.cgi scripts/w3mhelp.cgi scripts/w3mmail.cgi scripts/xface2xpm scripts/multipart/Makefile scripts/multipart/multipart.cgi scripts/w3mman/Makefile scripts/w3mman/w3mman scripts/w3mman/w3mman.1 scripts/w3mman/w3mman2html.cgi libwc/Makefile w3mimg/Makefile w3mimg/fb/Makefile w3mimg/x11/Makefile w3mimg/win/Makefile w3mhelp-w3m_en.html w3mhelp-w3m_ja.html w3mhelp-lynx_en.html w3mhelp-lynx_ja.html" +diff --git a/configure.ac b/configure.ac +index 7308fc6..3332251 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -172,7 +172,7 @@ AC_SUBST(RC_DIR) + RC_DIR="~/.$PACKAGE" + AC_DEFINE(RC_DIR, "$RC_DIR") + AC_SUBST(DOCDIRS) +-DOCDIRS="doc:en_English doc-jp:ja_Japanese" ++DOCDIRS="doc:en_English doc-jp:ja_Japanese doc-de:de_German" + AC_DEFINE_UNQUOTED(DOCDIRS, "$DOCDIRS") + + AC_W3M_VERSION diff --git a/cookie.c b/cookie.c index 8020f6d..705e277 100644 --- a/cookie.c @@ -4636,6 +4938,156 @@ index e00eb0c..d4f336a 100644 if (image->width > 0) w = image->width - sx; else +diff --git a/doc-de/README.func b/doc-de/README.func +new file mode 100644 +index 0000000..9d062be +--- /dev/null ++++ b/doc-de/README.func +@@ -0,0 +1,144 @@ ++ABORT Quit w3m without confirmation ++ACCESSKEY Pop up accesskey menu ++ADD_BOOKMARK Add current page to bookmarks ++ALARM Set alarm ++BACK Back to previous buffer ++BEGIN Go to the first line ++BOOKMARK View bookmarks ++CENTER_H Move to the center line ++CENTER_V Move to the center column ++CHARSET Change the current document charset ++CLOSE_TAB Close current tab ++CLOSE_TAB_MOUSE Close tab on mouse cursor (for mouse action) ++COMMAND Execute w3m command(s) ++COOKIE View cookie list ++DEFAULT_CHARSET Change the default document charset ++DEFINE_KEY Define a binding between a keystroke and a user command ++DELETE_PREVBUF Delete previous buffer (mainly for local-CGI) ++DICT_WORD Execute dictionary command (see README.dict) ++DICT_WORD_AT Execute dictionary command for word at cursor ++DISPLAY_IMAGE Restart loading and drawing of images ++DOWN Scroll down one line ++DOWNLOAD Save document (source) to file ++DOWNLOAD_LIST Display download list panel ++EDIT Edit current document ++EDIT_SCREEN Edit currently rendered document ++END Go to the last line ++EXEC_SHELL Execute shell command ++EXIT Quit w3m without confirmation ++EXTERN Execute external browser ++EXTERN_LINK View current link using external browser ++FRAME Render frames ++GOTO Go to URL ++GOTO_LINE Go to specified line ++GOTO_LINK Follow current link ++GOTO_RELATIVE Go to relative URL ++HELP View help ++HISTORY View browser history ++INFO View info of current document ++INTERRUPT Suspend w3m ++ISEARCH Incremental search forward ++ISEARCH_BACK Incremental search backward ++LEFT Shift screen one column ++LINE_BEGIN Go to the beginning of line ++LINE_END Go to the end of line ++LINE_INFO Show current line number ++LINK_BEGIN Go to the first link ++LINK_END Go to the last link ++LINK_MENU Pop up link element menu ++LIST Show all links and images ++LIST_MENU Pop up link list menu and go to selected link ++LOAD Load local file ++MAIN_MENU Pop up menu ++MARK Set/unset mark ++MARK_MID Mark Message-ID-like strings as links ++MARK_URL Mark URL-like strings as links ++MARK_WORD Mark current word as link ++MENU Pop up menu ++MENU_MOUSE Pop up menu at mouse cursor (for mouse action) ++MOUSE_TOGGLE Toggle mouse support ++MOVE_DOWN Move cursor down (a half screen scroll at the end of screen) ++MOVE_DOWN1 Move cursor down (1 line scroll at the end of screen) ++MOVE_LEFT Move cursor left (a half screen shift at the left edge) ++MOVE_LEFT1 Move cursor left (1 column shift at the left edge) ++MOVE_LIST_MENU Pop up link list menu and move cursor to selected link ++MOVE_MOUSE Move cursor to mouse cursor (for mouse action) ++MOVE_RIGHT Move cursor right (a half screen shift at the right edge) ++MOVE_RIGHT1 Move cursor right (1 column shift at the right edge) ++MOVE_UP Move cursor up (a half screen scroll at the top of screen) ++MOVE_UP1 Move cursor up (1 line scroll at the top of screen) ++MSGS Display error messages ++NEW_TAB Open new tab ++NEXT Move to next buffer ++NEXT_DOWN Move downward to next link ++NEXT_LEFT Move left to next link ++NEXT_LEFT_UP Move left (or upward) to next link ++NEXT_LINK Move to next link ++NEXT_MARK Move to next word ++NEXT_PAGE Move to next page ++NEXT_RIGHT Move right to next link ++NEXT_RIGHT_DOWN Move right (or downward) to next link ++NEXT_TAB Move to next tab ++NEXT_UP Move upward to next link ++NEXT_VISITED Move to next visited link ++NEXT_WORD Move to next word ++NOTHING Do nothing ++NULL Do nothing ++OPTIONS Display option setting panel ++PEEK Peek at current URL ++PEEK_IMG Peek at image URL ++PEEK_LINK Peek at link URL ++PIPE_BUF Send rendered document to pipe ++PIPE_SHELL Execute shell command and browse ++PREV Move to previous buffer ++PREV_LINK Move to previous link ++PREV_MARK Move to previous mark ++PREV_PAGE Move to previous page ++PREV_TAB Move to previous tab ++PREV_VISITED Move to previous visited link ++PREV_WORD Move to previous word ++PRINT Save buffer to file ++QUIT Quit w3m ++READ_SHELL Execute shell command and load ++REDO Cancel the last undo ++REDRAW Redraw screen ++REG_MARK Set mark using regexp ++REINIT Reload configuration files ++RELOAD Reload buffer ++RESHAPE Re-render buffer ++RIGHT Shift screen one column right ++SAVE Save document (source) to file ++SAVE_IMAGE Save image to file ++SAVE_LINK Save link to file ++SAVE_SCREEN Save buffer to file ++SEARCH Search forward ++SEARCH_BACK Search backward ++SEARCH_FORE Search forward ++SEARCH_NEXT Search next regexp ++SEARCH_PREV Search previous regexp ++SELECT Go to buffer selection panel ++SELECT_MENU Pop up buffer selection menu ++SETENV Set environment variable ++SET_OPTION Set option ++SHELL Execute shell command ++SHIFT_LEFT Shift screen left ++SHIFT_RIGHT Shift screen right ++SOURCE View HTML source ++STOP_IMAGE Stop loading and drawing of images ++SUBMIT Submit form ++SUSPEND Suspend w3m ++TAB_GOTO Open URL on new tab ++TAB_GOTO_RELATIVE Open relative URL on new tab ++TAB_LEFT Move current tab left ++TAB_LINK Open current link on new tab ++TAB_MENU Pop up tab selection menu ++TAB_MOUSE Move to tab on mouse cursor (for mouse action) ++TAB_RIGHT Move current tab right ++UNDO Cancel the last cursor movement ++UP Scroll up one line ++VERSION Display version of w3m ++VIEW View HTML source ++VIEW_BOOKMARK View bookmarks ++VIEW_IMAGE Bild anzeigen ++WHEREIS Search forward ++WRAP_TOGGLE Toggle search wrap mode diff --git a/doc-jp/FAQ.html b/doc-jp/FAQ.html index e16a986..86ef05a 100644 --- a/doc-jp/FAQ.html @@ -4650,7 +5102,7 @@ index e16a986..86ef05a 100644 Ѥ硤 <p> diff --git a/doc-jp/MANUAL.html b/doc-jp/MANUAL.html -index 41d70f1..a8623e2 100644 +index 41d70f1..66fdc6e 100644 --- a/doc-jp/MANUAL.html +++ b/doc-jp/MANUAL.html @@ -51,15 +51,9 @@ w3m @@ -4680,6 +5132,30 @@ index 41d70f1..a8623e2 100644 <dd>Ϣ³Ԥ1ԤˤޤȤɽ롥 <dt>-X <dd>w3mλˡβ̤ʤ +@@ -211,9 +205,9 @@ HTMLʸ + <TR><TD>F<TD><FRAMESET>ޤʸɽƤȤˡ<FRAME> + λؤʣʸ1ĤʸѴɽޤ + <TR><TD>M<TD>߸Ƥڡ֥饦Ȥäɽޤ +-2M, 3M 2ܤ3ܤΥ֥饦Ȥޤ ++2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ + <TR><TD>ESC M<TD>ߤΥ֥饦Ȥäɽޤ +-2ESC M, 3ESC M 2ܤ3ܤΥ֥饦Ȥޤ ++2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ + </table> + + <H3>եURLط</H3> +@@ -349,9 +343,9 @@ Lynx + <TR><TD>F<TD><FRAMESET>ޤʸɽƤȤˡ<FRAME> + λؤʣʸ1ĤʸѴɽޤ + <TR><TD>M<TD>߸Ƥڡ֥饦Ȥäɽޤ +-2M, 3M 2ܤ3ܤΥ֥饦Ȥޤ ++2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ + <TR><TD>ESC M<TD>ߤΥ֥饦Ȥäɽޤ +-2ESC M, 3ESC M 2ܤ3ܤΥ֥饦Ȥޤ ++2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ + </table> + + <H3>եURLط</H3> @@ -489,8 +483,7 @@ w3m w3mȤСHTTPФʤCGIץȤư뤳ȤǤޤ ΤȤw3mФΤդƥץȤưνϤ @@ -4730,6 +5206,18 @@ index 4aedfde..47d5fd6 100644 while line = $stdin.gets next if line =~ /^#/ next if line =~ /^\s*$/ +diff --git a/doc-jp/README.func b/doc-jp/README.func +index 542aaa9..1b2a060 100644 +--- a/doc-jp/README.func ++++ b/doc-jp/README.func +@@ -36,7 +36,6 @@ GOTO_RELATIVE + HELP إץեɽޤ + HISTORY URLɽޤ + INFO ߤʸ˴ؤɽޤ +-INIT_MAILCAP mailcap ɤ߹ߤޤ( local-CGI ) + INTERRUPT ʸɤ߹ߤǤޤ + ISEARCH եˤफäƥ륵ޤ + ISEARCH_BACK եƬˤफäƥ륵ޤ diff --git a/doc-jp/README.siteconf b/doc-jp/README.siteconf new file mode 100644 index 0000000..90066f7 @@ -4810,9 +5298,16 @@ index 869c716..e4085c8 100644 keymap = INFO keymap > SHIFT_RIGHT diff --git a/doc-jp/w3m.1 b/doc-jp/w3m.1 -index 89aacb6..099a803 100644 +index 89aacb6..a54e078 100644 --- a/doc-jp/w3m.1 +++ b/doc-jp/w3m.1 +@@ -1,5 +1,5 @@ + .\" +-.TH W3M 1 "Jun 6 2000" "UNIX" ++.TH W3M 1 "2016-04-02" "w3m 0.5.3" + .SH NAME + .B w3m + \- text base pager/WWW browser @@ -39,19 +39,10 @@ text/plain ɸϤƤɽȤ¸Կꤹ롥 ǥեȤ10000 @@ -4844,19 +5339,1034 @@ index 89aacb6..099a803 100644 Ϣ³Ԥ1ԤˤޤȤɽ롥 .TP .B \-X +@@ -327,13 +318,13 @@ URL + .TP + .B M + ߸Ƥڡ֥饦Ȥäɽޤ +-.B 2M, 3M +-2ܤ3ܤΥ֥饦Ȥޤ ++.B 2M, 3M, ..., 9M ++2ܡ3ܡ9ܤΥ֥饦Ȥޤ + .TP + .B "ESC M" + ߤΥ֥饦Ȥäɽޤ +-.B "2ESC M", "3ESC M" +-2ܤ3ܤΥ֥饦Ȥޤ ++.B "2ESC M", "3ESC M", ..., "9ESC M" ++2ܡ3ܡ9ܤΥ֥饦Ȥޤ + .SS եURLط + .TP + .B U diff --git a/doc/FAQ.html b/doc/FAQ.html -index ed2a704..4d82790 100644 +index ed2a704..34da9f1 100644 --- a/doc/FAQ.html +++ b/doc/FAQ.html -@@ -222,7 +222,7 @@ from the server each time it accesses it. If possible, use a cache server. - <dd>Use 'a' (or 'd' with Lynx-like keybindings) or ESC RET. If you want to download an inline image, use ESC 'I'. - <p> - <dt><h3>How do I specify a proxy server?</h3> +@@ -1,151 +1,423 @@ +-<HTML> +-<HEAD> +-<TITLE>W3M FAQ</TITLE> +-</HEAD> +-<BODY> +-<p> +-<center><h1>Frequently Asked Questions and Answers about w3m</h1></center> +-<div align=right> +-Akinori Ito<br> +-aito@fw.ipsj.or.jp<br> +-Corrected by Tom Berger <tom.be@gmx.net> +-</div> +-<p> +-<b><center><font size=+1><u><a name="index">Index</a></u></font></center></b> +-<p> +-<br> +-<ul> +-<li><h2><a href="#general">General Questions, How to Get It, Required Environment</a></h2></li> +-<ul> +-<li><h3>How do I pronounce "w3m"?</h3> +-<li><h3>Why is it called "w3m"?</h3> +-<li><h3>On which platforms does w3m work?</h3> +-<li><h3>Where can I get more information about w3m?</h3> +-<li><h3>Is there a mailing list for w3m?</h3> +-<li><h3>Are there any binary distributions?</h3> +-</ul> +-<br> +-<li><a href="#install"><h2>Compile and Install</h2></a> +-<br> +-<li><a href="#command"><h2>Options, Commands, Usage</h2></a> +-<ul> +-<li><h3>w3m quits if started without parameters. What's wrong?</h3> +-<li><h3>w3m starts with black characters on a black screen. How do I change this?</h3> +-<li><h3>Does w3m support colours?</h3> +-<li><h3>Does w3m support monochrome display?</h3> +-<li><h3>How do I shift the display?</h3> +-<li><h3>How do I move from anchor to anchor?</h3> +-<li><h3>Netscape displays a word red, but w3m doesn't. Why?</h3> +-<li><h3>How do I change the colour of anchor-/image-/form links?</h3> +-<li><h3>w3m doesn't seem to use the variable EDITOR. Why? </h3> +-<li><h3>How do I quit a search or URL text input?</h3> +-</ul> +-<br> +-<li><a href="#www"><h2>Questions about WWW usage</h2></a> +-<ul> +-<li><h3>How do I fill in forms with w3m?</h3> +-<li><h3>Seems like w3m is slower than Netscape or Lynx. Why?</h3> +-<li><h3>Loading time doesn't decrease when loading a previously seen page</h3> +-<li><h3>How do I download a linked file?</h3> +-<li><h3>How do I specify a proxy server?</h3> +-<li><h3>w3m freezes when I invoke an external browser.</h3> +-<li><h3>How do I change the default image viewer?</h3> +-<li><h3>How do I enter a URL?</h3> +-<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> +-<ul> +-<li><h3>What is w3m's configuration file?</h3> +-<li><h3>What are these w3mxxxx files in my ~/.w3m directory for?</h3> +-</ul> +-<br> +-<br> +-<u><h2><a name="general">General Questions, How to Get It, Required Environment</a></h2></u> +-<br> +-<dl> +-<dt><h3>How do I pronounce "w3m"?</h3> +-<dd>It's "W-three-M". It doesn't rhyme with "pteranodon". +-<p> +-<dt><h3>Why is it called "w3m"?</h3> +-<dd>It's an abbreviation of "WWW-wo-Miru", which is Japanese for +-"See the WWW". So in English the name of this browser would be +-something like "stw3". +-<p> +-<dt><h3>On which platforms does w3m work?</h3> +-<dd>It runs on various versions of Unix, since version 990226 on OS/2 and since +-version 990303 also on MS-Windows with Cygwin32. +-<br> +-Current versions have been confirmed to run on: +-<ul> +-<li>SunOS 4.1.x +-<li>HP-UX 9.x, 10.x +-<li>Solaris 2.5.x, 2.6, 8 +-<li>Linux 2.0.30 +-<li>FreeBSD 2.2.8, 3.1, 3.2, 4.6 +-<li>NetBSD/macppc, m68k +-<li>EWS4800 Rel.12.2 Rev.A +-<li>Digital UNIX: v3.2D, v4.0D +-<li>IRIX 5.3, IRIX 6.5 +-<li>OS/2 with emx +-<li>Windows 9x/NT with Cygwin32 b20.1 +-<li>MS-DOS with DJGPP and WATT32 packet driver +-<li>MacOS X Server +-<li>MacOS X 10.1, 10.2 +-</ul> +-<dt><h3>Where can I get more information about w3m?</h3> +-<dd>At the <a href="http://w3m.sourceforge.net/index.en.html">English w3m home page</a>. +-<dt><h3>Is there a mailing list for w3m?</h3> +-<dd>There is a mailing list for developpers (w3m-dev-en). Please see +-<a href="http://w3m.sourceforge.net/index.en.html">w3m page</a> +-for details. You may also mail your comments to <a href="mailto:aito@fw.ipsj.or.jp">the author</a>. +-<dt><h3>Are there any binary distributions?</h3> +-<dd>So far there are only binaries for the win/cygnus32 version. You can get +-them from <a href="http://prdownloads.sourceforge.net/w3m/">here</a>. +-Contact <a href="mailto:aito@fw.ipsj.or.jp">the author</a> if you want to contribute binaries for other platforms. +-</dd> +-</dl> +-<br> +-<div align=right> +-<i>Up to <a href="#index">index</a></i> +-</div> +-<br> +-<u><h2><a name="install">Compile and Install</a></h2></u> +-No problem :-) +-<u><h2><a name="command">Options, Commands, Usage</a></h2></u> +-<br> +-<dl> +-<dt><h3>w3m quits if started without parameters. What's wrong?</h3> +-<dd>w3m is a <b>pager</b>. Therefore it just quits when invoked without any +-arguments. Possible arguments are: +-<ol> +-<li>A filename or an URL +-<li>Pipe from standard input +-<li>The -B option (Show bookmark file) +-<li>The -v option (visual startup) +-<li>From a specified HTTP_HOME or WWW_HOME variable +-</ol> +-<p> +-<dt><h3>w3m starts with black characters on black background. How do I change +-this?</h3> +-<dd> +-When compiled with colour support, w3m assumes a white background and therefore +-displays black characters. +-<br> +-You may either change the background colour of your terminal (e.g. with the -bg +-option in a xterm) or take these steps: +-<ul> +-<li>invoke w3m with 'w3m -M' (for monochrome), +-<li>type 'o' for getting to the options screen +-<li><b>Mark 'Display with colour' as ON</b> and choose an arbitrary colour. +-Click on [OK]. +-</ul> +-<p> +-<dt><h3>Does w3m support colours?</h3> +-<dd>Yes. When you run './configure', answer the question +-<p> ++<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> ++<html> ++ <head> ++ <meta http-equiv=content-type content="text/html;charset=US-ASCII"> ++ <title>W3M FAQ</title> ++ </head> ++ <body> ++ <h1 align="center"> ++ Frequently Asked Questions and Answers about w3m ++ </h1> ++ <p align="right"> ++ Akinori Ito<br> ++ aito@fw.ipsj.or.jp<br> ++ Corrected by Tom Berger <tom.be@gmx.net> ++ </p> ++ <h2 id="index"> ++ <u> ++ Index ++ </u> ++ </h2> ++ <ul> ++ <li> ++ <a href="#general"> ++ <b> ++ General Questions, How to Get It, Required Environment ++ </b> ++ </a> ++ </li> ++ <ul> ++ <li> ++ <b> ++ How do I pronounce <q>w3m</q>? ++ </b> ++ </li> ++ <li> ++ <b> ++ Why is it called <q>w3m</q>? ++ </b> ++ </li> ++ <li> ++ <b> ++ On which platforms does w3m work? ++ </b> ++ </li> ++ <li> ++ <b> ++ Where can I get more information about w3m? ++ </b> ++ </li> ++ <li> ++ <b> ++ Is there a mailing list for w3m? ++ </b> ++ </li> ++ <li> ++ <b> ++ Are there any binary distributions? ++ </b> ++ </li> ++ </ul> ++ <li> ++ <a href="#install"> ++ <b> ++ Compile and Install ++ </b> ++ </a> ++ </li> ++ <li> ++ <a href="#command"> ++ <b> ++ Options, Commands, Usage ++ </b> ++ </a> ++ </li> ++ <ul> ++ <li> ++ <b> ++ w3m quits if started without parameters. What's wrong? ++ </b> ++ </li> ++ <li> ++ <b> ++ w3m starts with black characters on a black background. How do ++ I change this? ++ </b> ++ </li> ++ <li> ++ <b> ++ Does w3m support colors? ++ </b> ++ </li> ++ <li> ++ <b> ++ Does w3m support monochrome displays? ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I shift the display? ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I move from anchor to anchor? ++ </b> ++ </li> ++ <li> ++ <b> ++ Graphical browsers display a word red, but w3m doesn't. Why? ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I change the color of anchor/image/form links? ++ </b> ++ </li> ++ <li> ++ <b> ++ w3m doesn't seem to use the variable EDITOR. Why? ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I quit a search or URL text input? ++ </b> ++ </li> ++ </ul> ++ <li> ++ <a href="#www"> ++ <b> ++ Questions about WWW usage ++ </b> ++ </a> ++ </li> ++ <ul> ++ <li> ++ <b> ++ How do I fill in forms with w3m? ++ </b> ++ </li> ++ <li> ++ <b> ++ Seems like w3m is slower than some other browsers. Why? ++ </b> ++ </li> ++ <li> ++ <b> ++ Loading time doesn't decrease when loading a previously seen ++ page. ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I download a linked file? ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I specify a proxy server? ++ </b> ++ </li> ++ <li> ++ <b> ++ w3m freezes when I invoke an external browser. ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I change the default image viewer? ++ </b> ++ </li> ++ <li> ++ <b> ++ How do I enter a URL? ++ </b> ++ </li> ++ <li> ++ <b> ++ w3m appends a URL to the former one even when I clear the line ++ with Ctrl-u. What should I do? ++ </b> ++ </li> ++ </ul> ++ <li> ++ <a href="#other"> ++ <b> ++ Miscellaneous ++ </b> ++ </a> ++ </li> ++ <ul> ++ <li> ++ <b> ++ What is w3m's configuration file? ++ </b> ++ </li> ++ <li> ++ <b> ++ What are these w3mxxxx files in my ~/.w3m directory for? ++ </b> ++ </li> ++ </ul> ++ </ul> ++ <h2 id="general"> ++ <u> ++ General Questions, How to Get It, Required Environment ++ </u> ++ </h2> ++ <dl> ++ <dt> ++ <b> ++ How do I pronounce <q>w3m</q>? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ It's <q>W-three-M</q>. It doesn't rhyme with <q>pteranodon</q>. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ Why is it called <q>w3m</q>? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ It's an abbreviation of <q>WWW-wo-Miru</q>, which is Japanese ++ for <q>See the WWW</q>. So in English the name of this browser ++ would be something like <q>stw3</q>. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ On which platforms does w3m work? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ It runs on various versions of Unix, since version 990226 on OS/2 ++ and since version 990303 also on MS-Windows with Cygwin32. ++ </p> ++ <p> ++ More recent versions have been confirmed to run on: ++ </p> ++ <ul> ++ <li> ++ SunOS 4.1.x ++ </li> ++ <li> ++ HP-UX 9.x, 10.x ++ </li> ++ <li> ++ Solaris 2.5.x, 2.6, 8 ++ </li> ++ <li> ++ Linux 2.0.1 to 3.17 ++ </li> ++ <li> ++ FreeBSD 2.2.8, 3.1, 3.2, 4.6 ++ </li> ++ <li> ++ NetBSD/macppc, m68k ++ </li> ++ <li> ++ EWS4800 Rel.12.2 Rev.A ++ </li> ++ <li> ++ Digital UNIX: v3.2D, v4.0D ++ </li> ++ <li> ++ IRIX 5.3, IRIX 6.5 ++ </li> ++ <li> ++ OS/2 with emx ++ </li> ++ <li> ++ Windows 9x/NT with Cygwin32 b20.1 ++ </li> ++ <li> ++ MS-DOS with DJGPP and WATT32 packet driver ++ </li> ++ <li> ++ MacOS X Server ++ </li> ++ <li> ++ MacOS X 10.1, 10.2 ++ </li> ++ </ul> ++ </dd> ++ <dt> ++ <b> ++ Where can I get more information about w3m? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ At the ++ <a href="http://w3m.sourceforge.net/index.en.html">English w3m ++ home page</a>. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ Is there a mailing list for w3m? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ There is a mailing list for developers (w3m-dev-en). Please see ++ the <a href="http://w3m.sourceforge.net/index.en.html">w3m home ++ page</a> for details. You may also mail your comments to ++ <a href="mailto:aito@fw.ipsj.or.jp">the author</a>. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ Are there any binary distributions? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ So far there are only binaries for the win/cygnus32 version. ++<!-- ++ You can get them from ++ <a href="http://prdownloads.sourceforge.net/w3m/">here</a>. ++!--> ++ Contact <a href="mailto:aito@fw.ipsj.or.jp">the author</a> if you ++ want to contribute binaries for other platforms. ++ </p> ++ </dd> ++ </dl> ++ <p align="right"> ++ <i> ++ Up to <a href="#index">index</a> ++ </i> ++ </p> ++ <h2 id="install"> ++ <u> ++ Compile and Install ++ </u> ++ </h2> ++ <p> ++ No problem :-) ++ </p> ++ <h2 id="command"> ++ <u> ++ Options, Commands, Usage ++ </u> ++ </h2> ++ <dl> ++ <dt> ++ <b> ++ w3m quits if started without parameters. What's wrong? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ w3m is a <b>pager</b>. Therefore it just quits when invoked ++ without any arguments. Possible arguments are: ++ </p> ++ <ol> ++ <li> ++ A filename or URL ++ </li> ++ <li> ++ Pipe from standard input ++ </li> ++ <li> ++ The -B option (show bookmark file) ++ </li> ++ <li> ++ The -v option (visual startup) ++ </li> ++ <li> ++ A specified HTTP_HOME or WWW_HOME variable ++ </li> ++ </ol> ++ </dd> ++ <dt> ++ <b> ++ w3m starts with black characters on a black background. How do I ++ change this? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ When compiled with color support, w3m assumes a white background ++ and therefore displays black characters. ++ </p> ++ <p> ++ You may either change the background color of your terminal ++ (e.g. with the -bg option in a xterm) or take these steps: ++ </p> ++ <ul> ++ <li> ++ invoke w3m with <q>w3m -M</q> (for monochrome), ++ </li> ++ <li> ++ type <q>o</q> to get to the options screen ++ </li> ++ <li> ++ Mark <q>Display with color</q> as <q>YES</q> and choose an ++ arbitrary color. ++ </li> ++ <li> ++ Click on [OK]. ++ </li> ++ </ul> ++ </dd> ++ <dt> ++ <b> ++ Does w3m support colors? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Yes. When you run <q>./configure</q>, answer the question ++ </p> + <pre> +-Let's do some configurations. Choose config option among the list." ++Let's do some configurations. Choose config option among the list. + + 1 - Baby model (no color, no menu, no mouse, no cookie, no SSL) + 2 - Little model (color, menu, no mouse, no cookie, no SSL) +@@ -153,139 +425,311 @@ Let's do some configurations. Choose config option among the list." + 4 - Cookie model (color, menu, mouse, cookie, no SSL) + 5 - Monster model (with everything; you need openSSL library) + 6 - Customize +-Which? ++Which? + </pre> +-<p> +-with 2,3,4 or 5. +-<p> +-<dt><h3>Does w3m support monochrome display?</h3> +-<dd>Yes. You may either +-<ol> +-<li>Answer the above mentioned 'configure' question with 1, or +-<li>Invoke w3m with the -M option, or +-<li>Type 'o' within w3m to enter the options screen and turn off colour display +-mode. +-</ol> +-<dt><h3>How do I shift the display?</h3> +-<dd>You can shift the display by moving the cursor to the edge of the screen. You +-may also use the ">"/"<" or "."/"," keys. +-<br> +-Another idea would be adjusting the xterm with the -geometry option (e.g. +-something like 'xterm -geometry 110x45 -bg white -name w3m -e w3m -B'). +-<dt><h3>How do I move from anchor to anchor?</h3> +-<dd>You can move to the next anchor using TAB. ESC TAB moves cursor to the previous anchor. +-<p> +-<dt><h3>Netscape displays a word red, but w3m doesn't. Why?</h3> +-<dd>w3m doesn't support <FONT COLOR=".."> tags. It won't be impossible to implement this, but I think it would make the document more difficult to read. +-<p> +-<dt><h3>How do I change the colour of anchor-/image-/form links?</h3> +-<dd>Type 'o' within w3m to get the 'options' screen. You can change these +-settings there. +-<dt> +-<dt><h3>w3m doesn't seem to use the variable EDITOR. Why? </h3> +-<dd><dd>Go to the 'options' screen using the "o" key. Any entry in the 'Editor' field will override the environment variable. +-<br> +-If you want to use the editor specified by EDITOR blank the field and push [OK]. +-<p> +-<dt><h3>How do I quit a search or URL text input?</h3> +-<dd>Clear input text using Ctrl-u and hit RETURN. +-</dd> +-</dl> +-<br> +-<div align=right> +-<i>Up to <a href="#index">index</a></i> +-</div> +-<br> +-<u><h2><a name="www">Questions about WWW usage</a></h2></u> +-<br> +-<dl> +-<dt><h3>How do I fill in forms with w3m?</h3> +-<dd>Form input fields are displayed in red (or reverse). Move the cursor to +-them and hit RETURN. Then, +-<ul> +-<li>if it is a text input field, put in your text on the bottom line, +-<li>if it is a radiobutton or checkbox, that item is selected, +-<li>if it is a textarea, an editor is spawned, +-<li>if it is 'submit' or 'reset', well, just do it. +-</ul> +-<dt><h3>Seems like w3m is slower than Netscape or Lynx. Why?</h3> +-<dd>w3m renders a HTML document in two passes. Therefore it displays the documentnot before having read the entire document. +-<br> +-Netscape or Lynx display the document before having read the whole page, +-and therefore seem faster. +-<p> +-<dt><h3>Loading time doesn't decrease when loading a previously seen page</h3> +-<dd>w3m doesn't have its own cache. Therefore, it reads the document +-from the server each time it accesses it. If possible, use a cache server. +-<p> +-<dt><h3>How do I download a linked file?</h3> +-<dd>Use 'a' (or 'd' with Lynx-like keybindings) or ESC RET. If you want to download an inline image, use ESC 'I'. +-<p> +-<dt><h3>How do I specify a proxy server?</h3> -<dd>Set the environment variable HTTP_PROXY or use the option setting panel -+<dd>Set the environment variables HTTP_PROXY, HTTPS_PROXY, GOPHER_PROXY and FTP_PROXY, or use the option setting panel - ("o" key). For example, if you want to use port 8000 of proxy.hogege.com, specify - <p> +-("o" key). For example, if you want to use port 8000 of proxy.hogege.com, specify +-<p> ++ <p> ++ with 2, 3, 4, or 5. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ Does w3m support monochrome displays? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Yes. You may either ++ </p> ++ <ol> ++ <li> ++ Answer the above-mentioned <q>configure</q> question with 1, ++ or ++ </li> ++ <li> ++ Invoke w3m with the -M option, or ++ </li> ++ <li> ++ Type <q>o</q> within w3m to enter the options screen and turn ++ off color display mode. ++ </li> ++ </ol> ++ </dd> ++ <dt> ++ <b> ++ How do I shift the display? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ You can shift the display by moving the cursor to the edge of ++ the screen. You may also use the <q>></q>/<q><</q> or ++ <q>.</q>/<q>,</q> keys. ++ </p> ++ <p> ++ Another idea would be adjusting the xterm with the -geometry ++ option (e.g. something like <q>xterm -geometry 110x45 -bg white ++ -name w3m -e w3m -B</q>). ++ </p> ++ </dd> ++ <dt> ++ <b> ++ How do I move from anchor to anchor? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ You can move to the next anchor using TAB. ESC TAB moves the ++ cursor to the previous anchor. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ Graphical browsers display a word red, but w3m doesn't. Why? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ w3m doesn't support the HTML COLOR="..." attribute. It wouldn't ++ be impossible to implement this, but I think it would make ++ documents more difficult to read. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ How do I change the color of anchor/image/form links? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Type <q>o</q> within w3m to get the <q>options</q> screen. You ++ can change these settings there. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ w3m doesn't seem to use the variable EDITOR. Why? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Go to the <q>options</q> screen using the <q>o</q> key. Any ++ entry in the <q>Editor</q> field will override the environment ++ variable. ++ </p> ++ <p> ++ If you want to use the editor specified by EDITOR, blank the ++ field and press [OK]. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ How do I quit a search or URL text input? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Clear input text using CTRL-u and hit RETURN. ++ </p> ++ </dd> ++ </dl> ++ <p align="right"> ++ <i> ++ Up to <a href="#index">index</a> ++ </i> ++ </p> ++ <h2 id="www"> ++ <u> ++ Questions about WWW usage ++ </u> ++ </h2> ++ <dl> ++ <dt> ++ <b> ++ How do I fill in forms with w3m? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Form input fields are displayed in red (or reverse). Move the ++ cursor to them and hit RETURN. Then, ++ </p> ++ <ul> ++ <li> ++ if it is a text input field, put in your text on the bottom ++ line, ++ </li> ++ <li> ++ if it is a radiobutton or checkbox, that item is selected, ++ </li> ++ <li> ++ if it is a textarea, an editor is spawned, ++ </li> ++ <li> ++ if it is <q>submit</q> or <q>reset</q>, well, just do it. ++ </li> ++ </ul> ++ </dd> ++ <dt> ++ <b> ++ Seems like w3m is slower than some other browsers. Why? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ w3m renders a HTML document in two passes. Therefore it doesn't ++ start to display the document until it has finished reading it. ++ </p> ++ <p> ++ Most other browsers display the document before having read the ++ whole page, and therefore seem faster. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ Loading time doesn't decrease when loading a previously seen ++ page. ++ </b> ++ </dt> ++ <dd> ++ <p> ++ w3m doesn't have its own cache. Therefore, it reads the document ++ from the server each time it accesses it. If possible, use a ++ cache server. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ How do I download a linked file? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Use <q>a</q> (or <q>d</q> with Lynx-like keybindings) or ESC RET. ++ If you want to download an inline image, use ESC <q>I</q>. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ How do I specify a proxy server? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Set the environment variables HTTP_PROXY, HTTPS_PROXY, GOPHER_PROXY ++ and FTP_PROXY, or use the option setting panel (<q>o</q> key). For ++ example, if you want to use port 8000 of proxy.example.org, specify ++ </p> <pre> +- http://proxy.hogege.com:8000/ ++ http://proxy.example.org:8000/ + </pre> +-<p> +-<dt><h3>w3m freezes when I invoke an external browser.</h3> +-<dd>Enter w3m's option screen using the 'o' key and specify +-<p> ++ </dd> ++ <dt> ++ <b> ++ w3m freezes when I invoke an external browser. ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Enter w3m's option screen using the <q>o</q> key and specify ++ </p> + <pre> +- netscape %s & ++ firefox %s & + </pre> +-<p> +-(if you are using netscape). +-<p> +-<dt><h3>How do I change the default image viewer?</h3> +-<dd>By default w3m uses xv to view images. If you want to change it into, let's say, 'display', add the following line to ~/.w3m/mailcap or /etc/mailcap. +-<p> ++ <p> ++ (if you are using Firefox). Note that %s is replaced with the URL ++ when invoking. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ How do I change the default image viewer? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ By default w3m uses xv to view images. If you want to change it ++ into, let's say, <q>display</q>, add the following line to ++ ~/.w3m/mailcap or /etc/mailcap. ++ </p> + <pre> + image/*; display %s + </pre> +-<p> +-You can specify external viewers of other file types as well: +-<p> ++ <p> ++ You can specify external viewers of other file types as well: ++ </p> + <pre> + image/*; display %s + application/postscript; ghostview %s + application/x-dvi; xdvi %s + </pre> +-<dt><h3>How do I enter a URL?</h3> +-<dd>Type SHIFT-U +-<p> +-<dt><h3>w3m appends a URL to the former one despite of having cleared the line +-with Ctrl-u. What to do?</h3> +-<dd>Enter the <i>complete</i> adress, e.g. http://www.slashdot.org. +-</dd> +-</dl> +-<br> +-<div align=right> +-<i>Up to <a href="#index">index</a></i> +-</div> +-<br> +-<u><h2><a name="other">Miscellaneous</a></h2></u> +-<br> +-<dl> +-<dt><h3>What is w3m's configuration file?</h3> +-<dd>It is ~/.w3m/config. +-With this file, you can adjust w3m's behavior by changing values of options +-that are described to be varied with the option setting panel. +-Each line contains setting for one option, which is a pair of an option name +-and its value with a space as a separator. +-<p> +-<dt><h3>What are these w3mxxxx files in my ~/.w3m directory for?</h3> +-<dd>These are temporary files used by w3m when reading documents from a +-WWW server. They are not cache files and are usually deleted when w3m is +-terminated. If there remain any temp files, please remove them by yourself. +-<p> +-</dd> +-</dl> +-<br> +-<div align=right> +-<i>Up to <a href="#index">index</a></i> +-</div> +-<br> +-</BODY> +-</HTML> ++ </dd> ++ <dt> ++ <b> ++ How do I enter a URL? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Type SHIFT-u ++ </p> ++ </dd> ++ <dt> ++ <b> ++ w3m appends a URL to the former one even when I clear the line ++ with CTRL-u. What should I do? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ Enter the <i>complete</i> address, e.g. http://www.slashdot.org. ++ </p> ++ </dd> ++ </dl> ++ <p align="right"> ++ <i> ++ Up to <a href="#index">index</a> ++ </i> ++ </p> ++ <h2 id="other"> ++ <u> ++ Miscellaneous ++ </u> ++ </h2> ++ <dl> ++ <dt> ++ <b> ++ What is w3m's configuration file? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ It is ~/.w3m/config. ++ </p> ++ <p> ++ With this file, you can adjust w3m's behavior by changing the ++ values of options whose effects are described in the option ++ setting panel. Each line contains one option setting, consisting ++ of an option name and its value with a space as a separator. ++ </p> ++ </dd> ++ <dt> ++ <b> ++ What are these w3mxxxx files in my ~/.w3m directory for? ++ </b> ++ </dt> ++ <dd> ++ <p> ++ These are temporary files used by w3m when reading documents ++ from a WWW server. They are not cache files and are usually ++ deleted when w3m is terminated. If any temp files are left ++ behind, please remove them yourself. ++ </p> ++ </dd> ++ </dl> ++ <p align="right"> ++ <i> ++ Up to <a href="#index">index</a> ++ </i> ++ </p> ++ </body> ++</html> diff --git a/doc/HISTORY b/doc/HISTORY index b8f5b94..7f7ae2b 100644 --- a/doc/HISTORY @@ -4908,45 +6418,2736 @@ index b8f5b94..7f7ae2b 100644 From: "OMAE, jun" <jun-o@osb.att.ne.jp> diff --git a/doc/MANUAL.html b/doc/MANUAL.html -index aff0189..8353f33 100644 +index aff0189..44379e9 100644 --- a/doc/MANUAL.html +++ b/doc/MANUAL.html -@@ -55,12 +55,10 @@ If you don't specify this option, - <dt>-l number - <dd>Specify line number preserved internally when reading text/plain document - fron standard input. Default is 10000. +@@ -1,508 +1,2207 @@ +-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> ++<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> + <html> +-<head><title>w3m manual</title> +-</head> +-<body> +-<h1>w3m MANUAL</h1> +-<div align=right> +-Akinori Ito<br> +-aito@fw.ipsj.or.jp +-</div> +-<h2>Index</h2> +-<menu> +-<li><a href="#Introduction">Introduction</a> +-<li><a href="#Options">Options</a> +-<li><a href="#Color">Document color</a> +-<li><a href="#Key:orig">Key binding</a> +-<li><a href="#Key:lynx">Lynx-like key binding</a> +-<li><a href="#Mouse">Mouse operation</a> +-<li><a href="#Key:custom">Key customization</a> +-<li><a href="#LocalCGI">Local CGI</a> +-</menu> +- +-<hr> +-<a name="Introduction"></a> +-<h2>Introduction</h2> +-w3m is a pager/text-based WWW browser. You can browse local documents and/or +-documents on the WWW using a terminal emulator. +- +-<hr> +-<a name="Options"></a> +-<h2>Options</h2> +- +-Command line usage is +-<p> ++ <head> ++ <meta http-equiv=content-type content="text/html;charset=US-ASCII"> ++ <title> ++ w3m manual ++ </title> ++ </head> ++ <body> ++ <!-- ++Todo: ++words anchor, link, hyperlink are used with the meaning link. Decide which one shall be prefered and used throughout the documentation ++--> ++ <!-- ++Todo: ++Keybindigs: Check whether there are keybindings that contain SHIFT-Letter which shall be replaced with the majuscule. Having this notation all over the documentation, this shall be noted in the introduction paragraph of section "Key bindings" ++--> ++ <!-- ++insertions tagged with "mh 2016-03-29" come from the latest version of manual page w3m (1) ++--> ++ <h1>w3m MANUAL</h1> ++ <div align="right"> ++ Akinori Ito<br> ++ aito@fw.ipsj.or.jp ++ </div> ++ <h2>Index</h2> ++ <ul> ++ <li> ++ <a href="#Introduction"> ++ Introduction ++ </a> ++ </li> ++ <li> ++ <a href="#Options"> ++ Options ++ </a> ++ </li> ++ <li> ++ <a href="#Color"> ++ Document colors ++ </a> ++ </li> ++ <li> ++ <a href="#Key:orig"> ++ Key bindings ++ </a> ++ </li> ++ <li> ++ <a href="#Key:lynx"> ++ Lynx-like key bindings ++ </a> ++ </li> ++ <li> ++ <a href="#Mouse"> ++ Mouse operation ++ </a> ++ </li> ++ <li> ++ <a href="#Key:custom"> ++ Key customization ++ </a> ++ </li> ++ <li> ++ <a href="#LocalCGI"> ++ Local CGI ++ </a> ++ </li> ++ </ul> ++ <hr> ++ <h2 id="Introduction"> ++ Introduction ++ </h2> ++ <p> ++ w3m is a pager/text-based WWW browser. You can browse local ++ documents and/or documents on the WWW using a terminal emulator. ++ </p> ++ <hr> ++ <h2 id="Options"> ++ Options ++ </h2> ++ <p> ++ Command line usage is ++ </p> + <pre> + w3m [options] [file|URL] + </pre> +-<P> +-If you specify filenames/URLs on command line, these documents are displayed. +-If you specify nothing, w3m reads a document from standard input and display it. +-If no filename and/or URLs are specified and standard input is tty, w3m terminates +-without displaying anything. +- +-<p> +-Options are as follows: +-<dl> +-<dt>+<line number> +-<dd>Move to the specified line. +-<dt>-t width +-<dd>Specify tab width. Default is 8. +-<dt>-r +-<dd>When displaying text/plain document, prohibit emphasis using backspace. +-If you don't specify this option, +-``A^H_'' is interpreted as underlined character and ``A^HA'' as a bold character. +-<dt>-l number +-<dd>Specify line number preserved internally when reading text/plain document +-fron standard input. Default is 10000. -<dt>-s -<dd>Display documents with Shift_JIS code. -<dt>-e -<dd>Display documents with EUC_JP code. -<dt>-j -<dd>Display documents with ISO-2022-JP code. -+<dt>-O charset -+<dd>Specify display/output charset. -+<dt>-I charset -+<dd>Specify document charset. - <dt>-T type - <dd>Specify document type. Without this option, document type - is determined from extension of a file. If the determination -@@ -90,7 +88,7 @@ It is useful when reading E-mail or NetNews messages. - <dd>Monochrome display mode. - <dt>-F - <dd>Automatically render frame. +-<dt>-T type +-<dd>Specify document type. Without this option, document type +-is determined from extension of a file. If the determination +-fails, the document is regarded as text/plain. +-<p> +-Example:<br> +-Read HTML document from standard input and display it ++ <p> ++ If you specify filenames/URLs on the command line, these documents ++ are displayed. If you specify nothing, w3m will read a document ++ from standard input and display it. If it doesn't find a document ++ there either then normally w3m will terminate. ++ </p> ++ <p> ++ Options include: ++ </p> ++ <dl> ++ <dt> ++ +<i>number</i> ++ </dt> ++ <dd> ++ <p> ++ Move to the specified line-number. ++ </p> ++ </dd> ++ <dt> ++ -t <i>width</i> ++ <!--mh 2016-03-29 -t <i>num</i>--> ++ </dt> ++ <dd> ++ <p> ++ Specify tab width. Default is 8. ++ <!--mh 2016-03-29 set tab width to num columns. No effect on stdout--> ++ </p> ++ </dd> ++ <dt> ++ -r ++ </dt> ++ <dd> ++ <p> ++ When displaying text/plain documents, prohibit emphasis using ++ backspace. If you don't specify this option, <q>A^H_</q> is ++ interpreted as an underlined <q>A</q> and <q>A^HA</q> as a bold ++ <q>A</q>. ++<!-- mh 2016-03-29 ++use caret notation to display special escape characters (such as ANSI escapes or nroff-style backspaces for bold and underlined characters) instead of processing them ++--> ++ </p> ++ </dd> ++ <dt> ++ -l <i>number</i> ++ </dt> ++ <dd> ++ <p> ++ Specify the number of lines that should be cached while reading a ++ text/plain document from standard input. Default is 10,000. ++ </p> ++ </dd> ++ <dt> ++ -O <i>charset</i> ++ </dt> ++ <dd> ++ <p> ++ Specify display/output charset. ++<!-- mh 2016-03-29 ++user defined character encoding of output data ++--> ++ </p> ++ </dd> ++ <dt> ++ -I <i>charset</i> ++ </dt> ++ <dd> ++ <p> ++ Specify document charset. ++<!-- mh 2016-03-29 ++user defined character encoding of input data ++--> ++ </p> ++ </dd> ++ <dt> ++ -T <i>type</i> ++ </dt> ++ <dd> ++ <p> ++ Specify document type. Without this option, document type is ++ determined from the extension of a file. If the determination ++ fails, the document is regarded as text/plain. For example: ++ </p> ++ <p> ++ Read HTML document from standard input and display it ++ </p> + <pre> +- cat hoge.html | w3m -T text/html ++ cat example.html | w3m -T text/html + </pre> +-<p> +-Display HTML source ++ <p> ++ Display HTML source ++ </p> + <pre> +- w3m -T text/plain hoge.html ++ w3m -T text/plain example.html + </pre> +-<dt>-m +-<dd>Display document with Internet message mode. +-With this option, w3m determines document type from header information. +-It is useful when reading E-mail or NetNews messages. +-<dt>-v +-<dd>visual startup mode. +-<dt>-B +-<dd>Show the bookmark. +-<dt>-bookmark file +-<dd>Specify bookmark file. +-<dt>-M +-<dd>Monochrome display mode. +-<dt>-F +-<dd>Automatically render frame. -<dt>-S -+<dt>-s - <dd>Squeeze blank lines. - <dt>-X - <dd>Upon exit, do not display preserved screen. -@@ -468,8 +466,7 @@ and <a href="keymap.lynx">keymap.lynx</a>) as examples. - You can run CGI scripts using w3m, without any HTTP server. - It means that w3m behaves like an HTTP server and activates CGI script, - then w3m reads the output of the script and display it. The +-<dd>Squeeze blank lines. +-<dt>-X +-<dd>Upon exit, do not display preserved screen. +-<dt>-W +-<dd>Toggle wrap search mode. +-<dt>-o option=value +-<dd>Specify option. The option names and values are +-same as that appears in ~/.w3m/config. +-<dt>-cookie +-<dd>Process cookies. +-<dt>-no-cookie +-<dd>Don't process cookies. +-<dt>-num +-<dd>Show linenumber. +-<dt>-dump +-<dd>Read document specified by URL and dump formatted text into standard +-output. The width of the document become 80. This width can be overridden +-with -cols option. +-<dt>-cols width +-<dd>Specify document width. Used with -dump option. +-<dt>-ppc count +-<dd> Specify the number of pixels per character (default 8.0). Larger +- values will make tables narrower. +-<dt>-dump_source +-<dd>Read document specified by URL and dump the source. +-<dt>-dump_head +-<dd>Read document specified by URL and dump headers. +-<dt>-dump_both +-<dd>Read document specified by URL and dump headers and the source. +-<dt>-dump_extra +-<dd>Read document specified by URL and dump extra informations, headers and the source. +-<dt>-post file +-<dd>use POST method with file content. +-<dt>-header string +-<dd>insert string as a header. +-<dt>-no-proxy +-<dd>Don't use proxy server. +-<dt>-no-graph +-<dd>Use ASCII character to draw frames. +-<dt>-no-mouse +-<dd>Don't activate mouse. +-<dt>-config file +-<dd>specify config file. +-</dl> +- +-<hr> +-<a name="Color"></a> +-<h2>Document color</h2> +- +-Links and images are displayed as follows. +-<div align="center"> +-<table border="1"> +-<tr><th> </th><th>Color mode</th><th>Monochrome mode</th></tr> +-<tr><td>links</td><td>blue</td><td>underline</td></tr> +-<tr><td>inline images</td><td>green</td><td>reverse</td></tr> +-<tr><td>form input</td><td>red</td><td>reverse</td></tr> +-</table> +-</div> +-These colors can be customized using option setting command "o". +- +-<hr> +-<a name="Key:orig"></a> +-<h2>Key binding</h2> +- +-After invocation, you can operate w3m by one-character commands from +-the keyboard. +-<P> +-Here's the original key-binding table. If you are using Lynx-like key +-bindings, see <a href="#Key:lynx">the Lynx-like key binding</a>. +- +-<H3>Page/Cursor motion</H3> +-<table> +-<TR><TD WIDTH=100>SPC,C-v<TD>Forward page +-<TR><TD>b,ESC v<TD>Backward page +-<TR><TD>l,C-f<TD>Cursor right +-<TR><TD>h,C-b<TD>Cursor left +-<TR><TD>j,C-n<TD>Cursor down +-<TR><TD>k,C-p<TD>Cursor up +-<TR><TD>J<TD>Roll up one line +-<TR><TD>K<TD>Roll down one line +-<TR><TD>^,C-a<TD>Go to the beginning of line +-<TR><TD>$,C-e<TD>Go to the end of line +-<TR><TD>w<TD>Go to next word +-<TR><TD>W<TD>Go to previous word +-<TR><TD>><TD>Shift screen right +-<TR><TD><<TD>Shift screen left +-<TR><TD>.<TD>Shift screen one column right +-<TR><TD>,<TD>Shift screen one column left +-<TR><TD>g,M-<<TD>Go to the first line +-<TR><TD>G,M-><TD>Go to the last line +-<TR><TD>ESC g<TD>Go to specified line +-<TR><TD>Z<TD>Move to the center line +-<TR><TD>z<TD>Move to the center column +-<TR><TD>TAB<TD>Move to next hyperlink +-<TR><TD>C-u,ESC TAB<TD>Move to previous hyperlink +-<TR><TD>[<TD>Move to the first hyperlink +-<TR><TD>]<TD>Move to the last hyperlink +-</table> +- +-<H3>Hyperlink operation</H3> +-<table> +-<TR><TD WIDTH=100>RET<TD>Follow hyperlink +-<TR><TD>a, ESC RET<TD>Save link to file +-<TR><TD>u<TD>Peek link URL +-<TR><TD>i<TD>Peek image URL +-<TR><TD>I<TD>View inline image +-<TR><TD>ESC I<TD>Save inline image to file +-<TR><TD>:<TD>Mark URL-like strings as anchors +-<TR><TD>ESC :<TD>Mark Message-ID-like strings as news anchors +-<TR><TD>c<TD>Peek current URL +-<TR><TD>=<TD>Display information about current document +-<TR><TD>C-g<TD>Show current line number +-<TR><TD>C-h<TD>View history of URL +-<TR><TD>F<TD>Render frame +-<TR><TD>M<TD>Browse current document using external browser +-(use 2M and 3M to invoke second and third browser) +-<TR><TD>ESC M<TD>Browse link using external browser +-(use 2ESC M and 3ESC M to invoke second and third browser) +-</table> +- +-<H3>File/Stream operation</H3> +-<table> +-<TR><TD WIDTH=100>U<TD>Open URL +-<TR><TD>V<TD>View new file +-<TR><TD>@<TD>Execute shell command and load +-<TR><TD>#<TD>Execute shell command and browse +-</table> +- +-<H3>Buffer operation</H3> +-<table> +-<TR><TD WIDTH=100>B<TD>Back to the previous buffer +-<TR><TD>v<TD>View HTML source +-<TR><TD>s<TD>Select buffer +-<TR><TD>E<TD>Edit buffer source +-<TR><TD>C-l<TD>Redraw screen +-<TR><TD>R<TD>Reload buffer +-<TR><TD>S<TD>Save buffer +-<TR><TD>ESC s<TD>Save source +-<TR><TD>ESC e<TD>Edit buffer image +-</table> +- +-<H3>Buffer selection mode</H3> +-<table> +-<TR><TD WIDTH=100>k, C-p<TD>Select previous buffer +-<TR><TD>j, C-n<TD>Select next buffer +-<TR><TD>D<TD>Delect current buffer +-<TR><TD>RET<TD>Go to the selected buffer +-</table> +- +-<H3>Bookmark operation</H3> +-<table> +-<TR><TD WIDTH=100>ESC b<TD>Load bookmark +-<TR><TD>ESC a<TD>Add current to bookmark +-</table> ++ </dd> ++ <dt> ++ -m ++ </dt> ++ <dd> ++ <p> ++ Display document using <q>Internet message mode</q>. With this ++ option, w3m determines document type from header information. ++ This is useful when reading e-mail or Usenet news posts. ++<!-- mh 2016-03-29 ++Render the body of Usenet messages according to the header <q>Content-type</q> ++--> ++ </p> ++ </dd> ++ <dt> ++ -v ++ </dt> ++ <dd> ++ <p> ++ Show w3m's startup page. ++<!-- mh 2016-03-29 ++with no other target defined, welcome users with a built-in page ++--> ++ </p> ++ </dd> ++ <dt> ++ -B ++ </dt> ++ <dd> ++ <p> ++ Show w3m's bookmarks page. ++<!-- mh 2016-03-29 ++with no other target defined, use the bookmark page for startup ++--> ++ </p> ++ </dd> ++ <dt> ++ -bookmark <i>file</i> ++ </dt> ++ <dd> ++ <p> ++ Specify a custom bookmarks file. ++ </p> ++ </dd> ++ <dt> ++ -M ++ </dt> ++ <dd> ++ <p> ++ Monochrome display mode. ++<!-- mh 2016-03-29 ++monochrome display ++--> ++ </p> ++ </dd> ++ <dt> ++ -F ++ </dt> ++ <dd> ++ <p> ++ Automatically render HTML frames. ++<!-- mh 2016-03-29 ++render frames ++--> ++ </p> ++ </dd> ++ <dt> ++ -s ++ </dt> ++ <dd> ++ <p> ++ Squeeze blank lines. ++<!-- mh 2016-03-29 ++squeeze multiple blank lines into one ++--> ++ </p> ++ </dd> ++ <dt> ++ -X ++ </dt> ++ <dd> ++ <p> ++ Upon exit, do not reinitialize the terminal. ++ </p> ++ </dd> ++ <dt> ++ -W ++ </dt> ++ <dd> ++ <p> ++ Toggle wrapping mode in searches. ++<!-- mh 2016-03-29 ++toggle wrapping in searches ++--> + +-<H3>Search</H3> +-<table> +-<TR><TD WIDTH=100>/,C-s<TD>Search forward +-<TR><TD>?,C-r<TD>Search backward +-<TR><TD>n<TD>Search next +-<TR><TD>N<TD>Search previous +-<TR><TD>C-w<TD>Toggle wrap search mode +-</table> ++ </p> ++ </dd> ++ <dt> ++ -o <i>option</i>=<i>value</i> ++ </dt> ++ <dd> ++ <p> ++ Specify option. The available option names and values are the ++ same as in ~/.w3m/config. ++<!-- mh 2016-03-29 ++modify one configuration item with an explicitly given value; without option=value, equivalent to -show-option ++--> ++ </p> ++ </dd> ++ <dt> ++ -cookie ++ </dt> ++ <dd> ++ <p> ++ Process cookies. ++<!-- mh 2016-03-29 ++use stored cookies and accept new ones ++--> + +-<H3>Mark operation</H3> +-<table> +-<TR><TD WIDTH=100>C-SPC<TD>Set/unset mark +-<TR><TD>ESC p<TD>Go to previous mark +-<TR><TD>ESC n<TD>Go to next mark +-<TR><TD>"<TD>Mark by regular expression +-</table> ++ </p> ++ </dd> ++ <dt> ++ -no-cookie ++ </dt> ++ <dd> ++ <p> ++ Don't process cookies. ++<!-- mh 2016-03-29 ++neither use stored cookies nor accept new ones ++--> + +-<H3>Miscellany</H3> +-<table> +-<TR><TD WIDTH=100>!<TD>Execute shell command +-<TR><TD>H<TD>Help (load this file) +-<TR><TD>o<TD>Set option +-<TR><TD>C-k<TD>Show cookie jar +-<TR><TD>C-c<TD>Stop +-<TR><TD>C-z<TD>Suspend +-<TR><TD>q<TD>Quit (with confirmation, if you like) +-<TR><TD>Q<TD>Quit without confirmation +-</table> ++ </p> ++ </dd> ++ <dt> ++ -num ++ </dt> ++ <dd> ++ <p> ++ Show line-numbers. ++<!-- mh 2016-03-29 ++display each line's number ++--> ++ </p> ++ </dd> ++ <dt> ++ -dump ++ </dt> ++ <dd> ++ <p> ++ Read document specified by URL and dump page rendered as text ++ into standard output. A width of 80 columns is used unless option ++ -cols sets another value. ++ ++<!-- mh 2016-03-29 ++dump rendered page into stdout. Set implicitly when output is directed to a file or pipe ++--> + +-<H3>Line-edit mode</H3> +-<table> +-<TR><TD WIDTH=100>C-f<TD>Move cursor forward +-<TR><TD>C-b<TD>Move cursor backward +-<TR><TD>C-h<TD>Delete previous character +-<TR><TD>C-d<TD>Delete current character +-<TR><TD>C-k<TD>Kill everything after cursor +-<TR><TD>C-u<TD>Kill everything before cursor +-<TR><TD>C-a<TD>Move to the top of line +-<TR><TD>C-e<TD>Move to the bottom of line +-<TR><TD>C-p<TD>Fetch the previous string from the history list +-<TR><TD>C-n<TD>Fetch the next string from the history list +-<TR><TD>TAB,SPC<TD>Complete filename +-<TR><TD>RETURN<TD>Accept +-</table> ++ </p> ++ </dd> ++ <dt> ++ -cols <i>width</i> ++ </dt> ++ <dd> ++ <p> ++ Specify document width. Used with -dump option. ++ </p> ++ </dd> ++ <dt> ++ -ppc <i>count</i> ++ </dt> ++ <dd> ++ <p> ++ Specify the number of pixels per character (default 8.0). Larger ++ values will make tables narrower. ++<!-- mh 2016-03-29 ++width of num pixels per character. Range of 4.0 to 32.0, default 8.0. Larger ++values will make tables narrower. (Implementation not verified) ++--> ++ </p> ++ </dd> ++ <dt> ++ -dump_source ++ </dt> ++ <dd> ++ <p> ++ Read document specified by URL and dump the source. ++<!-- mh 2016-03-29 ++dump the page's source code into stdout ++--> ++ </p> ++ </dd> ++ <dt> ++ -dump_head ++ </dt> ++ <dd> ++ <p> ++ Read document specified by URL and dump headers. ++<!-- mh 2016-03-29 ++dump response of a HEAD request for a URL into stdout ++--> ++ </p> ++ </dd> ++ <dt> ++ -dump_both ++ </dt> ++ <dd> ++ <p> ++ Read document specified by URL and dump headers and the source. ++<!-- mh 2016-03-29 ++dump HEAD, and source code for a URL into stdout ++--> + +-<hr> +-<a name="Key:lynx"></a> +-<h2>Lynx-like key binding</h2> ++ </p> ++ </dd> ++ <dt> ++ -dump_extra ++ </dt> ++ <dd> ++ <p> ++ Read document specified by URL and dump extra informations, ++ headers, and the source. ++<!-- mh 2016-03-29 ++dump HEAD, source code, and extra information for a URL into ++stdout ++--> + +-If you have chosen `Lynx-like key binding' at the compile time, +-you can use the following key binding. ++ </p> ++ </dd> ++ <dt> ++ -post <i>file</i> ++ </dt> ++ <dd> ++ <p> ++ Use POST method with file content. ++<!-- mh 2016-03-29 ++use POST method to upload data defined in <q>file</q>. The syntax to be ++ used is var1=value1[&var2=value2]... ++--> + +-<H3>Page/Cursor motion</H3> +-<table> +-<TR><TD WIDTH=100>SPC,C-v,+<TD>Forward page +-<TR><TD>b,ESC v,-<TD>Previous page +-<TR><TD>l<TD>Cursor right +-<TR><TD>h<TD>Cursor left +-<TR><TD>j<TD>Cursor down +-<TR><TD>k<TD>Cursor up +-<TR><TD>J<TD>Roll up one line +-<TR><TD>K<TD>Roll down one line +-<TR><TD>^<TD>Go to the beginning of line +-<TR><TD>$<TD>Go to the end of line +-<TR><TD>><TD>Shift screen right +-<TR><TD><<TD>Shift screen left +-<TR><TD>C-a<TD>Go to the first line +-<TR><TD>C-e<TD>Go to the last line +-<TR><TD>G<TD>Go to the specified line +-<TR><TD>Z<TD>Move to the center line +-<TR><TD>z<TD>Move to the center column +-<TR><TD>TAB,C-n,Down arrow<TD>Move to next hyperlink +-<TR><TD>ESC TAB,C-p,Up arrow<TD>Move to previous link +-<TR><TD>C-g<TD>Show current page position +-</table> ++ </p> ++ </dd> ++ <dt> ++ -header <i>string</i> ++ </dt> ++ <dd> ++ <p> ++ Insert string as a header. ++<!-- mh 2016-03-29 ++append <q>string</q> to the HTTP(S) request. Expected to match the ++header syntax Variable: Value ++--> + ++ </p> ++ </dd> ++ <dt> ++ -no-proxy ++ </dt> ++ <dd> ++ <p> ++ Don't use proxy server. ++ </p> ++ </dd> ++ <dt> ++ -no-graph ++ </dt> ++ <dd> ++ <p> ++ Use ASCII characters to draw frames rather than graphical ones. ++<!-- mh 2016-03-29 ++do not use graphic characters for drawing HTML table and ++frame borders ++--> + +-<H2>Hyperlink operation</H2> +-<table> +-<TR><TD WIDTH=100>RET, C-f, Right arrow<TD>Follow hyperlink +-<TR><TD>d, ESC RET<TD>Save link to file +-<TR><TD>u<TD>Peek link URL +-<TR><TD>i<TD>Peek image URL +-<TR><TD>I<TD>View inline image +-<TR><TD>ESC I<TD>Save inline image to file +-<TR><TD>:<TD>Mark URL-like strings as anchors +-<TR><TD>ESC :<TD>Mark Message-ID-like strings as news anchors +-<TR><TD>c<TD>Peek current URL +-<TR><TD>=<TD>Display information about current document +-<TR><TD>C-h<TD>View history of URL +-<TR><TD>F<TD>Render frame +-<TR><TD>M<TD>Browse current document using external browser +-(use 2M and 3M to invoke second and third browser) +-<TR><TD>ESC M<TD>Browse link using external browser +-(use 2ESC M and 3ESC M to invoke second and third browser) +-</table> +- +-<H2>File/Stream operation</H2> +-<table> +-<TR><TD WIDTH=100>g,U<TD>Open URL +-<TR><TD>V<TD>View new file +-<TR><TD>@<TD>Execute shell command and load +-<TR><TD>#<TD>Execute shell command and browse +-</table> +- +-<H2>Buffer operation</H2> +-<table> +-<TR><TD WIDTH=100>B, C-b, Left arrow<TD>Back to the previous buffer +-<TR><TD>\<TD>View HTML source +-<TR><TD>s, C-h<TD>Select buffer +-<TR><TD>E<TD>Edit buffer source +-<TR><TD>C-l, C-w<TD>Redraw screen +-<TR><TD>R, C-r<TD>Reload buffer +-<TR><TD>S, p<TD>Save buffer +-<TR><TD>ESC s<TD>Save source +-<TR><TD>ESC e<TD>Edit buffer image +-</table> +- +-<H2>Buffer selection mode</H2> +-<table> +-<TR><TD WIDTH=100>k, C-p<TD>Select previous buffer +-<TR><TD>j, C-n<TD>Select next buffer +-<TR><TD>D<TD>Delect current buffer +-<TR><TD>RET<TD>Go to the selected buffer +-</table> +- +-<H2>Bookmark operation</H2> +-<table> +-<TR><TD WIDTH=100>v, ESC b<TD>Load bookmark +-<TR><TD>a, ESC a<TD>Add current to bookmark +-</table> +- +-<H2>Search</H2> +-<table> +-<TR><TD WIDTH=100>/, C-s<TD>Search forward +-<TR><TD>n<TD>Search next +-<TR><TD>w<TD>Toggle wrap search mode +-</table> +- +-<H2>Mark operation</H2> +-<table> +-<TR><TD WIDTH=100>C-SPC<TD>Set/unset mark +-<TR><TD>P<TD>Go to previous mark +-<TR><TD>N<TD>Go to next mark +-<TR><TD>"<TD>Mark by regular expression +-</table> +- +-<H2>Miscellany</H2> +-<table> +-<TR><TD WIDTH=100>!<TD>Execute shell command +-<TR><TD>H, ?<TD>Help (load this file) +-<TR><TD>o<TD>Set option +-<TR><TD>C-k<TD>Show cookie jar +-<TR><TD>C-c<TD>Stop +-<TR><TD>C-z<TD>Suspend +-<TR><TD>q<TD>Quit (with confirmation, if you like) +-<TR><TD>Q<TD>Quit without confirmation +-</table> +- +-<H2>Line-edit mode</H2> +-<table> +-<TR><TD WIDTH=100>C-f<TD>Move cursor forward +-<TR><TD>C-b<TD>Move cursor backward +-<TR><TD>C-h<TD>Delete previous character +-<TR><TD>C-d<TD>Delete current character +-<TR><TD>C-k<TD>Kill everything after cursor +-<TR><TD>C-u<TD>Kill everything before cursor +-<TR><TD>C-a<TD>Move to the top of line +-<TR><TD>C-e<TD>Move to the bottom of line +-<TR><TD>C-p<TD>Fetch the previous string from the history list +-<TR><TD>C-n<TD>Fetch the next string from the history list +-<TR><TD>TAB,SPC<TD>Complete filename +-<TR><TD>RETURN<TD>Accept +-</table> +- +-<hr> +-<a name="Mouse"></a> +-<h2>Mouse operation</h2> +-If w3m is compiled with mouse option and you are using +-xterm/kterm/rxvt (in this case, you have to set the TERM +-environment variable to `xterm' or `kterm'.) or GPM +-environment, you can use mouse +-for the navigation. +-<p> +-<table border=0> +-<tr><td>left click +-<td>Move the cursor to the place pointed by the mouse cursor. +-If you click the cursor and it is on an anchor, follow the anchor. +-<tr><td>middle click +-<td>Back to the previous buffer. +-<tr><td>right click +-<td>Open pop-up menu. You can choose an item by clicking it. +-<tr><td>left drag +-<td>Scroll document. The default behavior is to grab the document +-and drag it. You can reverse the behavior (grab the window and drag it) +-with the option setting panel. +-</table> +-<p> +- +- +-<hr> +-<a name="Key:custom"></a> +-<h2>Key customization</h2> +-You can customize the key binding (except line-editing keymap) +-by describing ~/.w3m/keymap. For example, ++ </p> ++ </dd> ++ <dt> ++ -no-mouse ++ </dt> ++ <dd> ++ <p> ++ Deactivate mouse support. ++ </p> ++ </dd> ++ <dt> ++ -config <i>file</i> ++ </dt> ++ <dd> ++ <p> ++ Specify config file. ++ </p> ++ </dd> ++ </dl> ++ <hr> ++ <h2 id="Color"> ++ Document colors ++ </h2> ++ <p> ++ Links and images are displayed as follows. ++ </p> ++ <div align="center"> ++ <table border="1"> ++ <tr> ++ <th> ++ ++ </th> ++ <th> ++ Color mode ++ </th> ++ <th> ++ Monochrome mode ++ </th> ++ </tr> ++ <tr> ++ <td> ++ links ++ </td> ++ <td> ++ blue ++ </td> ++ <td> ++ underline ++ </td> ++ </tr> ++ <tr> ++ <td> ++ inline images ++ </td> ++ <td> ++ green ++ </td> ++ <td> ++ reverse ++ </td> ++ </tr> ++ <tr> ++ <td> ++ form input ++ </td> ++ <td> ++ red ++ </td> ++ <td> ++ reverse ++ </td> ++ </tr> ++ </table> ++ </div> ++ <p> ++ These colors can be customized using the option setting command ++ <q>o</q>. ++ </p> ++ <hr> ++ <h2 id="Key:orig"> ++ Key bindings ++ </h2> ++<!-- ++ TODO: reorganise this whole thing into one big table of ++ FUNCTIONNAME | description | default-binding | Lynxlike-binding ++!--> ++ <p> ++ After invoking w3m, you can control it with keyboard commands. ++ </p> ++ <p> ++ Here's the original key-binding table. If you are using Lynx-like ++ key bindings, see <a href="#Key:lynx">the Lynx-like key ++ bindings</a>. Throughout, the <q>C-</q> and <q>M-</q> notations ++ indicate the modifiers <q>control</q> and <q>meta</q> (which can be ++ replaced with <q>alt</q> or ESC); on the other hand <q>2 M</q> ++ simply means <q>2</q> followed by <q>M</q>. ++ </p> ++<!-- ++Correction: ++The two equivalents to the meta-key are pressing simultaneously the ALT-key or pressing the ESC-key first and then other mentioned keys. ++--> ++ <h3> ++ In-page navigation ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ SPC, C-v, +, PGDN ++ </td> ++ <td> ++ Forward page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ b, M-v, -, PGUP ++ </td> ++ <td> ++ Backward page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ l, C-f, RIGHT ++ </td> ++ <td> ++ Cursor right ++ </td> ++ </tr> ++ <tr> ++ <td> ++ h, C-b, LEFT ++ </td> ++ <td> ++ Cursor left ++ </td> ++ </tr> ++ <tr> ++ <td> ++ j, C-n, DOWN ++ </td> ++ <td> ++ Cursor down ++ </td> ++ </tr> ++ <tr> ++ <td> ++ k, C-p, UP ++ </td> ++ <td> ++ Cursor up ++ </td> ++ </tr> ++ <tr> ++ <td> ++ J ++ </td> ++ <td> ++ Scroll screen up one line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ K ++ </td> ++ <td> ++ Scroll screen down one line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ ^, C-a ++ </td> ++ <td> ++ Go to the beginning of line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ $, C-e ++ </td> ++ <td> ++ Go to the end of line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ w ++ </td> ++ <td> ++ Go to the next word ++ </td> ++ </tr> ++ <tr> ++ <td> ++ W ++ </td> ++ <td> ++ Go to the previous word ++ </td> ++ </tr> ++ <tr> ++ <td> ++ > ++ </td> ++ <td> ++ Shift screen right ++ </td> ++ </tr> ++ <tr> ++ <td> ++ < ++ </td> ++ <td> ++ Shift screen left ++ </td> ++ </tr> ++ <tr> ++ <td> ++ . ++ </td> ++ <td> ++ Shift screen one column right ++ </td> ++ </tr> ++ <tr> ++ <td> ++ , ++ </td> ++ <td> ++ Shift screen one column left ++ </td> ++ </tr> ++ <tr> ++ <td> ++ g, M-<, HOME ++ </td> ++ <td> ++ Go to the first line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ G, M->, END ++ </td> ++ <td> ++ Go to the last line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-g ++ </td> ++ <td> ++ Go to the specified line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ Z ++ </td> ++ <td> ++ Center on cursor column ++ </td> ++ </tr> ++ <tr> ++ <td> ++ z ++ </td> ++ <td> ++ Center on cursor line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ TAB ++ </td> ++ <td> ++ Move to the next hyperlink ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-u, M-TAB ++ </td> ++ <td> ++ Move to the previous hyperlink ++ </td> ++ </tr> ++ <tr> ++ <td> ++ [ ++ </td> ++ <td> ++ Move to the first hyperlink ++ </td> ++ </tr> ++ <tr> ++ <td> ++ ] ++ </td> ++ <td> ++ Move to the last hyperlink ++ </td> ++ </tr> ++ </table> ++ <h3>Hyperlink operation</h3> ++ <table> ++ <tr> ++ <td width="100"> ++ C-j, C-m, RET ++ </td> ++ <td> ++ Follow hyperlink ++ </td> ++ </tr> ++ <tr> ++ <td> ++ a, M-RET ++ </td> ++ <td> ++ Save link to file ++ </td> ++ </tr> ++ <tr> ++ <td> ++ u ++ </td> ++ <td> ++ Show link URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ i ++ </td> ++ <td> ++ Show image URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ I ++ </td> ++ <td> ++ View inline image ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-I ++ </td> ++ <td> ++ Save inline image to file ++ </td> ++ </tr> ++ <tr> ++ <td> ++ : ++ </td> ++ <td> ++ Mark URL-like strings as hyperlinks ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-: ++ </td> ++ <td> ++ Mark Message-ID-like strings as links ++ </td> ++ </tr> ++ <tr> ++ <td> ++ c ++ </td> ++ <td> ++ Show current URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ = ++ </td> ++ <td> ++ Show information about current document ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-g ++ </td> ++ <td> ++ Show current position in page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-h ++ </td> ++ <td> ++ Show browsing history ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M ++ </td> ++ <td> ++ Browse current document using external browser (prefix 2, 3, ..., ++ or 9 to invoke alternate configured browsers, e.g. 3 M) ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-M ++ </td> ++ <td> ++ Browse link using external browser (prefixed as above, e.g. ++ 3 M-M) ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Bookmark management ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ M-b ++ </td> ++ <td> ++ Go to the bookmarks page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-a ++ </td> ++ <td> ++ Bookmark current page ++ </td> ++ </tr> ++ </table> ++ <h3> ++ File/stream operation ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ U ++ </td> ++ <td> ++ Open new URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ V ++ </td> ++ <td> ++ Open new file ++ </td> ++ </tr> ++ <tr> ++ <td> ++ @ ++ </td> ++ <td> ++ Execute shell command and view output ++ </td> ++ </tr> ++ <tr> ++ <td> ++ # ++ </td> ++ <td> ++ Execute shell command and browse output ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Content operations ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ v ++ </td> ++ <td> ++ Toggle viewing as text or rendered HTML ++ </td> ++ </tr> ++ <tr> ++ <td> ++ F ++ </td> ++ <td> ++ Toggle rendering HTML frames ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-l ++ </td> ++ <td> ++ Redraw screen ++ </td> ++ </tr> ++ <tr> ++ <td> ++ R ++ </td> ++ <td> ++ Reload ++ </td> ++ </tr> ++ <tr> ++ <td> ++ E ++ </td> ++ <td> ++ Edit local source ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-e ++ </td> ++ <td> ++ Edit rendered copy of page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-s ++ </td> ++ <td> ++ Save source ++ </td> ++ </tr> ++ <tr> ++ <td> ++ S ++ </td> ++ <td> ++ Save rendered copy of page ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Buffer/tab navigation ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ B ++ </td> ++ <td> ++ Go back, <q>popping</q> the buffer stack ++ </td> ++ </tr> ++ <tr> ++ <td> ++ s ++ </td> ++ <td> ++ Show buffer-stack menu ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-t ++ </td> ++ <td> ++ Show tab menu ++ </td> ++ </tr> ++ <tr> ++ <td> ++ T ++ </td> ++ <td> ++ Open current page as new tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-t ++ </td> ++ <td> ++ Open link as new tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ } ++ </td> ++ <td> ++ Switch to next tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ { ++ </td> ++ <td> ++ Switch to previous tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-q ++ </td> ++ <td> ++ Close current tab ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Search ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ / ++ </td> ++ <td> ++ Search forward ++ </td> ++ </tr> ++ <tr> ++ <td> ++ ? ++ </td> ++ <td> ++ Search backward ++ </td> ++ </tr> ++ <tr> ++ <td width="100"> ++ C-s ++ </td> ++ <td> ++ Incremental search forward ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-r ++ </td> ++ <td> ++ Incremental search backward ++ </td> ++ </tr> ++ <tr> ++ <td> ++ n ++ </td> ++ <td> ++ Next match ++ </td> ++ </tr> ++ <tr> ++ <td> ++ N ++ </td> ++ <td> ++ Previous match ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-w ++ </td> ++ <td> ++ Toggle wrapping mode in searches ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Mark management ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ C-SPC ++ </td> ++ <td> ++ Set/unset mark ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-p ++ </td> ++ <td> ++ Go to the previous mark ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-n ++ </td> ++ <td> ++ Go to the next mark ++ </td> ++ </tr> ++ <tr> ++ <td> ++ " ++ </td> ++ <td> ++ Mark all occurrences of a regular expression ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Miscellany ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ ! ++ </td> ++ <td> ++ Execute shell command ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-c ++ </td> ++ <td> ++ Invoke w3m function ++ </td> ++ </tr> ++ <tr> ++ <td> ++ H ++ </td> ++ <td> ++ Show help panel ++ </td> ++ </tr> ++ <tr> ++ <td> ++ o ++ </td> ++ <td> ++ Show options panel ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-k ++ </td> ++ <td> ++ Show cookie jar ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-c ++ </td> ++ <td> ++ Interrupt ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-z ++ </td> ++ <td> ++ Suspend w3m ++ </td> ++ </tr> ++ <tr> ++ <td> ++ q ++ </td> ++ <td> ++ Quit (with confirmation dialog) ++ </td> ++ </tr> ++ <tr> ++ <td> ++ Q ++ </td> ++ <td> ++ Quit without confirmation ++ </td> ++ </tr> ++ </table> ++<!-- ++ TODO: import leftovers from current keymap (same in both): ++ ( UNDO ++ ) REDO ++ ; MARK_WORD ++ D DOWNLOAD_LIST ++ L LIST ++ m MOUSE_TOGGLE ++ r VERSION ++ | PIPE_BUF ++ M-W DICT_WORD_AT ++ M-c COMMAND ++ M-k DEFINE_KEY ++ M-l LIST_MENU ++ M-m MOVE_LIST_MENU ++ M-o SET_OPTION ++ M-u GOTO_RELATIVE ++ M-w DICT_WORD ++ M-Fn MENU ++!--> ++ <p> ++ Two special operational modes exist which have built-in (not ++ redefinable) keymappings: ++ </p> ++ <h3> ++ Menu selection mode ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ k, C-p, UP ++ </td> ++ <td> ++ Select previous item ++ </td> ++ </tr> ++ <tr> ++ <td> ++ j, C-n, DOWN ++ </td> ++ <td> ++ Select next item ++ </td> ++ </tr> ++ <tr> ++ <td> ++ D ++ </td> ++ <td> ++ Delete current item ++ </td> ++ </tr> ++ <tr> ++ <td> ++ SPC, RET ++ </td> ++ <td> ++ Go to the selected item ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Line-editing mode ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ C-f, RIGHT ++ </td> ++ <td> ++ Move cursor forward ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-b, LEFT ++ </td> ++ <td> ++ Move cursor backward ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-h, BKSPC ++ </td> ++ <td> ++ Delete previous character ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-d ++ </td> ++ <td> ++ Delete current character ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-k ++ </td> ++ <td> ++ Kill everything after cursor ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-u ++ </td> ++ <td> ++ Kill everything before cursor ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-a ++ </td> ++ <td> ++ Move to the beginning of line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-e ++ </td> ++ <td> ++ Move to the end of line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-p, UP ++ </td> ++ <td> ++ Fetch the previous string from the history list ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-n, DOWN ++ </td> ++ <td> ++ Fetch the next string from the history list ++ </td> ++ </tr> ++ <tr> ++ <td> ++ TAB, SPC ++ </td> ++ <td> ++ Try to complete filename ++ </td> ++ </tr> ++ <tr> ++ <td> ++ RET ++ </td> ++ <td> ++ Accept ++ </td> ++ </tr> ++ </table> ++ <hr> ++ <h2 id="Key:lynx"> ++ Lynx-like key bindings ++ </h2> ++ <p> ++ If w3m was compiled with <q>Lynx-like key bindings</q>, you can use ++ the following key bindings. ++ </p> ++ <h3> ++ In-page navigation ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ SPC, C-v, + ++ </td> ++ <td> ++ Forward page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ b, M-v, - ++ </td> ++ <td> ++ Backward page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ l ++ </td> ++ <td> ++ Cursor right ++ </td> ++ </tr> ++ <tr> ++ <td> ++ h ++ </td> ++ <td> ++ Cursor left ++ </td> ++ </tr> ++ <tr> ++ <td> ++ j ++ </td> ++ <td> ++ Cursor down ++ </td> ++ </tr> ++ <tr> ++ <td> ++ k ++ </td> ++ <td> ++ Cursor up ++ </td> ++ </tr> ++ <tr> ++ <td> ++ J ++ </td> ++ <td> ++ Scroll screen up one line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ K ++ </td> ++ <td> ++ Scroll screen down one line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ ^ ++ </td> ++ <td> ++ Go to the beginning of line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ $ ++ </td> ++ <td> ++ Go to the end of line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ > ++ </td> ++ <td> ++ Shift screen right ++ </td> ++ </tr> ++ <tr> ++ <td> ++ < ++ </td> ++ <td> ++ Shift screen left ++ </td> ++ </tr> ++ <tr> ++ <td> ++ . ++ </td> ++ <td> ++ Shift screen one column right ++ </td> ++ </tr> ++ <tr> ++ <td> ++ , ++ </td> ++ <td> ++ Shift screen one column left ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-a, M-< ++ </td> ++ <td> ++ Go to the first line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-e, M-> ++ </td> ++ <td> ++ Go to the last line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ G ++ </td> ++ <td> ++ Go to the specified line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ w ++ </td> ++ <td> ++ Go to the next word ++ </td> ++ </tr> ++ <tr> ++ <td> ++ W ++ </td> ++ <td> ++ Go to the previous word ++ </td> ++ </tr> ++ <tr> ++ <td> ++ Z ++ </td> ++ <td> ++ Center on cursor line ++ </td> ++ </tr> ++ <tr> ++ <td> ++ z ++ </td> ++ <td> ++ Center on cursor column ++ </td> ++ </tr> ++ <tr> ++ <td> ++ TAB, C-n, DOWN ++ </td> ++ <td> ++ Move to the next hyperlink ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-TAB, C-p, C-u, UP ++ </td> ++ <td> ++ Move to the previous link ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-g ++ </td> ++ <td> ++ Show current position in page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ [ ++ </td> ++ <td> ++ Move to the first hyperlink ++ </td> ++ </tr> ++ <tr> ++ <td> ++ ] ++ </td> ++ <td> ++ Move to the last hyperlink ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Hyperlink operation ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ C-f, C-j, C-m, RET, RIGHT ++ </td> ++ <td> ++ Follow hyperlink ++ </td> ++ </tr> ++ <tr> ++ <td> ++ d, M-RET ++ </td> ++ <td> ++ Save link to file ++ </td> ++ </tr> ++ <tr> ++ <td> ++ u ++ </td> ++ <td> ++ Show link URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ i ++ </td> ++ <td> ++ Show image URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ I ++ </td> ++ <td> ++ View inline image ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-I ++ </td> ++ <td> ++ Save inline image to file ++ </td> ++ </tr> ++ <tr> ++ <td> ++ : ++ </td> ++ <td> ++ Mark URL-like strings as hyperlinks ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-: ++ </td> ++ <td> ++ Mark Message-ID-like strings as news anchors ++ </td> ++ </tr> ++ <tr> ++ <td> ++ c ++ </td> ++ <td> ++ Show current URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ = ++ </td> ++ <td> ++ Show information about current document ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-h ++ </td> ++ <td> ++ Show browsing history ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M ++ </td> ++ <td> ++ Browse current document using external browser (prefix 2, 3, ..., ++ or 9 to invoke alternate configured browsers, e.g. 3 M) ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-M ++ </td> ++ <td> ++ Browse link using external browser (prefixed as above, e.g. ++ 3 M-M) ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Bookmark management ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ v, M-b ++ </td> ++ <td> ++ Go to the bookmarks page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ a, M-a ++ </td> ++ <td> ++ Bookmark current page ++ </td> ++ </tr> ++ </table> ++ <h3> ++ File/stream operation ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ g, U ++ </td> ++ <td> ++ Open new URL ++ </td> ++ </tr> ++ <tr> ++ <td> ++ V ++ </td> ++ <td> ++ Open new file ++ </td> ++ </tr> ++ <tr> ++ <td> ++ @ ++ </td> ++ <td> ++ Execute shell command and view output ++ </td> ++ </tr> ++ <tr> ++ <td> ++ # ++ </td> ++ <td> ++ Execute shell command and browse output ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Content operations ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ \ ++ </td> ++ <td> ++ Toggle viewing as text or rendered HTML ++ </td> ++ </tr> ++ <tr> ++ <td> ++ F ++ </td> ++ <td> ++ Toggle rendering HTML frames ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-l, C-w ++ </td> ++ <td> ++ Redraw screen ++ </td> ++ </tr> ++ <tr> ++ <td> ++ R, C-r ++ </td> ++ <td> ++ Reload ++ </td> ++ </tr> ++ <tr> ++ <td> ++ E ++ </td> ++ <td> ++ Edit local source ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-e ++ </td> ++ <td> ++ Edit rendered copy of page ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-s ++ </td> ++ <td> ++ Save source ++ </td> ++ </tr> ++ <tr> ++ <td> ++ S, p ++ </td> ++ <td> ++ Save rendered copy of page ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Buffer/tab navigation ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ B, C-b, LEFT ++ </td> ++ <td> ++ Go back, <q>popping</q> the buffer stack ++ </td> ++ </tr> ++ <tr> ++ <td> ++ s, C-h ++ </td> ++ <td> ++ Show buffer-stack menu ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-t ++ </td> ++ <td> ++ Show tab menu ++ </td> ++ </tr> ++ <tr> ++ <td> ++ T ++ </td> ++ <td> ++ Open current page as new tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-t ++ </td> ++ <td> ++ Open link as new tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ } ++ </td> ++ <td> ++ Switch to next tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ { ++ </td> ++ <td> ++ Switch to previous tab ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-q ++ </td> ++ <td> ++ Close current tab ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Search ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ /, C-s ++ </td> ++ <td> ++ Search forward ++ </td> ++ </tr> ++ <tr> ++ <td> ++ n ++ </td> ++ <td> ++ Next match ++ </td> ++ </tr> ++ <tr> ++ <td> ++ w ++ </td> ++ <td> ++ Toggle wrapping mode in searches ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Mark management ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ C-SPC ++ </td> ++ <td> ++ Set/unset mark ++ </td> ++ </tr> ++ <tr> ++ <td> ++ P ++ </td> ++ <td> ++ Go to the previous mark ++ </td> ++ </tr> ++ <tr> ++ <td> ++ N ++ </td> ++ <td> ++ Go to the next mark ++ </td> ++ </tr> ++ <tr> ++ <td> ++ " ++ </td> ++ <td> ++ Mark all occurrences of a regular expression ++ </td> ++ </tr> ++ </table> ++ <h3> ++ Miscellany ++ </h3> ++ <table> ++ <tr> ++ <td width="100"> ++ ! ++ </td> ++ <td> ++ Execute shell command ++ </td> ++ </tr> ++ <tr> ++ <td> ++ M-c ++ </td> ++ <td> ++ Invoke w3m function ++ </td> ++ </tr> ++ <tr> ++ <td> ++ H, ? ++ </td> ++ <td> ++ Show help panel ++ </td> ++ </tr> ++ <tr> ++ <td> ++ o ++ </td> ++ <td> ++ Show options panel ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-k ++ </td> ++ <td> ++ Show cookie jar ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-c ++ </td> ++ <td> ++ Interrupt ++ </td> ++ </tr> ++ <tr> ++ <td> ++ C-z ++ </td> ++ <td> ++ Suspend w3m ++ </td> ++ </tr> ++ <tr> ++ <td> ++ q ++ </td> ++ <td> ++ Quit (with confirmation dialog) ++ </td> ++ </tr> ++ <tr> ++ <td> ++ Q ++ </td> ++ <td> ++ Quit without confirmation ++ </td> ++ </tr> ++ </table> ++ <p> ++ The Lynx-like configuration leaves keymappings unchanged in the ++ menu-selection and line-editing modes. ++ </p> ++ <hr> ++ <h2 id="Mouse"> ++ Mouse operation ++ </h2> ++ <p> ++ If w3m is compiled with mouse support and you are invoking w3m ++ either from a console with GPM or from an X terminal emulator, you ++ can use the mouse for navigation (in the case of rxvt, you need to ++ set the TERM environment variable to <q>xterm</q> or <q>kterm</q>). ++ </p> ++ <table border="0"> ++ <tr> ++ <td> ++ left click ++ </td> ++ <td> ++ Move the cursor to the place indicated by the mouse cursor. ++ If you click the cursor and it is on a hyperlink, follow the ++ link. ++ </td> ++ </tr> ++ <tr> ++ <td> ++ middle click ++ </td> ++ <td> ++ Back to the previous buffer. ++ </td> ++ </tr> ++ <tr> ++ <td> ++ right click ++ </td> ++ <td> ++ Open pop-up menu. You can choose an item by clicking it. ++ </td> ++ </tr> ++ <tr> ++ <td> ++ left drag ++ </td> ++ <td> ++ Scroll document. The default behavior is to grab the document ++ and drag it. You can reverse the behavior (grab the window and ++ drag it) with the option setting panel. ++ </td> ++ </tr> ++ </table> ++ <hr> ++ <h2 id="Key:custom"> ++ Key customization ++ </h2> ++ <p> ++ You can customize the key bindings (except the line-editing keymap) ++ in a ~/.w3m/keymap file. For example, ++ </p> + <pre> + + keymap C-o NEXT_PAGE + + </pre> +-binds `NEXT_PAGE' function (normally bound to SPC and C-v) +-to control-o. See <a href="README.func">README.func</a> for +-list of available functions. Original and Lynx-like keymap +-definitions are provided (<a href="keymap.default">keymap.default</a> +-and <a href="keymap.lynx">keymap.lynx</a>) as examples. +- +-<hr> +-<a name="LocalCGI"></a> +-<h2>Local CGI</h2> +-You can run CGI scripts using w3m, without any HTTP server. +-It means that w3m behaves like an HTTP server and activates CGI script, +-then w3m reads the output of the script and display it. The -<a href="file:///$LIB/w3mbookmark?mode=panel&bmark=~/.w3m/bookmark.html&url=MANUAL.html&title=w3m+manual">bookmark registration</a> -and <a href="file:///$LIB/w3mhelperpanel?mode=panel">helper-app editor</a> -+bookmark registration and helper-app editor - are realized as local CGI scripts. - Using local CGI, w3m can be used as a general purpose form interface. - <P> +-are realized as local CGI scripts. +-Using local CGI, w3m can be used as a general purpose form interface. +-<P> +-For security reason, CGI scripts invoked by w3m must be in one of +-these directories. +-<ul> +-<li>The directory where w3m-related files are stored +-(typically /usr/local/lib/w3m). This directory can be referred +-as $LIB. +-<li>/cgi-bin/ directory. You can map /cgi-bin/ to any directory you like +-with option setting panel (``Directory corresponds to /cgi-bin'' field). +-You can specify multiple paths separated by `:', like +-/usr/local/cgi-bin:/home/aito/cgi-bin. To use /cgi-bin/ directory, +-you must use file:/cgi-bin URL as follows: ++ <p> ++ binds the <q>NEXT_PAGE</q> function (normally bound to SPC and C-v) ++ to control-o. See <a href="README.func">README.func</a> for a ++ list of available functions. Original and Lynx-like keymap ++ definitions are provided (<a href="keymap.default">keymap.default</a> ++ and <a href="keymap.lynx">keymap.lynx</a>) as examples. ++ </p> ++ <hr> ++ <h2 id="LocalCGI"> ++ Local CGI ++ </h2> ++ <p> ++ You can run CGI scripts using w3m, without any HTTP server. ++ This means that w3m behaves like an HTTP server and runs the CGI ++ script, then reads the output of the script and displays it. For ++ example, the bookmark registration system and default directory ++ browser are realized as local CGI scripts. Moreover, such scripts ++ allow w3m to be used as a form interface to acquire all kinds of ++ data. ++ </p> ++ <p> ++ For security reason, CGI scripts invoked by w3m must be in one of ++ the following directories: ++ </p> ++ <ul> ++ <li> ++ The directory where w3m-related files are stored (typically ++ /usr/local/lib/w3m). This directory can be referenced as $LIB. ++ </li> ++ <li> ++ The /cgi-bin/ directory. You can map /cgi-bin/ to any directory you ++ like in the option setting panel (the <q>Directory corresponds to ++ /cgi-bin</q> field). You can specify multiple paths separated by ++ <q>:</q>, like /usr/local/cgi-bin:/home/aito/cgi-bin. To use a ++ /cgi-bin/ directory, you must use a file:/cgi-bin URL as follows: + <pre> + w3m -o cgi_bin=/path/to/cgi-bin file:/cgi-bin/script.cgi + </pre> +-It is not recommended to include current directory to this path. +-</ul> +-<p> +-The CGI script can use special header `w3m-control:' to control w3m. +-This field can take any function (see <a href="README.func">README.func</a>), +-and the specified function is invoked after the document is displayed. +-For example, The CGI output ++ It is not recommended to include the current directory to this path. ++ </li> ++ </ul> ++ <p> ++ The CGI script can use the special header <q>w3m-control:</q> to ++ control w3m. This field can take any function (see ++ <a href="README.func">README.func</a>), and the specified function ++ is invoked after the document is displayed. For example, the CGI ++ output ++ </p> + <pre> + + Content-Type: text/plain + W3m-control: BACK + + </pre> +-will display blank page and delete that buffer immediately. +-This is useful when you don't want to display any page after +-the script is invoked. The next example ++ <p> ++ will display a blank page and delete that buffer immediately. ++ This is useful when you don't want to display any page after ++ the script is invoked. The next example ++ </p> + <pre> + + Content-Type: text/plain +@@ -510,26 +2209,32 @@ W3m-control: DELETE_PREVBUF + + contents..... + </pre> +-will override the current buffer. +-<p> +-One w3m-control: header have to contain only one function, but you can +-include more than one w3m-control: lines in the HTTP header. +-In addition, you can specify an argument to GOTO function: ++ <p> ++ will override the current buffer. ++ </p> ++ <p> ++ Each w3m-control: header can contain only one function, but you can ++ include more than one w3m-control: line in the HTTP header. ++ In addition, you can specify an argument to the GOTO function: ++ </p> + <pre> + + Content-Type: text/plain +-W3m-control: GOTO http://www.yahoo.com/ ++W3m-control: GOTO http://www.example.org/ + + </pre> +-This example works exactly the same way to the Location header: ++ <p> ++ This example works exactly the same way as the Location header: ++ </p> + <pre> + + Content-Type: text/plain +-Location: http://www.yahoo.com/ ++Location: http://www.example.org/ + + </pre> +-Note that this header has no effect when the CGI script is invoked +-through HTTP server. +- +-</body> ++ <p> ++ Note that this header has no effect when the CGI script is invoked ++ through an HTTP server. ++ </p> ++ </body> + </html> diff --git a/doc/README b/doc/README index 324ea3e..60d6d19 100644 --- a/doc/README @@ -4975,16 +9176,216 @@ index 56cca50..da16947 100644 use cookie_avoid_wrong_number_of_dots to avoid this restriction. You can set this in "Domains to avoid [wrong number diff --git a/doc/README.func b/doc/README.func -index 0b2c034..26de39d 100644 +index 0b2c034..12d49db 100644 --- a/doc/README.func +++ b/doc/README.func -@@ -1,5 +1,5 @@ +@@ -1,25 +1,25 @@ ABORT Quit w3m without confirmation -ACCESSSKEY Popup acceskey menu -+ACCESSKEY Popup accesskey menu - ADD_BOOKMARK Add current page to bookmark +-ADD_BOOKMARK Add current page to bookmark ++ACCESSKEY Pop up accesskey menu ++ADD_BOOKMARK Add current page to bookmarks ALARM Set alarm BACK Back to previous buffer + BEGIN Go to the first line +-BOOKMARK Read bookmark ++BOOKMARK View bookmarks + CENTER_H Move to the center line + CENTER_V Move to the center column +-CHARSET Change the current document charset ++CHARSET Change the current document charset + CLOSE_TAB Close current tab +-CLOSE_TAB_MOUSE Close tab on mouse cursor (for mouse action) +-COMMAND Execute w3m command(s) ++CLOSE_TAB_MOUSE Close tab on mouse cursor (for mouse action) ++COMMAND Execute w3m command(s) + COOKIE View cookie list +-DEFAULT_CHARSET Change the default document charset +-DEFINE_KEY Define a binding between a key stroke and a user command +-DELETE_PREVBUF Delete previous buffer (mainly for local-CGI) ++DEFAULT_CHARSET Change the default document charset ++DEFINE_KEY Define a binding between a keystroke and a user command ++DELETE_PREVBUF Delete previous buffer (mainly for local-CGI) + DICT_WORD Execute dictionary command (see README.dict) +-DICT_WORD_AT Execute dictionary command for word at cursor ++DICT_WORD_AT Execute dictionary command for word at cursor + DISPLAY_IMAGE Restart loading and drawing of images + DOWN Scroll down one line +-DOWNLOAD Save document source to file ++DOWNLOAD Save document (source) to file + DOWNLOAD_LIST Display download list panel + EDIT Edit current document + EDIT_SCREEN Edit currently rendered document +@@ -28,75 +28,74 @@ EXEC_SHELL Execute shell command + EXIT Quit w3m without confirmation + EXTERN Execute external browser + EXTERN_LINK View current link using external browser +-FRAME Render frame ++FRAME Render frames + GOTO Go to URL + GOTO_LINE Go to specified line +-GOTO_LINK Go to current link ++GOTO_LINK Follow current link + GOTO_RELATIVE Go to relative URL + HELP View help +-HISTORY View history of URL ++HISTORY View browser history + INFO View info of current document +-INTERRUPT Stop loading document +-INIT_MAILCAP Reread mailcap (mainly for local-CGI) +-ISEARCH Incremental search forward ++INTERRUPT Suspend w3m ++ISEARCH Incremental search forward + ISEARCH_BACK Incremental search backward + LEFT Shift screen one column + LINE_BEGIN Go to the beginning of line + LINE_END Go to the end of line + LINE_INFO Show current line number +-LINK_BEGIN Go to the first link +-LINK_END Go to the last link +-LINK_MENU Popup link element menu ++LINK_BEGIN Go to the first link ++LINK_END Go to the last link ++LINK_MENU Pop up link element menu + LIST Show all links and images +-LIST_MENU Popup link list menu and go to selected link ++LIST_MENU Pop up link list menu and go to selected link + LOAD Load local file +-MAIN_MENU Popup menu ++MAIN_MENU Pop up menu + MARK Set/unset mark +-MARK_MID Mark Message-ID-like strings as anchors +-MARK_URL Mark URL-like strings as anchors +-MARK_WORD Mark current word as anchor +-MENU Popup menu +-MENU_MOUSE Popup menu at mouse cursor (for mouse action) +-MOUSE_TOGGLE Toggle activity of mouse +-MOVE_DOWN Move cursor down (a half screen scroll at the end of screen) +-MOVE_DOWN1 Move cursor down (1 line scroll at the end of screen) +-MOVE_LEFT Move cursor left (a half screen shift at the left edge) +-MOVE_LEFT1 Move cursor left (1 columns shift at the left edge) +-MOVE_LIST_MENU Popup link list menu and move cursor to selected link ++MARK_MID Mark Message-ID-like strings as links ++MARK_URL Mark URL-like strings as links ++MARK_WORD Mark current word as link ++MENU Pop up menu ++MENU_MOUSE Pop up menu at mouse cursor (for mouse action) ++MOUSE_TOGGLE Toggle mouse support ++MOVE_DOWN Move cursor down (a half screen scroll at the end of screen) ++MOVE_DOWN1 Move cursor down (1 line scroll at the end of screen) ++MOVE_LEFT Move cursor left (a half screen shift at the left edge) ++MOVE_LEFT1 Move cursor left (1 column shift at the left edge) ++MOVE_LIST_MENU Pop up link list menu and move cursor to selected link + MOVE_MOUSE Move cursor to mouse cursor (for mouse action) +-MOVE_RIGHT Move cursor right (a half screen shift at the right edge) +-MOVE_RIGHT1 Move cursor right (1 columns shift at the right edge) +-MOVE_UP Move cursor up (a half screen scroll at the top of screen) +-MOVE_UP1 Move cursor up (1 line scrol at the top of screen) +-MSGS Display error messages +-NEW_TAB Open new tab ++MOVE_RIGHT Move cursor right (a half screen shift at the right edge) ++MOVE_RIGHT1 Move cursor right (1 column shift at the right edge) ++MOVE_UP Move cursor up (a half screen scroll at the top of screen) ++MOVE_UP1 Move cursor up (1 line scroll at the top of screen) ++MSGS Display error messages ++NEW_TAB Open new tab + NEXT Move to next buffer +-NEXT_DOWN Move to next downward link +-NEXT_LEFT Move to next left link +-NEXT_LEFT_UP Move to next left (or upward) link ++NEXT_DOWN Move downward to next link ++NEXT_LEFT Move left to next link ++NEXT_LEFT_UP Move left (or upward) to next link + NEXT_LINK Move to next link + NEXT_MARK Move to next word + NEXT_PAGE Move to next page +-NEXT_RIGHT Move to next right link +-NEXT_RIGHT_DOWN Move to next right (or downward) link ++NEXT_RIGHT Move right to next link ++NEXT_RIGHT_DOWN Move right (or downward) to next link + NEXT_TAB Move to next tab +-NEXT_UP Move to next upward link +-NEXT_VISITED Move to next visited link ++NEXT_UP Move upward to next link ++NEXT_VISITED Move to next visited link + NEXT_WORD Move to next word +-NOTHING Do nothing ++NOTHING Do nothing + NULL Do nothing +-OPTIONS Option setting panel +-PEEK Peek current URL +-PEEK_IMG Peek image URL +-PEEK_LINK Peek link URL +-PIPE_BUF Send rendered document to pipe ++OPTIONS Display option setting panel ++PEEK Peek at current URL ++PEEK_IMG Peek at image URL ++PEEK_LINK Peek at link URL ++PIPE_BUF Send rendered document to pipe + PIPE_SHELL Execute shell command and browse + PREV Move to previous buffer + PREV_LINK Move to previous link + PREV_MARK Move to previous mark + PREV_PAGE Move to previous page + PREV_TAB Move to previous tab +-PREV_VISITED Move to previous visited link ++PREV_VISITED Move to previous visited link + PREV_WORD Move to previous word + PRINT Save buffer to file + QUIT Quit w3m +@@ -106,40 +105,40 @@ REDRAW Redraw screen + REG_MARK Set mark using regexp + REINIT Reload configuration files + RELOAD Reload buffer +-RESHAPE Re-render buffer ++RESHAPE Re-render buffer + RIGHT Shift screen one column right +-SAVE Save document source to file ++SAVE Save document (source) to file + SAVE_IMAGE Save image to file + SAVE_LINK Save link to file +-SAVE_SCREEN Save rendered document to file ++SAVE_SCREEN Save buffer to file + SEARCH Search forward + SEARCH_BACK Search backward + SEARCH_FORE Search forward + SEARCH_NEXT Search next regexp + SEARCH_PREV Search previous regexp + SELECT Go to buffer selection panel +-SELECT_MENU Popup buffer selection menu +-SETENV Set environment variable +-SET_OPTION Set option ++SELECT_MENU Pop up buffer selection menu ++SETENV Set environment variable ++SET_OPTION Set option + SHELL Execute shell command + SHIFT_LEFT Shift screen left + SHIFT_RIGHT Shift screen right + SOURCE View HTML source + STOP_IMAGE Stop loading and drawing of images + SUBMIT Submit form +-SUSPEND Stop loading document ++SUSPEND Suspend w3m + TAB_GOTO Open URL on new tab + TAB_GOTO_RELATIVE Open relative URL on new tab + TAB_LEFT Move current tab left + TAB_LINK Open current link on new tab +-TAB_MENU Popup tab selection menu ++TAB_MENU Pop up tab selection menu + TAB_MOUSE Move to tab on mouse cursor (for mouse action) + TAB_RIGHT Move current tab right + UNDO Cancel the last cursor movement + UP Scroll up one line +-VERSION Display version of w3m ++VERSION Display version of w3m + VIEW View HTML source +-VIEW_BOOKMARK View bookmark ++VIEW_BOOKMARK View bookmarks + VIEW_IMAGE View image +-WHEREIS Search forward +-WRAP_TOGGLE Toggle wrap search mode ++WHEREIS Search forward ++WRAP_TOGGLE Toggle search wrap mode diff --git a/doc/README.img b/doc/README.img index 0c10114..f11362f 100644 --- a/doc/README.img @@ -5123,16 +9524,28 @@ index 869c716..e4085c8 100644 keymap < SHIFT_LEFT keymap = INFO keymap > SHIFT_RIGHT +diff --git a/doc/menu.submenu b/doc/menu.submenu +index e55193d..e837f46 100644 +--- a/doc/menu.submenu ++++ b/doc/menu.submenu +@@ -39,6 +39,6 @@ menu Link + end + + menu Bookmark +- func "Read bookmark (b)" BOOKMARK "bB" ++ func "View bookmarks (b)" BOOKMARK "bB" + func "Add page to bookmark(a)" ADD_BOOKMARK "aA" + end diff --git a/doc/w3m.1 b/doc/w3m.1 -index 8f071c6..0762f51 100644 +index 8f071c6..dbd01af 100644 --- a/doc/w3m.1 +++ b/doc/w3m.1 -@@ -1,13 +1,11 @@ +@@ -1,13 +1,10 @@ .nr N -1 .nr D 5 -.TH W3M 1 Local -+.TH W3M 1 "2014-11-29" - .UC 4 +-.UC 4 ++.TH W3M 1 "2016-04-02" "w3m 0.5.3" .SH NAME -w3m \- a text based Web browser and pager +w3m \- a text based web browser and pager @@ -5144,7 +9557,7 @@ index 8f071c6..0762f51 100644 .SH DESCRIPTION .\" This defines appropriate quote strings for nroff and troff .ds lq \&" -@@ -17,234 +15,285 @@ w3m \- a text based Web browser and pager +@@ -17,234 +14,283 @@ w3m \- a text based Web browser and pager .\" Just in case these number registers aren't set yet... .if \nN==0 .nr N 10 .if \nD==0 .nr D 5 @@ -5566,7 +9979,7 @@ index 8f071c6..0762f51 100644 -.\" .I ${HOME}/.w3m/urimethodmap +.\" .I $~/.w3m/urimethodmap .\" ??? - .SH NOTES +-.SH NOTES -This is the -.I -w3m @@ -5583,7 +9996,6 @@ index 8f071c6..0762f51 100644 -.br -or on its English version of the site at: - http://w3m.sourceforge.net/index.en.html -+This is the \fIw3m\fP 0.5.3 Release. +.SH SEE ALSO +README and example files are to be found in the doc directory of your \fIw3m\fP installation. Recent information about \fIw3m\fP may be found on +.UR http://w3m.sourceforge.net @@ -5633,7 +10045,7 @@ index 8fe1215..dcc6edd 100644 QuietMessage = TRUE; fmInitialized = FALSE; diff --git a/file.c b/file.c -index 567d41e..9d1dc9a 100644 +index 567d41e..e26f383 100644 --- a/file.c +++ b/file.c @@ -26,6 +26,8 @@ @@ -6749,6 +11161,15 @@ index 567d41e..9d1dc9a 100644 ISclose(f1); if (is_pipe) pclose(f2); +@@ -7998,7 +8160,7 @@ _doFileCopy(char *tmpf, char *defstr, int download) + else { + if (q) { + p = unescape_spaces(Strnew_charp(q))->ptr; +- p = conv_to_system(q); ++ p = conv_to_system(p); + } + p = expandPath(p); + if (checkOverWrite(p) < 0) @@ -8317,21 +8479,23 @@ uncompress_stream(URLFile *uf, char **src) } if (pid2 == 0) { @@ -6788,7 +11209,7 @@ index 567d41e..9d1dc9a 100644 } ungetc(c, fp); diff --git a/fm.h b/fm.h -index 8378939..f4194ee 100644 +index 8378939..4bd83bc 100644 --- a/fm.h +++ b/fm.h @@ -76,6 +76,7 @@ typedef int wc_ces; /* XXX: not used */ @@ -6893,7 +11314,17 @@ index 8378939..f4194ee 100644 #define DUMP_BUFFER 0x01 #define DUMP_HEAD 0x02 -@@ -972,6 +998,7 @@ global int BackgroundExtViewer init(TRUE); +@@ -968,10 +994,17 @@ global int MailtoOptions init(MAILTO_OPTIONS_IGNORE); + global char *ExtBrowser init(DEF_EXT_BROWSER); + global char *ExtBrowser2 init(NULL); + global char *ExtBrowser3 init(NULL); ++global char *ExtBrowser4 init(NULL); ++global char *ExtBrowser5 init(NULL); ++global char *ExtBrowser6 init(NULL); ++global char *ExtBrowser7 init(NULL); ++global char *ExtBrowser8 init(NULL); ++global char *ExtBrowser9 init(NULL); + global int BackgroundExtViewer init(TRUE); global int disable_secret_security_check init(FALSE); global char *passwd_file init(PASSWD_FILE); global char *pre_form_file init(PRE_FORM_FILE); @@ -6901,7 +11332,7 @@ index 8378939..f4194ee 100644 global char *ftppasswd init(NULL); global int ftppass_hostnamegen init(TRUE); global int do_download init(FALSE); -@@ -1065,11 +1092,12 @@ global char SimplePreserveSpace init(FALSE); +@@ -1065,11 +1098,12 @@ global char SimplePreserveSpace init(FALSE); #define wc_Str_conv(x,charset0,charset1) (x) #define wc_Str_conv_strict(x,charset0,charset1) (x) #endif @@ -6915,7 +11346,7 @@ index 8378939..f4194ee 100644 extern char *graph_symbol[]; extern char *graph2_symbol[]; extern int symbol_width; -@@ -1113,9 +1141,9 @@ global MouseAction mouse_action; +@@ -1113,9 +1147,9 @@ global MouseAction mouse_action; #ifdef USE_COOKIE global int default_use_cookie init(TRUE); @@ -6928,7 +11359,7 @@ index 8378939..f4194ee 100644 #define ACCEPT_BAD_COOKIE_DISCARD 0 #define ACCEPT_BAD_COOKIE_ACCEPT 1 #define ACCEPT_BAD_COOKIE_ASK 2 -@@ -1135,7 +1163,7 @@ global int view_unseenobject init(TRUE); +@@ -1135,7 +1169,7 @@ global int view_unseenobject init(TRUE); #endif #if defined(USE_SSL) && defined(USE_SSL_VERIFY) @@ -6937,7 +11368,7 @@ index 8378939..f4194ee 100644 global char *ssl_cert_file init(NULL); global char *ssl_key_file init(NULL); global char *ssl_ca_path init(NULL); -@@ -1144,15 +1172,17 @@ global int ssl_path_modified init(FALSE); +@@ -1144,15 +1178,17 @@ global int ssl_path_modified init(FALSE); #endif /* defined(USE_SSL) && * defined(USE_SSL_VERIFY) */ #ifdef USE_SSL @@ -8621,6 +13052,172 @@ index 33d9a19..385adde 100644 cc.ccs == WC_CCS_JOHAB_2 || cc.ccs == WC_CCS_JOHAB_3) && cs94w_gmap[WC_F_KS_X_1001 - WC_F_ISO_BASE]) { wc_wchar_t cc2 = wc_johab_to_ksx1001(cc); +diff --git a/libwc/johab.c b/libwc/johab.c +index 8d587b8..498b1bb 100644 +--- a/libwc/johab.c ++++ b/libwc/johab.c +@@ -160,9 +160,9 @@ wc_N_to_johab1(wc_uint32 code) + { + wc_uint32 a, b, c; + +- a = N_johab1_map[0][(code / 28) / 21]; +- b = N_johab1_map[1][(code / 28) % 21]; +- c = N_johab1_map[2][ code % 28 ]; ++ a = N_johab1_map[0][(code / 28) / 21 & 0x1F]; ++ b = N_johab1_map[1][(code / 28) % 21 & 0x1F]; ++ c = N_johab1_map[2][ code % 28 & 0x1F]; + return 0x8000 | (a << 10) | (b << 5) | c; + } + +diff --git a/libwc/map/big5_ucs.map b/libwc/map/big5_ucs.map +index 0c6fd12..ac817a9 100644 +--- a/libwc/map/big5_ucs.map ++++ b/libwc/map/big5_ucs.map +@@ -1,6 +1,8 @@ + /* Big5 (Chinese Taiwan) */ + +-static wc_uint16 big5_ucs_map[ 0x59 * 0x9D ] = { ++#define N_big5_ucs_map (0x59 * 0x9D) ++ ++static wc_uint16 big5_ucs_map[ N_big5_ucs_map ] = { + 0x3000, /* 0xA140 */ + 0xFF0C, /* 0xA141 */ + 0x3001, /* 0xA142 */ +diff --git a/libwc/map/cns11643_ucs.map b/libwc/map/cns11643_ucs.map +index b426dd3..fcba334 100644 +--- a/libwc/map/cns11643_ucs.map ++++ b/libwc/map/cns11643_ucs.map +@@ -1,6 +1,8 @@ + /* CNS 11643 (Chinese Taiwan) */ + +-static wc_uint16 cns116431_ucs_map[ 0x5E * 0x5E ] = { ++#define N_cns116431_ucs_map (0x5E * 0x5E) ++ ++static wc_uint16 cns116431_ucs_map[ N_cns116431_ucs_map ] = { + 0x3000, /* 0x2121 */ + 0xFF0C, /* 0x2122 */ + 0x3001, /* 0x2123 */ +@@ -8839,7 +8841,9 @@ static wc_uint16 cns116431_ucs_map[ 0x5E * 0x5E ] = { + 0, /* 0x7E7E */ + }; + +-static wc_uint16 cns116432_ucs_map[ 0x5E * 0x5E ] = { ++#define N_cns116432_ucs_map (0x5E * 0x5E) ++ ++static wc_uint16 cns116432_ucs_map[ N_cns116432_ucs_map ] = { + 0x4E42, /* 0x2121 */ + 0x4E5C, /* 0x2122 */ + 0x51F5, /* 0x2123 */ +diff --git a/libwc/map/gb12345_ucs.map b/libwc/map/gb12345_ucs.map +index 55558c7..3fb338d 100644 +--- a/libwc/map/gb12345_ucs.map ++++ b/libwc/map/gb12345_ucs.map +@@ -1,6 +1,8 @@ + /* GB 12345 (Chinese) */ + +-static wc_uint16 gb12345_ucs_map[ 0x5E * 0x5E ] = { ++#define N_gb12345_ucs_map (0x5E * 0x5E) ++ ++static wc_uint16 gb12345_ucs_map[ N_gb12345_ucs_map ] = { + 0x3000, /* 0x2121 */ + 0x3001, /* 0x2122 */ + 0x3002, /* 0x2123 */ +diff --git a/libwc/map/gb2312_ucs.map b/libwc/map/gb2312_ucs.map +index 38fb88f..3d37465 100644 +--- a/libwc/map/gb2312_ucs.map ++++ b/libwc/map/gb2312_ucs.map +@@ -1,6 +1,8 @@ + /* GB 2312 (Chinese) */ + +-static wc_uint16 gb2312_ucs_map[ 0x5E * 0x5E ] = { ++#define N_gb2312_ucs_map (0x5E * 0x5E) ++ ++static wc_uint16 gb2312_ucs_map[ N_gb2312_ucs_map ] = { + 0x3000, /* 0x2121 */ + 0x3001, /* 0x2122 */ + 0x3002, /* 0x2123 */ +diff --git a/libwc/map/gbk_ucs.map b/libwc/map/gbk_ucs.map +index 5a0d5ba..d092fd7 100644 +--- a/libwc/map/gbk_ucs.map ++++ b/libwc/map/gbk_ucs.map +@@ -6,7 +6,9 @@ static wc_map ucs_gbk_80_map[ N_ucs_gbk_80_map ] = { + { 0x20AC, 0x0080 }, + }; + +-static wc_uint16 gbk_ucs_map[ 0x7E * 0xBE - 0x5E * 0x5E + 0x0A + 0x16 + 0x06 ] = { ++#define N_gbk_ucs_map (0x7E * 0xBE - 0x5E * 0x5E + 0x0A + 0x16 + 0x06) ++ ++static wc_uint16 gbk_ucs_map[ N_gbk_ucs_map ] = { + 0x4E02, /* 0x8140 */ + 0x4E04, /* 0x8141 */ + 0x4E05, /* 0x8142 */ +diff --git a/libwc/map/hkscs_ucs.map b/libwc/map/hkscs_ucs.map +index 96d1566..2fbe6b4 100644 +--- a/libwc/map/hkscs_ucs.map ++++ b/libwc/map/hkscs_ucs.map +@@ -1,6 +1,8 @@ + /* HKSCS (Chinese Hong Kong) */ + +-static wc_uint16 hkscs_ucs_map[ 0x1E * 0x9D ] = { ++#define N_hkscs_ucs_map (0x1E * 0x9D) ++ ++static wc_uint16 hkscs_ucs_map[ N_hkscs_ucs_map ] = { + 0, /* 0x8840 */ + 0, /* 0x8841 */ + 0, /* 0x8842 */ +diff --git a/libwc/map/jisx0208x0212x0213_ucs.map b/libwc/map/jisx0208x0212x0213_ucs.map +index 1a1d706..28c2a6c 100644 +--- a/libwc/map/jisx0208x0212x0213_ucs.map ++++ b/libwc/map/jisx0208x0212x0213_ucs.map +@@ -1,6 +1,8 @@ + /* JIS X 0208, JIS X 0212, JIS X 0213 (Japanese) */ + +-static wc_uint16 jisx0208x02131_ucs_map[ 0x5E * 0x5E ] = { ++#define N_jisx0208x02131_ucs_map (0x5E * 0x5E) ++ ++static wc_uint16 jisx0208x02131_ucs_map[ N_jisx0208x02131_ucs_map ] = { + 0x3000, /* JIS X 0208 0x2121 */ + 0x3001, /* JIS X 0208 0x2122 */ + 0x3002, /* JIS X 0208 0x2123 */ +@@ -8839,7 +8841,9 @@ static wc_uint16 jisx0208x02131_ucs_map[ 0x5E * 0x5E ] = { + 0, /* JIS X 0213-1 0x7E7E */ + }; + +-static wc_uint16 jisx0212x02132_ucs_map[ 0x5E * 0x5E ] = { ++#define N_jisx0212x02132_ucs_map (0x5E * 0x5E) ++ ++static wc_uint16 jisx0212x02132_ucs_map[ N_jisx0212x02132_ucs_map ] = { + 0, /* JIS X 0213-2 0x2121 */ + 0x4E02, /* JIS X 0213-2 0x2122 */ + 0x4E0F, /* JIS X 0213-2 0x2123 */ +diff --git a/libwc/map/ksx1001_ucs.map b/libwc/map/ksx1001_ucs.map +index 9a17d61..cb62f98 100644 +--- a/libwc/map/ksx1001_ucs.map ++++ b/libwc/map/ksx1001_ucs.map +@@ -1,6 +1,8 @@ + /* KS X 1001 (Korean) */ + +-static wc_uint16 ksx1001_ucs_map[ 0x5E * 0x5E ] = { ++#define N_ksx1001_ucs_map (0x5E * 0x5E) ++ ++static wc_uint16 ksx1001_ucs_map[ N_ksx1001_ucs_map ] = { + 0x3000, /* 0x2121 */ + 0x3001, /* 0x2122 */ + 0x3002, /* 0x2123 */ +diff --git a/libwc/map/sjis_ext_ucs.map b/libwc/map/sjis_ext_ucs.map +index a82995c..cc748ba 100644 +--- a/libwc/map/sjis_ext_ucs.map ++++ b/libwc/map/sjis_ext_ucs.map +@@ -1,6 +1,8 @@ + /* Shift_JIS/CP932 (Japanese) */ + +-static wc_uint16 sjis_ext_ucs_map[ 0x5E * 10 ] = { ++#define N_sjis_ext_ucs_map (0x5E * 10) ++ ++static wc_uint16 sjis_ext_ucs_map[ N_sjis_ext_ucs_map ] = { + 0x2460, /* 0x8740 */ + 0x2461, /* 0x8741 */ + 0x2462, /* 0x8742 */ diff --git a/libwc/map/ucs_ambwidth.map b/libwc/map/ucs_ambwidth.map index 6f03ba8..35ceedb 100644 --- a/libwc/map/ucs_ambwidth.map @@ -8802,6 +13399,20 @@ index 6f03ba8..35ceedb 100644 { 0x26E8, 0x26FF }, { 0x273D, 0x273D }, { 0x2757, 0x2757 }, +diff --git a/libwc/map/uhc_ucs.map b/libwc/map/uhc_ucs.map +index b6b43ca..55efc09 100644 +--- a/libwc/map/uhc_ucs.map ++++ b/libwc/map/uhc_ucs.map +@@ -1,6 +1,8 @@ + /* UHC/CP949 (Korean) */ + +-static wc_uint16 uhc_ucs_map[ 0x20 * 0xB2 + 0x27 * 0x54 + 2 ] = { ++#define N_uhc_ucs_map (0x20 * 0xB2 + 0x27 * 0x54 + 2) ++ ++static wc_uint16 uhc_ucs_map[ N_uhc_ucs_map ] = { + 0xAC02, /* 0x8141 */ + 0xAC03, /* 0x8142 */ + 0xAC05, /* 0x8143 */ diff --git a/libwc/status.c b/libwc/status.c index d25c924..4a2ebf8 100644 --- a/libwc/status.c @@ -8816,7 +13427,7 @@ index d25c924..4a2ebf8 100644 #include "wc.h" #ifdef USE_UNICODE diff --git a/libwc/ucs.c b/libwc/ucs.c -index d7b6948..5e78b4e 100644 +index d7b6948..727e574 100644 --- a/libwc/ucs.c +++ b/libwc/ucs.c @@ -100,6 +100,7 @@ wc_ucs_to_any(wc_uint32 ucs, wc_table *t) @@ -8827,6 +13438,123 @@ index d7b6948..5e78b4e 100644 return cc; } +@@ -108,6 +109,7 @@ wc_any_to_ucs(wc_wchar_t cc) + { + int f; + wc_uint16 *map = NULL; ++ wc_uint32 map_size = 0x80; + wc_map *map2; + + f = WC_CCS_INDEX(cc.ccs); +@@ -138,6 +140,7 @@ wc_any_to_ucs(wc_wchar_t cc) + if (f < WC_F_ISO_BASE || f > WC_F_CS94W_END) + return 0; + map = cs94w_ucs_map[f - WC_F_ISO_BASE]; ++ map_size = cs94w_ucs_map_size[f - WC_F_ISO_BASE]; + cc.code = WC_CS94W_N(cc.code); + break; + case WC_CCS_A_CS96: +@@ -150,6 +153,7 @@ wc_any_to_ucs(wc_wchar_t cc) + if (f < WC_F_ISO_BASE || f > WC_F_CS96W_END) + return WC_C_UCS4_ERROR; + map = cs96w_ucs_map[f - WC_F_ISO_BASE]; ++ map_size = cs96w_ucs_map_size[f - WC_F_ISO_BASE]; + cc.code = WC_CS96W_N(cc.code); + break; + case WC_CCS_A_CS942: +@@ -180,6 +184,7 @@ wc_any_to_ucs(wc_wchar_t cc) + if (f < WC_F_PCS_BASE || f > WC_F_PCSW_END) + return WC_C_UCS4_ERROR; + map = pcsw_ucs_map[f - WC_F_PCS_BASE]; ++ map_size = pcsw_ucs_map_size[f - WC_F_PCS_BASE]; + switch (cc.ccs) { + case WC_CCS_BIG5: + cc.code = WC_BIG5_N(cc.code); +@@ -271,6 +276,8 @@ wc_any_to_ucs(wc_wchar_t cc) + } + if (map == NULL) + return WC_C_UCS4_ERROR; ++ if (map_size == 0 || cc.code > map_size - 1) ++ return WC_C_UCS4_ERROR; + cc.code = map[cc.code]; + return cc.code ? cc.code : WC_C_UCS4_ERROR; + } +diff --git a/libwc/ucs.map b/libwc/ucs.map +index dfac6d9..5d6f688 100644 +--- a/libwc/ucs.map ++++ b/libwc/ucs.map +@@ -195,7 +195,28 @@ static wc_uint16 *cs94w_ucs_map[] = { + jisx0212x02132_ucs_map, /* 50 (JIS X 0213-2) */ + }; + ++static wc_uint32 cs94w_ucs_map_size[] = { ++ N_jisx0208x02131_ucs_map, /* 40 (JIS C 6226) */ ++ N_gb2312_ucs_map, /* 41 (GB 2312) */ ++ N_jisx0208x02131_ucs_map, /* 42 (JIS X 0208) */ ++ N_ksx1001_ucs_map, /* 43 (KS X 1001) */ ++ N_jisx0212x02132_ucs_map, /* 44 (JIS X 0212) */ ++ 0, /* 45 (ISO IR 165) */ ++ 0, /* 46 */ ++ N_cns116431_ucs_map, /* 47 (CNS 11643-1) */ ++ N_cns116432_ucs_map, /* 48 (CNS 11643-2) */ ++ 0, /* 49 (CNS 11643-3) */ ++ 0, /* 4A (CNS 11643-4) */ ++ 0, /* 4B (CNS 11643-5) */ ++ 0, /* 4C (CNS 11643-6) */ ++ 0, /* 4D (CNS 11643-7) */ ++ 0, /* 4E (KSP 9566) */ ++ N_jisx0208x02131_ucs_map, /* 4F (JIS X 0213-1) */ ++ N_jisx0212x02132_ucs_map, /* 50 (JIS X 0213-2) */ ++}; ++ + static wc_uint16 **cs96w_ucs_map; ++static wc_uint32 *cs96w_ucs_map_size; + + static wc_uint16 *pcsw_ucs_map[] = { + big5_ucs_map, /* Big5 */ +@@ -233,6 +254,42 @@ static wc_uint16 *pcsw_ucs_map[] = { + hkscs_ucs_map, /* HKSCS-2 */ + }; + ++static wc_uint32 pcsw_ucs_map_size[] = { ++ N_big5_ucs_map, /* Big5 */ ++ N_big5_ucs_map, /* Big5-1 */ ++ N_big5_ucs_map, /* Big5-2 */ ++ 0, /* CNS 11643-8 */ ++ 0, /* CNS 11643-9 */ ++ 0, /* CNS 11643-10 */ ++ 0, /* CNS 11643-11 */ ++ 0, /* CNS 11643-12 */ ++ 0, /* CNS 11643-13 */ ++ 0, /* CNS 11643-14 */ ++ 0, /* CNS 11643-15 */ ++ 0, /* CNS 11643-16 */ ++ 0, /* CNS 11643-X */ ++ N_gb12345_ucs_map, /* GB 12345 */ ++ 0, /* Johab (special conversion) */ ++ 0, /* Johab-1 (special conversion) */ ++ 0, /* Johab-2 (special conversion) */ ++ N_ksx1001_ucs_map, /* Johab-3 */ ++ N_sjis_ext_ucs_map, /* Shift_JIS(CP932) ext */ ++ N_sjis_ext_ucs_map, /* Shift_JIS(CP932) ext-1 */ ++ N_sjis_ext_ucs_map, /* Shift_JIS(CP932) ext-2 */ ++ N_gbk_ucs_map, /* GBK(CP936) */ ++ N_gbk_ucs_map, /* GBK(CP936)-1 */ ++ N_gbk_ucs_map, /* GBK(CP936)-2 */ ++ 0, /* GB18030 GBK-ext (special conversion) */ ++ 0, /* GB18030 GBK-ext-1 (special conversion) */ ++ 0, /* GB18030 GBK-ext-2 (special conversion) */ ++ N_uhc_ucs_map, /* UHC(CP949) */ ++ N_uhc_ucs_map, /* UHC(CP949)-1 */ ++ N_uhc_ucs_map, /* UHC(CP949)-2 */ ++ N_hkscs_ucs_map, /* HKSCS */ ++ N_hkscs_ucs_map, /* HKSCS-1 */ ++ N_hkscs_ucs_map, /* HKSCS-2 */ ++}; ++ + static wc_wchar_t + ucs_cs94_conv(wc_ccs ccs, wc_uint16 c) + { diff --git a/linein.c b/linein.c index b7e81b6..d8f9023 100644 --- a/linein.c @@ -8874,7 +13602,7 @@ index b7e81b6..d8f9023 100644 } else { diff --git a/local.c b/local.c -index f5a73a2..202e9c4 100644 +index f5a73a2..46ac579 100644 --- a/local.c +++ b/local.c @@ -109,6 +109,7 @@ loadLocalDir(char *dname) @@ -8894,7 +13622,36 @@ index f5a73a2..202e9c4 100644 lbuf[l] = '\0'; Strcat_m_charp(tmp, " -> ", html_quote(conv_from_system(lbuf)), NULL); -@@ -359,6 +360,10 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer) +@@ -212,18 +213,17 @@ set_environ(char *var, char *value) + if (var != NULL && value != NULL) + setenv(var, value, 1); + #else /* not HAVE_SETENV */ +-#ifdef HAVE_PUTENV + static Hash_sv *env_hash = NULL; + Str tmp = Strnew_m_charp(var, "=", value, NULL); + + if (env_hash == NULL) + env_hash = newHash_sv(20); + putHash_sv(env_hash, var, (void *)tmp->ptr); ++#ifdef HAVE_PUTENV + putenv(tmp->ptr); + #else /* not HAVE_PUTENV */ + extern char **environ; + char **ne; +- char *p; + int i, l, el; + char **e, **newenv; + +@@ -250,7 +250,7 @@ set_environ(char *var, char *value) + if (newenv == NULL) + return; + for (e = environ, ne = newenv; *e != NULL; *(ne++) = *(e++)) ; +- *(ne++) = p; ++ *(ne++) = tmp->ptr; + *ne = NULL; + environ = newenv; + #endif /* not HAVE_PUTENV */ +@@ -359,6 +359,10 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer) int status; pid_t pid; char *file = uri, *name = uri, *path_info = NULL, *tmpf = NULL; @@ -8905,7 +13662,7 @@ index f5a73a2..202e9c4 100644 #ifdef __MINGW32_VERSION return NULL; -@@ -373,18 +378,25 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer) +@@ -373,18 +377,25 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer) if (!fw) return NULL; } @@ -8935,7 +13692,7 @@ index f5a73a2..202e9c4 100644 set_cgi_environ(name, file, uri); if (path_info) set_environ("PATH_INFO", path_info); -@@ -415,12 +427,11 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer) +@@ -415,12 +426,11 @@ localcgi_post(char *uri, char *qstr, FormList *request, char *referer) } #ifdef HAVE_CHDIR /* ifndef __EMX__ ? */ @@ -8965,7 +13722,7 @@ index c0461df..f0c6242 100644 int quoted; char *q = NULL; diff --git a/main.c b/main.c -index b421943..d4f6b21 100644 +index b421943..56301cc 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,7 @@ @@ -9008,7 +13765,16 @@ index b421943..d4f6b21 100644 fprintf(f, " -B load bookmark\n"); fprintf(f, " -bookmark file specify bookmark file\n"); fprintf(f, " -T type specify content-type\n"); -@@ -248,7 +256,11 @@ fusage(FILE * f, int err) +@@ -214,7 +222,7 @@ fusage(FILE * f, int err) + #endif /* USE_COLOR */ + fprintf(f, + " -N open URL of command line on each new tab\n"); +- fprintf(f, " -F automatically render frame\n"); ++ fprintf(f, " -F automatically render frames\n"); + fprintf(f, + " -cols width specify column width (used with -dump)\n"); + fprintf(f, +@@ -248,8 +256,12 @@ fusage(FILE * f, int err) #endif /* USE_COOKIE */ fprintf(f, " -graph use DEC special graphics for border of table and menu\n"); fprintf(f, " -no-graph use ACII character for border of table and menu\n"); @@ -9016,10 +13782,12 @@ index b421943..d4f6b21 100644 + fprintf(f, " -s squeeze multiple blank lines\n"); +#else fprintf(f, " -S squeeze multiple blank lines\n"); +- fprintf(f, " -W toggle wrap search mode\n"); +#endif - fprintf(f, " -W toggle wrap search mode\n"); ++ fprintf(f, " -W toggle search wrap mode\n"); fprintf(f, " -X don't use termcap init/deinit\n"); fprintf(f, + " -title[=TERM] set buffer name to terminal title string\n"); @@ -372,6 +384,13 @@ make_optional_header_string(char *s) return hs; } @@ -9301,6 +14069,15 @@ index b421943..d4f6b21 100644 } static int +@@ -2502,7 +2610,7 @@ DEFUN(selBuf, SELECT, "Go to buffer selection panel") + } + + /* Suspend (on BSD), or run interactive shell (on SysV) */ +-DEFUN(susp, INTERRUPT SUSPEND, "Stop loading document") ++DEFUN(susp, INTERRUPT SUSPEND, "Suspend w3m") + { + #ifndef SIGSTOP + char *shell; @@ -2804,12 +2912,15 @@ loadLink(char *url, char *target, char *referer, FormList *request) union frameset_element *f_element = NULL; int flag = 0; @@ -9318,9 +14095,21 @@ index b421943..d4f6b21 100644 base->scheme == SCM_LOCAL || base->scheme == SCM_LOCAL_CGI) referer = NO_REFERER; if (referer == NULL) -@@ -2961,7 +3072,6 @@ handleMailto(char *url) +@@ -2830,7 +2941,7 @@ loadLink(char *url, char *target, char *referer, FormList *request) + if (!on_target) /* open link as an indivisual page */ + return loadNormalBuf(buf, TRUE); + +- if (do_download) /* download (thus no need to render frame) */ ++ if (do_download) /* download (thus no need to render frames) */ + return loadNormalBuf(buf, FALSE); + + if (target == NULL || /* no target specified (that means this page is not a frame page) */ +@@ -2959,9 +3070,8 @@ handleMailto(char *url) + } + /* follow HREF link */ - DEFUN(followA, GOTO_LINK, "Go to current link") +-DEFUN(followA, GOTO_LINK, "Go to current link") ++DEFUN(followA, GOTO_LINK, "Follow current link") { - Line *l; Anchor *a; @@ -9406,6 +14195,50 @@ index b421943..d4f6b21 100644 /* go to the next anchor */ DEFUN(nextA, NEXT_LINK, "Move to next link") { +@@ -3863,37 +3994,37 @@ nextY(int d) + } + + /* go to the next left anchor */ +-DEFUN(nextL, NEXT_LEFT, "Move to next left link") ++DEFUN(nextL, NEXT_LEFT, "Move left to next link") + { + nextX(-1, 0); + } + + /* go to the next left-up anchor */ +-DEFUN(nextLU, NEXT_LEFT_UP, "Move to next left (or upward) link") ++DEFUN(nextLU, NEXT_LEFT_UP, "Move left (or upward) to next link") + { + nextX(-1, -1); + } + + /* go to the next right anchor */ +-DEFUN(nextR, NEXT_RIGHT, "Move to next right link") ++DEFUN(nextR, NEXT_RIGHT, "Move right to next link") + { + nextX(1, 0); + } + + /* go to the next right-down anchor */ +-DEFUN(nextRD, NEXT_RIGHT_DOWN, "Move to next right (or downward) link") ++DEFUN(nextRD, NEXT_RIGHT_DOWN, "Move right (or downward) to next link") + { + nextX(1, 1); + } + + /* go to the next downward anchor */ +-DEFUN(nextD, NEXT_DOWN, "Move to next downward link") ++DEFUN(nextD, NEXT_DOWN, "Move downward to next link") + { + nextY(1); + } + + /* go to the next upward anchor */ +-DEFUN(nextU, NEXT_UP, "Move to next upward link") ++DEFUN(nextU, NEXT_UP, "Move upward to next link") + { + nextY(-1); + } @@ -4055,6 +4186,7 @@ goURL0(char *prompt, int relative) char *url, *referer; ParsedURL p_url, *current; @@ -9487,15 +14320,82 @@ index b421943..d4f6b21 100644 parseURL2(url, &p_url, current); pushHashHist(URLHist, parsedURL2Str(&p_url)->ptr); cmd_loadURL(url, current, referer, NULL); -@@ -4329,7 +4454,7 @@ anchorMn(Anchor *(*menu_func) (Buffer *), int go) +@@ -4151,14 +4276,14 @@ cmd_loadBuffer(Buffer *buf, int prop, int linkid) + } + + /* load bookmark */ +-DEFUN(ldBmark, BOOKMARK VIEW_BOOKMARK, "Read bookmark") ++DEFUN(ldBmark, BOOKMARK VIEW_BOOKMARK, "View bookmarks") + { + cmd_loadURL(BookmarkFile, NULL, NO_REFERER, NULL); + } + + + /* Add current to bookmark */ +-DEFUN(adBmark, ADD_BOOKMARK, "Add current page to bookmark") ++DEFUN(adBmark, ADD_BOOKMARK, "Add current page to bookmarks") + { + Str tmp; + FormList *request; +@@ -4188,7 +4313,7 @@ DEFUN(adBmark, ADD_BOOKMARK, "Add current page to bookmark") + } + + /* option setting */ +-DEFUN(ldOpt, OPTIONS, "Option setting panel") ++DEFUN(ldOpt, OPTIONS, "Display option setting panel") + { + cmd_loadBuffer(load_option_panel(), BP_NO_URL, LB_NOLINK); + } +@@ -4291,7 +4416,7 @@ follow_map(struct parsed_tagarg *arg) + + #ifdef USE_MENU + /* link menu */ +-DEFUN(linkMn, LINK_MENU, "Popup link element menu") ++DEFUN(linkMn, LINK_MENU, "Pop up link element menu") + { + LinkList *l = link_menu(Currentbuf); + ParsedURL p_url; +@@ -4329,19 +4454,19 @@ anchorMn(Anchor *(*menu_func) (Buffer *), int go) } /* accesskey */ -DEFUN(accessKey, ACCESSKEY, "Popup acceskey menu") -+DEFUN(accessKey, ACCESSKEY, "Popup accesskey menu") ++DEFUN(accessKey, ACCESSKEY, "Pop up accesskey menu") { anchorMn(accesskey_menu, TRUE); } + + /* list menu */ +-DEFUN(listMn, LIST_MENU, "Popup link list menu and go to selected link") ++DEFUN(listMn, LIST_MENU, "Pop up link list menu and go to selected link") + { + anchorMn(list_menu, TRUE); + } + + DEFUN(movlistMn, MOVE_LIST_MENU, +- "Popup link list menu and move cursor to selected link") ++ "Pop up link list menu and move cursor to selected link") + { + anchorMn(list_menu, FALSE); + } +@@ -4375,7 +4500,7 @@ DEFUN(cooLst, COOKIE, "View cookie list") + + #ifdef USE_HISTORY + /* History page */ +-DEFUN(ldHist, HISTORY, "View history of URL") ++DEFUN(ldHist, HISTORY, "View browser history") + { + cmd_loadBuffer(historyBuffer(URLHist), BP_NO_URL, LB_NOLINK); + } +@@ -4449,7 +4574,7 @@ DEFUN(svBuf, PRINT SAVE_SCREEN, "Save rendered document to file") + } + + /* save source */ +-DEFUN(svSrc, DOWNLOAD SAVE, "Save document source to file") ++DEFUN(svSrc, DOWNLOAD SAVE, "Save document (source) to file") + { + char *file; + @@ -4510,8 +4635,7 @@ _peekURL(int only_img) s = parsedURL2Str(&pu); } @@ -9506,6 +14406,31 @@ index b421943..d4f6b21 100644 #ifdef USE_M17N s = checkType(s, &pp, NULL); p = NewAtom_N(Lineprop, s->length); +@@ -4529,13 +4653,13 @@ _peekURL(int only_img) + } + + /* peek URL */ +-DEFUN(peekURL, PEEK_LINK, "Peek link URL") ++DEFUN(peekURL, PEEK_LINK, "Peek at link URL") + { + _peekURL(0); + } + + /* peek URL of image */ +-DEFUN(peekIMG, PEEK_IMG, "Peek image URL") ++DEFUN(peekIMG, PEEK_IMG, "Peek at image URL") + { + _peekURL(1); + } +@@ -4549,7 +4673,7 @@ currentURL(void) + return parsedURL2Str(&Currentbuf->currentURL); + } + +-DEFUN(curURL, PEEK, "Peek current URL") ++DEFUN(curURL, PEEK, "Peek at current URL") + { + static Str s = NULL; + #ifdef USE_M17N @@ -4570,7 +4694,7 @@ DEFUN(curURL, PEEK, "Peek current URL") offset = 0; s = currentURL(); @@ -9515,7 +14440,76 @@ index b421943..d4f6b21 100644 #ifdef USE_M17N s = checkType(s, &pp, NULL); p = NewAtom_N(Lineprop, s->length); -@@ -5398,6 +5522,60 @@ DEFUN(mouse, MOUSE, "mouse operation") +@@ -4915,13 +5039,13 @@ chkURLBuffer(Buffer *buf) + buf->check_url |= CHK_URL; + } + +-DEFUN(chkURL, MARK_URL, "Mark URL-like strings as anchors") ++DEFUN(chkURL, MARK_URL, "Mark URL-like strings as links") + { + chkURLBuffer(Currentbuf); + displayBuffer(Currentbuf, B_FORCE_REDRAW); + } + +-DEFUN(chkWORD, MARK_WORD, "Mark current word as anchor") ++DEFUN(chkWORD, MARK_WORD, "Mark current word as link") + { + char *p; + int spos, epos; +@@ -4948,15 +5072,15 @@ chkNMIDBuffer(Buffer *buf) + buf->check_url |= CHK_NMID; + } + +-DEFUN(chkNMID, MARK_MID, "Mark Message-ID-like strings as anchors") ++DEFUN(chkNMID, MARK_MID, "Mark Message-ID-like strings as links") + { + chkNMIDBuffer(Currentbuf); + displayBuffer(Currentbuf, B_FORCE_REDRAW); + } + #endif /* USE_NNTP */ + +-/* render frame */ +-DEFUN(rFrame, FRAME, "Render frame") ++/* render frames */ ++DEFUN(rFrame, FRAME, "Render frames") + { + Buffer *buf; + +@@ -5010,6 +5134,24 @@ invoke_browser(char *url) + case 3: + browser = ExtBrowser3; + break; ++ case 4: ++ browser = ExtBrowser4; ++ break; ++ case 5: ++ browser = ExtBrowser5; ++ break; ++ case 6: ++ browser = ExtBrowser6; ++ break; ++ case 7: ++ browser = ExtBrowser7; ++ break; ++ case 8: ++ browser = ExtBrowser8; ++ break; ++ case 9: ++ browser = ExtBrowser9; ++ break; + } + if (browser == NULL || *browser == '\0') { + browser = inputStr("Browse command: ", NULL); +@@ -5362,7 +5504,7 @@ process_mouse(int btn, int x, int y) + } + } + +-DEFUN(msToggle, MOUSE_TOGGLE, "Toggle activity of mouse") ++DEFUN(msToggle, MOUSE_TOGGLE, "Toggle mouse support") + { + if (use_mouse) { + use_mouse = FALSE; +@@ -5398,6 +5540,60 @@ DEFUN(mouse, MOUSE, "mouse operation") process_mouse(btn, x, y); } @@ -9576,7 +14570,25 @@ index b421943..d4f6b21 100644 #ifdef USE_GPM int gpm_process_mouse(Gpm_Event * event, void *data) -@@ -5604,7 +5782,7 @@ execdict(char *word) +@@ -5473,7 +5669,7 @@ DEFUN(movMs, MOVE_MOUSE, "Move cursor to mouse cursor (for mouse action)") + #define FRAME_WIDTH 1 + #endif + +-DEFUN(menuMs, MENU_MOUSE, "Popup menu at mouse cursor (for mouse action)") ++DEFUN(menuMs, MENU_MOUSE, "Pop up menu at mouse cursor (for mouse action)") + { + if (!mouse_action.in_action) + return; +@@ -5523,7 +5719,7 @@ DEFUN(dispVer, VERSION, "Display version of w3m") + disp_message(Sprintf("w3m version %s", w3m_version)->ptr, TRUE); + } + +-DEFUN(wrapToggle, WRAP_TOGGLE, "Toggle wrap search mode") ++DEFUN(wrapToggle, WRAP_TOGGLE, "Toggle search wrap mode") + { + if (WrapSearch) { + WrapSearch = FALSE; +@@ -5604,7 +5800,7 @@ execdict(char *word) disp_message("Execution failed", TRUE); return; } @@ -9585,7 +14597,7 @@ index b421943..d4f6b21 100644 buf->filename = w; buf->buffername = Sprintf("%s %s", DICTBUFFERNAME, word)->ptr; if (buf->type == NULL) -@@ -5671,7 +5849,7 @@ set_buffer_environ(Buffer *buf) +@@ -5671,7 +5867,7 @@ set_buffer_environ(Buffer *buf) set_environ("W3M_CURRENT_FORM", form2str((FormItemList *)a->url)); else set_environ("W3M_CURRENT_FORM", ""); @@ -9594,7 +14606,7 @@ index b421943..d4f6b21 100644 l->real_linenumber)->ptr); set_environ("W3M_CURRENT_COLUMN", Sprintf("%d", buf->currentColumn + -@@ -5747,8 +5925,14 @@ deleteFiles() +@@ -5747,8 +5943,14 @@ deleteFiles() Firstbuf = buf; } } @@ -9610,6 +14622,15 @@ index b421943..d4f6b21 100644 } void +@@ -5970,7 +6172,7 @@ DEFUN(reinit, REINIT, "Reload configuration files") + } + + DEFUN(defKey, DEFINE_KEY, +- "Define a binding between a key stroke and a user command") ++ "Define a binding between a keystroke and a user command") + { + char *data; + diff --git a/map.c b/map.c index 90aa35a..bb240ea 100644 --- a/map.c @@ -9732,7 +14753,7 @@ index 64fd0ad..bc7a5be 100644 #define SWAPI(a,b) { int tmp = a; a = b; b = tmp; } diff --git a/menu.c b/menu.c -index 774b1bd..11a5369 100644 +index 774b1bd..dfbeabe 100644 --- a/menu.c +++ b/menu.c @@ -57,6 +57,7 @@ static int mCancel(char c); @@ -9834,7 +14855,38 @@ index 774b1bd..11a5369 100644 #ifdef USE_GPM static int gpm_process_menu_mouse(Gpm_Event * event, void *data) -@@ -1365,9 +1408,7 @@ initSelectMenu(void) +@@ -1261,6 +1304,12 @@ mMouse(char c) + { + return (MENU_NOTHING); + } ++ ++static int ++mSgrMouse(char c) ++{ ++ return (MENU_NOTHING); ++} + #endif /* not USE_MOUSE */ + + /* --- MenuFunctions (END) --- */ +@@ -1289,7 +1338,7 @@ mainMenu(int x, int y) + popupMenu(x, y, &MainMenu); + } + +-DEFUN(mainMn, MAIN_MENU MENU, "Popup menu") ++DEFUN(mainMn, MAIN_MENU MENU, "Pop up menu") + { + Menu *menu = &MainMenu; + char *data; +@@ -1317,7 +1366,7 @@ DEFUN(mainMn, MAIN_MENU MENU, "Popup menu") + + /* --- SelectMenu --- */ + +-DEFUN(selMn, SELECT_MENU, "Popup buffer selection menu") ++DEFUN(selMn, SELECT_MENU, "Pop up buffer selection menu") + { + int x = Currentbuf->cursorX + Currentbuf->rootX, + y = Currentbuf->cursorY + Currentbuf->rootY; +@@ -1365,9 +1414,7 @@ initSelectMenu(void) break; default: Strcat_char(str, ' '); @@ -9845,7 +14897,16 @@ index 774b1bd..11a5369 100644 Strcat_charp(str, p); break; } -@@ -1513,9 +1554,7 @@ initSelTabMenu(void) +@@ -1464,7 +1511,7 @@ smDelBuf(char c) + + /* --- SelTabMenu --- */ + +-DEFUN(tabMn, TAB_MENU, "Popup tab selection menu") ++DEFUN(tabMn, TAB_MENU, "Pop up tab selection menu") + { + int x = Currentbuf->cursorX + Currentbuf->rootX, + y = Currentbuf->cursorY + Currentbuf->rootY; +@@ -1513,9 +1560,7 @@ initSelTabMenu(void) case SCM_MISSING: break; default: @@ -9856,7 +14917,7 @@ index 774b1bd..11a5369 100644 Strcat_charp(str, p); break; } -@@ -1845,10 +1884,8 @@ link_menu(Buffer *buf) +@@ -1845,10 +1890,8 @@ link_menu(Buffer *buf) Strcat_charp(str, " "); if (!l->url) p = ""; @@ -9868,7 +14929,7 @@ index 774b1bd..11a5369 100644 Strcat_charp(str, p); label[i] = str->ptr; if (len < str->length) -@@ -1913,6 +1950,7 @@ accesskey_menu(Buffer *buf) +@@ -1913,6 +1956,7 @@ accesskey_menu(Buffer *buf) } label[nitem] = NULL; @@ -9876,7 +14937,7 @@ index 774b1bd..11a5369 100644 new_option_menu(&menu, label, &key, NULL); menu.initial = 0; -@@ -2025,7 +2063,6 @@ list_menu(Buffer *buf) +@@ -2025,7 +2069,6 @@ list_menu(Buffer *buf) label[nitem] = NULL; set_menu_frame(); @@ -10064,6 +15125,27 @@ index 1489115..ddd267b 100644 # Set of available languages. -ja +ja de zh_CN zh_TW +diff --git a/po/Makefile.in.in b/po/Makefile.in.in +index 83d8838..ef8bd94 100644 +--- a/po/Makefile.in.in ++++ b/po/Makefile.in.in +@@ -153,14 +153,14 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ +- --copyright-holder='$(COPYRIGHT_HOLDER)' \ ++ --copyright-holder="$(COPYRIGHT_HOLDER)" \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + *) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ +- --copyright-holder='$(COPYRIGHT_HOLDER)' \ ++ --copyright-holder="$(COPYRIGHT_HOLDER)" \ + --package-name="$${package_gnu}@PACKAGE@" \ + --package-version='@VERSION@' \ + --msgid-bugs-address="$$msgid_bugs_address" \ diff --git a/po/Makevars b/po/Makevars index 2f57810..a60a09d 100644 --- a/po/Makevars @@ -10079,10 +15161,10 @@ index 2f57810..a60a09d 100644 # bugs in the untranslated strings: diff --git a/po/de.po b/po/de.po new file mode 100644 -index 0000000..19a3d3a +index 0000000..96489c1 --- /dev/null +++ b/po/de.po -@@ -0,0 +1,914 @@ +@@ -0,0 +1,936 @@ +# German translation of w3m +# Copyright (C) 2014 THE w3m'S COPYRIGHT HOLDER +# This file is distributed under the same license as the w3m package. @@ -10091,9 +15173,9 @@ index 0000000..19a3d3a +msgstr "" +"Project-Id-Version: w3m 0.5.3\n" +"Report-Msgid-Bugs-To: satodai@w3m.jp\n" -+"POT-Creation-Date: 2015-04-29 16:18+0900\n" -+"PO-Revision-Date: 2015-04-29 09:45+0200\n" -+"Last-Translator: Markus Hiereth <post@hiereth.de>\n" ++"POT-Creation-Date: 2016-03-14 19:47+0900\n" ++"PO-Revision-Date: 2016-03-14 19:51+0900\n" ++"Last-Translator: Tatsuya Kinoshita <tats@debian.org>\n" +"Language-Team: German <debian-l10n-german@lists.debian.org>\n" +"Language: de\n" +"MIME-Version: 1.0\n" @@ -10102,75 +15184,75 @@ index 0000000..19a3d3a +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" + -+#: menu.c:267 ++#: menu.c:269 +msgid " Back (b) " +msgstr " Zurück (b) " + -+#: menu.c:268 ++#: menu.c:270 +msgid " Select Buffer(s) " +msgstr " Puffer auswählen (s) " + -+#: menu.c:270 ++#: menu.c:272 +msgid " Select Tab (t) " +msgstr " Reiter auswählen (t) " + -+#: menu.c:272 ++#: menu.c:274 +msgid " View Source (v) " +msgstr " Codeansicht (v) " + -+#: menu.c:273 ++#: menu.c:275 +msgid " Edit Source (e) " +msgstr " Code bearbeiten (e) " + -+#: menu.c:274 ++#: menu.c:276 +msgid " Save Source (S) " +msgstr " Code speichern (S) " + -+#: menu.c:275 ++#: menu.c:277 +msgid " Reload (r) " +msgstr " Erneut laden (r) " + -+#: menu.c:276 menu.c:283 menu.c:287 ++#: menu.c:278 menu.c:285 menu.c:289 +msgid " ---------------- " +msgstr " ---------------------- " + -+#: menu.c:277 ++#: menu.c:279 +msgid " Go Link (a) " +msgstr " Ziel öffnen.. (a) " + -+#: menu.c:278 ++#: menu.c:280 +msgid " on New Tab (n) " +msgstr " ..in neuem Reiter (n) " + -+#: menu.c:279 ++#: menu.c:281 +msgid " Save Link (A) " +msgstr " Ziel speichern (A) " + -+#: menu.c:280 ++#: menu.c:282 +msgid " View Image (i) " +msgstr " Bild anzeigen (i) " + -+#: menu.c:281 ++#: menu.c:283 +msgid " Save Image (I) " +msgstr " Bild speichern (I) " + -+#: menu.c:282 ++#: menu.c:284 +msgid " View Frame (f) " +msgstr " Frames zeigen (f) " + -+#: menu.c:284 ++#: menu.c:286 +msgid " Bookmark (B) " +msgstr " Lesezeichen (B) " + -+#: menu.c:285 ++#: menu.c:287 +msgid " Help (h) " +msgstr " Hilfe (h) " + -+#: menu.c:286 ++#: menu.c:288 +msgid " Option (o) " +msgstr " Einstellungen (o) " + -+#: menu.c:288 ++#: menu.c:290 +msgid " Quit (q) " +msgstr " Programm verlassen (q) " + @@ -10478,514 +15560,536 @@ index 0000000..19a3d3a +msgstr "Umgang mit mailto-URLs" + +#: rc.c:146 -+msgid "External Browser" -+msgstr "Externer Browser" ++msgid "External browser" ++msgstr "Externer browser" + +#: rc.c:147 -+msgid "Second External Browser" -+msgstr "Zweiter externer Browser" ++msgid "2nd external browser" ++msgstr "Zweiter externer browser" + +#: rc.c:148 -+msgid "Third External Browser" -+msgstr "Dritter externer Browser" ++msgid "3rd external browser" ++msgstr "Dritter externer browser" ++ ++#: rc.c:149 ++msgid "4th external browser" ++msgstr "Vierter externer browser" ++ ++#: rc.c:150 ++msgid "5th external browser" ++msgstr "Fünfter externer browser" ++ ++#: rc.c:151 ++msgid "6th external browser" ++msgstr "Sechster externer browser" ++ ++#: rc.c:152 ++msgid "7th external browser" ++msgstr "Siebter externer browser" ++ ++#: rc.c:153 ++msgid "8th external browser" ++msgstr "Achter externer browser" ++ ++#: rc.c:154 ++msgid "9th external browser" ++msgstr "Neunter externer browser" + +# entsprechend file:///usr/share/doc/w3m/README.passwd +# Prüfung beanstandete auch passwd_file mit Zugriffbytes 600, mh, 05.10.2014 -+#: rc.c:149 ++#: rc.c:155 +msgid "Disable secret file security check" +msgstr "Keine Prüfung der Sicherheit bei Dateien mit geheimem Inhalt" + -+#: rc.c:150 ++#: rc.c:156 +msgid "Password file" +msgstr "Passwort-Datei" + -+#: rc.c:151 ++#: rc.c:157 +msgid "File for setting form on loading" +msgstr "Datei mit vordefinierten Eingaben für Formulare" + -+#: rc.c:152 ++#: rc.c:158 +msgid "File for preferences for each site" +msgstr "Datei mit adress-spezifischen Voreinstellungen" + -+#: rc.c:153 ++#: rc.c:159 +msgid "Password for anonymous FTP (your mail address)" +msgstr "Passwort für anonyme FTP-Anmeldung (Ihre Mailadresse)" + -+#: rc.c:154 ++#: rc.c:160 +msgid "Generate domain part of password for FTP" +msgstr "Domain-Teil des FTP-Passwortes erzeugen" + -+#: rc.c:155 ++#: rc.c:161 +msgid "User-Agent identification string" +msgstr "Browserkennung übermitteln" + -+#: rc.c:156 ++#: rc.c:162 +msgid "Accept-Encoding header" +msgstr "Accept-Encoding-Kopfzeile" + -+#: rc.c:157 ++#: rc.c:163 +msgid "Accept header" +msgstr "Accept-Kopfzeile" + -+#: rc.c:158 ++#: rc.c:164 +msgid "Accept-Language header" +msgstr "Accept-Language-Kopfzeile" + -+#: rc.c:159 ++#: rc.c:165 +msgid "Treat URL-like strings as links in all pages" +msgstr "URL-artige Zeichenketten auf allen Seiten als Links auffassen" + -+#: rc.c:160 ++#: rc.c:166 +msgid "Wrap search" +msgstr "Im Dokument umlaufend suchen" + -+#: rc.c:161 ++#: rc.c:167 +msgid "Display unseen objects (e.g. bgimage tag)" +msgstr "Nicht gezeigte Objekte melden (z.B. Hintergrundbild)" + -+#: rc.c:162 ++#: rc.c:168 +msgid "Uncompress compressed data automatically when downloading" +msgstr "Komprimierte Daten beim Download selbstständig dekomprimieren" + +# String nicht in Optionen-Menü gefunden. mh, 05.10.2014 -+#: rc.c:164 ++#: rc.c:170 +msgid "Run external viewer in a separate session" +msgstr "Externe Anzeigeprogramme in eigener Sitzung laufen lassen" + -+#: rc.c:166 ++#: rc.c:172 +msgid "Run external viewer in the background" +msgstr "Externe Anzeigeprogramme im Hintergrund laufen lassen" + -+#: rc.c:168 ++#: rc.c:174 +msgid "Use external program for directory listing" +msgstr "Externes Programm zum Auflisten von Verzeichnissen verwenden" + -+#: rc.c:169 ++#: rc.c:175 +msgid "URL of directory listing command" +msgstr "URL des Befehls zum Auflisten von Verzeichnissen" + -+#: rc.c:171 ++#: rc.c:177 +msgid "Enable dictionary lookup through CGI" +msgstr "Wörterbuchabfrage mittels CGI aktivieren" + -+#: rc.c:172 ++#: rc.c:178 +msgid "URL of dictionary lookup command" +msgstr "URL des Befehls zur Wörterbuch-Abfrage" + -+#: rc.c:174 ++#: rc.c:180 +msgid "Display link name for images lacking ALT" +msgstr "Bei Bildern ohne ALT-Angabe Linkziel anzeigen" + -+#: rc.c:175 ++#: rc.c:181 +msgid "Index file for directories" +msgstr "Indexdatei für Verzeichnisse" + -+#: rc.c:176 ++#: rc.c:182 +msgid "Prepend http:// to URL automatically" +msgstr "Ziel-Eingaben gegebenenfalls http:// voranstellen" + -+#: rc.c:177 ++#: rc.c:183 +msgid "Default value for open-URL command" +msgstr "Vorgabewert bei der Adresseneingabe" + -+#: rc.c:178 ++#: rc.c:184 +msgid "Decode Content-Transfer-Encoding when saving" +msgstr "Beim Speichern entsprechend Content-Transfer-Encoding entschlüsseln" + -+#: rc.c:179 ++#: rc.c:185 +msgid "Preserve timestamp when saving" +msgstr "Zeitstempel beim Speichern erhalten" + -+#: rc.c:181 ++#: rc.c:187 +msgid "Enable mouse" +msgstr "Maus aktivieren" + -+#: rc.c:182 ++#: rc.c:188 +msgid "Scroll in reverse direction of mouse drag" +msgstr "Mausbewegungen entgegengesetzt scrollen" + -+#: rc.c:183 ++#: rc.c:189 +msgid "Behavior of wheel scroll speed" +msgstr "Umsetzung der Mausradbewegung" + -+#: rc.c:184 ++#: rc.c:190 +msgid "(A only)Scroll by # (%) of screen" +msgstr "(nur A) Um # % des Fensters scrollen" + -+#: rc.c:185 ++#: rc.c:191 +msgid "(B only)Scroll by # lines" +msgstr "(nur B) Um # Zeilen scrollen" + -+#: rc.c:187 ++#: rc.c:193 +msgid "Free memory of undisplayed buffers" +msgstr "Speicherplatz nicht angezeigter Puffer freigeben" + -+#: rc.c:188 ++#: rc.c:194 +msgid "Suppress `Referer:' header" +msgstr "Referer-Kopfzeile unterdrücken" + -+#: rc.c:189 ++#: rc.c:195 +msgid "Search case-insensitively" +msgstr "Groß- und Kleinschreibung beim Suchen ignorieren" + -+#: rc.c:190 ++#: rc.c:196 +msgid "Use LESSOPEN" +msgstr "LESSOPEN verwenden" + -+#: rc.c:193 ++#: rc.c:199 +msgid "Perform SSL server verification" +msgstr "SSL-Server-Verifizierung durchführen" + -+#: rc.c:194 ++#: rc.c:200 +msgid "PEM encoded certificate file of client" +msgstr "PEM-kodierte Zertifikatsdatei des Clients" + -+#: rc.c:195 ++#: rc.c:201 +msgid "PEM encoded private key file of client" +msgstr "PEM-kodierte private Schlüsseldatei des Clients" + -+#: rc.c:196 ++#: rc.c:202 +msgid "Path to directory for PEM encoded certificates of CAs" +msgstr "Pfad zum Verzeichnis für PEM-kodierte Zertifikate von CAs" + -+#: rc.c:197 ++#: rc.c:203 +msgid "File consisting of PEM encoded certificates of CAs" +msgstr "Datei mit PEM-kodierten Zertifikaten von CAs" + -+#: rc.c:199 ++#: rc.c:205 +msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)" +msgstr "Liste unzulässiger SSL-Verfahren (2: SSLv2, 3: SSLv3, t: TLSv1)" + -+#: rc.c:202 ++#: rc.c:208 +msgid "Enable cookie processing" +msgstr "Cookie-Verarbeitung aktivieren" + -+#: rc.c:203 ++#: rc.c:209 +msgid "Print a message when receiving a cookie" +msgstr "Den Empfang von Cookies melden" + -+#: rc.c:204 ++#: rc.c:210 +msgid "Accept cookies" +msgstr "Cookies akzeptieren" + -+#: rc.c:205 ++#: rc.c:211 +msgid "Action to be taken on invalid cookie" +msgstr "Reaktion auf ungültiges Cookie" + -+#: rc.c:206 ++#: rc.c:212 +msgid "Domains to reject cookies from" +msgstr "Domains, deren Cookies abzulehnen sind" + -+#: rc.c:207 ++#: rc.c:213 +msgid "Domains to accept cookies from" +msgstr "Domains, deren Cookies akzeptiert werden" + +# Variable vom Typ String im Abschnitt Cookies-Einstellungen, mh 10.10.2014 -+#: rc.c:208 -+#, fuzzy ++#: rc.c:214 +msgid "Domains to avoid [wrong number of dots]" +msgstr "Zu meidende Domains (falsche Anzahl von Punkten)" + -+#: rc.c:210 ++#: rc.c:216 +msgid "Number of redirections to follow" +msgstr "Anzahl zu akzeptierender Umleitungen" + +# Konfigurationsvariable vom Typ string, mh, 05.10.2014 -+#: rc.c:211 ++#: rc.c:217 +msgid "Enable processing of meta-refresh tag" +msgstr "Meta-Refresh-Element verarbeiten" + -+#: rc.c:214 ++#: rc.c:220 +msgid "Enable Migemo (Roma-ji search)" +msgstr "Romaji-Suche mittels Migemo aktivieren" + -+#: rc.c:215 ++#: rc.c:221 +msgid "Migemo command" +msgstr "Migemo-Befehl" + -+#: rc.c:219 ++#: rc.c:225 +msgid "Display charset" +msgstr "Zeichenkodierung der Anzeige" + -+#: rc.c:220 ++#: rc.c:226 +msgid "Default document charset" +msgstr "Zeichenkodierungs-Vorgabe für Dokumente" + -+#: rc.c:221 ++#: rc.c:227 +msgid "Automatic charset detect when loading" +msgstr "Selbstständige Erkennung der Zeichenkodierung beim Laden" + -+#: rc.c:222 ++#: rc.c:228 +msgid "System charset" +msgstr "Zeichenkodierung des Systems" + -+#: rc.c:223 ++#: rc.c:229 +msgid "System charset follows locale(LC_CTYPE)" +msgstr "Zeichenkodierung des Systems entsprechend Locale (LC_CTYPE)" + +# war zuvor +# msgstr "Halfdump mit der zur Anzeige benutzten Zeichenkodierung exportieren" -+#: rc.c:224 ++#: rc.c:230 +msgid "Output halfdump with display charset" +msgstr "Halfdump in der zur Anzeige benutzten Kodierung" + +# Konfigurationsvariable vom Typ boolean, mh, 05.10.2014 -+#: rc.c:225 -+#, fuzzy ++#: rc.c:231 +msgid "Use multi column characters" +msgstr "Spaltenübergreifende Zeichen verwenden" + -+#: rc.c:226 ++#: rc.c:232 +msgid "Use combining characters" +msgstr "Kombinationszeichen verwenden" + -+#: rc.c:227 ++#: rc.c:233 +msgid "Use double width for some Unicode characters" +msgstr "Einzelnen Unicode-Zeichen zwei Spalten einräumen" + -+#: rc.c:228 ++#: rc.c:234 +msgid "Use Unicode language tags" +msgstr "Unicode-Sprach-Tags verwenden" + -+#: rc.c:229 ++#: rc.c:235 +msgid "Charset conversion using Unicode map" +msgstr "Zeichen in Unicode kodieren" + -+#: rc.c:230 ++#: rc.c:236 +msgid "Charset conversion when loading" +msgstr "Zeichenkodierung beim Laden anpassen" + -+#: rc.c:231 ++#: rc.c:237 +msgid "Adjust search string for document charset" +msgstr "Zu suchende Zeichenkette der Kodierung des Dokumentes anpassen" + -+#: rc.c:232 ++#: rc.c:238 +msgid "Fix character width when conversion" +msgstr "Bei Umwandlung an der Breite von Zeichen festhalten" + -+#: rc.c:233 ++#: rc.c:239 +msgid "Use GB 12345 Unicode map instead of GB 2312's" +msgstr "GB-12345-Unicode statt GB 2312 verwenden" + -+#: rc.c:234 ++#: rc.c:240 +msgid "Use JIS X 0201 Roman for ISO-2022-JP" +msgstr "JIS X 0201 Roman statt ISO-2022-JP verwenden" + -+#: rc.c:235 ++#: rc.c:241 +msgid "Use JIS C 6226:1978 for ISO-2022-JP" +msgstr "JIS C 6226:1978 statt ISO-2022-JP verwenden" + -+#: rc.c:236 ++#: rc.c:242 +msgid "Use JIS X 0201 Katakana" +msgstr "JIS X 0201 Katakana verwenden" + -+#: rc.c:237 ++#: rc.c:243 +msgid "Use JIS X 0212:1990 (Supplemental Kanji)" +msgstr "JIS X 0212:1990 verwenden (ergänzendes Kanji)" + -+#: rc.c:238 ++#: rc.c:244 +msgid "Use JIS X 0213:2000 (2000JIS)" +msgstr "JIS X 0213:2000 verwenden (2000JIS)" + -+#: rc.c:239 ++#: rc.c:245 +msgid "Strict ISO-2022-JP/KR/CN" +msgstr "Striktes ISO-2022-JP/KR/CN" + -+#: rc.c:240 ++#: rc.c:246 +msgid "Treat 4 bytes char. of GB18030 as Unicode" +msgstr "4-Byte-Zeichen von GB 18030 als Unicode auffassen" + -+#: rc.c:241 ++#: rc.c:247 +msgid "Simple Preserve space" +msgstr "Einfache Platzerhaltung" + -+#: rc.c:244 ++#: rc.c:250 +msgid "keymap file" +msgstr "Tastaturbelegungs-Datei" + -+#: rc.c:261 ++#: rc.c:267 +msgid "black" +msgstr "schwarz" + -+#: rc.c:262 ++#: rc.c:268 +msgid "red" +msgstr "rot" + -+#: rc.c:263 ++#: rc.c:269 +msgid "green" +msgstr "grün" + -+#: rc.c:264 ++#: rc.c:270 +msgid "yellow" +msgstr "gelb" + -+#: rc.c:265 ++#: rc.c:271 +msgid "blue" +msgstr "blau" + -+#: rc.c:266 ++#: rc.c:272 +msgid "magenta" +msgstr "magenta" + -+#: rc.c:267 ++#: rc.c:273 +msgid "cyan" +msgstr "cyan" + -+#: rc.c:268 ++#: rc.c:274 +msgid "white" +msgstr "weiß" + -+#: rc.c:269 ++#: rc.c:275 +msgid "terminal" +msgstr "wie Terminal" + -+#: rc.c:288 ++#: rc.c:294 +msgid "none" +msgstr "keiner" + -+#: rc.c:289 ++#: rc.c:295 +msgid "current URL" +msgstr "aktuelle URL" + -+#: rc.c:290 ++#: rc.c:296 +msgid "link URL" +msgstr "Link-URL" + -+#: rc.c:295 ++#: rc.c:301 +msgid "simple" +msgstr "einfach" + -+#: rc.c:296 ++#: rc.c:302 +msgid "use tag" +msgstr "durch Tags" + -+#: rc.c:297 ++#: rc.c:303 +msgid "fontify" +msgstr "hervorgehoben" + -+#: rc.c:303 ++#: rc.c:309 +msgid "A:relative to screen height" +msgstr "A: relativ zu Fensterhöhe" + -+#: rc.c:304 ++#: rc.c:310 +msgid "B:fixed speed" +msgstr "B: feste Geschwindigkeit" + -+#: rc.c:311 ++#: rc.c:317 +msgid "unspecified" +msgstr "nicht spezifiziert" + -+#: rc.c:312 ++#: rc.c:318 +msgid "inet inet6" +msgstr "inet inet6" + -+#: rc.c:313 ++#: rc.c:319 +msgid "inet6 inet" +msgstr "inet6 inet" + -+#: rc.c:314 ++#: rc.c:320 +msgid "inet only" +msgstr "nur inet" + -+#: rc.c:315 ++#: rc.c:321 +msgid "inet6 only" +msgstr "nur inet6" + -+#: rc.c:322 ++#: rc.c:328 +msgid "discard" +msgstr "verwerfen" + -+#: rc.c:324 ++#: rc.c:330 +msgid "accept" +msgstr "annehmen" + -+#: rc.c:326 ++#: rc.c:332 +msgid "ask" +msgstr "nachfragen" + +# gehört zu rc.c:142 +# erscheint in Pulldown-Menü, daher verkürzt. mh 09.10.2014 -+#: rc.c:333 ++#: rc.c:339 +msgid "use internal mailer instead" +msgstr "Mail intern erstellen" + +# gehört zu rc.c:142 +# erscheint in Pulldown-Menü, daher verkürzt. mh 09.10.2014 -+#: rc.c:335 ++#: rc.c:341 +msgid "ignore options and use only the address" +msgstr "Optionen ignorieren" + +# gehört zu rc.c:142 +# erscheint in Pulldown-Menü, daher verkürzt. mh 09.10.2014 -+#: rc.c:336 ++#: rc.c:342 +msgid "use full mailto URL" +msgstr "komplett verwenden" + -+#: rc.c:345 ++#: rc.c:351 +msgid "OFF" +msgstr "AUS" + -+#: rc.c:346 ++#: rc.c:352 +msgid "Only ISO 2022" +msgstr "Nur ISO-2022" + -+#: rc.c:347 ++#: rc.c:353 +msgid "ON" +msgstr "AN" + +# Wert aus einem Set zur Wiedergabe von Rändern, mh, 05.10.2014 -+#: rc.c:353 ++#: rc.c:359 +msgid "ASCII" +msgstr "ASCII" + +# Wert aus einem Set zur Wiedergabe von Rändern, mh, 05.10.2014 +# hier ist "Zeichensatz" akzeptabel mh, 09.10.2014 -+#: rc.c:354 ++#: rc.c:360 +msgid "charset specific" +msgstr "zeichensatzspezifisch" + +# Wert aus einem Set zur Wiedergabe von Rändern, mh, 05.10.2014 -+#: rc.c:355 ++#: rc.c:361 +msgid "DEC special graphics" +msgstr "mit DEC-Grafiken" + -+#: rc.c:722 ++#: rc.c:740 +msgid "Display Settings" +msgstr "Einstellungen zur Anzeige" + -+#: rc.c:724 ++#: rc.c:742 +msgid "Color Settings" +msgstr "Farbeinstellungen" + -+#: rc.c:726 ++#: rc.c:744 +msgid "Miscellaneous Settings" +msgstr "Weitere Einstellungen" + -+#: rc.c:727 ++#: rc.c:745 +msgid "Directory Settings" +msgstr "Verzeichnis-Einstellungen" + -+#: rc.c:728 ++#: rc.c:746 +msgid "External Program Settings" +msgstr "Einstellungen für externe Programme" + -+#: rc.c:729 ++#: rc.c:747 +msgid "Network Settings" +msgstr "Netzwerk-Einstellungen" + -+#: rc.c:730 ++#: rc.c:748 +msgid "Proxy Settings" +msgstr "Proxy-Einstellungen" + -+#: rc.c:732 ++#: rc.c:750 +msgid "SSL Settings" +msgstr "SSL-Einstellungen" + -+#: rc.c:735 ++#: rc.c:753 +msgid "Cookie Settings" +msgstr "Cookie-Einstellungen" + -+#: rc.c:738 ++#: rc.c:756 +msgid "Charset Settings" +msgstr "Zeichenkodierungs-Einstellungen" + @@ -10994,11 +16098,11 @@ index 0000000..19a3d3a +#. * header. For example, ja.po should translate it as +#. * "ja;q=1.0, en;q=0.5" like that. +#. -+#: rc.c:1220 ++#: rc.c:1238 +msgid "en;q=1.0" +msgstr "de;q=1.0, en;q=0.5" diff --git a/po/ja.po b/po/ja.po -index d67c695..ef079e4 100644 +index d67c695..3810d30 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,6 +1,6 @@ @@ -11009,15 +16113,15 @@ index d67c695..ef079e4 100644 # This file is distributed under the same license as the w3m package. # Fumitoshi UKAI <ukai@debian.or.jp>, 2003. # -@@ -8,11 +8,11 @@ msgid "" +@@ -8,865 +8,897 @@ msgid "" msgstr "" "Project-Id-Version: w3m 0.5.3\n" "Report-Msgid-Bugs-To: satodai@w3m.jp\n" -"POT-Creation-Date: 2010-08-20 18:44+0900\n" -"PO-Revision-Date: 2010-08-20 18:45+0900\n" -"Last-Translator: Fumitoshi UKAI <ukai@debian.or.jp>\n" -+"POT-Creation-Date: 2015-04-29 16:18+0900\n" -+"PO-Revision-Date: 2015-04-29 16:38+0900\n" ++"POT-Creation-Date: 2016-03-14 19:47+0900\n" ++"PO-Revision-Date: 2016-03-14 19:51+0900\n" +"Last-Translator: Tatsuya Kinoshita <tats@debian.org>\n" "Language-Team: Japanese\n" -"Language: \n" @@ -11025,7 +16129,95 @@ index d67c695..ef079e4 100644 "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -@@ -90,783 +90,791 @@ msgstr "オプション (o)" + "Plural-Forms: nplurals=1; plural=0;\n" + +-#: menu.c:267 ++#: menu.c:269 + msgid " Back (b) " + msgstr "戻る (b)" + +-#: menu.c:268 ++#: menu.c:270 + msgid " Select Buffer(s) " + msgstr "バッファ選択 (s)" + +-#: menu.c:270 ++#: menu.c:272 + msgid " Select Tab (t) " + msgstr "タブ選択 (t)" + +-#: menu.c:272 ++#: menu.c:274 + msgid " View Source (v) " + msgstr "ソースを表示 (v)" + +-#: menu.c:273 ++#: menu.c:275 + msgid " Edit Source (e) " + msgstr "ソースを編集 (e)" + +-#: menu.c:274 ++#: menu.c:276 + msgid " Save Source (S) " + msgstr "ソースを保存 (S)" + +-#: menu.c:275 ++#: menu.c:277 + msgid " Reload (r) " + msgstr "再読み込み (r)" + +-#: menu.c:276 menu.c:283 menu.c:287 ++#: menu.c:278 menu.c:285 menu.c:289 + msgid " ---------------- " + msgstr "----------------" + +-#: menu.c:277 ++#: menu.c:279 + msgid " Go Link (a) " + msgstr "リンクを表示 (a)" + +-#: menu.c:278 ++#: menu.c:280 + msgid " on New Tab (n) " + msgstr "新タブで表示 (n)" + +-#: menu.c:279 ++#: menu.c:281 + msgid " Save Link (A) " + msgstr "リンクを保存 (A)" + +-#: menu.c:280 ++#: menu.c:282 + msgid " View Image (i) " + msgstr "画像を表示 (i)" + +-#: menu.c:281 ++#: menu.c:283 + msgid " Save Image (I) " + msgstr "画像を保存 (I)" + +-#: menu.c:282 ++#: menu.c:284 + msgid " View Frame (f) " + msgstr "フレーム表示 (f)" + +-#: menu.c:284 ++#: menu.c:286 + msgid " Bookmark (B) " + msgstr "ブックマーク (B)" + +-#: menu.c:285 ++#: menu.c:287 + msgid " Help (h) " + msgstr "ヘルプ (h)" + +-#: menu.c:286 ++#: menu.c:288 + msgid " Option (o) " + msgstr "オプション (o)" + +-#: menu.c:288 ++#: menu.c:290 msgid " Quit (q) " msgstr "終了 (q)" @@ -11399,648 +16591,767 @@ index d67c695..ef079e4 100644 msgstr "mailto タグの取り扱い" -#: rc.c:143 +-msgid "External Browser" +#: rc.c:146 - msgid "External Browser" ++msgid "External browser" msgstr "外部ブラウザ" -#: rc.c:144 +-msgid "Second External Browser" +#: rc.c:147 - msgid "Second External Browser" ++msgid "2nd external browser" msgstr "外部ブラウザその2" -#: rc.c:145 +-msgid "Third External Browser" +#: rc.c:148 - msgid "Third External Browser" ++msgid "3rd external browser" msgstr "外部ブラウザその3" -#: rc.c:146 +#: rc.c:149 ++msgid "4th external browser" ++msgstr "外部ブラウザその4" ++ ++#: rc.c:150 ++msgid "5th external browser" ++msgstr "外部ブラウザその5" ++ ++#: rc.c:151 ++msgid "6th external browser" ++msgstr "外部ブラウザその6" ++ ++#: rc.c:152 ++msgid "7th external browser" ++msgstr "外部ブラウザその7" ++ ++#: rc.c:153 ++msgid "8th external browser" ++msgstr "外部ブラウザその8" ++ ++#: rc.c:154 ++msgid "9th external browser" ++msgstr "外部ブラウザその9" ++ ++#: rc.c:155 msgid "Disable secret file security check" msgstr "パスワードファイルのパーミッションをチェックしない" -#: rc.c:147 -+#: rc.c:150 ++#: rc.c:156 msgid "Password file" msgstr "パスワードファイル" -#: rc.c:148 -+#: rc.c:151 ++#: rc.c:157 msgid "File for setting form on loading" msgstr "文書読込時のフォーム設定用ファイル" -#: rc.c:149 -+#: rc.c:152 ++#: rc.c:158 +msgid "File for preferences for each site" +msgstr "サイト別設定のファイル" + -+#: rc.c:153 ++#: rc.c:159 msgid "Password for anonymous FTP (your mail address)" msgstr "FTPのパスワード(普通は自分のmail addressを使う)" -#: rc.c:150 -+#: rc.c:154 ++#: rc.c:160 msgid "Generate domain part of password for FTP" msgstr "FTPのパスワードのドメイン名を自動生成する" -#: rc.c:151 -+#: rc.c:155 ++#: rc.c:161 msgid "User-Agent identification string" msgstr "User-Agent" -#: rc.c:152 -+#: rc.c:156 ++#: rc.c:162 msgid "Accept-Encoding header" msgstr "圧縮方法(Accept-Encoding:)" -#: rc.c:153 -+#: rc.c:157 ++#: rc.c:163 msgid "Accept header" msgstr "受けつけるメディアタイプ(Accept:)" -#: rc.c:154 -+#: rc.c:158 ++#: rc.c:164 msgid "Accept-Language header" msgstr "受けつける言語(Accept-Language:)" -#: rc.c:155 -+#: rc.c:159 ++#: rc.c:165 msgid "Treat URL-like strings as links in all pages" msgstr "全てのページのURL風の文字列をリンクにする" -#: rc.c:156 -+#: rc.c:160 ++#: rc.c:166 msgid "Wrap search" msgstr "折り返し検索" -#: rc.c:157 -+#: rc.c:161 ++#: rc.c:167 msgid "Display unseen objects (e.g. bgimage tag)" msgstr "背景画像等へのリンクを作る" -#: rc.c:158 -+#: rc.c:162 ++#: rc.c:168 msgid "Uncompress compressed data automatically when downloading" msgstr "ダウンロード時に自動的に圧縮されたデータを解凍する" -#: rc.c:160 -+#: rc.c:164 ++#: rc.c:170 msgid "Run external viewer in a separate session" msgstr "外部ビューアを別セッションで動かす" -#: rc.c:162 -+#: rc.c:166 ++#: rc.c:172 msgid "Run external viewer in the background" msgstr "外部ビューアをバックグラウンドで動かす" -#: rc.c:164 -+#: rc.c:168 ++#: rc.c:174 msgid "Use external program for directory listing" msgstr "ディレクトリリストに外部コマンドを使う" -#: rc.c:165 -+#: rc.c:169 ++#: rc.c:175 msgid "URL of directory listing command" msgstr "ディレクトリリスト用コマンド" -#: rc.c:167 -+#: rc.c:171 ++#: rc.c:177 msgid "Enable dictionary lookup through CGI" msgstr "辞書引きをCGI経由でおこなう" -#: rc.c:168 -+#: rc.c:172 ++#: rc.c:178 msgid "URL of dictionary lookup command" msgstr "辞書引きコマンドのURL" -#: rc.c:170 -+#: rc.c:174 ++#: rc.c:180 msgid "Display link name for images lacking ALT" msgstr "空のIMG ALT属性の時にリンク名を表示する" -#: rc.c:171 -+#: rc.c:175 ++#: rc.c:181 msgid "Index file for directories" msgstr "各ディレクトリのインデックスファイル" -#: rc.c:172 -+#: rc.c:176 ++#: rc.c:182 msgid "Prepend http:// to URL automatically" msgstr "URLに自動的に http:// を補う" -#: rc.c:173 -+#: rc.c:177 ++#: rc.c:183 msgid "Default value for open-URL command" msgstr "URLを開く時のデフォルト文字列" -#: rc.c:174 -+#: rc.c:178 ++#: rc.c:184 msgid "Decode Content-Transfer-Encoding when saving" msgstr "保存時に Content-Transfer-Encoding をデコードする" -#: rc.c:175 -+#: rc.c:179 ++#: rc.c:185 msgid "Preserve timestamp when saving" msgstr "保存時にタイムスタンプを保持する" -#: rc.c:177 -+#: rc.c:181 ++#: rc.c:187 msgid "Enable mouse" msgstr "マウスを使う" -#: rc.c:178 -+#: rc.c:182 ++#: rc.c:188 msgid "Scroll in reverse direction of mouse drag" msgstr "マウスのドラッグ動作を逆にする" -#: rc.c:179 -+#: rc.c:183 ++#: rc.c:189 msgid "Behavior of wheel scroll speed" msgstr "ホイールでのスクロール速度の扱い" -#: rc.c:180 -+#: rc.c:184 ++#: rc.c:190 msgid "(A only)Scroll by # (%) of screen" msgstr "(Aのみ)画面の何%スクロールするか" -#: rc.c:181 -+#: rc.c:185 ++#: rc.c:191 msgid "(B only)Scroll by # lines" msgstr "(Bのみ)スクロールする行数" -#: rc.c:183 -+#: rc.c:187 ++#: rc.c:193 msgid "Free memory of undisplayed buffers" msgstr "表示されていないバッファのメモリを解放する" -#: rc.c:184 -+#: rc.c:188 ++#: rc.c:194 msgid "Suppress `Referer:' header" msgstr "Referer: を送らないようにする" -#: rc.c:185 -+#: rc.c:189 ++#: rc.c:195 msgid "Search case-insensitively" msgstr "サーチ時に大文字小文字の区別をしない" -#: rc.c:186 -+#: rc.c:190 ++#: rc.c:196 msgid "Use LESSOPEN" msgstr "LESSOPENを使用" -#: rc.c:189 -+#: rc.c:193 ++#: rc.c:199 msgid "Perform SSL server verification" msgstr "SSLのサーバ認証を行う" -#: rc.c:190 -+#: rc.c:194 ++#: rc.c:200 msgid "PEM encoded certificate file of client" msgstr "SSLのクライアント用PEM形式証明書ファイル" -#: rc.c:191 -+#: rc.c:195 ++#: rc.c:201 msgid "PEM encoded private key file of client" msgstr "SSLのクライアント用PEM形式秘密鍵ファイル" -#: rc.c:192 -+#: rc.c:196 ++#: rc.c:202 msgid "Path to directory for PEM encoded certificates of CAs" msgstr "SSLの認証局のPEM形式証明書群のあるディレクトリへのパス" -#: rc.c:193 -+#: rc.c:197 ++#: rc.c:203 msgid "File consisting of PEM encoded certificates of CAs" msgstr "SSLの認証局のPEM形式証明書群のファイル" -#: rc.c:195 -+#: rc.c:199 ++#: rc.c:205 msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)" msgstr "使わないSSLメソッドのリスト(2: SSLv2, 3: SSLv3, t:TLSv1)" -#: rc.c:198 -+#: rc.c:202 ++#: rc.c:208 msgid "Enable cookie processing" msgstr "クッキーを使用する" -#: rc.c:199 -+#: rc.c:203 ++#: rc.c:209 msgid "Print a message when receiving a cookie" msgstr "クッキーを受け付けたときにメッセージを表示する" -#: rc.c:200 -+#: rc.c:204 ++#: rc.c:210 msgid "Accept cookies" msgstr "クッキーを受け付ける" -#: rc.c:201 -+#: rc.c:205 ++#: rc.c:211 msgid "Action to be taken on invalid cookie" msgstr "問題のあるクッキーでも受け付ける" -#: rc.c:202 -+#: rc.c:206 ++#: rc.c:212 msgid "Domains to reject cookies from" msgstr "クッキーを受け付けないドメイン" -#: rc.c:203 -+#: rc.c:207 ++#: rc.c:213 msgid "Domains to accept cookies from" msgstr "クッキーを受け付けるドメイン" -#: rc.c:204 -+#: rc.c:208 ++#: rc.c:214 msgid "Domains to avoid [wrong number of dots]" msgstr "[wrong number of dots] を無視するドメイン" -#: rc.c:206 -+#: rc.c:210 ++#: rc.c:216 msgid "Number of redirections to follow" msgstr "従うリダイレクトの回数" -#: rc.c:207 -+#: rc.c:211 ++#: rc.c:217 msgid "Enable processing of meta-refresh tag" msgstr "meta refresh に対応する" -#: rc.c:210 -+#: rc.c:214 ++#: rc.c:220 msgid "Enable Migemo (Roma-ji search)" msgstr "Migemo(ローマ字検索)を使用する" -#: rc.c:211 -+#: rc.c:215 ++#: rc.c:221 msgid "Migemo command" msgstr "Migemoコマンド" -#: rc.c:215 -+#: rc.c:219 ++#: rc.c:225 msgid "Display charset" msgstr "表示用文字コード" -#: rc.c:216 -+#: rc.c:220 ++#: rc.c:226 msgid "Default document charset" msgstr "文書の標準の文字コード" -#: rc.c:217 -+#: rc.c:221 ++#: rc.c:227 msgid "Automatic charset detect when loading" msgstr "文書の読み込み時に文字コードの自動判定を行う" -#: rc.c:218 -+#: rc.c:222 ++#: rc.c:228 msgid "System charset" msgstr "システムの文字コード" -#: rc.c:219 -+#: rc.c:223 ++#: rc.c:229 msgid "System charset follows locale(LC_CTYPE)" msgstr "Locale(LC_CTYPE) に従ってシステムの文字コードを設定" -#: rc.c:220 -+#: rc.c:224 ++#: rc.c:230 msgid "Output halfdump with display charset" msgstr "表示用文字コードで halfdump の出力を行う" -#: rc.c:221 -+#: rc.c:225 ++#: rc.c:231 msgid "Use multi column characters" msgstr "複数カラムの文字を使う" -#: rc.c:222 -+#: rc.c:226 ++#: rc.c:232 msgid "Use combining characters" msgstr "結合文字を使う" -#: rc.c:223 -+#: rc.c:227 ++#: rc.c:233 msgid "Use double width for some Unicode characters" msgstr "ある種のUnicode文字を全角にする" -#: rc.c:224 -+#: rc.c:228 ++#: rc.c:234 msgid "Use Unicode language tags" msgstr "Unicode の言語タグを使う" -#: rc.c:225 -+#: rc.c:229 ++#: rc.c:235 msgid "Charset conversion using Unicode map" msgstr "Unicodeを介したコード変換" -#: rc.c:226 -+#: rc.c:230 ++#: rc.c:236 msgid "Charset conversion when loading" msgstr "文書の読み込み時に文字コードを変換する" -#: rc.c:227 -+#: rc.c:231 ++#: rc.c:237 msgid "Adjust search string for document charset" msgstr "検索文字列を文書の文字コードに変換する" -#: rc.c:228 -+#: rc.c:232 ++#: rc.c:238 msgid "Fix character width when conversion" msgstr "文字幅の変わる変換をしない" -#: rc.c:229 -+#: rc.c:233 ++#: rc.c:239 msgid "Use GB 12345 Unicode map instead of GB 2312's" msgstr "GB 12345 の Unicode マップを GB 2312 用に使う" -#: rc.c:230 -+#: rc.c:234 ++#: rc.c:240 msgid "Use JIS X 0201 Roman for ISO-2022-JP" msgstr "ISO-2022-JP で JIS X 0201-Roman を使う" -#: rc.c:231 -+#: rc.c:235 ++#: rc.c:241 msgid "Use JIS C 6226:1978 for ISO-2022-JP" msgstr "ISO-2022-JP で JIS C 6226:1978(旧JIS) を使う" -#: rc.c:232 -+#: rc.c:236 ++#: rc.c:242 msgid "Use JIS X 0201 Katakana" msgstr "JIS X 0201-Katakana を使う" -#: rc.c:233 -+#: rc.c:237 ++#: rc.c:243 msgid "Use JIS X 0212:1990 (Supplemental Kanji)" msgstr "JIS X 0212:1990(補助漢字) を使う" -#: rc.c:234 -+#: rc.c:238 ++#: rc.c:244 msgid "Use JIS X 0213:2000 (2000JIS)" msgstr "JIS X 0213:2000(2000JIS) を使う" -#: rc.c:235 -+#: rc.c:239 ++#: rc.c:245 msgid "Strict ISO-2022-JP/KR/CN" msgstr "厳格な ISO-2022-JP/KR/CN を使う" -#: rc.c:236 -+#: rc.c:240 ++#: rc.c:246 msgid "Treat 4 bytes char. of GB18030 as Unicode" msgstr "GB18030 の 4バイト文字を Unicode として扱う" -#: rc.c:237 -+#: rc.c:241 ++#: rc.c:247 msgid "Simple Preserve space" msgstr "単純な空白の保存" -#: rc.c:240 -+#: rc.c:244 ++#: rc.c:250 msgid "keymap file" msgstr "keymapファイル" -#: rc.c:257 -+#: rc.c:261 ++#: rc.c:267 msgid "black" msgstr "黒" -#: rc.c:258 -+#: rc.c:262 ++#: rc.c:268 msgid "red" msgstr "赤" -#: rc.c:259 -+#: rc.c:263 ++#: rc.c:269 msgid "green" msgstr "緑" -#: rc.c:260 -+#: rc.c:264 ++#: rc.c:270 msgid "yellow" msgstr "黄" -#: rc.c:261 -+#: rc.c:265 ++#: rc.c:271 msgid "blue" msgstr "青" -#: rc.c:262 -+#: rc.c:266 ++#: rc.c:272 msgid "magenta" msgstr "紫" -#: rc.c:263 -+#: rc.c:267 ++#: rc.c:273 msgid "cyan" msgstr "空色" -#: rc.c:264 -+#: rc.c:268 ++#: rc.c:274 msgid "white" msgstr "白" -#: rc.c:265 -+#: rc.c:269 ++#: rc.c:275 msgid "terminal" msgstr "端末" -#: rc.c:284 -+#: rc.c:288 ++#: rc.c:294 msgid "none" msgstr "無し" -#: rc.c:285 -+#: rc.c:289 ++#: rc.c:295 msgid "current URL" msgstr "現在のURL" -#: rc.c:286 -+#: rc.c:290 ++#: rc.c:296 msgid "link URL" msgstr "リンク先のURL" -#: rc.c:291 -+#: rc.c:295 ++#: rc.c:301 msgid "simple" msgstr "シンプル" -#: rc.c:292 -+#: rc.c:296 ++#: rc.c:302 msgid "use tag" msgstr "タグで表示" -#: rc.c:293 -+#: rc.c:297 ++#: rc.c:303 msgid "fontify" msgstr "文字装飾" -#: rc.c:299 -+#: rc.c:303 ++#: rc.c:309 msgid "A:relative to screen height" msgstr "A:画面サイズに比例" -#: rc.c:300 -+#: rc.c:304 ++#: rc.c:310 msgid "B:fixed speed" msgstr "B:一定の行数" -#: rc.c:307 -+#: rc.c:311 ++#: rc.c:317 msgid "unspecified" msgstr "指定しない" -#: rc.c:308 -+#: rc.c:312 ++#: rc.c:318 msgid "inet inet6" msgstr "IPv4優先" -#: rc.c:309 -+#: rc.c:313 ++#: rc.c:319 msgid "inet6 inet" msgstr "IPv6優先" -#: rc.c:310 -+#: rc.c:314 ++#: rc.c:320 msgid "inet only" msgstr "IPv4のみ" -#: rc.c:311 -+#: rc.c:315 ++#: rc.c:321 msgid "inet6 only" msgstr "IPv6のみ" -#: rc.c:318 -+#: rc.c:322 ++#: rc.c:328 msgid "discard" msgstr "破棄する" -#: rc.c:320 -+#: rc.c:324 ++#: rc.c:330 msgid "accept" msgstr "受け入れる" -#: rc.c:322 -+#: rc.c:326 ++#: rc.c:332 msgid "ask" msgstr "確認する" -#: rc.c:329 -+#: rc.c:333 ++#: rc.c:339 msgid "use internal mailer instead" msgstr "内部メーラを使用" -#: rc.c:331 -+#: rc.c:335 ++#: rc.c:341 msgid "ignore options and use only the address" msgstr "アドレスのみ使用" -#: rc.c:332 -+#: rc.c:336 ++#: rc.c:342 msgid "use full mailto URL" msgstr "URL 全体を使用" -#: rc.c:341 -+#: rc.c:345 ++#: rc.c:351 msgid "OFF" msgstr "無効" -#: rc.c:342 -+#: rc.c:346 ++#: rc.c:352 msgid "Only ISO 2022" msgstr "ISO 2022 のみ" -#: rc.c:343 -+#: rc.c:347 ++#: rc.c:353 msgid "ON" msgstr "有効" -#: rc.c:349 -+#: rc.c:353 ++#: rc.c:359 msgid "ASCII" msgstr "ASCII" -#: rc.c:350 -+#: rc.c:354 ++#: rc.c:360 msgid "charset specific" msgstr "文字コード依存" -#: rc.c:351 -+#: rc.c:355 ++#: rc.c:361 msgid "DEC special graphics" msgstr "DEC 特殊文字" -#: rc.c:714 -+#: rc.c:722 ++#: rc.c:740 msgid "Display Settings" msgstr "表示関係" -#: rc.c:716 -+#: rc.c:724 ++#: rc.c:742 msgid "Color Settings" msgstr "表示色" -#: rc.c:718 -+#: rc.c:726 ++#: rc.c:744 msgid "Miscellaneous Settings" msgstr "雑多な設定" -#: rc.c:719 -+#: rc.c:727 ++#: rc.c:745 msgid "Directory Settings" msgstr "ディレクトリ設定" -#: rc.c:720 -+#: rc.c:728 ++#: rc.c:746 msgid "External Program Settings" msgstr "外部プログラム" -#: rc.c:721 -+#: rc.c:729 ++#: rc.c:747 msgid "Network Settings" msgstr "ネットワークの設定" -#: rc.c:722 -+#: rc.c:730 ++#: rc.c:748 msgid "Proxy Settings" msgstr "プロキシの設定" -#: rc.c:724 -+#: rc.c:732 ++#: rc.c:750 msgid "SSL Settings" msgstr "SSLの設定" -#: rc.c:727 -+#: rc.c:735 ++#: rc.c:753 msgid "Cookie Settings" msgstr "クッキーの設定" -#: rc.c:730 -+#: rc.c:738 ++#: rc.c:756 msgid "Charset Settings" msgstr "文字コードの設定" -@@ -875,6 +883,6 @@ msgstr "文字コードの設定" +@@ -875,6 +907,6 @@ msgstr "文字コードの設定" #. * header. For example, ja.po should translate it as #. * "ja;q=1.0, en;q=0.5" like that. #. -#: rc.c:1209 -+#: rc.c:1220 ++#: rc.c:1238 msgid "en;q=1.0" msgstr "ja;q=1.0, en;q=0.5" diff --git a/po/w3m.pot b/po/w3m.pot -index e164b1e..b277bb9 100644 +index e164b1e..607e26f 100644 --- a/po/w3m.pot +++ b/po/w3m.pot -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Fumitoshi UKAI +-# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE w3m'S COPYRIGHT HOLDER - # This file is distributed under the same license as the PACKAGE package. ++# This file is distributed under the same license as the w3m package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # + #, fuzzy @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: w3m 0.5.3\n" "Report-Msgid-Bugs-To: satodai@w3m.jp\n" -"POT-Creation-Date: 2010-08-20 18:44+0900\n" -+"POT-Creation-Date: 2015-04-29 16:18+0900\n" ++"POT-Creation-Date: 2016-03-14 19:47+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" -@@ -89,783 +89,791 @@ msgstr "" +@@ -17,855 +17,887 @@ msgstr "" + "Content-Type: text/plain; charset=CHARSET\n" + "Content-Transfer-Encoding: 8bit\n" + +-#: menu.c:267 ++#: menu.c:269 + msgid " Back (b) " + msgstr "" + +-#: menu.c:268 ++#: menu.c:270 + msgid " Select Buffer(s) " + msgstr "" + +-#: menu.c:270 ++#: menu.c:272 + msgid " Select Tab (t) " + msgstr "" + +-#: menu.c:272 ++#: menu.c:274 + msgid " View Source (v) " + msgstr "" + +-#: menu.c:273 ++#: menu.c:275 + msgid " Edit Source (e) " + msgstr "" + +-#: menu.c:274 ++#: menu.c:276 + msgid " Save Source (S) " + msgstr "" + +-#: menu.c:275 ++#: menu.c:277 + msgid " Reload (r) " + msgstr "" + +-#: menu.c:276 menu.c:283 menu.c:287 ++#: menu.c:278 menu.c:285 menu.c:289 + msgid " ---------------- " + msgstr "" + +-#: menu.c:277 ++#: menu.c:279 + msgid " Go Link (a) " + msgstr "" + +-#: menu.c:278 ++#: menu.c:280 + msgid " on New Tab (n) " + msgstr "" + +-#: menu.c:279 ++#: menu.c:281 + msgid " Save Link (A) " + msgstr "" + +-#: menu.c:280 ++#: menu.c:282 + msgid " View Image (i) " + msgstr "" + +-#: menu.c:281 ++#: menu.c:283 + msgid " Save Image (I) " + msgstr "" + +-#: menu.c:282 ++#: menu.c:284 + msgid " View Frame (f) " + msgstr "" + +-#: menu.c:284 ++#: menu.c:286 + msgid " Bookmark (B) " + msgstr "" + +-#: menu.c:285 ++#: menu.c:287 + msgid " Help (h) " + msgstr "" + +-#: menu.c:286 ++#: menu.c:288 + msgid " Option (o) " + msgstr "" + +-#: menu.c:288 ++#: menu.c:290 msgid " Quit (q) " msgstr "" @@ -12414,633 +17725,660 @@ index e164b1e..b277bb9 100644 msgstr "" -#: rc.c:143 +-msgid "External Browser" +#: rc.c:146 - msgid "External Browser" ++msgid "External browser" msgstr "" -#: rc.c:144 +-msgid "Second External Browser" +#: rc.c:147 - msgid "Second External Browser" ++msgid "2nd external browser" msgstr "" -#: rc.c:145 +-msgid "Third External Browser" +#: rc.c:148 - msgid "Third External Browser" ++msgid "3rd external browser" msgstr "" -#: rc.c:146 +#: rc.c:149 ++msgid "4th external browser" ++msgstr "" ++ ++#: rc.c:150 ++msgid "5th external browser" ++msgstr "" ++ ++#: rc.c:151 ++msgid "6th external browser" ++msgstr "" ++ ++#: rc.c:152 ++msgid "7th external browser" ++msgstr "" ++ ++#: rc.c:153 ++msgid "8th external browser" ++msgstr "" ++ ++#: rc.c:154 ++msgid "9th external browser" ++msgstr "" ++ ++#: rc.c:155 msgid "Disable secret file security check" msgstr "" -#: rc.c:147 -+#: rc.c:150 ++#: rc.c:156 msgid "Password file" msgstr "" -#: rc.c:148 -+#: rc.c:151 ++#: rc.c:157 msgid "File for setting form on loading" msgstr "" -#: rc.c:149 -+#: rc.c:152 ++#: rc.c:158 +msgid "File for preferences for each site" +msgstr "" + -+#: rc.c:153 ++#: rc.c:159 msgid "Password for anonymous FTP (your mail address)" msgstr "" -#: rc.c:150 -+#: rc.c:154 ++#: rc.c:160 msgid "Generate domain part of password for FTP" msgstr "" -#: rc.c:151 -+#: rc.c:155 ++#: rc.c:161 msgid "User-Agent identification string" msgstr "" -#: rc.c:152 -+#: rc.c:156 ++#: rc.c:162 msgid "Accept-Encoding header" msgstr "" -#: rc.c:153 -+#: rc.c:157 ++#: rc.c:163 msgid "Accept header" msgstr "" -#: rc.c:154 -+#: rc.c:158 ++#: rc.c:164 msgid "Accept-Language header" msgstr "" -#: rc.c:155 -+#: rc.c:159 ++#: rc.c:165 msgid "Treat URL-like strings as links in all pages" msgstr "" -#: rc.c:156 -+#: rc.c:160 ++#: rc.c:166 msgid "Wrap search" msgstr "" -#: rc.c:157 -+#: rc.c:161 ++#: rc.c:167 msgid "Display unseen objects (e.g. bgimage tag)" msgstr "" -#: rc.c:158 -+#: rc.c:162 ++#: rc.c:168 msgid "Uncompress compressed data automatically when downloading" msgstr "" -#: rc.c:160 -+#: rc.c:164 ++#: rc.c:170 msgid "Run external viewer in a separate session" msgstr "" -#: rc.c:162 -+#: rc.c:166 ++#: rc.c:172 msgid "Run external viewer in the background" msgstr "" -#: rc.c:164 -+#: rc.c:168 ++#: rc.c:174 msgid "Use external program for directory listing" msgstr "" -#: rc.c:165 -+#: rc.c:169 ++#: rc.c:175 msgid "URL of directory listing command" msgstr "" -#: rc.c:167 -+#: rc.c:171 ++#: rc.c:177 msgid "Enable dictionary lookup through CGI" msgstr "" -#: rc.c:168 -+#: rc.c:172 ++#: rc.c:178 msgid "URL of dictionary lookup command" msgstr "" -#: rc.c:170 -+#: rc.c:174 ++#: rc.c:180 msgid "Display link name for images lacking ALT" msgstr "" -#: rc.c:171 -+#: rc.c:175 ++#: rc.c:181 msgid "Index file for directories" msgstr "" -#: rc.c:172 -+#: rc.c:176 ++#: rc.c:182 msgid "Prepend http:// to URL automatically" msgstr "" -#: rc.c:173 -+#: rc.c:177 ++#: rc.c:183 msgid "Default value for open-URL command" msgstr "" -#: rc.c:174 -+#: rc.c:178 ++#: rc.c:184 msgid "Decode Content-Transfer-Encoding when saving" msgstr "" -#: rc.c:175 -+#: rc.c:179 ++#: rc.c:185 msgid "Preserve timestamp when saving" msgstr "" -#: rc.c:177 -+#: rc.c:181 ++#: rc.c:187 msgid "Enable mouse" msgstr "" -#: rc.c:178 -+#: rc.c:182 ++#: rc.c:188 msgid "Scroll in reverse direction of mouse drag" msgstr "" -#: rc.c:179 -+#: rc.c:183 ++#: rc.c:189 msgid "Behavior of wheel scroll speed" msgstr "" -#: rc.c:180 -+#: rc.c:184 ++#: rc.c:190 msgid "(A only)Scroll by # (%) of screen" msgstr "" -#: rc.c:181 -+#: rc.c:185 ++#: rc.c:191 msgid "(B only)Scroll by # lines" msgstr "" -#: rc.c:183 -+#: rc.c:187 ++#: rc.c:193 msgid "Free memory of undisplayed buffers" msgstr "" -#: rc.c:184 -+#: rc.c:188 ++#: rc.c:194 msgid "Suppress `Referer:' header" msgstr "" -#: rc.c:185 -+#: rc.c:189 ++#: rc.c:195 msgid "Search case-insensitively" msgstr "" -#: rc.c:186 -+#: rc.c:190 ++#: rc.c:196 msgid "Use LESSOPEN" msgstr "" -#: rc.c:189 -+#: rc.c:193 ++#: rc.c:199 msgid "Perform SSL server verification" msgstr "" -#: rc.c:190 -+#: rc.c:194 ++#: rc.c:200 msgid "PEM encoded certificate file of client" msgstr "" -#: rc.c:191 -+#: rc.c:195 ++#: rc.c:201 msgid "PEM encoded private key file of client" msgstr "" -#: rc.c:192 -+#: rc.c:196 ++#: rc.c:202 msgid "Path to directory for PEM encoded certificates of CAs" msgstr "" -#: rc.c:193 -+#: rc.c:197 ++#: rc.c:203 msgid "File consisting of PEM encoded certificates of CAs" msgstr "" -#: rc.c:195 -+#: rc.c:199 ++#: rc.c:205 msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)" msgstr "" -#: rc.c:198 -+#: rc.c:202 ++#: rc.c:208 msgid "Enable cookie processing" msgstr "" -#: rc.c:199 -+#: rc.c:203 ++#: rc.c:209 msgid "Print a message when receiving a cookie" msgstr "" -#: rc.c:200 -+#: rc.c:204 ++#: rc.c:210 msgid "Accept cookies" msgstr "" -#: rc.c:201 -+#: rc.c:205 ++#: rc.c:211 msgid "Action to be taken on invalid cookie" msgstr "" -#: rc.c:202 -+#: rc.c:206 ++#: rc.c:212 msgid "Domains to reject cookies from" msgstr "" -#: rc.c:203 -+#: rc.c:207 ++#: rc.c:213 msgid "Domains to accept cookies from" msgstr "" -#: rc.c:204 -+#: rc.c:208 ++#: rc.c:214 msgid "Domains to avoid [wrong number of dots]" msgstr "" -#: rc.c:206 -+#: rc.c:210 ++#: rc.c:216 msgid "Number of redirections to follow" msgstr "" -#: rc.c:207 -+#: rc.c:211 ++#: rc.c:217 msgid "Enable processing of meta-refresh tag" msgstr "" -#: rc.c:210 -+#: rc.c:214 ++#: rc.c:220 msgid "Enable Migemo (Roma-ji search)" msgstr "" -#: rc.c:211 -+#: rc.c:215 ++#: rc.c:221 msgid "Migemo command" msgstr "" -#: rc.c:215 -+#: rc.c:219 ++#: rc.c:225 msgid "Display charset" msgstr "" -#: rc.c:216 -+#: rc.c:220 ++#: rc.c:226 msgid "Default document charset" msgstr "" -#: rc.c:217 -+#: rc.c:221 ++#: rc.c:227 msgid "Automatic charset detect when loading" msgstr "" -#: rc.c:218 -+#: rc.c:222 ++#: rc.c:228 msgid "System charset" msgstr "" -#: rc.c:219 -+#: rc.c:223 ++#: rc.c:229 msgid "System charset follows locale(LC_CTYPE)" msgstr "" -#: rc.c:220 -+#: rc.c:224 ++#: rc.c:230 msgid "Output halfdump with display charset" msgstr "" -#: rc.c:221 -+#: rc.c:225 ++#: rc.c:231 msgid "Use multi column characters" msgstr "" -#: rc.c:222 -+#: rc.c:226 ++#: rc.c:232 msgid "Use combining characters" msgstr "" -#: rc.c:223 -+#: rc.c:227 ++#: rc.c:233 msgid "Use double width for some Unicode characters" msgstr "" -#: rc.c:224 -+#: rc.c:228 ++#: rc.c:234 msgid "Use Unicode language tags" msgstr "" -#: rc.c:225 -+#: rc.c:229 ++#: rc.c:235 msgid "Charset conversion using Unicode map" msgstr "" -#: rc.c:226 -+#: rc.c:230 ++#: rc.c:236 msgid "Charset conversion when loading" msgstr "" -#: rc.c:227 -+#: rc.c:231 ++#: rc.c:237 msgid "Adjust search string for document charset" msgstr "" -#: rc.c:228 -+#: rc.c:232 ++#: rc.c:238 msgid "Fix character width when conversion" msgstr "" -#: rc.c:229 -+#: rc.c:233 ++#: rc.c:239 msgid "Use GB 12345 Unicode map instead of GB 2312's" msgstr "" -#: rc.c:230 -+#: rc.c:234 ++#: rc.c:240 msgid "Use JIS X 0201 Roman for ISO-2022-JP" msgstr "" -#: rc.c:231 -+#: rc.c:235 ++#: rc.c:241 msgid "Use JIS C 6226:1978 for ISO-2022-JP" msgstr "" -#: rc.c:232 -+#: rc.c:236 ++#: rc.c:242 msgid "Use JIS X 0201 Katakana" msgstr "" -#: rc.c:233 -+#: rc.c:237 ++#: rc.c:243 msgid "Use JIS X 0212:1990 (Supplemental Kanji)" msgstr "" -#: rc.c:234 -+#: rc.c:238 ++#: rc.c:244 msgid "Use JIS X 0213:2000 (2000JIS)" msgstr "" -#: rc.c:235 -+#: rc.c:239 ++#: rc.c:245 msgid "Strict ISO-2022-JP/KR/CN" msgstr "" -#: rc.c:236 -+#: rc.c:240 ++#: rc.c:246 msgid "Treat 4 bytes char. of GB18030 as Unicode" msgstr "" -#: rc.c:237 -+#: rc.c:241 ++#: rc.c:247 msgid "Simple Preserve space" msgstr "" -#: rc.c:240 -+#: rc.c:244 ++#: rc.c:250 msgid "keymap file" msgstr "" -#: rc.c:257 -+#: rc.c:261 ++#: rc.c:267 msgid "black" msgstr "" -#: rc.c:258 -+#: rc.c:262 ++#: rc.c:268 msgid "red" msgstr "" -#: rc.c:259 -+#: rc.c:263 ++#: rc.c:269 msgid "green" msgstr "" -#: rc.c:260 -+#: rc.c:264 ++#: rc.c:270 msgid "yellow" msgstr "" -#: rc.c:261 -+#: rc.c:265 ++#: rc.c:271 msgid "blue" msgstr "" -#: rc.c:262 -+#: rc.c:266 ++#: rc.c:272 msgid "magenta" msgstr "" -#: rc.c:263 -+#: rc.c:267 ++#: rc.c:273 msgid "cyan" msgstr "" -#: rc.c:264 -+#: rc.c:268 ++#: rc.c:274 msgid "white" msgstr "" -#: rc.c:265 -+#: rc.c:269 ++#: rc.c:275 msgid "terminal" msgstr "" -#: rc.c:284 -+#: rc.c:288 ++#: rc.c:294 msgid "none" msgstr "" -#: rc.c:285 -+#: rc.c:289 ++#: rc.c:295 msgid "current URL" msgstr "" -#: rc.c:286 -+#: rc.c:290 ++#: rc.c:296 msgid "link URL" msgstr "" -#: rc.c:291 -+#: rc.c:295 ++#: rc.c:301 msgid "simple" msgstr "" -#: rc.c:292 -+#: rc.c:296 ++#: rc.c:302 msgid "use tag" msgstr "" -#: rc.c:293 -+#: rc.c:297 ++#: rc.c:303 msgid "fontify" msgstr "" -#: rc.c:299 -+#: rc.c:303 ++#: rc.c:309 msgid "A:relative to screen height" msgstr "" -#: rc.c:300 -+#: rc.c:304 ++#: rc.c:310 msgid "B:fixed speed" msgstr "" -#: rc.c:307 -+#: rc.c:311 ++#: rc.c:317 msgid "unspecified" msgstr "" -#: rc.c:308 -+#: rc.c:312 ++#: rc.c:318 msgid "inet inet6" msgstr "" -#: rc.c:309 -+#: rc.c:313 ++#: rc.c:319 msgid "inet6 inet" msgstr "" -#: rc.c:310 -+#: rc.c:314 ++#: rc.c:320 msgid "inet only" msgstr "" -#: rc.c:311 -+#: rc.c:315 ++#: rc.c:321 msgid "inet6 only" msgstr "" -#: rc.c:318 -+#: rc.c:322 ++#: rc.c:328 msgid "discard" msgstr "" -#: rc.c:320 -+#: rc.c:324 ++#: rc.c:330 msgid "accept" msgstr "" -#: rc.c:322 -+#: rc.c:326 ++#: rc.c:332 msgid "ask" msgstr "" -#: rc.c:329 -+#: rc.c:333 ++#: rc.c:339 msgid "use internal mailer instead" msgstr "" -#: rc.c:331 -+#: rc.c:335 ++#: rc.c:341 msgid "ignore options and use only the address" msgstr "" -#: rc.c:332 -+#: rc.c:336 ++#: rc.c:342 msgid "use full mailto URL" msgstr "" -#: rc.c:341 -+#: rc.c:345 ++#: rc.c:351 msgid "OFF" msgstr "" -#: rc.c:342 -+#: rc.c:346 ++#: rc.c:352 msgid "Only ISO 2022" msgstr "" -#: rc.c:343 -+#: rc.c:347 ++#: rc.c:353 msgid "ON" msgstr "" -#: rc.c:349 -+#: rc.c:353 ++#: rc.c:359 msgid "ASCII" msgstr "" -#: rc.c:350 -+#: rc.c:354 ++#: rc.c:360 msgid "charset specific" msgstr "" -#: rc.c:351 -+#: rc.c:355 ++#: rc.c:361 msgid "DEC special graphics" msgstr "" -#: rc.c:714 -+#: rc.c:722 ++#: rc.c:740 msgid "Display Settings" msgstr "" -#: rc.c:716 -+#: rc.c:724 ++#: rc.c:742 msgid "Color Settings" msgstr "" -#: rc.c:718 -+#: rc.c:726 ++#: rc.c:744 msgid "Miscellaneous Settings" msgstr "" -#: rc.c:719 -+#: rc.c:727 ++#: rc.c:745 msgid "Directory Settings" msgstr "" -#: rc.c:720 -+#: rc.c:728 ++#: rc.c:746 msgid "External Program Settings" msgstr "" -#: rc.c:721 -+#: rc.c:729 ++#: rc.c:747 msgid "Network Settings" msgstr "" -#: rc.c:722 -+#: rc.c:730 ++#: rc.c:748 msgid "Proxy Settings" msgstr "" -#: rc.c:724 -+#: rc.c:732 ++#: rc.c:750 msgid "SSL Settings" msgstr "" -#: rc.c:727 -+#: rc.c:735 ++#: rc.c:753 msgid "Cookie Settings" msgstr "" -#: rc.c:730 -+#: rc.c:738 ++#: rc.c:756 msgid "Charset Settings" msgstr "" -@@ -874,6 +882,6 @@ msgstr "" +@@ -874,6 +906,6 @@ msgstr "" #. * header. For example, ja.po should translate it as #. * "ja;q=1.0, en;q=0.5" like that. #. -#: rc.c:1209 -+#: rc.c:1220 ++#: rc.c:1238 msgid "en;q=1.0" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 -index 0000000..a9215c0 +index 0000000..8cfa8fd --- /dev/null +++ b/po/zh_CN.po -@@ -0,0 +1,892 @@ +@@ -0,0 +1,916 @@ +# zh_CN translation for w3m +# Copyright (C) YEAR THE w3m'S COPYRIGHT HOLDER +# This file is distributed under the same license as the w3m package. @@ -13054,9 +18392,9 @@ index 0000000..a9215c0 +msgstr "" +"Project-Id-Version: w3m 0.5.3\n" +"Report-Msgid-Bugs-To: satodai@w3m.jp\n" -+"POT-Creation-Date: 2015-04-29 16:18+0900\n" -+"PO-Revision-Date: 2015-11-10 18:58-0500\n" -+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n" ++"POT-Creation-Date: 2016-03-14 19:47+0900\n" ++"PO-Revision-Date: 2016-03-14 19:51+0900\n" ++"Last-Translator: Tatsuya Kinoshita <tats@debian.org>\n" +"Language-Team: AOSC zh_CN <aosc@members.fsf.org>\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" @@ -13065,75 +18403,75 @@ index 0000000..a9215c0 +"X-Generator: Poedit 1.8.6\n" +"Plural-Forms: nplurals=1; plural=0;\n" + -+#: menu.c:267 ++#: menu.c:269 +msgid " Back (b) " +msgstr " 后退 (b) " + -+#: menu.c:268 ++#: menu.c:270 +msgid " Select Buffer(s) " +msgstr " 选择缓冲区 " + -+#: menu.c:270 ++#: menu.c:272 +msgid " Select Tab (t) " +msgstr " 选择标签 (t) " + -+#: menu.c:272 ++#: menu.c:274 +msgid " View Source (v) " +msgstr " 查看源码 (v) " + -+#: menu.c:273 ++#: menu.c:275 +msgid " Edit Source (e) " +msgstr " 修改源码 (e) " + -+#: menu.c:274 ++#: menu.c:276 +msgid " Save Source (S) " +msgstr " 保存源码 (S) " + -+#: menu.c:275 ++#: menu.c:277 +msgid " Reload (r) " +msgstr " 重新载入 (r) " + -+#: menu.c:276 menu.c:283 menu.c:287 ++#: menu.c:278 menu.c:285 menu.c:289 +msgid " ---------------- " +msgstr " ---------------- " + -+#: menu.c:277 ++#: menu.c:279 +msgid " Go Link (a) " +msgstr " 转到链接 (a) " + -+#: menu.c:278 ++#: menu.c:280 +msgid " on New Tab (n) " +msgstr " 在新标签 (n) " + -+#: menu.c:279 ++#: menu.c:281 +msgid " Save Link (A) " +msgstr " 保存链接 (A) " + -+#: menu.c:280 ++#: menu.c:282 +msgid " View Image (i) " +msgstr " 查看图片 (i) " + -+#: menu.c:281 ++#: menu.c:283 +msgid " Save Image (I) " +msgstr " 保存图片 (I) " + -+#: menu.c:282 ++#: menu.c:284 +msgid " View Frame (f) " +msgstr " 查看框架 (f) " + -+#: menu.c:284 ++#: menu.c:286 +msgid " Bookmark (B) " +msgstr " 书签 (B) " + -+#: menu.c:285 ++#: menu.c:287 +msgid " Help (h) " +msgstr " 帮助 (h) " + -+#: menu.c:286 ++#: menu.c:288 +msgid " Option (o) " +msgstr " 选项 (o) " + -+#: menu.c:288 ++#: menu.c:290 +msgid " Quit (q) " +msgstr " 退出 (q) " + @@ -13434,494 +18772,518 @@ index 0000000..a9215c0 +msgstr "启动 mailto 地址时调用电子邮件程序的方式和参数" + +#: rc.c:146 -+msgid "External Browser" ++msgid "External browser" +msgstr "外部浏览器" + +#: rc.c:147 -+msgid "Second External Browser" -+msgstr "第二外部浏览器 " ++msgid "2nd external browser" ++msgstr "第二外部浏览器" + +#: rc.c:148 -+msgid "Third External Browser" ++msgid "3rd external browser" +msgstr "第三外部浏览器" + +#: rc.c:149 ++msgid "4th external browser" ++msgstr "第四外部浏览器" ++ ++#: rc.c:150 ++msgid "5th external browser" ++msgstr "第五外部浏览器" ++ ++#: rc.c:151 ++msgid "6th external browser" ++msgstr "第六外部浏览器" ++ ++#: rc.c:152 ++msgid "7th external browser" ++msgstr "第七外部浏览器" ++ ++#: rc.c:153 ++msgid "8th external browser" ++msgstr "第八外部浏览器" ++ ++#: rc.c:154 ++msgid "9th external browser" ++msgstr "第九外部浏览器" ++ ++#: rc.c:155 +msgid "Disable secret file security check" +msgstr "关闭秘密文件安全检查" + -+#: rc.c:150 ++#: rc.c:156 +msgid "Password file" +msgstr "密码文件" + -+#: rc.c:151 ++#: rc.c:157 +msgid "File for setting form on loading" +msgstr "设置窗口加载时的文件" + -+#: rc.c:152 ++#: rc.c:158 +msgid "File for preferences for each site" +msgstr "各个站点的首选项文件" + -+#: rc.c:153 ++#: rc.c:159 +msgid "Password for anonymous FTP (your mail address)" +msgstr "匿名FTP密码（您的邮箱地址）" + -+#: rc.c:154 ++#: rc.c:160 +msgid "Generate domain part of password for FTP" +msgstr "为 FTP 生成密码的域部分" + -+#: rc.c:155 ++#: rc.c:161 +msgid "User-Agent identification string" +msgstr "User-Agent 串" + -+#: rc.c:156 ++#: rc.c:162 +msgid "Accept-Encoding header" +msgstr "接受的编码 (Accept-Encoding) 报头" + -+#: rc.c:157 ++#: rc.c:163 +msgid "Accept header" +msgstr "接受 (Accept) 报头" + -+#: rc.c:158 ++#: rc.c:164 +msgid "Accept-Language header" +msgstr "接受的语言 (Accept-Language) 报头" + -+#: rc.c:159 ++#: rc.c:165 +msgid "Treat URL-like strings as links in all pages" +msgstr "将所有页面中类似于 URL 的字符串当做链接" + -+#: rc.c:160 ++#: rc.c:166 +msgid "Wrap search" +msgstr "包装搜索结果" + -+#: rc.c:161 ++#: rc.c:167 +msgid "Display unseen objects (e.g. bgimage tag)" +msgstr "显示看不到的对象 （例如，bdimage标签）" + -+#: rc.c:162 ++#: rc.c:168 +msgid "Uncompress compressed data automatically when downloading" +msgstr "在下载时自动解压被压缩的数据" + -+#: rc.c:164 ++#: rc.c:170 +msgid "Run external viewer in a separate session" +msgstr "在另一个会话中运行外部查看器" + -+#: rc.c:166 ++#: rc.c:172 +msgid "Run external viewer in the background" +msgstr "在后台运行外部查看器" + -+#: rc.c:168 ++#: rc.c:174 +msgid "Use external program for directory listing" +msgstr "使用外部程序列出目录" + -+#: rc.c:169 ++#: rc.c:175 +msgid "URL of directory listing command" +msgstr "目录列表命令的网址" + -+#: rc.c:171 ++#: rc.c:177 +msgid "Enable dictionary lookup through CGI" +msgstr "启用基于 CGI 的词典查询" + -+#: rc.c:172 ++#: rc.c:178 +msgid "URL of dictionary lookup command" +msgstr "字典查找命令的网址" + -+#: rc.c:174 ++#: rc.c:180 +msgid "Display link name for images lacking ALT" +msgstr "对缺少 ALT 的图片显示链接名称" + -+#: rc.c:175 ++#: rc.c:181 +msgid "Index file for directories" +msgstr "目录的索引文件" + -+#: rc.c:176 ++#: rc.c:182 +msgid "Prepend http:// to URL automatically" +msgstr "自动在 URL 前加入 http://" + -+#: rc.c:177 ++#: rc.c:183 +msgid "Default value for open-URL command" +msgstr "打开网址命令的默认值" + -+#: rc.c:178 ++#: rc.c:184 +msgid "Decode Content-Transfer-Encoding when saving" +msgstr "保存时对内容传输编码信息 (Content-Transfer-Encoding) 进行解码" + -+#: rc.c:179 ++#: rc.c:185 +msgid "Preserve timestamp when saving" +msgstr "在保存时保留时间戳" + -+#: rc.c:181 ++#: rc.c:187 +msgid "Enable mouse" +msgstr "启用鼠标" + -+#: rc.c:182 ++#: rc.c:188 +msgid "Scroll in reverse direction of mouse drag" +msgstr "向鼠标拖动的反方向滚动" + -+#: rc.c:183 ++#: rc.c:189 +msgid "Behavior of wheel scroll speed" +msgstr "滚轮滚动速度行为" + -+#: rc.c:184 ++#: rc.c:190 +msgid "(A only)Scroll by # (%) of screen" +msgstr "(仅 A) 每次滚动 # (%) 的屏幕高度" + -+#: rc.c:185 ++#: rc.c:191 +msgid "(B only)Scroll by # lines" +msgstr "(仅 B) 每次滚动 # 行" + -+#: rc.c:187 ++#: rc.c:193 +msgid "Free memory of undisplayed buffers" +msgstr "释放未显示缓存的存储" + -+#: rc.c:188 ++#: rc.c:194 +msgid "Suppress `Referer:' header" +msgstr "禁止 'Referer:' 文件头" + -+#: rc.c:189 ++#: rc.c:195 +msgid "Search case-insensitively" +msgstr "搜索不区分大小写" + -+#: rc.c:190 ++#: rc.c:196 +msgid "Use LESSOPEN" +msgstr "使用 LESSOPEN" + -+#: rc.c:193 ++#: rc.c:199 +msgid "Perform SSL server verification" +msgstr "进行 SSL 服务器检查" + -+#: rc.c:194 ++#: rc.c:200 +msgid "PEM encoded certificate file of client" +msgstr "客户端的 PEM 编码证书文件" + -+#: rc.c:195 ++#: rc.c:201 +msgid "PEM encoded private key file of client" +msgstr "客户端的 PEM 编码私钥文件" + -+#: rc.c:196 ++#: rc.c:202 +msgid "Path to directory for PEM encoded certificates of CAs" +msgstr "PEM 编码 CA 证书目录的路径" + -+#: rc.c:197 ++#: rc.c:203 +msgid "File consisting of PEM encoded certificates of CAs" +msgstr "包含 PEM 编码 CA 证书的文件" + -+#: rc.c:199 ++#: rc.c:205 +msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)" +msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t:TLSv1)" + -+#: rc.c:202 ++#: rc.c:208 +msgid "Enable cookie processing" +msgstr "开启 Cookie 处理" + -+#: rc.c:203 ++#: rc.c:209 +msgid "Print a message when receiving a cookie" +msgstr "在接收一个 Cookie 时显示一个消息" + -+#: rc.c:204 ++#: rc.c:210 +msgid "Accept cookies" +msgstr "接受 Cookies" + -+#: rc.c:205 ++#: rc.c:211 +msgid "Action to be taken on invalid cookie" +msgstr "对无效 Cookies 进行的操作" + -+#: rc.c:206 ++#: rc.c:212 +msgid "Domains to reject cookies from" +msgstr "拒绝如下域的 Cookies" + -+#: rc.c:207 ++#: rc.c:213 +msgid "Domains to accept cookies from" +msgstr "接受如下域的 Cookies" + -+#: rc.c:208 ++#: rc.c:214 +msgid "Domains to avoid [wrong number of dots]" +msgstr "避免访问的域 [错误的点数]" + -+#: rc.c:210 ++#: rc.c:216 +msgid "Number of redirections to follow" +msgstr "跟随的重定向数量" + -+#: rc.c:211 ++#: rc.c:217 +msgid "Enable processing of meta-refresh tag" +msgstr "开启 meta-refresh 标签处理" + -+#: rc.c:214 ++#: rc.c:220 +msgid "Enable Migemo (Roma-ji search)" +msgstr "开启 Migemo (罗马字搜索)" + -+#: rc.c:215 ++#: rc.c:221 +msgid "Migemo command" +msgstr "Migemo 命令" + -+#: rc.c:219 ++#: rc.c:225 +msgid "Display charset" +msgstr "显示字符集" + -+#: rc.c:220 ++#: rc.c:226 +msgid "Default document charset" +msgstr "默认文档字符集" + -+#: rc.c:221 ++#: rc.c:227 +msgid "Automatic charset detect when loading" +msgstr "在载入时进行自动字符集探测" + -+#: rc.c:222 ++#: rc.c:228 +msgid "System charset" +msgstr "系统字符集" + -+#: rc.c:223 ++#: rc.c:229 +msgid "System charset follows locale(LC_CTYPE)" +msgstr "根据系统设置 (LC_CTYPE) 选定系统字符集" + -+#: rc.c:224 ++#: rc.c:230 +msgid "Output halfdump with display charset" +msgstr "使用显示字符集输出 halfdump" + -+#: rc.c:225 ++#: rc.c:231 +msgid "Use multi column characters" +msgstr "使用多列字符" + -+#: rc.c:226 ++#: rc.c:232 +msgid "Use combining characters" +msgstr "使用合并字符" + -+#: rc.c:227 ++#: rc.c:233 +msgid "Use double width for some Unicode characters" +msgstr "使 Unicode 字符使用双重宽度" + -+#: rc.c:228 ++#: rc.c:234 +msgid "Use Unicode language tags" +msgstr "使用 Unicode 语言标签" + -+#: rc.c:229 ++#: rc.c:235 +msgid "Charset conversion using Unicode map" +msgstr "使用 Unicode 映射进行字符集转换" + -+#: rc.c:230 ++#: rc.c:236 +msgid "Charset conversion when loading" +msgstr "在载入时进行字符集转换" + -+#: rc.c:231 ++#: rc.c:237 +msgid "Adjust search string for document charset" +msgstr "调整文档字符集的搜索字串" + -+#: rc.c:232 ++#: rc.c:238 +msgid "Fix character width when conversion" +msgstr "在转换时固定字符宽度" + -+#: rc.c:233 ++#: rc.c:239 +msgid "Use GB 12345 Unicode map instead of GB 2312's" +msgstr "使用 GB 12345 Unicode 映射而非 GB 2312" + -+#: rc.c:234 ++#: rc.c:240 +msgid "Use JIS X 0201 Roman for ISO-2022-JP" +msgstr "使用 JIS X 0201 罗马字母于 ISO-2022-JP" + -+#: rc.c:235 ++#: rc.c:241 +msgid "Use JIS C 6226:1978 for ISO-2022-JP" +msgstr "使用 JIS C 6226:1978 于 ISO-2022-JP" + -+#: rc.c:236 ++#: rc.c:242 +msgid "Use JIS X 0201 Katakana" +msgstr "使用 JIS X 0201 片假名" + -+#: rc.c:237 ++#: rc.c:243 +msgid "Use JIS X 0212:1990 (Supplemental Kanji)" +msgstr "使用 JIS X 0212:1990 (补充汉字)" + -+#: rc.c:238 ++#: rc.c:244 +msgid "Use JIS X 0213:2000 (2000JIS)" +msgstr "使用 JIS X 0213:2000 (2000JIS)" + -+#: rc.c:239 ++#: rc.c:245 +msgid "Strict ISO-2022-JP/KR/CN" +msgstr "严格 ISO-2022-JP/KR/CN" + -+#: rc.c:240 ++#: rc.c:246 +msgid "Treat 4 bytes char. of GB18030 as Unicode" +msgstr "视 GB18030 编码的 4 字节字符为 Unicode" + -+#: rc.c:241 ++#: rc.c:247 +msgid "Simple Preserve space" +msgstr "简单的保留空间" + -+#: rc.c:244 ++#: rc.c:250 +msgid "keymap file" +msgstr "键盘映射文件" + -+#: rc.c:261 ++#: rc.c:267 +msgid "black" +msgstr "黑色" + -+#: rc.c:262 ++#: rc.c:268 +msgid "red" +msgstr "红色" + -+#: rc.c:263 ++#: rc.c:269 +msgid "green" +msgstr "绿色" + -+#: rc.c:264 ++#: rc.c:270 +msgid "yellow" +msgstr "黄色" + -+#: rc.c:265 ++#: rc.c:271 +msgid "blue" +msgstr "蓝色" + -+#: rc.c:266 ++#: rc.c:272 +msgid "magenta" +msgstr "品红" + -+#: rc.c:267 ++#: rc.c:273 +msgid "cyan" +msgstr "青色" + -+#: rc.c:268 ++#: rc.c:274 +msgid "white" +msgstr "白色" + -+#: rc.c:269 ++#: rc.c:275 +msgid "terminal" +msgstr "终端" + -+#: rc.c:288 ++#: rc.c:294 +msgid "none" +msgstr "无" + -+#: rc.c:289 ++#: rc.c:295 +msgid "current URL" +msgstr "当前 URL" + -+#: rc.c:290 ++#: rc.c:296 +msgid "link URL" +msgstr "链接 URL" + -+#: rc.c:295 ++#: rc.c:301 +msgid "simple" +msgstr "简单" + -+#: rc.c:296 ++#: rc.c:302 +msgid "use tag" +msgstr "使用标签" + -+#: rc.c:297 ++#: rc.c:303 +msgid "fontify" +msgstr "" + -+#: rc.c:303 ++#: rc.c:309 +msgid "A:relative to screen height" +msgstr "A:相对于屏幕高度" + -+#: rc.c:304 ++#: rc.c:310 +msgid "B:fixed speed" +msgstr "B:固定速度" + -+#: rc.c:311 ++#: rc.c:317 +msgid "unspecified" +msgstr "未指定" + -+#: rc.c:312 ++#: rc.c:318 +msgid "inet inet6" +msgstr "" + -+#: rc.c:313 ++#: rc.c:319 +msgid "inet6 inet" +msgstr "" + -+#: rc.c:314 ++#: rc.c:320 +msgid "inet only" +msgstr "仅 inet" + -+#: rc.c:315 ++#: rc.c:321 +msgid "inet6 only" +msgstr "仅 inet6" + -+#: rc.c:322 ++#: rc.c:328 +msgid "discard" +msgstr "丢弃" + -+#: rc.c:324 ++#: rc.c:330 +msgid "accept" +msgstr "接受" + -+#: rc.c:326 ++#: rc.c:332 +msgid "ask" +msgstr "询问" + -+#: rc.c:333 ++#: rc.c:339 +msgid "use internal mailer instead" +msgstr "使用内建邮件发送器" + -+#: rc.c:335 ++#: rc.c:341 +msgid "ignore options and use only the address" +msgstr "忽略选项而只使用地址" + -+#: rc.c:336 ++#: rc.c:342 +msgid "use full mailto URL" +msgstr "使用整个 mailto URL" + -+#: rc.c:345 ++#: rc.c:351 +msgid "OFF" +msgstr "关" + -+#: rc.c:346 ++#: rc.c:352 +msgid "Only ISO 2022" +msgstr "仅 ISO 2022" + -+#: rc.c:347 ++#: rc.c:353 +msgid "ON" +msgstr "开" + -+#: rc.c:353 ++#: rc.c:359 +msgid "ASCII" +msgstr "ASCII" + -+#: rc.c:354 ++#: rc.c:360 +msgid "charset specific" +msgstr "字符集特定" + -+#: rc.c:355 ++#: rc.c:361 +msgid "DEC special graphics" +msgstr "DEC 特殊图像" + -+#: rc.c:722 ++#: rc.c:740 +msgid "Display Settings" +msgstr "显示设置" + -+#: rc.c:724 ++#: rc.c:742 +msgid "Color Settings" +msgstr "颜色设置" + -+#: rc.c:726 ++#: rc.c:744 +msgid "Miscellaneous Settings" +msgstr "杂项设置" + -+#: rc.c:727 ++#: rc.c:745 +msgid "Directory Settings" +msgstr "目录设置" + -+#: rc.c:728 ++#: rc.c:746 +msgid "External Program Settings" +msgstr "外部程序设置" + -+#: rc.c:729 ++#: rc.c:747 +msgid "Network Settings" +msgstr "网络设置" + -+#: rc.c:730 ++#: rc.c:748 +msgid "Proxy Settings" +msgstr "代理设置" + -+#: rc.c:732 ++#: rc.c:750 +msgid "SSL Settings" +msgstr "SSL 设置" + -+#: rc.c:735 ++#: rc.c:753 +msgid "Cookie Settings" +msgstr "Cookie 设置" + -+#: rc.c:738 ++#: rc.c:756 +msgid "Charset Settings" +msgstr "字符集设置" + @@ -13930,15 +19292,15 @@ index 0000000..a9215c0 +#. * header. For example, ja.po should translate it as +#. * "ja;q=1.0, en;q=0.5" like that. +#. -+#: rc.c:1220 ++#: rc.c:1238 +msgid "en;q=1.0" +msgstr "zh-CN;q=1.0, zh-Hans;q=0.9, zh;q=0.8, en;q=0.6" diff --git a/po/zh_TW.po b/po/zh_TW.po new file mode 100644 -index 0000000..40cae87 +index 0000000..954a4d2 --- /dev/null +++ b/po/zh_TW.po -@@ -0,0 +1,892 @@ +@@ -0,0 +1,916 @@ +# zh_TW translation for w3m, machine converted +# Copyright (C) YEAR THE w3m'S COPYRIGHT HOLDER +# This file is distributed under the same license as the w3m package. @@ -13952,9 +19314,9 @@ index 0000000..40cae87 +msgstr "" +"Project-Id-Version: w3m 0.5.3\n" +"Report-Msgid-Bugs-To: satodai@w3m.jp\n" -+"POT-Creation-Date: 2015-04-29 16:18+0900\n" -+"PO-Revision-Date: 2015-11-10 18:58-0500\n" -+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n" ++"POT-Creation-Date: 2016-03-14 19:47+0900\n" ++"PO-Revision-Date: 2016-03-14 19:51+0900\n" ++"Last-Translator: Tatsuya Kinoshita <tats@debian.org>\n" +"Language-Team: AOSC zh_TW fuzzy <aosc@members.fsf.org>\n" +"Language: zh_TW\n" +"MIME-Version: 1.0\n" @@ -13963,75 +19325,75 @@ index 0000000..40cae87 +"X-Generator: Poedit 1.8.6\n" +"Plural-Forms: nplurals=1; plural=0;\n" + -+#: menu.c:267 ++#: menu.c:269 +msgid " Back (b) " +msgstr " 後退 (b) " + -+#: menu.c:268 ++#: menu.c:270 +msgid " Select Buffer(s) " +msgstr " 選擇緩衝區 " + -+#: menu.c:270 ++#: menu.c:272 +msgid " Select Tab (t) " +msgstr " 選擇標籤 (t) " + -+#: menu.c:272 ++#: menu.c:274 +msgid " View Source (v) " +msgstr " 檢視源碼 (v) " + -+#: menu.c:273 ++#: menu.c:275 +msgid " Edit Source (e) " +msgstr " 修改源碼 (e) " + -+#: menu.c:274 ++#: menu.c:276 +msgid " Save Source (S) " +msgstr " 儲存源碼 (S) " + -+#: menu.c:275 ++#: menu.c:277 +msgid " Reload (r) " +msgstr " 重新載入 (r) " + -+#: menu.c:276 menu.c:283 menu.c:287 ++#: menu.c:278 menu.c:285 menu.c:289 +msgid " ---------------- " +msgstr " ---------------- " + -+#: menu.c:277 ++#: menu.c:279 +msgid " Go Link (a) " +msgstr " 轉到連結 (a) " + -+#: menu.c:278 ++#: menu.c:280 +msgid " on New Tab (n) " +msgstr " 在新標籤 (n) " + -+#: menu.c:279 ++#: menu.c:281 +msgid " Save Link (A) " +msgstr " 儲存連結 (A) " + -+#: menu.c:280 ++#: menu.c:282 +msgid " View Image (i) " +msgstr " 檢視圖片 (i) " + -+#: menu.c:281 ++#: menu.c:283 +msgid " Save Image (I) " +msgstr " 儲存圖片 (I) " + -+#: menu.c:282 ++#: menu.c:284 +msgid " View Frame (f) " +msgstr " 檢視框架 (f) " + -+#: menu.c:284 ++#: menu.c:286 +msgid " Bookmark (B) " +msgstr " 書籤 (B) " + -+#: menu.c:285 ++#: menu.c:287 +msgid " Help (h) " +msgstr " 幫助 (h) " + -+#: menu.c:286 ++#: menu.c:288 +msgid " Option (o) " +msgstr " 選項 (o) " + -+#: menu.c:288 ++#: menu.c:290 +msgid " Quit (q) " +msgstr " 退出 (q) " + @@ -14332,494 +19694,518 @@ index 0000000..40cae87 +msgstr "啟動 mailto 地址時呼叫電子郵件程式的方式和參數" + +#: rc.c:146 -+msgid "External Browser" ++msgid "External browser" +msgstr "外部瀏覽器" + +#: rc.c:147 -+msgid "Second External Browser" -+msgstr "第二外部瀏覽器 " ++msgid "2nd external browser" ++msgstr "第二外部瀏覽器" + +#: rc.c:148 -+msgid "Third External Browser" ++msgid "3rd external browser" +msgstr "第三外部瀏覽器" + +#: rc.c:149 ++msgid "4th external browser" ++msgstr "第四外部瀏覽器" ++ ++#: rc.c:150 ++msgid "5th external browser" ++msgstr "第五外部瀏覽器" ++ ++#: rc.c:151 ++msgid "6th external browser" ++msgstr "第六外部瀏覽器" ++ ++#: rc.c:152 ++msgid "7th external browser" ++msgstr "第七外部瀏覽器" ++ ++#: rc.c:153 ++msgid "8th external browser" ++msgstr "第八外部瀏覽器" ++ ++#: rc.c:154 ++msgid "9th external browser" ++msgstr "第九外部瀏覽器" ++ ++#: rc.c:155 +msgid "Disable secret file security check" +msgstr "關閉祕密檔案安全檢查" + -+#: rc.c:150 ++#: rc.c:156 +msgid "Password file" +msgstr "密碼檔案" + -+#: rc.c:151 ++#: rc.c:157 +msgid "File for setting form on loading" +msgstr "設定視窗載入時的檔案" + -+#: rc.c:152 ++#: rc.c:158 +msgid "File for preferences for each site" +msgstr "各個站點的首選項檔案" + -+#: rc.c:153 ++#: rc.c:159 +msgid "Password for anonymous FTP (your mail address)" +msgstr "匿名FTP密碼（您的郵箱地址）" + -+#: rc.c:154 ++#: rc.c:160 +msgid "Generate domain part of password for FTP" +msgstr "為 FTP 生成密碼的域部分" + -+#: rc.c:155 ++#: rc.c:161 +msgid "User-Agent identification string" +msgstr "User-Agent 串" + -+#: rc.c:156 ++#: rc.c:162 +msgid "Accept-Encoding header" +msgstr "接受的編碼 (Accept-Encoding) 報頭" + -+#: rc.c:157 ++#: rc.c:163 +msgid "Accept header" +msgstr "接受 (Accept) 報頭" + -+#: rc.c:158 ++#: rc.c:164 +msgid "Accept-Language header" +msgstr "接受的語言 (Accept-Language) 報頭" + -+#: rc.c:159 ++#: rc.c:165 +msgid "Treat URL-like strings as links in all pages" +msgstr "將所有頁面中類似於 URL 的字元串當做連結" + -+#: rc.c:160 ++#: rc.c:166 +msgid "Wrap search" +msgstr "包裝搜尋結果" + -+#: rc.c:161 ++#: rc.c:167 +msgid "Display unseen objects (e.g. bgimage tag)" +msgstr "顯示看不到的物件 （例如，bdimage標籤）" + -+#: rc.c:162 ++#: rc.c:168 +msgid "Uncompress compressed data automatically when downloading" +msgstr "在下載時自動解壓被壓縮的資料" + -+#: rc.c:164 ++#: rc.c:170 +msgid "Run external viewer in a separate session" +msgstr "在另一個會話中執行外部檢視器" + -+#: rc.c:166 ++#: rc.c:172 +msgid "Run external viewer in the background" +msgstr "在後臺執行外部檢視器" + -+#: rc.c:168 ++#: rc.c:174 +msgid "Use external program for directory listing" +msgstr "使用外部程式列出目錄" + -+#: rc.c:169 ++#: rc.c:175 +msgid "URL of directory listing command" +msgstr "目錄列表命令的網址" + -+#: rc.c:171 ++#: rc.c:177 +msgid "Enable dictionary lookup through CGI" +msgstr "啟用基於 CGI 的詞典查詢" + -+#: rc.c:172 ++#: rc.c:178 +msgid "URL of dictionary lookup command" +msgstr "字典查詢命令的網址" + -+#: rc.c:174 ++#: rc.c:180 +msgid "Display link name for images lacking ALT" +msgstr "對缺少 ALT 的圖片顯示連結名稱" + -+#: rc.c:175 ++#: rc.c:181 +msgid "Index file for directories" +msgstr "目錄的索引檔案" + -+#: rc.c:176 ++#: rc.c:182 +msgid "Prepend http:// to URL automatically" +msgstr "自動在 URL 前加入 http://" + -+#: rc.c:177 ++#: rc.c:183 +msgid "Default value for open-URL command" +msgstr "開啟網址命令的預設值" + -+#: rc.c:178 ++#: rc.c:184 +msgid "Decode Content-Transfer-Encoding when saving" +msgstr "儲存時對內容傳輸編碼資訊 (Content-Transfer-Encoding) 進行解碼" + -+#: rc.c:179 ++#: rc.c:185 +msgid "Preserve timestamp when saving" +msgstr "在儲存時保留時間戳" + -+#: rc.c:181 ++#: rc.c:187 +msgid "Enable mouse" +msgstr "啟用滑鼠" + -+#: rc.c:182 ++#: rc.c:188 +msgid "Scroll in reverse direction of mouse drag" +msgstr "向滑鼠拖動的反方向滾動" + -+#: rc.c:183 ++#: rc.c:189 +msgid "Behavior of wheel scroll speed" +msgstr "滾輪滾動速度行為" + -+#: rc.c:184 ++#: rc.c:190 +msgid "(A only)Scroll by # (%) of screen" +msgstr "(僅 A) 每次滾動 # (%) 的螢幕高度" + -+#: rc.c:185 ++#: rc.c:191 +msgid "(B only)Scroll by # lines" +msgstr "(僅 B) 每次滾動 # 行" + -+#: rc.c:187 ++#: rc.c:193 +msgid "Free memory of undisplayed buffers" +msgstr "釋放未顯示快取的儲存" + -+#: rc.c:188 ++#: rc.c:194 +msgid "Suppress `Referer:' header" +msgstr "禁止 'Referer:' 檔案頭" + -+#: rc.c:189 ++#: rc.c:195 +msgid "Search case-insensitively" +msgstr "搜尋不區分大小寫" + -+#: rc.c:190 ++#: rc.c:196 +msgid "Use LESSOPEN" +msgstr "使用 LESSOPEN" + -+#: rc.c:193 ++#: rc.c:199 +msgid "Perform SSL server verification" +msgstr "進行 SSL 伺服器檢查" + -+#: rc.c:194 ++#: rc.c:200 +msgid "PEM encoded certificate file of client" +msgstr "客戶端的 PEM 編碼證書檔案" + -+#: rc.c:195 ++#: rc.c:201 +msgid "PEM encoded private key file of client" +msgstr "客戶端的 PEM 編碼私鑰檔案" + -+#: rc.c:196 ++#: rc.c:202 +msgid "Path to directory for PEM encoded certificates of CAs" +msgstr "PEM 編碼 CA 證書目錄的路徑" + -+#: rc.c:197 ++#: rc.c:203 +msgid "File consisting of PEM encoded certificates of CAs" +msgstr "包含 PEM 編碼 CA 證書的檔案" + -+#: rc.c:199 ++#: rc.c:205 +msgid "List of forbidden SSL methods (2: SSLv2, 3: SSLv3, t:TLSv1)" +msgstr "被禁止的 SSL 方式列表 (2: SSLv2, 3: SSLv3, t:TLSv1)" + -+#: rc.c:202 ++#: rc.c:208 +msgid "Enable cookie processing" +msgstr "開啟 Cookie 處理" + -+#: rc.c:203 ++#: rc.c:209 +msgid "Print a message when receiving a cookie" +msgstr "在接收一個 Cookie 時顯示一個訊息" + -+#: rc.c:204 ++#: rc.c:210 +msgid "Accept cookies" +msgstr "接受 Cookies" + -+#: rc.c:205 ++#: rc.c:211 +msgid "Action to be taken on invalid cookie" +msgstr "對無效 Cookies 進行的操作" + -+#: rc.c:206 ++#: rc.c:212 +msgid "Domains to reject cookies from" +msgstr "拒絕如下域的 Cookies" + -+#: rc.c:207 ++#: rc.c:213 +msgid "Domains to accept cookies from" +msgstr "接受如下域的 Cookies" + -+#: rc.c:208 ++#: rc.c:214 +msgid "Domains to avoid [wrong number of dots]" +msgstr "避免訪問的域 [錯誤的點數]" + -+#: rc.c:210 ++#: rc.c:216 +msgid "Number of redirections to follow" +msgstr "跟隨的重定向數量" + -+#: rc.c:211 ++#: rc.c:217 +msgid "Enable processing of meta-refresh tag" +msgstr "開啟 meta-refresh 標籤處理" + -+#: rc.c:214 ++#: rc.c:220 +msgid "Enable Migemo (Roma-ji search)" +msgstr "開啟 Migemo (羅馬字搜尋)" + -+#: rc.c:215 ++#: rc.c:221 +msgid "Migemo command" +msgstr "Migemo 命令" + -+#: rc.c:219 ++#: rc.c:225 +msgid "Display charset" +msgstr "顯示字符集" + -+#: rc.c:220 ++#: rc.c:226 +msgid "Default document charset" +msgstr "預設文件字符集" + -+#: rc.c:221 ++#: rc.c:227 +msgid "Automatic charset detect when loading" +msgstr "在載入時進行自動字符集探測" + -+#: rc.c:222 ++#: rc.c:228 +msgid "System charset" +msgstr "系統字符集" + -+#: rc.c:223 ++#: rc.c:229 +msgid "System charset follows locale(LC_CTYPE)" +msgstr "根據系統設定 (LC_CTYPE) 選定系統字符集" + -+#: rc.c:224 ++#: rc.c:230 +msgid "Output halfdump with display charset" +msgstr "使用顯示字符集輸出 halfdump" + -+#: rc.c:225 ++#: rc.c:231 +msgid "Use multi column characters" +msgstr "使用多列字元" + -+#: rc.c:226 ++#: rc.c:232 +msgid "Use combining characters" +msgstr "使用合併字元" + -+#: rc.c:227 ++#: rc.c:233 +msgid "Use double width for some Unicode characters" +msgstr "使 Unicode 字元使用雙重寬度" + -+#: rc.c:228 ++#: rc.c:234 +msgid "Use Unicode language tags" +msgstr "使用 Unicode 語言標籤" + -+#: rc.c:229 ++#: rc.c:235 +msgid "Charset conversion using Unicode map" +msgstr "使用 Unicode 對映進行字符集轉換" + -+#: rc.c:230 ++#: rc.c:236 +msgid "Charset conversion when loading" +msgstr "在載入時進行字符集轉換" + -+#: rc.c:231 ++#: rc.c:237 +msgid "Adjust search string for document charset" +msgstr "調整文件字符集的搜尋字串" + -+#: rc.c:232 ++#: rc.c:238 +msgid "Fix character width when conversion" +msgstr "在轉換時固定字元寬度" + -+#: rc.c:233 ++#: rc.c:239 +msgid "Use GB 12345 Unicode map instead of GB 2312's" +msgstr "使用 GB 12345 Unicode 對映而非 GB 2312" + -+#: rc.c:234 ++#: rc.c:240 +msgid "Use JIS X 0201 Roman for ISO-2022-JP" +msgstr "使用 JIS X 0201 羅馬字母於 ISO-2022-JP" + -+#: rc.c:235 ++#: rc.c:241 +msgid "Use JIS C 6226:1978 for ISO-2022-JP" +msgstr "使用 JIS C 6226:1978 於 ISO-2022-JP" + -+#: rc.c:236 ++#: rc.c:242 +msgid "Use JIS X 0201 Katakana" +msgstr "使用 JIS X 0201 片假名" + -+#: rc.c:237 ++#: rc.c:243 +msgid "Use JIS X 0212:1990 (Supplemental Kanji)" +msgstr "使用 JIS X 0212:1990 (補充漢字)" + -+#: rc.c:238 ++#: rc.c:244 +msgid "Use JIS X 0213:2000 (2000JIS)" +msgstr "使用 JIS X 0213:2000 (2000JIS)" + -+#: rc.c:239 ++#: rc.c:245 +msgid "Strict ISO-2022-JP/KR/CN" +msgstr "嚴格 ISO-2022-JP/KR/CN" + -+#: rc.c:240 ++#: rc.c:246 +msgid "Treat 4 bytes char. of GB18030 as Unicode" +msgstr "視 GB18030 編碼的 4 位元組字元為 Unicode" + -+#: rc.c:241 ++#: rc.c:247 +msgid "Simple Preserve space" +msgstr "簡單的保留空間" + -+#: rc.c:244 ++#: rc.c:250 +msgid "keymap file" +msgstr "鍵盤對映檔案" + -+#: rc.c:261 ++#: rc.c:267 +msgid "black" +msgstr "黑色" + -+#: rc.c:262 ++#: rc.c:268 +msgid "red" +msgstr "紅色" + -+#: rc.c:263 ++#: rc.c:269 +msgid "green" +msgstr "綠色" + -+#: rc.c:264 ++#: rc.c:270 +msgid "yellow" +msgstr "黃色" + -+#: rc.c:265 ++#: rc.c:271 +msgid "blue" +msgstr "藍色" + -+#: rc.c:266 ++#: rc.c:272 +msgid "magenta" +msgstr "品紅" + -+#: rc.c:267 ++#: rc.c:273 +msgid "cyan" +msgstr "青色" + -+#: rc.c:268 ++#: rc.c:274 +msgid "white" +msgstr "白色" + -+#: rc.c:269 ++#: rc.c:275 +msgid "terminal" +msgstr "終端" + -+#: rc.c:288 ++#: rc.c:294 +msgid "none" +msgstr "無" + -+#: rc.c:289 ++#: rc.c:295 +msgid "current URL" +msgstr "當前 URL" + -+#: rc.c:290 ++#: rc.c:296 +msgid "link URL" +msgstr "連結 URL" + -+#: rc.c:295 ++#: rc.c:301 +msgid "simple" +msgstr "簡單" + -+#: rc.c:296 ++#: rc.c:302 +msgid "use tag" +msgstr "使用標籤" + -+#: rc.c:297 ++#: rc.c:303 +msgid "fontify" +msgstr "" + -+#: rc.c:303 ++#: rc.c:309 +msgid "A:relative to screen height" +msgstr "A:相對於螢幕高度" + -+#: rc.c:304 ++#: rc.c:310 +msgid "B:fixed speed" +msgstr "B:固定速度" + -+#: rc.c:311 ++#: rc.c:317 +msgid "unspecified" +msgstr "未指定" + -+#: rc.c:312 ++#: rc.c:318 +msgid "inet inet6" +msgstr "" + -+#: rc.c:313 ++#: rc.c:319 +msgid "inet6 inet" +msgstr "" + -+#: rc.c:314 ++#: rc.c:320 +msgid "inet only" +msgstr "僅 inet" + -+#: rc.c:315 ++#: rc.c:321 +msgid "inet6 only" +msgstr "僅 inet6" + -+#: rc.c:322 ++#: rc.c:328 +msgid "discard" +msgstr "丟棄" + -+#: rc.c:324 ++#: rc.c:330 +msgid "accept" +msgstr "接受" + -+#: rc.c:326 ++#: rc.c:332 +msgid "ask" +msgstr "詢問" + -+#: rc.c:333 ++#: rc.c:339 +msgid "use internal mailer instead" +msgstr "使用內建郵件傳送器" + -+#: rc.c:335 ++#: rc.c:341 +msgid "ignore options and use only the address" +msgstr "忽略選項而只使用地址" + -+#: rc.c:336 ++#: rc.c:342 +msgid "use full mailto URL" +msgstr "使用整個 mailto URL" + -+#: rc.c:345 ++#: rc.c:351 +msgid "OFF" +msgstr "關" + -+#: rc.c:346 ++#: rc.c:352 +msgid "Only ISO 2022" +msgstr "僅 ISO 2022" + -+#: rc.c:347 ++#: rc.c:353 +msgid "ON" +msgstr "開" + -+#: rc.c:353 ++#: rc.c:359 +msgid "ASCII" +msgstr "ASCII" + -+#: rc.c:354 ++#: rc.c:360 +msgid "charset specific" +msgstr "字符集特定" + -+#: rc.c:355 ++#: rc.c:361 +msgid "DEC special graphics" +msgstr "DEC 特殊影象" + -+#: rc.c:722 ++#: rc.c:740 +msgid "Display Settings" +msgstr "顯示設定" + -+#: rc.c:724 ++#: rc.c:742 +msgid "Color Settings" +msgstr "顏色設定" + -+#: rc.c:726 ++#: rc.c:744 +msgid "Miscellaneous Settings" +msgstr "雜項設定" + -+#: rc.c:727 ++#: rc.c:745 +msgid "Directory Settings" +msgstr "目錄設定" + -+#: rc.c:728 ++#: rc.c:746 +msgid "External Program Settings" +msgstr "外部程式設定" + -+#: rc.c:729 ++#: rc.c:747 +msgid "Network Settings" +msgstr "網路設定" + -+#: rc.c:730 ++#: rc.c:748 +msgid "Proxy Settings" +msgstr "代理設定" + -+#: rc.c:732 ++#: rc.c:750 +msgid "SSL Settings" +msgstr "SSL 設定" + -+#: rc.c:735 ++#: rc.c:753 +msgid "Cookie Settings" +msgstr "Cookie 設定" + -+#: rc.c:738 ++#: rc.c:756 +msgid "Charset Settings" +msgstr "字符集設定" + @@ -14828,11 +20214,11 @@ index 0000000..40cae87 +#. * header. For example, ja.po should translate it as +#. * "ja;q=1.0, en;q=0.5" like that. +#. -+#: rc.c:1220 ++#: rc.c:1238 +msgid "en;q=1.0" +msgstr "zh-TW;q=1.0, zh-Hants;q=0.9, zh;q=0.8, en;q=0.6" diff --git a/proto.h b/proto.h -index f8a7345..0d8beb5 100644 +index f8a7345..d744e14 100644 --- a/proto.h +++ b/proto.h @@ -11,6 +11,8 @@ extern void pushEvent(int cmd, void *data); @@ -14942,7 +20328,15 @@ index f8a7345..0d8beb5 100644 extern void mouse_init(void); extern void mouse_end(void); extern void mouse_active(void); -@@ -723,6 +749,8 @@ extern int getKey(char *s); +@@ -698,6 +724,7 @@ extern void tabMs(void); + extern void closeTMs(void); + #else /* not USE_MOUSE */ + #define mouse nulcmd ++#define sgrmouse nulcmd + #define msToggle nulcmd + #define movMs nulcmd + #define menuMs nulcmd +@@ -723,6 +750,8 @@ extern int getKey(char *s); extern char *getKeyData(int key); extern char *getWord(char **str); extern char *getQWord(char **str); @@ -14951,14 +20345,14 @@ index f8a7345..0d8beb5 100644 #ifdef USE_MOUSE extern void initMouseAction(void); #endif -@@ -786,5 +814,3 @@ extern void dispVer(void); +@@ -786,5 +815,3 @@ extern void dispVer(void); void srand48(long); long lrand48(void); #endif - -#include "indep.h" diff --git a/rc.c b/rc.c -index 8441a39..0cd7634 100644 +index 8441a39..7de87b8 100644 --- a/rc.c +++ b/rc.c @@ -9,7 +9,9 @@ @@ -14979,7 +20373,22 @@ index 8441a39..0cd7634 100644 #define CMT_FOLD_TEXTAREA N_("Fold lines in TEXTAREA") #define CMT_DISP_INS_DEL N_("Display INS, DEL, S and STRIKE element") #define CMT_COLOR N_("Display with color") -@@ -146,6 +149,7 @@ static int OptionEncode = FALSE; +@@ -140,12 +143,19 @@ static int OptionEncode = FALSE; + #define CMT_EDITOR N_("Editor") + #define CMT_MAILER N_("Mailer") + #define CMT_MAILTO_OPTIONS N_("How to call Mailer for mailto URLs with options") +-#define CMT_EXTBRZ N_("External Browser") +-#define CMT_EXTBRZ2 N_("Second External Browser") +-#define CMT_EXTBRZ3 N_("Third External Browser") ++#define CMT_EXTBRZ N_("External browser") ++#define CMT_EXTBRZ2 N_("2nd external browser") ++#define CMT_EXTBRZ3 N_("3rd external browser") ++#define CMT_EXTBRZ4 N_("4th external browser") ++#define CMT_EXTBRZ5 N_("5th external browser") ++#define CMT_EXTBRZ6 N_("6th external browser") ++#define CMT_EXTBRZ7 N_("7th external browser") ++#define CMT_EXTBRZ8 N_("8th external browser") ++#define CMT_EXTBRZ9 N_("9th external browser") #define CMT_DISABLE_SECRET_SECURITY_CHECK N_("Disable secret file security check") #define CMT_PASSWDFILE N_("Password file") #define CMT_PRE_FORM_FILE N_("File for setting form on loading") @@ -14987,7 +20396,7 @@ index 8441a39..0cd7634 100644 #define CMT_FTPPASS N_("Password for anonymous FTP (your mail address)") #define CMT_FTPPASS_HOSTNAMEGEN N_("Generate domain part of password for FTP") #define CMT_USERAGENT N_("User-Agent identification string") -@@ -390,6 +394,8 @@ struct param_ptr params1[] = { +@@ -390,6 +400,8 @@ struct param_ptr params1[] = { NULL}, {"graphic_char", P_CHARINT, PI_SEL_C, (void *)&UseGraphicChar, CMT_GRAPHIC_CHAR, (void *)graphic_char_str}, @@ -14996,7 +20405,26 @@ index 8441a39..0cd7634 100644 {"fold_textarea", P_CHARINT, PI_ONOFF, (void *)&FoldTextarea, CMT_FOLD_TEXTAREA, NULL}, {"display_ins_del", P_INT, PI_SEL_C, (void *)&displayInsDel, -@@ -619,6 +625,8 @@ struct param_ptr params9[] = { +@@ -561,6 +573,18 @@ struct param_ptr params6[] = { + NULL}, + {"extbrowser3", P_STRING, PI_TEXT, (void *)&ExtBrowser3, CMT_EXTBRZ3, + NULL}, ++ {"extbrowser4", P_STRING, PI_TEXT, (void *)&ExtBrowser4, CMT_EXTBRZ4, ++ NULL}, ++ {"extbrowser5", P_STRING, PI_TEXT, (void *)&ExtBrowser5, CMT_EXTBRZ5, ++ NULL}, ++ {"extbrowser6", P_STRING, PI_TEXT, (void *)&ExtBrowser6, CMT_EXTBRZ6, ++ NULL}, ++ {"extbrowser7", P_STRING, PI_TEXT, (void *)&ExtBrowser7, CMT_EXTBRZ7, ++ NULL}, ++ {"extbrowser8", P_STRING, PI_TEXT, (void *)&ExtBrowser8, CMT_EXTBRZ8, ++ NULL}, ++ {"extbrowser9", P_STRING, PI_TEXT, (void *)&ExtBrowser9, CMT_EXTBRZ9, ++ NULL}, + {"bgextviewer", P_INT, PI_ONOFF, (void *)&BackgroundExtViewer, + CMT_BGEXTVIEW, NULL}, + {"use_lessopen", P_INT, PI_ONOFF, (void *)&use_lessopen, CMT_USE_LESSOPEN, +@@ -619,6 +643,8 @@ struct param_ptr params9[] = { CMT_FTPPASS_HOSTNAMEGEN, NULL}, {"pre_form_file", P_STRING, PI_TEXT, (void *)&pre_form_file, CMT_PRE_FORM_FILE, NULL}, @@ -15005,7 +20433,7 @@ index 8441a39..0cd7634 100644 {"user_agent", P_STRING, PI_TEXT, (void *)&UserAgent, CMT_USERAGENT, NULL}, {"no_referer", P_INT, PI_ONOFF, (void *)&NoSendReferer, CMT_NOSENDREFERER, NULL}, -@@ -771,7 +779,7 @@ create_option_search_table() +@@ -771,7 +797,7 @@ create_option_search_table() qsort(RC_search_table, RC_table_size, sizeof(struct rc_search_table), (int (*)(const void *, const void *))compare_table); @@ -15014,7 +20442,7 @@ index 8441a39..0cd7634 100644 for (i = 0; i < RC_table_size - 1; i++) { p = RC_search_table[i].param->name; q = RC_search_table[i + 1].param->name; -@@ -829,7 +837,7 @@ void +@@ -829,7 +855,7 @@ void show_params(FILE * fp) { int i, j, l; @@ -15023,7 +20451,7 @@ index 8441a39..0cd7634 100644 char *cmt; #ifdef USE_M17N -@@ -1173,6 +1181,8 @@ do_mkdir(const char *dir, long mode) +@@ -1173,6 +1199,8 @@ do_mkdir(const char *dir, long mode) #endif /* not __MINW32_VERSION */ #endif /* not __EMX__ */ @@ -15032,7 +20460,7 @@ index 8441a39..0cd7634 100644 void sync_with_option(void) { -@@ -1199,6 +1209,7 @@ sync_with_option(void) +@@ -1199,6 +1227,7 @@ sync_with_option(void) #endif loadPasswd(); loadPreForm(); @@ -15040,7 +20468,36 @@ index 8441a39..0cd7634 100644 if (AcceptLang == NULL || *AcceptLang == '\0') { /* TRANSLATORS: -@@ -1556,3 +1567,217 @@ helpFile(char *base) +@@ -1483,6 +1512,7 @@ panel_set_option(struct parsed_tagarg *arg) + { + FILE *f = NULL; + char *p; ++ Str s = Strnew(), tmp; + + if (config_file == NULL) { + disp_message("There's no config file... config not saved", FALSE); +@@ -1498,14 +1528,17 @@ panel_set_option(struct parsed_tagarg *arg) + if (arg->value) { + p = conv_to_system(arg->value); + if (set_param(arg->arg, p)) { +- if (f) +- fprintf(f, "%s %s\n", arg->arg, p); ++ tmp = Sprintf("%s %s\n", arg->arg, p); ++ Strcat(tmp, s); ++ s = tmp; + } + } + arg = arg->next; + } +- if (f) ++ if (f) { ++ fputs(s->ptr, f); + fclose(f); ++ } + sync_with_option(); + backBf(); + } +@@ -1556,3 +1589,217 @@ helpFile(char *base) return expandPath(Strnew_m_charp(w3m_help_dir(), "/", base, NULL)->ptr); } #endif @@ -15259,7 +20716,7 @@ index 8441a39..0cd7634 100644 + return NULL; +} diff --git a/regex.c b/regex.c -index 5bee4b2..5675d09 100644 +index 5bee4b2..93406e8 100644 --- a/regex.c +++ b/regex.c @@ -77,7 +77,7 @@ static longchar @@ -15271,8 +20728,117 @@ index 5bee4b2..5675d09 100644 #ifdef USE_M17N if (*p & 0x80) { +@@ -580,7 +580,7 @@ regmatch_iter(struct MatchingContext1 *c, + c->lastpos = c->str; + #ifdef REGEX_DEBUG + if (verbose) +- printf("Succeed: %s %d\n", c->str, c->lastpos - c->str); ++ printf("Succeed: %s %ld\n", c->str, (long)(c->lastpos - c->str)); + #endif + YIELD(1, c, 7); + return 0; +diff --git a/scripts/Makefile.in b/scripts/Makefile.in +index 4da9ce5..a37d792 100644 +--- a/scripts/Makefile.in ++++ b/scripts/Makefile.in +@@ -60,7 +60,7 @@ w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab $(top_srcdir)/doc/ke + @cat $(srcdir)/w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl + @echo "done" + +-w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in ++w3mhelp-funcdesc-stamp: $(top_srcdir)/doc/README.func $(top_srcdir)/doc-jp/README.func $(top_srcdir)/doc-de/README.func w3mhelp-funcdesc.en.pl.in w3mhelp-funcdesc.ja.pl.in w3mhelp-funcdesc.de.pl.in + @echo "generating w3mhelp-funcdesc*.pl..." + @for dirlang in $(DOCDIRS); do \ + dir=`expr "$$dirlang" : "\(.*\):.*"`; \ +diff --git a/scripts/w3mhelp-funcdesc.de.pl.in b/scripts/w3mhelp-funcdesc.de.pl.in +new file mode 100644 +index 0000000..1fe37b4 +--- /dev/null ++++ b/scripts/w3mhelp-funcdesc.de.pl.in +@@ -0,0 +1,66 @@ ++# charset ++$charset = 'UTF-8'; ++ ++# Buffer selection mode ++ ++%buf_funcdesc = ( ++ 'BUF:PREV', 'Select previous buffer', ++ 'BUF:NEXT', 'Select next buffer', ++ 'BUF:DELETE', 'Delete current buffer', ++ 'BUF:GO', 'Go to the selected buffer', ++); ++ ++%lineedit_funcdesc = ( ++ 'LINEEDIT:FORWARD', 'Move cursor forward', ++ 'LINEEDIT:BACK', 'Move cursor backward', ++ 'LINEEDIT:BS', 'Delete previous character', ++ 'LINEEDIT:DEL', 'Delete current character', ++ 'LINEEDIT:KILL_AFTER', 'Kill everything after cursor', ++ 'LINEEDIT:KILL_BEFORE', 'Kill everything before cursor', ++ 'LINEEDIT:TOP', 'Move to the top of line', ++ 'LINEEDIT:BOTTOM', 'Move to the bottom of line', ++ 'LINEEDIT:PREV', 'Fetch the previous string from the history list', ++ 'LINEEDIT:NEXT', 'Fetch the next string from the history list', ++ 'LINEEDIT:EDITOR', 'Edit with external editor', ++ 'LINEEDIT:COMPLETE', 'Complete filename', ++ 'LINEEDIT:ACCEPT', 'Accept', ++); ++ ++%menu_funcdesc = ( ++ 'MENU:SELECT', 'Select item', ++ 'MENU:CLOSE', 'Close menu', ++ 'MENU:CANCEL', 'Back', ++ 'MENU:DOWN', 'Move to next item', ++ 'MENU:UP', 'Move to previous item', ++ 'MENU:LINE_UP', 'Scroll up one item', ++ 'MENU:LINE_DOWN', 'Scroll down one item', ++ 'MENU:TOP', 'Go to top item', ++ 'MENU:LAST', 'Go to last item', ++ 'MENU:NEXT', 'Go to next page', ++ 'MENU:PREV', 'Go to previous page', ++ 'MENU:SEARCH_FORE', 'Search foreward', ++ 'MENU:SEARCH_BACK', 'Search backward', ++ 'MENU:SEARCH_NEXT', 'Search next regexp', ++ 'MENU:SEARCH_PREV', 'Search previous regexp', ++ 'MENU:SUSPEND', 'Suspend', ++); ++ ++%title = ( ++ "Show keymap file", 'Show keymap file', ++ "Page/Cursor motion", 'Page/Cursor motion', ++ "Hyperlink operation", 'Hyperlink operation', ++ "File/Stream operation", 'File/Stream operation', ++ "Buffer operation", 'Buffer operation', ++ "Tab operation", 'Tab operation', ++ "Buffer selection mode", 'Buffer selection mode', ++ "Bookmark operation", 'Bookmark operation', ++ "Search", 'Search', ++ "Dictionary look-up", 'Dictionary look-up', ++ "Mark operation", 'Mark operation', ++ "Miscellany", 'Miscellany', ++ "User defined keymaps", 'User defined keymaps', ++ "Line-editing mode", 'Line-editing mode', ++ "Pop up menu", 'Pop up menu', ++); ++ ++1; +diff --git a/scripts/w3mhelp-funcdesc.ja.pl.in b/scripts/w3mhelp-funcdesc.ja.pl.in +index 051c888..b0f529e 100644 +--- a/scripts/w3mhelp-funcdesc.ja.pl.in ++++ b/scripts/w3mhelp-funcdesc.ja.pl.in +@@ -59,8 +59,8 @@ $charset = 'EUC-JP'; + "Mark operation", 'ޡ', + "Miscellany", '¾', + "User defined keymaps", '桼', +- "Line-edit mode", 'Խ⡼', +- "Popup menu", '˥塼', ++ "Line-editing mode", 'Խ⡼', ++ "Pop up menu", '˥塼', + ); + + 1; diff --git a/scripts/w3mhelp.cgi.in b/scripts/w3mhelp.cgi.in -index b2fca8f..31c0049 100644 +index b2fca8f..2c3f4d5 100644 --- a/scripts/w3mhelp.cgi.in +++ b/scripts/w3mhelp.cgi.in @@ -48,7 +48,7 @@ if (defined($ENV{'QUERY_STRING'})) { @@ -15284,6 +20850,50 @@ index b2fca8f..31c0049 100644 $lang = $tlang; } } +@@ -102,8 +102,7 @@ Content-Type: text/html; charset=$charset + ******* + <A HREF="http://w3m.sourceforge.net/">w3m</A> + (WWW-wo-Miru) Version $version by +-<A HREF="mailto:aito\@fw.ipsj.or.jp">A.ITO</A> ********<BR> +- ***** Key assign table ***** ++<A HREF="mailto:aito\@fw.ipsj.or.jp">A.ITO</A> ******** + </CENTER> + + HEADING +@@ -112,13 +111,13 @@ $q_version = $version; + $q_version =~ s/[^A-Za-z0-9_\$\.\-]/sprintf('%%%02X', ord($&))/ge; + $script = "<A HREF=\"$ENV{'SCRIPT_NAME'}?version=$q_version&lang="; + +-# doc:en_English doc-jp:ja_Japanese ++# doc:en_English doc-jp:ja_Japanese doc-de:de_German + for $otherlang (@docdirs) { + local(@d) = split(/[:_]/, $otherlang); + + if ($d[1] ne $lang) { + $d[1] =~ s/[^A-Za-z0-9_\$\.\-]/sprintf('%%%02X', ord($&))/ge; +- print $script, $d[1], "\">$d[2] version</A>\n"; ++ print $script, $d[1], "\">[$d[2]]</A>\n"; + } + } + +@@ -182,7 +181,7 @@ print "<BR>\n<HR WIDTH=80%>\n"; + + print "<BR>\n<HR WIDTH=80%>\n"; + +-&show_keymap("Line-edit mode", ++&show_keymap("Line-editing mode", + split(" ", "lineedit_forward lineedit_back lineedit_backspace + lineedit_delete lineedit_kill_after lineedit_kill_before + lineedit_top lineedit_bottom lineedit_prev lineedit_next +@@ -190,7 +189,7 @@ print "<BR>\n<HR WIDTH=80%>\n"; + + print "<BR>\n<HR WIDTH=80%>\n"; + +-&show_keymap("Popup menu", ++&show_keymap("Pop up menu", + split(" ", "menu_select menu_close menu_cancel menu_down menu_up + menu_line_up menu_line_down menu_top menu_last menu_next + menu_prev menu_search_fore menu_search_back menu_search_next diff --git a/scripts/w3mman/w3mman.1.in b/scripts/w3mman/w3mman.1.in index 1c0361d..1b1d990 100644 --- a/scripts/w3mman/w3mman.1.in @@ -15814,7 +21424,7 @@ index 7a3c987..3d2ffd7 100644 #define CYGWIN_OFF {fputs("\033[?1000l",ttyf); flush_tty();} diff --git a/url.c b/url.c -index ed6062e..d346312 100644 +index ed6062e..c90cd9f 100644 --- a/url.c +++ b/url.c @@ -121,6 +121,7 @@ static struct table2 DefaultGuess[] = { @@ -15829,7 +21439,7 @@ index ed6062e..d346312 100644 SSL_load_error_strings(); if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method()))) goto eend; -+ SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!EXP"); ++ SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!RC4:!EXP"); option = SSL_OP_ALL; if (ssl_forbid_method) { if (strchr(ssl_forbid_method, '2')) @@ -16020,7 +21630,7 @@ index ed6062e..d346312 100644 - if (!NoSendReferer) { + no_referer = NoSendReferer; + no_referer_ptr = query_SCONF_NO_REFERER_FROM(current); -+ no_referer = NoSendReferer || (no_referer_ptr && *no_referer_ptr); ++ no_referer = no_referer || (no_referer_ptr && *no_referer_ptr); + no_referer_ptr = query_SCONF_NO_REFERER_TO(target); + no_referer = no_referer || (no_referer_ptr && *no_referer_ptr); + if (!no_referer) { @@ -16134,6 +21744,15 @@ index ed6062e..d346312 100644 if (sock < 0) return uf; if (pu->file == NULL) +@@ -2049,7 +2080,7 @@ filename_extension(char *path, int is_url) + break; + } + if (*last_dot == '.') { +- for (i = 1; last_dot[i] && i < 8; i++) { ++ for (i = 1; i < 8 && last_dot[i]; i++) { + if (is_url && !IS_ALNUM(last_dot[i])) + break; + } @@ -2234,3 +2265,66 @@ schemeToProxy(int scheme) } return pu; @@ -16212,6 +21831,44 @@ index 31d30e4..ab25163 100644 #ifndef FM_H char *w3m_version = CURRENT_VERSION; +diff --git a/w3m-doc/outline.html.in b/w3m-doc/outline.html.in +index 60bda47..4ed2a59 100644 +--- a/w3m-doc/outline.html.in ++++ b/w3m-doc/outline.html.in +@@ -146,8 +146,8 @@ w3m $B$N(Bmake$B;~$K;XDj$7$?%-!<A`:n$K$h$C$F!"%X%k%W%U%!%$%k$,0[$J$j$^$9!#(B + <TR> <TD>c</TD> <TD>$B8=%Z!<%8$N(B URL $B$rI=<((B</TD></TR>
+ <TR> <TD>=</TD> <TD>$B8=%I%-%e%a%s%H$N>pJs$rI=<((B</TD></TR>
+ <TR> <TD>F</TD> <TD>$B%U%l!<%`$rI=<($9$k(B</TD></TR>
+- <TR> <TD>M</TD> <TD>$B8=%Z!<%8$r30It%V%i%&%6$GI=<($9$k(B(2M,3M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r8F$S$@$9(B)</TD></TR>
+- <TR> <TD>ESC M</TD> <TD>$B%j%s%/@h$r30It%V%i%&%6$GI=<($9$k(B(2ESC M,3ESC M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r8F$S$@$9(B)</TD></TR>
++ <TR> <TD>M</TD> <TD>$B8=%Z!<%8$r30It%V%i%&%6$GI=<($9$k(B(2M, 3M, ..., 9M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r8F$S$@$9(B)</TD></TR>
++ <TR> <TD>ESC M</TD> <TD>$B%j%s%/@h$r30It%V%i%&%6$GI=<($9$k(B(2ESC M, 3ESC M, ..., 9ESC M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r8F$S$@$9(B)</TD></TR>
+ </TABLE>
+
+ <H5>$B%U%!%$%k(B/$B%9%H%j!<%`A`:n(B</H5>
+@@ -257,8 +257,8 @@ w3m $B$N(Bmake$B;~$K;XDj$7$?%-!<A`:n$K$h$C$F!"%X%k%W%U%!%$%k$,0[$J$j$^$9!#(B + <TR><TD>c<TD>$B8=:_$NJ8=q$N(B URL $B$rI=<($7$^$9!%(B
+ <TR><TD>=<TD>$B8=:_$NJ8=q$K4X$9$k>pJs$rI=<($7$^$9!%(B
+ <TR><TD>F<TD><FRAMESET> $B$r4^$`J8=q$rI=<($7$F$$$k$H$-$K!$(B<FRAME> $B%?%0$N;X$9J#?t$NJ8=q$r(B1$B$D$NJ8=q$KJQ49$7$FI=<($7$^$9!%(B
+-<TR><TD>M<TD>$B8=:_8+$F$$$k%Z!<%8$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2M, 3M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B
+-<TR><TD>ESC M<TD>$B8=:_$N%j%s%/@h$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2ESC M, 3ESC M $B$G(B2$BHVL\$H(B3$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B
++<TR><TD>M<TD>$B8=:_8+$F$$$k%Z!<%8$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2M, 3M, ..., 9M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B
++<TR><TD>ESC M<TD>$B8=:_$N%j%s%/@h$r!$30It%V%i%&%6$r;H$C$FI=<($7$^$9!%(B 2ESC M, 3ESC M, ..., 9ESC M $B$G(B2$BHVL\!$(B3$BHVL\!$(B9$BHVL\$N%V%i%&%6$r;H$$$^$9!%(B
+ </table>
+
+ <H5>$B%U%!%$%k$H(B URL $B4X78$NA`:n(B</H5>
+diff --git a/w3m-doc/sample/keymap.cgi b/w3m-doc/sample/keymap.cgi +index f68f5fb..d92c60f 100755 +--- a/w3m-doc/sample/keymap.cgi ++++ b/w3m-doc/sample/keymap.cgi +@@ -203,7 +203,6 @@ GOTO_LINK + HELP + HISTORY + INFO +-INIT_MAILCAP + INTERRUPT + LEFT + LINE_BEGIN diff --git a/w3mbookmark.c b/w3mbookmark.c index 4355536..a306f26 100644 --- a/w3mbookmark.c @@ -16245,6 +21902,142 @@ index 4355536..a306f26 100644 while (tl->nitem) { fputs(popText(tl), f); } +diff --git a/w3mhelp-lynx_en.html.in b/w3mhelp-lynx_en.html.in +index 7448877..d073b0f 100644 +--- a/w3mhelp-lynx_en.html.in ++++ b/w3mhelp-lynx_en.html.in +@@ -43,20 +43,20 @@ w3m</A> + <table cellpadding=0> + <TR><TD WIDTH=100>RET, C-f, Right arrow<TD>Follow hyperlink + <TR><TD>d, ESC RET<TD>Save link to file +-<TR><TD>u<TD>Peek link URL +-<TR><TD>i<TD>Peek image URL ++<TR><TD>u<TD>Peek at link URL ++<TR><TD>i<TD>Peek at image URL + <TR><TD>I<TD>View inline image + <TR><TD>ESC I<TD>Save inline image to file +-<TR><TD>:<TD>Mark URL-like strings as anchors +-<TR><TD>ESC :<TD>Mark Message-ID-like strings as news anchors +-<TR><TD>c<TD>Peek current URL ++<TR><TD>:<TD>Mark URL-like strings as links ++<TR><TD>ESC :<TD>Mark Message-ID-like strings as links ++<TR><TD>c<TD>Peek at current URL + <TR><TD>=<TD>Display information about current document +-<TR><TD>C-h<TD>View history of URL +-<TR><TD>F<TD>Render frame ++<TR><TD>C-h<TD>View browser history ++<TR><TD>F<TD>Render frames + <TR><TD>M<TD>Browse current document using external browser +-(use 2M and 3M to invoke second and third browser) ++(prefix 2, 3, ..., or 9 to invoke alternate configured browsers, e.g. 3 M) + <TR><TD>ESC M<TD>Browse link using external browser +-(use 2ESC M and 3ESC M to invoke second and third browser) ++(prefixed as above, e.g. 3ESC M) + </table> + + <H2>File/Stream operation</H2> +@@ -98,7 +98,7 @@ w3m</A> + <table cellpadding=0> + <TR><TD WIDTH=100>/, C-s<TD>Search forward + <TR><TD>n<TD>Search next +-<TR><TD>w<TD>Toggle wrap search mode ++<TR><TD>w<TD>Toggle search wrap mode + </table> + + <H2>Mark operation</H2> +@@ -121,7 +121,7 @@ w3m</A> + <TR><TD>Q<TD>Quit without confirmation + </table> + +-<H2>Line-edit mode</H2> ++<H2>Line-editing mode</H2> + <table cellpadding=0> + <TR><TD WIDTH=100>C-f<TD>Move cursor forward + <TR><TD>C-b<TD>Move cursor backward +diff --git a/w3mhelp-lynx_ja.html.in b/w3mhelp-lynx_ja.html.in +index d160984..828b5a3 100644 +--- a/w3mhelp-lynx_ja.html.in ++++ b/w3mhelp-lynx_ja.html.in +@@ -58,9 +58,9 @@ + <TR><TD>F<TD><FRAMESET>ޤʸɽƤȤˡ<FRAME> + λؤʣʸ1ĤʸѴɽޤ + <TR><TD>M<TD>߸Ƥڡ֥饦Ȥäɽޤ +-2M, 3M 2ܤ3ܤΥ֥饦Ȥޤ ++2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ + <TR><TD>ESC M<TD>ߤΥ֥饦Ȥäɽޤ +-2ESC M, 3ESC M 2ܤ3ܤΥ֥饦Ȥޤ ++2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦Ȥޤ + </table> + + <H3>եURLط</H3> +diff --git a/w3mhelp-w3m_en.html.in b/w3mhelp-w3m_en.html.in +index eb46e8a..a692142 100644 +--- a/w3mhelp-w3m_en.html.in ++++ b/w3mhelp-w3m_en.html.in +@@ -47,21 +47,21 @@ w3m</A> + <table cellpadding=0> + <TR><TD WIDTH=100>RET<TD>Follow hyperlink + <TR><TD>a, ESC RET<TD>Save link to file +-<TR><TD>u<TD>Peek link URL +-<TR><TD>i<TD>Peek image URL ++<TR><TD>u<TD>Peek at link URL ++<TR><TD>i<TD>Peek at image URL + <TR><TD>I<TD>View inline image + <TR><TD>ESC I<TD>Save inline image to file +-<TR><TD>:<TD>Mark URL-like strings as anchors +-<TR><TD>ESC :<TD>Mark Message-ID-like strings as news anchors +-<TR><TD>c<TD>Peek current URL ++<TR><TD>:<TD>Mark URL-like strings as links ++<TR><TD>ESC :<TD>Mark Message-ID-like strings as links ++<TR><TD>c<TD>Peek at current URL + <TR><TD>=<TD>Display information about current document + <TR><TD>C-g<TD>Show current line number +-<TR><TD>C-h<TD>View history of URL +-<TR><TD>F<TD>Render frame ++<TR><TD>C-h<TD>View browser history ++<TR><TD>F<TD>Render frames + <TR><TD>M<TD>Browse current document using external browser +-(use 2M and 3M to invoke second and third browser) ++(prefix 2, 3, ..., or 9 to invoke alternate configured browsers, e.g. 3 M) + <TR><TD>ESC M<TD>Browse link using external browser +-(use 2ESC M and 3ESC M to invoke second and third browser) ++(prefixed as above, e.g. 3ESC M) + </table> + + <H2>File/Stream operation</H2> +@@ -105,7 +105,7 @@ w3m</A> + <TR><TD>?,C-r<TD>Search backward + <TR><TD>n<TD>Search next + <TR><TD>N<TD>Search previous +-<TR><TD>C-w<TD>Toggle wrap search mode ++<TR><TD>C-w<TD>Toggle search wrap mode + </table> + + <H2>Dictionary look-up</H2> +@@ -134,7 +134,7 @@ w3m</A> + <TR><TD>Q<TD>Quit without confirmation + </table> + +-<H2>Line-edit mode</H2> ++<H2>Line-editing mode</H2> + <table cellpadding=0> + <TR><TD WIDTH=100>C-f<TD>Move cursor forward + <TR><TD>C-b<TD>Move cursor backward +diff --git a/w3mhelp-w3m_ja.html.in b/w3mhelp-w3m_ja.html.in +index 95464ab..72cb849 100644 +--- a/w3mhelp-w3m_ja.html.in ++++ b/w3mhelp-w3m_ja.html.in +@@ -61,8 +61,8 @@ + <TR> <TD>C-g</TD> <TD>ڡǤθ֤߰ɽ</TD></TR> + <TR> <TD>C-h</TD> <TD>URLɽ</TD></TR> + <TR> <TD>F</TD> <TD>ե졼ɽ</TD></TR> +- <TR> <TD>M</TD> <TD>ڡ֥饦ɽ(2M,3M2ܤ3ܤΥ֥饦ƤӤ)</TD></TR> +- <TR> <TD>ESC M</TD> <TD>֥饦ɽ(2ESC M,3ESC M2ܤ3ܤΥ֥饦ƤӤ)</TD></TR> ++ <TR> <TD>M</TD> <TD>ڡ֥饦ɽ(2M, 3M, ..., 9M 2ܡ3ܡ9ܤΥ֥饦ƤӤ)</TD></TR> ++ <TR> <TD>ESC M</TD> <TD>֥饦ɽ(2ESC M, 3ESC M, ..., 9ESC M 2ܡ3ܡ9ܤΥ֥饦ƤӤ)</TD></TR> + </TABLE> + + <H2>ե/ȥ</H2> diff --git a/w3mhelperpanel.c b/w3mhelperpanel.c index 110794b..96b60a0 100644 --- a/w3mhelperpanel.c @@ -16274,7 +22067,7 @@ index dfc550c..8e2ad73 100644 $(RANLIB) $@ diff --git a/w3mimg/fb/fb.c b/w3mimg/fb/fb.c -index cd11128..7b6f23b 100644 +index cd11128..7960584 100644 --- a/w3mimg/fb/fb.c +++ b/w3mimg/fb/fb.c @@ -12,12 +12,24 @@ @@ -16386,7 +22179,7 @@ index cd11128..7b6f23b 100644 if (fb_fscrn_get(fbfp, &fscinfo)) { goto ERR_END; } -@@ -83,22 +142,67 @@ fb_open(void) +@@ -83,22 +142,69 @@ fb_open(void) if (fb_vscrn_get(fbfp, &vscinfo)) { goto ERR_END; } @@ -16450,11 +22243,13 @@ index cd11128..7b6f23b 100644 + if (video_adapter_info.va_flags & V_ADP_PALETTE && + video_info.vi_mem_model == V_INFO_MM_PACKED && + video_info.vi_depth == 8) { ++#else ++ if (0) { +#endif if (fb_cmap_get(fbfp, cmap)) { fprintf(stderr, "Can't get color map.\n"); fb_cmap_destroy(cmap); -@@ -111,12 +215,20 @@ fb_open(void) +@@ -111,6 +217,7 @@ fb_open(void) pixel_size = 1; } @@ -16462,20 +22257,22 @@ index cd11128..7b6f23b 100644 else if ((fscinfo.visual == FB_VISUAL_TRUECOLOR || fscinfo.visual == FB_VISUAL_DIRECTCOLOR) && (vscinfo.bits_per_pixel == 15 || - vscinfo.bits_per_pixel == 16 || +@@ -118,6 +225,14 @@ fb_open(void) vscinfo.bits_per_pixel == 24 || vscinfo.bits_per_pixel == 32)) { pixel_size = (vscinfo.bits_per_pixel + 7) / CHAR_BIT; + } +#elif defined(__FreeBSD__) + else if (video_info.vi_mem_model == V_INFO_MM_DIRECT && + (video_info.vi_depth == 15 || + video_info.vi_depth == 16 || + video_info.vi_depth == 24 || video_info.vi_depth == 32)) { + pixel_size = (video_info.vi_depth + 7) / CHAR_BIT; ++ } +#endif - } else { fprintf(stderr, "This type of framebuffer is not supported.\n"); -@@ -147,7 +259,11 @@ fb_close(void) + goto ERR_END; +@@ -147,7 +262,11 @@ fb_close(void) cmap = NULL; } if (buf != NULL) { @@ -16487,7 +22284,7 @@ index cd11128..7b6f23b 100644 buf = NULL; } -@@ -259,11 +375,19 @@ fb_image_draw(FB_IMAGE * image, int x, int y, int sx, int sy, int width, +@@ -259,11 +378,19 @@ fb_image_draw(FB_IMAGE * image, int x, int y, int sx, int sy, int width, if (y + height > fb_height()) height = fb_height() - y; @@ -16507,7 +22304,7 @@ index cd11128..7b6f23b 100644 offset_img += image->rowstride; } -@@ -336,7 +460,11 @@ fb_width(void) +@@ -336,7 +463,11 @@ fb_width(void) if (is_open != TRUE) return 0; @@ -16519,7 +22316,7 @@ index cd11128..7b6f23b 100644 } int -@@ -345,7 +473,11 @@ fb_height(void) +@@ -345,7 +476,11 @@ fb_height(void) if (is_open != TRUE) return 0; @@ -16531,7 +22328,7 @@ index cd11128..7b6f23b 100644 } int -@@ -369,7 +501,11 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b) +@@ -369,7 +504,11 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b) h = fb_height() - y; if (tmp == NULL) { @@ -16543,7 +22340,7 @@ index cd11128..7b6f23b 100644 if (tmp == NULL) return 1; } -@@ -384,10 +520,18 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b) +@@ -384,10 +523,18 @@ fb_clear(int x, int y, int w, int h, int r, int g, int b) gg = g; bb = b; } @@ -16562,7 +22359,7 @@ index cd11128..7b6f23b 100644 } return 0; } -@@ -400,11 +544,21 @@ fb_get_packed_color(int r, int g, int b) +@@ -400,11 +547,21 @@ fb_get_packed_color(int r, int g, int b) return fb_get_cmap_index(r, g, b); } else { @@ -16584,7 +22381,7 @@ index cd11128..7b6f23b 100644 } } -@@ -433,16 +587,31 @@ fb_cmap_init(void) +@@ -433,16 +590,31 @@ fb_cmap_init(void) if (cmap == NULL) return 1; @@ -16616,7 +22413,7 @@ index cd11128..7b6f23b 100644 if (fb_cmap_get(fbfp, cmap_org)) { fprintf(stderr, "Can't get color map.\n"); -@@ -452,8 +621,13 @@ fb_cmap_init(void) +@@ -452,8 +624,13 @@ fb_cmap_init(void) } } @@ -16630,7 +22427,7 @@ index cd11128..7b6f23b 100644 for (lp = 0; lp < COLORS_MONO_8BIT; lp++) { int c; -@@ -506,73 +680,213 @@ fb_cmap_init(void) +@@ -506,73 +683,223 @@ fb_cmap_init(void) #define LUT_MAX (256) @@ -16721,6 +22518,8 @@ index cd11128..7b6f23b 100644 +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[0]) { + cmap->red = (u_char *) malloc(sizeof(u_char) * cmaplen); ++#else ++ if (0) { +#endif if (!cmap->red) { perror("red lut malloc error\n"); @@ -16737,6 +22536,8 @@ index cd11128..7b6f23b 100644 +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[1]) { + cmap->green = (u_char *) malloc(sizeof(u_char) * cmaplen); ++#else ++ if (0) { +#endif if (!cmap->green) { +#if defined(__linux__) @@ -16760,6 +22561,8 @@ index cd11128..7b6f23b 100644 +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[2]) { + cmap->blue = (u_char *) malloc(sizeof(u_char) * cmaplen); ++#else ++ if (0) { +#endif if (!cmap->blue) { +#if defined(__linux__) @@ -16790,11 +22593,15 @@ index cd11128..7b6f23b 100644 +#elif defined(__FreeBSD__) + if (video_info->vi_pixel_fsizes[3]) { + cmap->transparent = (u_char *) malloc(sizeof(u_char) * cmaplen); ++#else ++ if (0) { +#endif +#if defined(__linux__) if (!cmap->transp) { +#elif defined(__FreeBSD__) + if (!cmap->transparent) { ++#else ++ if (0) { +#endif +#if defined(__linux__) if (vscinfo->red.length) @@ -16844,7 +22651,7 @@ index cd11128..7b6f23b 100644 { if (cmap->red) free(cmap->red); -@@ -580,28 +894,57 @@ fb_cmap_destroy(struct fb_cmap *cmap) +@@ -580,28 +907,57 @@ fb_cmap_destroy(struct fb_cmap *cmap) free(cmap->green); if (cmap->blue) free(cmap->blue); @@ -16902,7 +22709,7 @@ index cd11128..7b6f23b 100644 return 0; } -@@ -612,10 +955,16 @@ fb_cmap_set(int fbfp, struct fb_cmap *cmap) +@@ -612,10 +968,16 @@ fb_cmap_set(int fbfp, struct fb_cmap *cmap) * fb_munmap() deletes the mappings */ @@ -16919,7 +22726,7 @@ index cd11128..7b6f23b 100644 if ((buf = (unsigned char *) mmap(NULL, scinfo->smem_len, PROT_READ | PROT_WRITE, MAP_SHARED, fbfp, (off_t) 0)) -@@ -623,13 +972,41 @@ fb_mmap(int fbfp, struct fb_fix_screeninfo *scinfo) +@@ -623,13 +985,41 @@ fb_mmap(int fbfp, struct fb_fix_screeninfo *scinfo) perror("mmap error"); return NULL; } @@ -16961,7 +22768,7 @@ index cd11128..7b6f23b 100644 } /* -@@ -637,6 +1014,7 @@ fb_munmap(void *buf, struct fb_fix_screeninfo *scinfo) +@@ -637,6 +1027,7 @@ fb_munmap(void *buf, struct fb_fix_screeninfo *scinfo) * * fb_fscrn_get() get information */ @@ -16969,7 +22776,7 @@ index cd11128..7b6f23b 100644 static int fb_fscrn_get(int fbfp, struct fb_fix_screeninfo *scinfo) { -@@ -646,12 +1024,14 @@ fb_fscrn_get(int fbfp, struct fb_fix_screeninfo *scinfo) +@@ -646,12 +1037,14 @@ fb_fscrn_get(int fbfp, struct fb_fix_screeninfo *scinfo) } return 0; } @@ -16984,7 +22791,7 @@ index cd11128..7b6f23b 100644 static int fb_vscrn_get(int fbfp, struct fb_var_screeninfo *scinfo) { -@@ -661,3 +1041,41 @@ fb_vscrn_get(int fbfp, struct fb_var_screeninfo *scinfo) +@@ -661,3 +1054,41 @@ fb_vscrn_get(int fbfp, struct fb_var_screeninfo *scinfo) } return 0; } @@ -17327,3 +23134,18 @@ index f5be4a8..9a539de 100644 wop->init = x11_init; wop->finish = x11_finish; wop->active = x11_active; +diff --git a/w3mimgdisplay.c b/w3mimgdisplay.c +index 5486a47..ccfa373 100644 +--- a/w3mimgdisplay.c ++++ b/w3mimgdisplay.c +@@ -281,6 +281,10 @@ DrawImage(char *buf, int redraw) + maxImage = n + 1; + imageBuf = (W3MImage *) realloc((void *)imageBuf, + sizeof(W3MImage) * maxImage); ++ if (imageBuf == NULL) { ++ fprintf(stderr, "Out of memory\n"); ++ exit(1); ++ } + for (; i < maxImage; i++) + imageBuf[i].pixmap = NULL; + } |