From 43e2e31c6c50260cce588637b892ab1b6c0ee743 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 May 2012 15:53:55 +0000 Subject: tl12 preliminaries git-svn-id: svn://tug.org/texlive/trunk@26312 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf/web2c/texmf.cnf | 47 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 7 deletions(-) (limited to 'Master/texmf/web2c/texmf.cnf') diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf index 078ac6112b0..7838c771984 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/2011/texmf/web2c/texmf.cnf, -% add your custom settings to /some/path/to/texlive/2011/texmf.cnf. +% this file is installed in /some/path/to/texlive/2012/texmf/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2012/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -49,6 +49,8 @@ % (http://tug.org/tds), or files may not be found. % % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. +% Kpathsea sets SELFAUTOLOC (the directory with the binary), +% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTOPARENT % The tree containing runtime files related to the specific @@ -74,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config TEXMFHOME = ~/texmf % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data. -TEXMFVAR = ~/.texlive2011/texmf-var +TEXMFVAR = ~/.texlive2012/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. -TEXMFCONFIG = ~/.texlive2011/texmf-config +TEXMFCONFIG = ~/.texlive2012/texmf-config % List all the texmf trees. % @@ -461,9 +463,39 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file % will take precedence over the distributed one under texmf/web2c. % -% For security reasons, it is better not to include . in this path. +% For security reasons, it is best not to include . in this path. % -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} +% The idea behind this lengthy definition: for each of +% SELFAUTO{LOC,DIR,AUTO}, look in the directory, +% then the subdirectories share/texmf-local and share/texmf, +% then ./texmf-local and ./texmf. +% +% However, we want to include one more directory: the +% great-grandparent's texmf-local, because that is how TL is installed +% by default. That is, given a binary +% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find +% /usr/local/texlive/texmf-local/web2c/texmf.cnf. I.e., not under YYYY. +% +% As a result, we cannot use actual brace expansion in the definition, +% since we don't want to scatter ../'s throughout the value. Hence we +% explicitly list every directory. Arguably more understandable this +% way anyway. +% +TEXMFCNF = {\ +$SELFAUTOLOC,\ +$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\ +$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\ +$SELFAUTODIR,\ +$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\ +$SELFAUTOPARENT/../texmf-local/web2c,\ +$SELFAUTOPARENT,\ +$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\ +$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\ +} +% +% For reference, here is the old brace-using definition: +%TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} % kpathsea 3.5.3 and later sets these at runtime. To avoid empty % expansions from binaries linked against an earlier version of the @@ -511,6 +543,7 @@ shell_escape_commands = \ bibtex,bibtex8,\ kpsewhich,\ makeindex,\ +mpost, repstopdf,\ % we'd like to allow: @@ -718,7 +751,7 @@ screen_depth.mf = 1200 % BibTeX only (max_strings also determines hash_size and hash_prime). ent_str_size = 250 -glob_str_size = 5000 +glob_str_size = 20000 max_strings.bibtex = 35307 max_strings.bibtex8 = 35307 max_strings.bibtexu = 35307 -- cgit v1.2.3