snapshot of project "lynx", label v2-8-3dev_13

1 files changed, 117 insertions, 41 deletions

diff --git a/lynx.cfg b/lynx.cfg
index 8ad61b1f..0542435c 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1515,7 +1515,9 @@ MINIMAL_COMMENTS:TRUE
 # NOTE: It is normally preferable to define new extension mappings in
 #       EXTENSION_MAP files (see below) instead of here:  Definitions
 #       here are overriden by those in EXTENSION_MAP files and even by
-#       some built-in defaults in src/HTInit.c.
+#       some built-in defaults in src/HTInit.c.  On the other hand,
+#       definitions here allow some more fields that are not possible
+#       in those files.
 #       Extension mappings have an effect mostly for ftp and local files,
 #       they are NOT used to determine the type of content for URLs with
 #       the http protocol.  This is because HTTP servers already specify
@@ -1524,76 +1526,148 @@ MINIMAL_COMMENTS:TRUE
 #       even if they are accessed only via the HTTP protocol, if the viewer
 #       (see below) for those MIME types requires a certain suffix for the
 #       temporary file passed to it.]
+
+# The global and personal EXTENSION_MAP files allow you to assign extensions
+# to MIME types which will override any of the suffix maps in this (lynx.cfg)
+# configuration file, or in src/HTInit.c.  See the example mime.types file
+# in the samples subdirectory.
+#
+# 	Unix:
+#GLOBAL_EXTENSION_MAP:/usr/local/lib/mosaic/mime.types
+# 	VMS:
+#GLOBAL_EXTENSION_MAP:Lynx_Dir:mime.types
 #
+#	Unix (sought in user's home directory):
+#PERSONAL_EXTENSION_MAP:.mime.types
+#	VMS (sought in user's sys$login directory):
+#PERSONAL_EXTENSION_MAP:mime.types
+
+# With SUFFIX_ORDER the precedence of suffix mappings can be changed.
+# Two kinds of settings are recognized:
+#    PRECEDENCE_OTHER or PRECEDENCE_HERE
+#      Suffix mappings can come from four sources: (1) SUFFIX rules
+#      given here - see below, (2) builtin defaults (HTInit.c), and the
+#      (3) GLOBAL_EXTENSION_MAP and (4) PERSONAL_EXTENSION_MAP files.
+#      The order of precedence is normally as listed: (1) has the
+#      *lowest*, (4) has the *highest* precedence if there are conflicts.
+#      In other words, SUFFIX mappings here are overridden by conflicting
+#      ones elsewhere.  This default ordering is called PRECEDENCE_OTHER.
+#      With PRECEDENCE_HERE, the order becomes (2) (3) (4) (1), i.e.
+#      mappings here override others made elsewhere.
+#    NO_BUILTIN
+#      This disables all builtin default rules.  In other words, (2) in the
+#      list above is skipped.  Some recognition for compressed files (".gz",
+#      ".Z") is still hardwired.   A mapping for some basic types, at least
+#      for text/html is probably necessary to get a usable configuration,
+#      it can be given in a SUFFIX rule below or an extension map file.
+# Both kinds of settings can be combined, separated by comma as in
+#        SUFFIX_ORDER:PRECEDENCE_HERE,NO_BUILTIN
+# Note: Using PRECEDENCE_HERE has only an effect on SUFFIX rules that follow.
+# Moreover, if GLOBAL_EXTENSION_MAP or PERSONAL_EXTENSION_MAP directives
+# are used, they should come *before* a SUFFIX_ORDER:PRECEDENCE_HERE.
+#
+#SUFFIX_ORDER:PRECEDENCE_OTHER
+
 # The SUFFIX definition takes the form of:
