[arch-commits] Commit in texlive-bin/trunk (texmf.cnf)

2011-06-05 Thread Rémy Oudompheng
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/ 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 

[arch-commits] Commit in texlive-bin/trunk (texmf.cnf)

2010-07-27 Thread François Charette
Date: Tuesday, July 27, 2010 @ 08:14:49
  Author: francois
Revision: 86278

Comment out OSFONTDIR by default
(otherwise fonts in $HOME are ignored my mkluatexfontdb)

Modified:
  texlive-bin/trunk/texmf.cnf

---+
 texmf.cnf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: texmf.cnf
===
--- texmf.cnf   2010-07-27 10:39:26 UTC (rev 86277)
+++ texmf.cnf   2010-07-27 12:14:49 UTC (rev 86278)
@@ -295,7 +295,7 @@
 % OSFONTDIR is to provide a convenient hook for allowing TeX to find
 % fonts installed on the system (outside of TeX).  An empty default
 % value would add // to the search paths, so we give it a dummy value.
-OSFONTDIR = /usr/share/fonts
+% OSFONTDIR = /usr/share/fonts
 
 % PostScript Type 1 outline fonts.
 T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR//