Date: Sunday, June 5, 2011 @ 07:59:07 Author: remy Revision: 126443 Update texmf.cnf with TL2011 pretest version
Modified: texlive-bin/trunk/texmf.cnf -----------+ texmf.cnf | 111 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 62 insertions(+), 49 deletions(-) Modified: texmf.cnf =================================================================== --- texmf.cnf 2011-06-05 11:46:05 UTC (rev 126442) +++ texmf.cnf 2011-06-05 11:59:07 UTC (rev 126443) @@ -1,6 +1,12 @@ % texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea. % Public domain. % +% 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/2011/texmf/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. +% % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. % @@ -29,68 +35,63 @@ % 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. We make -% extensive use of this. +% expands to /usr/local/mytex:/usr/local/othertex. We make extensive +% use of this. + % Part 1: Search paths and directories. -% You can set an environment variable to override TEXMF if you're testing -% a new TeX tree, without changing anything else. +% This is the parent directory of our several trees, i.e., +% /usr/local/texlive/YYYY in the original TeX Live distribution. % -% You may wish to use one of the $SELFAUTO... variables here so TeX will -% find where to look dynamically. See the manual and the definition -% below of TEXMFCNF. +% All trees must be organized according to the TeX Directory Structure +% (http://tug.org/tds), or files may not be found. +% +% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +TEXMFROOT = $SELFAUTODIR/share -% The tree containing the runtime files closely related to the specific -% program version used: -TEXMFMAIN = /usr/share/texmf +% The tree containing runtime files related to the specific +% distribution and version. +TEXMFMAIN = $TEXMFROOT/texmf -% The main distribution tree: -TEXMFDIST = /usr/share/texmf-dist +% The main tree of packages, distribution-agnostic: +TEXMFDIST = $TEXMFROOT/texmf-dist -% Our documentation-only tree, arranged by language: -TEXMFDOC = /usr/share/texmf-doc - -% A place for local additions to a "standard" texmf tree. -% This tree is not used for local configuration maintained by -% texconfig, it uses TEXMFCONFIG below. +% Local additions to the distribution trees. TEXMFLOCAL = /usr/local/share/texmf -% TEXMFSYSVAR, where texconfig-sys stores variable runtime data. +% TEXMFSYSVAR, where *-sys store cached runtime data. TEXMFSYSVAR = /var/lib/texmf -% TEXMFSYSCONFIG, where texconfig-sys stores configuration data. +% TEXMFSYSCONFIG, where *-sys store configuration data. TEXMFSYSCONFIG = /etc/texmf -% User texmf trees are allowed as follows. +% Per-user texmf tree(s) -- organized per the TDS, as usual. To define +% more than one per-user tree, set this to a list of directories in +% braces, as described above. (This used to be HOMETEXMF.) ~ expands +% to %USERPROFILE% on Windows, $HOME otherwise. TEXMFHOME = ~/texmf -% TEXMFVAR, where texconfig stores variable runtime data. +% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. TEXMFVAR = ~/.texlive/texmf-var -% TEXMFCONFIG, where texconfig stores configuration data. +% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive/texmf-config -% Now, list all the texmf trees. If you have multiple trees you can -% use shell brace notation, like this: -% TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN} -% The braces are necessary. +% List all the texmf trees. % % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named % explicitly and before all other trees. % % TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the % files in TEXMFMAIN are tightly coupled with the particular version of -% the distribution, such as format files. Overriding them would be more -% likely to cause trouble than help. On the other hand, all the -% standard packages and fonts are in TEXMFDIST, and locally-installed -% versions should take precedence over those (although it is generally a -% source of confusion to have different versions of a package installed, -% whatever the trees, so try to avoid it). +% the distribution, such as configuration files. Overriding them would +% be more likely to cause trouble than help. On the other hand, the +% bulk of packages and fonts are in TEXMFDIST, and locally-installed +% versions should take precedence over those -- although it is generally +% a source of confusion to have different versions of a package +% installed, whatever the trees, so try to avoid it. TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} % Where to look for ls-R files. There need not be an ls-R in the @@ -101,7 +102,7 @@ % This is arguably a bug in kpathsea. TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} -% The system trees. These are the trees that are shared by all the users. +% The system trees. These are the trees that are shared by all users. % If a tree appears in this list, the mktex* scripts will use % VARTEXFONTS for generated files, if the original tree isn't writable; % otherwise the current working directory is used. @@ -116,7 +117,7 @@ % files that may be created as well as the formats. For example % TEXMFVAR = /var/lib/texmf % is used in many distros. In this case, set VARTEXFONTS like this -% VARTEXFONTS = $TEXMFVAR/fonts +%VARTEXFONTS = $TEXMFVAR/fonts % and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). % % Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below @@ -203,7 +204,7 @@ % ConTeXt. TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// -% jadetex +% jadetex. TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// @@ -304,10 +305,10 @@ AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// % TrueType outline fonts. -TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR// +TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR// % Opentype outline fonts. -OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR// +OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR// % Type 42 outline fonts. T42FONTS = .;$TEXMF/fonts/type42// @@ -387,6 +388,10 @@ TW_LIBPATH = $TEXMFCONFIG/texworks TW_INIPATH = $TW_LIBPATH +% For security, do not look in . for dvipdfmx.cfg, since the D option +% would allow command execution. +DVIPDFMXINPUTS = $TEXMF/dvipdfmx + % Find scripts that are distributed/installed in the texmf tree. % Lua needs to look in TEXINPUTS for lua scripts distributed with packages. @@ -488,7 +493,14 @@ % plain TeX should remain unenhanced. shell_escape.tex = f +shell_escape.initex = f +% This is used by the Windows script wrapper for restricting searching +% for the purportedly safe shell_escape_commands above to system +% directories. +TEXMF_RESTRICTED_SCRIPTS = \ + {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}// + % Allow TeX \openin, \openout, or \input on filenames starting with `.' % (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? % a (any) : any file can be opened. @@ -499,7 +511,7 @@ openin_any = a % Write .log/.dvi/etc. files here, if the current directory is unwritable. -% TEXMFOUTPUT = /tmp +%TEXMFOUTPUT = /tmp % If a dynamic file creation fails, log the command to this file, in % either the current directory or TEXMFOUTPUT. Set to the @@ -521,6 +533,7 @@ % file_line_error_style settings, as well as the options -enctex, % -mltex, -8bit, etc., also affect this, but they are all off by default. parse_first_line.tex = f +parse_first_line.initex = f % Control file:line:error style messages. file_line_error_style = f @@ -534,13 +547,13 @@ % set DVIPSMAKEPK to `foo', what counts is the value of the environment % variable/config value `FOO', not the `MKTEXPK' value. % -% MKTEXTEX = 0 -% MKTEXPK = 0 -% MKTEXMF = 0 -% MKTEXTFM = 0 -% MKTEXFMT = 0 -% MKOCP = 0 -% MKOFM = 0 +%MKTEXTEX = 0 +%MKTEXPK = 0 +%MKTEXMF = 0 +%MKTEXTFM = 0 +%MKTEXFMT = 0 +%MKOCP = 0 +%MKOFM = 0 % Used by makempx to run TeX. We use "etex" because MetaPost is % expecting DVI, and not "tex" because we want first line parsing.