-#    SUFFIX:<file extension>:<mime type>
-# for instance the following definition maps the
+#    SUFFIX:<file extension>:<mime type>:<encoding>:<quality>:<description>
+# All fields after <mime type> are optional (including the separators
+# if no more fields follow).
+#     <file extension> trailing end of file name.  This need not strictly
+#                      be a file extension as understood by the OS, a dot
+#                      has to be given explicitly if it is indented, for
+#                      some uses one could even match full filenames here.
+#                      In addition, two forms are special: "*.*" and "*"
+#                      refer to the defaults for otherwise unmatched files
+#                      (the first for filenames with a dot somewhere in
+#                      the name, the second without), these are currently
+#                      mapped to text/plain in the (HTInit.c) builtin code.
+#     <mime type> a MIME content type.  It can also contain a charset
+#                 parameter, see example below.  This should be given in
+#                 all lowercase, use <description> for more fancy labels.
+#                 It can be left empty if an HTTP style encoding is given.
+# Fields in addition to the usual ones are
+#     <encoding>  either a mail style trivial encoding (7bit, 8bit, binary)
+#                 which could be used on some systems to determine how to
+#                 open local files (currently it isn't), and is used to
+#                 determine transfer mode for some FTP URLs; or a HTTP style
+#                 content encoding (gzip (equivalent to x-gzip), compress)
+#     <quality> a floating point quality factor, usually between 0.0 and 1.0
+#               currently unused in most situations.
+#     <description> text that can appear in FTP directory listings, and in
+#                   local directory listings (see LIST_FORMAT, code %t)
+#
+# For instance the following definition maps the
 # extension ".gif" to the mime type "image/gif"
 #    SUFFIX:.gif:image/gif
+# The following can be used if you have a convention to label
+# HTML files in some character set that differs from your local
+# default (see also ASSUME_LOCAL_CHARSET) with a different
+# extension, here ".html-u8".  It also demonstrates use of the
+# description field, note extra separators for omitted fields:
+#    SUFFIX:.html-u8:text/html;charset=utf-8:::UTF-8 HTML
+# The following shows how a suffix can indicate a combination
+# of MIME type and compression method. (The ending ".ps.gz" should
+# already be recognized by default; the form below could be used on
+# systems that don't allow more than one dot in filenames.)
+#    SUFFIX:.ps_gz:application/postscript:gzip::gzip'd Postscript
+# The following is meant to match a full filename (but can match
+# any file ending in "core", so be careful):
+#    SUFFIX:core:application/x-core-file
 #
 # file suffixes are case INsensitive!
 #
 # The suffix definitions listed here in the default lynx.cfg file are
-# among those established via src/HTInit.c.  You can change any of the
-# defaults by editing that file, or via the global or personal mime.types
-# files at run time.  Assignments made here will be overridden by entries
-# in those files.
+# similar to those normally established via src/HTInit.c.  You can change
+# the defaults by editing that file or disable them, or via the global or
+# personal mime.types files at run time (except for the additional fields).
+# Assignments made here are overridden by entries in those files
+# unless preceded with a SUFFIX_ORDER:PRECEDENCE_HERE.
 #
 #SUFFIX:.ps:application/postscript
 #SUFFIX:.eps:application/postscript
 #SUFFIX:.ai:application/postscript
-#SUFFIX:.rtf:application/x-rtf
+#SUFFIX:.rtf:application/rtf
 #SUFFIX:.snd:audio/basic
 #SUFFIX:.gif:image/gif
 #SUFFIX:.rgb:image/x-rgb
-#SUFFIX:.pict:image/x-pict
+#SUFFIX:.png:image/png
 #SUFFIX:.xbm:image/x-xbitmap
-#SUFFIX:.tiff:image/x-tiff
+#SUFFIX:.tiff:image/tiff
 #SUFFIX:.jpg:image/jpeg
 #SUFFIX:.jpeg:image/jpeg
 #SUFFIX:.mpg:video/mpeg
 #SUFFIX:.mpeg:video/mpeg
 #SUFFIX:.mov:video/quicktime
-#SUFFIX:.hqx:application/octet-stream
+#SUFFIX:.hqx:application/mac-binhex40
 #SUFFIX:.bin:application/octet-stream
 #SUFFIX:.exe:application/octet-stream
