# is also a comment character in texmf.cnf

git-svn-id: svn://tug.org/texlive/trunk@60070 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 76 insertions, 95 deletions

diff --git a/Build/source/texk/kpathsea/doc/kpathsea.info b/Build/source/texk/kpathsea/doc/kpathsea.info
index 40282ce21af..c57020d0d01 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.info
+++ b/Build/source/texk/kpathsea/doc/kpathsea.info
@@ -1,4 +1,4 @@
-This is kpathsea.info, produced by makeinfo version 6.7 from
+This is kpathsea.info, produced by makeinfo version 6.8 from
 kpathsea.texi.
 
 This file documents the Kpathsea library for path searching.
@@ -37,7 +37,7 @@ Kpathsea library
 ****************
 
 This manual documents the Kpathsea library for path searching.  It
-corresponds to version 6.3.3, released in April 2021.
+corresponds to version 6.3.3, released in July 2021.
 
 * Menu:
 
@@ -62,7 +62,7 @@ File: kpathsea.info,  Node: Introduction,  Next: unixtex.ftp,  Prev: Top,  Up: T
 **************
 
 This manual corresponds to version 6.3.3 of the Kpathsea library,
-released in April 2021.
+released in July 2021.
 
    The library's fundamental purpose is to return a filename from a list
 of directories specified by the user, similar to what shells do when
@@ -526,10 +526,10 @@ character '0' (zero, not oh).
 helpful to look at the distributed 'texmf.cnf', which uses or at least
 mentions most features.  The format of 'texmf.cnf' files follows:
 
-   * Comments start with '%', either at the beginning of a line or
-     preceded by whitespace, and continue to the end of the line.  That
-     is, similar to most shells, a '%' in the "middle" of a value does
-     not start a comment.  Examples:
+   * Comments start with '%' or '#', either at the beginning of a line
+     or preceded by whitespace, and continue to the end of the line.
+     That is, similar to most shells, a comment character in the
+     "middle" of a value does not start a comment.  Examples:
 
           % this is a comment
           var = a%b  % but the value of var will be "a%b"
@@ -585,13 +585,6 @@ Here is a configuration file fragment illustrating most of these points:
      TEXINPUTS.latex2e = $latex2e_inputs
      TEXINPUTS.latex = $latex2e_inputs
 
-   This format has some similarity to Bourne shell scripts--change the
-comment character to '#', disallow spaces around the '=', and get rid of
-the '.NAME' convention, and it could be run through the shell.  However,
-there seemed little advantage in this, since all the information would
-have to passed back to Kpathsea and parsed there anyway, since the 'sh'
-process couldn't affect its parent's environment.
-
    The combination of spaces being ignored before the '.' of a program
 name qualifer and the optional '=' for the assignment has an unexpected
 consequence: if the value begins with a literal '.' and the '=' is
@@ -1996,7 +1989,7 @@ found are read; earlier definitions override later ones.
      equivalent, so that it no longer matters what the name of the
      installed file is; TeX documents will find their favorite name.
 
