sync texmf.cnf, update for current values

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

2 files changed, 53 insertions, 32 deletions

diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index ca145a89e5f..b74f62c84a3 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
-% this file is installed in /some/path/to/texlive/2008/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2008/texmf.cnf.
+% this file is installed in /some/path/to/texlive/2009/texmf/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2009/texmf.cnf.
 % 
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
@@ -27,18 +27,20 @@
 % right-hand side. For environment variables, use FOO_PROGRAM.
 %
 % Which file formats use which paths for searches is described in the
-% various programs' and the Kpathsea documentation.
+% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
 %
 % // means to search subdirectories (recursively).
 % A leading !! means to look only in the ls-R db, never on the disk.
 % In this file, either ; or : can be used to separate path components.
 % A leading/trailing/doubled path separator in the paths will be
 %   expanded into the compile-time default. Probably not what you want.
-%   
+%
+
 % Brace notation is supported, for example: /usr/local/{mytex,othertex}
 % expands to /usr/local/mytex:/usr/local/othertex.  You can use the path
 % separator as well as the comma for this: /usr/local/{mytex:othertex}
-% also expands to /usr/local/mytex:/usr/local/othertex.
+% also expands to /usr/local/mytex:/usr/local/othertex.  We make
+% extensive use of this.
 
 %  Part 1: Search paths and directories.
 
@@ -223,7 +225,7 @@ TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
 TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,generic,}//
 TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
 TEXINPUTS.pdflualatex   = .;$TEXMF/tex/{lualatex,latex,generic,}//
-TEXINPUTS.pdfluatex     = .;$TEXMF/tex/{lualatex,latex,generic,}//
+TEXINPUTS.pdfluatex     = .;$TEXMF/tex/{luatex,plain,generic,}//
 
 % XeTeX.
 TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,generic,}//
@@ -400,14 +402,12 @@ FONTCONFIG_FILE=fonts.conf
 FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
 FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
 
-% TeX documentation and source files, for use with kpsewhich.
+% TeX documentation and source files, for use with kpsewhich (and texdoc).
 % TeX Live has a separate hierarchy with just documentation, texmf-doc,
 % in addition to the doc files in the other hierarchies.
-% Also, find the English documentation first -- better than random, when
-% there are name collisions.
-% Also, find things from man pages first, same reason.
-TEXMFDOCDIR = $TEXMFDOC/doc{/english,}
-TEXDOCS = .;$TEXMF/doc{/man,}//;$TEXMFDOCDIR//
+% Find non-man pages first, better than random in case of conflict.
+TEXMFDOCDIR = $TEXMFDOC/doc
+TEXDOCS = .;$TEXMF/doc{,/man}//;$TEXMFDOCDIR//
 TEXSOURCES = .;$TEXMF/source//
 
 % Web and CWeb input paths.
@@ -503,7 +503,7 @@ shell_escape_commands = \
 bibtex,convert,dvips,epstopdf,epspdf,etex,fc-match,gnuplot,\
 kpsewhich,latex,luatex,lualatex,makeindex,mpost,\
 pdfcrop,pdflatex,pdfluatex,ps2pdf,ps4pdf,pstopdf,pygmentize,\
-tex,texexec,texmfstart\
+tex,texexec,texmfstart,ulqda\
 
 % plain TeX should remain unenhanced.
 shell_escape.tex = f
@@ -611,11 +611,10 @@ extra_mem_bot.context = 4000000
 % Must be >= 20000 and <= 4000000 (without tex.ch changes).
 font_mem_size = 3000000
 
-% Total number of fonts. Must be >= 50 and <= 5000 (without tex.ch changes).
-font_max = 5000
+% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
+font_max = 9000
 
-% Extra space for the hash table of control sequences (which allows 10K
-% names as distributed).
+% Extra space for the hash table of control sequences.
 hash_extra = 50000
 
 % Max number of characters in all strings, including all error messages,
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index 8f2fab376c0..b74f62c84a3 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -4,8 +4,8 @@
 % If you modify this original file, YOUR CHANGES WILL BE LOST when it is
 % updated.  Instead, put your changes -- and only your changes, not an
 % entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
-% this file is installed in /some/path/to/texlive/2008/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2008/texmf.cnf.
+% this file is installed in /some/path/to/texlive/2009/texmf/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2009/texmf.cnf.
 % 
 % What follows is a super-summary of what this .cnf file can
 % contain. Please read the Kpathsea manual for more information.