-#SUFFIX:.tar:application/octet-stream
-#SUFFIX:.Z:application/octet-stream
-#SUFFIX:.gz:application/octet-stream
-#SUFFIX:.bz2:application/octet-stream
-#SUFFIX:.zip:application/octet-stream
-#SUFFIX:.lzh:application/octet-stream
-#SUFFIX:.lha:application/octet-stream
-#SUFFIX:.dms:application/octet-stream
-
-# The global and personal EXTENSION_MAP files allow you to assign extensions
-# to MIME types which will override any of the suffix maps in this (lynx.cfg)
-# configuration file, or in src/HTInit.c.  See the example mime.types file
-# in the samples subdirectory.
-#
-# 	Unix:
-#GLOBAL_EXTENSION_MAP:/usr/local/lib/mosaic/mime.types
-# 	VMS:
-#GLOBAL_EXTENSION_MAP:Lynx_Dir:mime.types
-#
-#	Unix (sought in user's home directory):
-#PERSONAL_EXTENSION_MAP:.mime.types
-#	VMS (sought in user's sys$login directory):
-#PERSONAL_EXTENSION_MAP:mime.types
+#SUFFIX:.tar:application/x-tar
+#SUFFIX:.tgz:application/x-tar:gzip
+#SUFFIX:.Z::compress
+#SUFFIX:.gz::gzip
+#SUFFIX:.bz2:application/x-bzip2
+#SUFFIX:.zip:application/zip
+#SUFFIX:.lzh:application/x-lzh
+#SUFFIX:.lha:application/x-lha
+#SUFFIX:.dms:application/x-dms
+#SUFFIX:.html:text/html
+#SUFFIX:.txt:text/plain
 
 # VMS:
 # ====
 # XLOADIMAGE_COMMAND will be used as a default in src/HTInit.c
 # for viewing image content types when the DECW$DISPLAY logical
 # is set.  Make it the foreign command for your system's X image
-# viewer (commonly, "xv").  Make it "exit" or something like that
-# if you don't have one.  It can be anything that will handle GIF,
+# viewer (commonly, "xv").  It can be anything that will handle GIF,
 # TIFF and other popular image formats.  Freeware ports of xv for
 # VMS are available in the ftp://ftp.wku.edu/vms/unsupported and
 # http://www.openvms.digital.com/cd/XV310A/ subdirectories.  You
 # must also have a "%s" for the filename.  The default is defined
 # in userdefs.h and can be overridden here, or via the global or
 # personal mailcap files (see below).
+# Make this empty (but no commented out) if you don't have such a
+# viewer or don't want to disable the built-in default viewer
+# mappings for image types.
 #
 #XLOADIMAGE_COMMAND:xv %s
 
@@ -1602,14 +1676,16 @@ MINIMAL_COMMENTS:TRUE
 # XLOADIMAGE_COMMAND will be used as a default in src/HTInit.c for
 # viewing image content types when the DISPLAY environment variable
 # is set.  Make it the full path and name of the xli (also know as
-# xloadimage or xview) command, or other image viewer.  Put 'echo' or
-# something like it here if you don't have a suitable viewer.  It can
-# be anything that will handle GIF, TIFF and other popular image formats
+# xloadimage or xview) command, or other image viewer.  It can be
+# anything that will handle GIF, TIFF and other popular image formats
 # (xli does).  The freeware distribution of xli is available in the
 # ftp://ftp.x.org/contrib subdirectory.  The shareware, xv, also is
 # suitable.  You must also have a "%s" for the filename; "&" for
 # background is optional.  The default is defined in userdefs.h and can be
 # overridden here, or via the global or personal mailcap files (see below).
+# Make this empty (but no commented out) if you don't have such a
+# viewer or don't want to disable the built-in default viewer
+# mappings for image types.
 # Note that open is used as the default for NeXT, instead of the
 # XLOADIMAGE_COMMAND definition.
 # If you use xli, you may want to add the -quiet flag.
@@ -1660,8 +1736,8 @@ MINIMAL_COMMENTS:TRUE
 #VIEWER:application/postscript:ghostview %s&:XWINDOWS
 #VIEWER:image/gif:xli %s&:XWINDOWS
 #VIEWER:image/x-xbm:xli %s&:XWINDOWS
-#VIEWER:image/x-rgb:xli %s&:XWINDOWS
-#VIEWER:image/x-tiff:xli %s&:XWINDOWS
+#VIEWER:image/png:xli %s&:XWINDOWS
+#VIEWER:image/tiff:xli %s&:XWINDOWS
 #VIEWER:image/jpeg:xli %s&:XWINDOWS
 #VIEWER:video/mpeg:mpeg_play %s &:XWINDOWS