-   The format of fontmap files is straightforward:
+   The format of fontmap files:
 
    * Comments start with the last '%' on a line and continue to the end
      of the line.  (This provides for names that include a %,
@@ -3213,7 +3206,7 @@ Index
 * : may not be ::                        Searching overview.  (line  13)
 * :: expansion:                          Default expansion.   (line   6)
 * ; translated to : in texmf.cnf:        Config files.        (line  66)
-* = omitted in texmf.cnf and misparsing: Config files.        (line  93)
+* = omitted in texmf.cnf and misparsing: Config files.        (line  86)
 * \, line continuation in texmf.cnf:     Config files.        (line  37)
 * \openin:                               Searching overview.  (line  31)
 * \special, suppressing warnings about:  Suppressing warnings.
@@ -3290,7 +3283,7 @@ Index
                                                               (line  46)
 * cmr10, as fallback font:               Fallback font.       (line  15)
 * cmr10.vf:                              Searching overview.  (line  31)
-* cnf.c:                                 Config files.        (line 112)
+* cnf.c:                                 Config files.        (line 105)
 * cnf.h:                                 Programming with config files.
                                                               (line  27)
 * comments, in fontmap files:            Fontmap.             (line  27)
@@ -3319,7 +3312,6 @@ Index
 * config.status:                         Bug checklist.       (line  27)
 * configuration bugs:                    Bug checklist.       (line  27)
 * configuration file, source for path:   Path sources.        (line  20)
-* configuration files as shell scripts.: Config files.        (line  86)
 * configuration of mktex scripts:        mktex configuration. (line   6)
 * configure options for mktex scripts:   mktex configuration. (line  12)
 * context diff:                          Bug checklist.       (line  52)
@@ -3498,7 +3490,7 @@ Index
                                                               (line  27)
 * KPATHSEA_DEBUG:                        Calling sequence.    (line  28)
 * KPATHSEA_DEBUG <1>:                    Debugging.           (line  18)
-* kpathsea_find_file:                    File lookup.         (line  38)
+* kpathsea_find_file:                    File lookup.         (line  37)
 * kpathsea_find_file <1>:                Calling sequence.    (line  62)
 * kpathsea_find_glyph:                   Glyph lookup.        (line  26)
 * kpathsea_finish:                       Calling sequence.    (line 106)
@@ -3734,7 +3726,6 @@ Index
 * setgid scripts:                        Security.            (line  40)
 * SFDFONTS:                              Supported file formats.
                                                               (line 177)
-* shell scripts as configuration files:  Config files.        (line  86)
 * shell variables:                       Variable expansion.  (line  17)
 * shell_escape, example for code:        Programming with config files.
                                                               (line  10)
@@ -3798,8 +3789,8 @@ Index
 * TeX file lookup:                       File lookup.         (line   6)
 * TeX glyph lookup:                      Glyph lookup.        (line   6)
 * TeX support:                           TeX support.         (line   6)
-* TeX Users Group:                       Introduction.        (line  43)
-* tex-file.c:                            File lookup.         (line  38)
+* TeX Users Group:                       Introduction.        (line  42)
+* tex-file.c:                            File lookup.         (line  37)
 * tex-file.h:                            Programming overview.
                                                               (line  26)
 * tex-glyph.c:                           Glyph lookup.        (line  26)
@@ -3956,62 +3947,62 @@ Index
 
 Tag Table:
 Node: Top1480
-Node: Introduction2260
-Node: History4327
-Node: unixtex.ftp8923
-Node: Security10393
-Node: TeX directory structure12897
-Node: Path searching16936
-Node: Searching overview17894
-Node: Path sources21713
-Node: Config files22939
-Node: Path expansion28202
-Node: Default expansion29155
-Node: Variable expansion31225
-Node: Tilde expansion32626
-Node: Brace expansion33606
-Node: KPSE_DOT expansion34545
-Node: Subdirectory expansion35058
-Node: Casefolding search37406
-Node: Casefolding rationale38175
-Node: Casefolding examples39521
-Node: Filename database44567
-Node: ls-R45549
-Node: Filename aliases49225
-Node: Database format50403
-Node: Invoking kpsewhich51416
-Node: Path searching options52371
-Node: Specially-recognized files61969
-Node: Auxiliary tasks63324
-Node: Standard options67049
-Node: TeX support67405
-Node: Supported file formats68759
-Node: File lookup76427
-Node: Glyph lookup78176
-Node: Basic glyph lookup79300
-Node: Fontmap80180
-Node: Fallback font82709
-Node: Suppressing warnings83621
-Node: mktex scripts84748
-Node: mktex configuration85963
-Node: mktex script names91766
-Node: mktex script arguments93152
-Node: Programming94031
-Node: Programming overview94604
-Node: Calling sequence97465
-Node: Program-specific files103994
-Node: Programming with config files105017
-Node: Reporting bugs106604
-Node: Bug checklist107282
-Node: Mailing lists110751
-Node: Debugging111428
-Node: Logging116505
-Node: Common problems118372
-Node: Unable to find files118849
-Node: Slow path searching121259
-Node: Unable to generate fonts122634
-Node: TeX or Metafont failing125106
-Node: Index126308
+Node: Introduction2259
+Node: History4325
+Node: unixtex.ftp8921
+Node: Security10391
+Node: TeX directory structure12895
+Node: Path searching16934
+Node: Searching overview17892
+Node: Path sources21711
+Node: Config files22937
+Node: Path expansion27809
+Node: Default expansion28762
+Node: Variable expansion30832
+Node: Tilde expansion32233
+Node: Brace expansion33213
+Node: KPSE_DOT expansion34152
+Node: Subdirectory expansion34665
+Node: Casefolding search37013
+Node: Casefolding rationale37782
+Node: Casefolding examples39128
+Node: Filename database44174
+Node: ls-R45156
+Node: Filename aliases48832
+Node: Database format50010
+Node: Invoking kpsewhich51023
+Node: Path searching options51978
+Node: Specially-recognized files61576
+Node: Auxiliary tasks62931
+Node: Standard options66656
+Node: TeX support67012
+Node: Supported file formats68366
+Node: File lookup76034
+Node: Glyph lookup77783
+Node: Basic glyph lookup78907
+Node: Fontmap79787
+Node: Fallback font82297
+Node: Suppressing warnings83209
+Node: mktex scripts84336
+Node: mktex configuration85551
+Node: mktex script names91354
+Node: mktex script arguments92740
+Node: Programming93619
+Node: Programming overview94192
+Node: Calling sequence97053
+Node: Program-specific files103582
+Node: Programming with config files104605
+Node: Reporting bugs106192
+Node: Bug checklist106870
+Node: Mailing lists110339
+Node: Debugging111016
+Node: Logging116093
+Node: Common problems117960
+Node: Unable to find files118437
+Node: Slow path searching120847
+Node: Unable to generate fonts122222
+Node: TeX or Metafont failing124694
+Node: Index125896
 
 End Tag Table
 
diff --git a/Build/source/texk/kpathsea/doc/kpathsea.texi b/Build/source/texk/kpathsea/doc/kpathsea.texi
index d522d8be49d..bed36be2041 100644
--- a/Build/source/texk/kpathsea/doc/kpathsea.texi
+++ b/Build/source/texk/kpathsea/doc/kpathsea.texi
@@ -3,7 +3,7 @@
 @settitle Kpathsea: A library for path searching
 
 @set version 6.3.3
-@set month-year April 2021
+@set month-year July 2021
 
 @copying
 This file documents the Kpathsea library for path searching.
@@ -651,10 +651,10 @@ mentions most features.  The format of @file{texmf.cnf} files follows:
 @itemize @bullet
 @item
 @cindex comments, in @file{texmf.cnf}
-Comments start with @samp{%}, either at the beginning of a line or
-preceded by whitespace, and continue to the end of the line.  That is,
-similar to most shells, a @samp{%} in the ``middle'' of a value does not
-start a comment.  Examples:
+Comments start with @samp{%} or @samp{#}, either at the beginning of a
+line or preceded by whitespace, and continue to the end of the line.
+That is, similar to most shells, a comment character in the ``middle''
+of a value does not start a comment.  Examples:
 
 @example
 % this is a comment
@@ -732,16 +732,6 @@ TEXINPUTS.latex2e = $latex2e_inputs
 TEXINPUTS.latex = $latex2e_inputs
 @end example
 
-@cindex shell scripts as configuration files
-@cindex configuration files as shell scripts.
-This format has some similarity to Bourne shell scripts---change the
-comment character to @code{#}, disallow spaces around the @code{=},
-and get rid of the @code{.@var{name}} convention, and it could be run
-through the shell.  However, there seemed little advantage in this,
-since all the information would have to passed back to Kpathsea and
-parsed there anyway, since the @code{sh} process couldn't affect its
-parent's environment.
-
 @kindex = @r{omitted in @file{texmf.cnf} and misparsing}
 The combination of spaces being ignored before the @code{.} of a
 program name qualifer and the optional @samp{=} for the assignment has
@@ -2620,7 +2610,7 @@ file is; @TeX{} documents will find their favorite name.
 
 @end enumerate
 
-The format of fontmap files is straightforward:
+The format of fontmap files:
 
 @itemize @bullet
 @cindex comments, in fontmap files
diff --git a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
index 6b6cb7f5cfa..fc594df15fb 100644
--- a/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
+++ b/Master/texmf-dist/doc/texlive/texlive-en/texlive-en.tex
@@ -2188,7 +2188,7 @@ The following list summarizes the special characters and constructs in
 \item[\CODE{,}] Separates items in brace expansion.
 \item[\CODE{//}] Subdirectory expansion (can occur anywhere in
     a path, except at its beginning).
-\item[\CODE{\%}] Start of comment.
+\item[\CODE{\%{\rm\ or }\#}] Start of comment.
 \item[\CODE{\bs}] At the end of a line, continuation character to allow
     multi-line entries.
 \item[\CODE{!!}] Search \emph{only} database to locate file, \emph{do