@@ -13,6 +13,7 @@
 % Any identifier (sticking to A-Za-z_ for names is safest) can be assigned.
 % The `=' (and surrounding spaces) is optional.
 % $foo (or ${foo}) in a value expands to the envvar or cnf value of foo.
+% Long lines can be continued with a \.
 %
 % Earlier entries (in the same or another file) override later ones, and
 % an environment variable foo overrides any texmf.cnf definition of foo.
@@ -26,7 +27,7 @@
 % right-hand side. For environment variables, use FOO_PROGRAM.
 %
 % Which file formats use which paths for searches is described in the
-% various programs' and the kpathsea documentation.
+% various programs' and the Kpathsea documentation (http://tug.org/kpathsea).
 %
 % // means to search subdirectories (recursively).
 % A leading !! means to look only in the ls-R db, never on the disk.
@@ -34,10 +35,12 @@
 % A leading/trailing/doubled path separator in the paths will be
 %   expanded into the compile-time default. Probably not what you want.
 %
-% You can use brace notation, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  Instead of the comma
-% you can use the path separator: /usr/local/{mytex:othertex} also expands
-% to /usr/local/mytex:/usr/local/othertex.
+
+% Brace notation is supported, for example: /usr/local/{mytex,othertex}
+% expands to /usr/local/mytex:/usr/local/othertex.  You can use the path
+% separator as well as the comma for this: /usr/local/{mytex:othertex}
+% also expands to /usr/local/mytex:/usr/local/othertex.  We make
+% extensive use of this.
 
 %  Part 1: Search paths and directories.
 
@@ -373,6 +376,12 @@ SFDFONTS = .;$TEXMF/fonts/sfd//
 % OpenType outline fonts.
 OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
 
+% OpenType feature files (.fea).
+FONTFEATURES=.;$TEXMF/fonts/fea//
+
+% .cid and .cidmap
+FONTCIDMAPS=.;$TEXMF/fonts/cid//
+
 % pdftex config files:
 PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
 
@@ -396,8 +405,9 @@ FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
 % TeX documentation and source files, for use with kpsewhich (and texdoc).
 % TeX Live has a separate hierarchy with just documentation, texmf-doc,
 % in addition to the doc files in the other hierarchies.
+% Find non-man pages first, better than random in case of conflict.
 TEXMFDOCDIR = $TEXMFDOC/doc
-TEXDOCS = .;$TEXMF/doc//;$TEXMFDOCDIR//
+TEXDOCS = .;$TEXMF/doc{,/man}//;$TEXMFDOCDIR//
 TEXSOURCES = .;$TEXMF/source//
 
 % Web and CWeb input paths.
@@ -481,9 +491,22 @@ engine = unsetengine
 % babel.sty, not babel.sty.tex, regardless of this setting.
 try_std_extension_first = t
 
-% Enable system commands via \write18{...}?  Obviously insecure, despite
-% being so useful.
-shell_escape = f
+% Enable system commands via \write18{...}.  When enabled fully (set to
+% 1), obviously insecure.  When enabled partially (set to p), only the
+% commands listed in shell_escape_commands are allowed.  Although this
+% is not fully secure either, it is much better, and so useful that we
+% enable it for everything but bare tex.
+shell_escape = p
+
+% No spaces in this command list.
+shell_escape_commands = \
+bibtex,convert,dvips,epstopdf,epspdf,etex,fc-match,gnuplot,\
+kpsewhich,latex,luatex,lualatex,makeindex,mpost,\
+pdfcrop,pdflatex,pdfluatex,ps2pdf,ps4pdf,pstopdf,pygmentize,\
+tex,texexec,texmfstart,ulqda\
+
+% plain TeX should remain unenhanced.
+shell_escape.tex = f
 
 % Allow TeX \openin, \openout, or \input on filenames starting with `.'
 % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
@@ -588,11 +611,10 @@ extra_mem_bot.context = 4000000
 % Must be >= 20000 and <= 4000000 (without tex.ch changes).
 font_mem_size = 3000000
 
-% Total number of fonts. Must be >= 50 and <= 5000 (without tex.ch changes).
-font_max = 5000
+% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
+font_max = 9000
 
-% Extra space for the hash table of control sequences (which allows 10K
-% names as distributed).
+% Extra space for the hash table of control sequences.
 hash_extra = 50000
 
 % Max number of characters in all strings, including all error messages,