From 4d63669ccf419954f13acc1dc2494a35b825c3b1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 2 Feb 2011 16:14:28 +0000 Subject: propagate commented-out TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL, doc changes git-svn-id: svn://tug.org/texlive/trunk@21273 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/web2c/texmf.cnf | 109 +++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 66 deletions(-) (limited to 'Master') diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf index cfd9c2319e7..3164cc7b01d 100644 --- a/Master/texmf/web2c/texmf.cnf +++ b/Master/texmf/web2c/texmf.cnf @@ -35,88 +35,54 @@ % 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. -% -% 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. +% Part 1: Search paths and directories. -% The tree containing the runtime files closely related to the specific -% program version used: +% The tree containing runtime files related to the specific +% distribution and version: TEXMFMAIN = $SELFAUTOPARENT/texmf -% The main distribution tree: +% The main tree of packages, distribution-agnostic: TEXMFDIST = $SELFAUTOPARENT/texmf-dist -% 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 = $SELFAUTOPARENT/../texmf-local -% TEXMFSYSVAR, where texconfig-sys stores variable runtime data. -% With teTeX-3.0 or later, this must be set. -% For sharing this tree with $TEXMFMAIN: -% TEXMFSYSVAR = $TEXMFMAIN -% For using a separate tree: -% TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var +% TEXMFSYSVAR, where *-sys store cached runtime data. TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var -% TEXMFSYSCONFIG, where texconfig-sys stores configuration data. -% With teTeX-3.0 or later, this must be set. -% For sharing this tree with $TEXMFMAIN: -% TEXMFSYSCONFIG = $TEXMFMAIN -% For using a separate tree: -% TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config +% TEXMFSYSCONFIG, where *-sys store configuration data. TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config -% User texmf trees are allowed as follows. -% This used to be HOMETEXMF. +% Per-user texmf trees. 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 Window, $HOME otherwise. TEXMFHOME = ~/texmf -% TEXMFVAR, where texconfig stores variable runtime data. -% With teTeX-3.0 or later, this must be set. -% For sharing this tree with $TEXMFMAIN: -% TEXMFVAR = $TEXMFMAIN -% For using a separate tree: -% TEXMFVAR = ~/.texmf-var # teTeX 3.0 default +% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. TEXMFVAR = ~/.texlive2010/texmf-var -% TEXMFCONFIG, where texconfig stores configuration data. -% With teTeX-3.0 or later, this must be set. -% For sharing this tree with $TEXMFMAIN: -% TEXMFCONFIG = $TEXMFMAIN -% For using a separate tree: -% TEXMFCONFIG = ~/.texmf-config # teTeX 3.0 default -% For using a separate tree: -% TEXMFCONFIG = $SELFAUTOPARENT/texmf-config +% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive2010/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 @@ -127,7 +93,7 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T % 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. @@ -142,7 +108,7 @@ VARTEXFONTS = $TEXMFVAR/fonts % 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 @@ -550,7 +516,7 @@ openout_any = p 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 @@ -585,13 +551,13 @@ file_line_error_style = f % 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. @@ -609,6 +575,17 @@ TEX = etex % given as command line option or environment variable. BIBTEX_CSFILE = 88591lat.csf +% This variable is specific to Windows. It must be set to 0 or 1. It +% tells script wrappers to use an already installed Perl interpreter if +% one is found on the search path, in preference to the Perl shipped +% with TeX Live. Thus, it may be useful if you (a) installed a full +% Perl distribution for general use, and (b) need to run Perl programs +% from TL that use additional modules we don't provide. The TL Perl +% does provide all the standard modules. +% +%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 + + % Part 3: Array and other sizes for TeX (and Metafont). % % If you want to change some of these sizes only for a certain TeX -- cgit v1.2.3