summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/web2c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-07 18:58:34 +0000
committerKarl Berry <karl@freefriends.org>2013-04-07 18:58:34 +0000
commit25fe101524f8eb688fb883418111c0a216bfb0c6 (patch)
treeb30c8a5bef846507b1acf07a23a4b9830c2eab21 /Master/texmf-dist/web2c
parent335c72669537f06bbf2b4b6e2248fae60c4f38a9 (diff)
first updates for TL13 pretest, and for texmf-dist having everything
git-svn-id: svn://tug.org/texlive/trunk@29725 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/web2c')
-rw-r--r--Master/texmf-dist/web2c/texmf.cnf72
-rw-r--r--Master/texmf-dist/web2c/texmfcnf.lua10
2 files changed, 40 insertions, 42 deletions
diff --git a/Master/texmf-dist/web2c/texmf.cnf b/Master/texmf-dist/web2c/texmf.cnf
index d8569d294aa..2ac8f1d7f4b 100644
--- a/Master/texmf-dist/web2c/texmf.cnf
+++ b/Master/texmf-dist/web2c/texmf.cnf
@@ -3,9 +3,9 @@
%
% 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/2012/texmf/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2012/texmf.cnf.
+% entire copy! -- in ../../texmf.cnf. That is, if this file is
+% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2013/texmf.cnf.
%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
@@ -53,13 +53,13 @@
% SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
TEXMFROOT = $SELFAUTOPARENT
-% The tree containing runtime files related to the specific
-% distribution and version.
-TEXMFMAIN = $TEXMFROOT/texmf
-
-% The main tree of packages, distribution-agnostic:
+% The main tree of distributed packages and programs:
TEXMFDIST = $TEXMFROOT/texmf-dist
+% We used to have a separate /texmf tree with some core programs and files.
+% Keep the variable name.
+TEXMFMAIN = $TEXMFDIST
+
% Local additions to the distribution trees.
TEXMFLOCAL = $TEXMFROOT/../texmf-local
@@ -76,25 +76,22 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2012/texmf-var
+TEXMFVAR = ~/.texlive2013/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2012/texmf-config
+TEXMFCONFIG = ~/.texlive2013/texmf-config
-% List all the texmf trees.
+% List all the texmf trees. For an explanation of what they are, see the
+% TeX Live manual.
%
% 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 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}
+% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions
+% should take precedence over distribution files -- 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,!!$TEXMFLOCAL,!!$TEXMFDIST}
% Where to look for ls-R files. There need not be an ls-R in the
% directories in this path, but if there is one, Kpathsea will use it.
@@ -102,13 +99,13 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T
% does not create ls-R files in the non-!! elements -- because if an
% ls-R is present, it will be used, and the disk will not be searched.
% This is arguably a bug in kpathsea.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
% 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.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST
+SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
% Where generated fonts may be written. This tree is used when the sources
% were found in a system tree and either that tree wasn't writable, or the
@@ -429,7 +426,7 @@ DVIPDFMXINPUTS = $TEXMF/dvipdfmx
% the /tex/ will not be found.
%
% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
-% The default LUAINPUTS sufficess for luatex and dviluatex.
+% The default LUAINPUTS suffices for luatex and dviluatex.
%
LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
@@ -457,7 +454,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
% argv[0], in kpse_set_program_name.
%
% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
+% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf.
% Since this file is subject to future updates, the TeX Live installer
% or human administrator may also create a file
% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
@@ -467,7 +464,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
%
% 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 the subdirectories share/texmf-local and share/texmf-dist,
% then ./texmf-local and ./texmf.
%
% However, we want to include one more directory: the
@@ -483,15 +480,16 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
%
TEXMFCNF = {\
$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf/web2c,\
-$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf/web2c,\
+$SELFAUTOLOC/share/texmf-local/web2c,$SELFAUTOLOC/share/texmf-dist/web2c,\
+$SELFAUTOLOC/texmf-local/web2c,$SELFAUTOLOC/texmf-dist/web2c,\
$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf/web2c,\
+$SELFAUTODIR/share/texmf-local/web2c,$SELFAUTODIR/share/texmf-dist/web2c,\
+$SELFAUTODIR/texmf-local/web2c,$SELFAUTODIR/texmf-dist/web2c,\
$SELFAUTOPARENT/../texmf-local/web2c,\
$SELFAUTOPARENT,\
-$SELFAUTOPARENT/share/texmf-local/web2c,$SELFAUTOPARENT/share/texmf/web2c,\
-$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf/web2c\
+$SELFAUTOPARENT/share/texmf-local/web2c,\
+$SELFAUTOPARENT/share/texmf-dist/web2c,\
+$SELFAUTOPARENT/texmf-local/web2c,$SELFAUTOPARENT/texmf-dist/web2c\
}
%
% For reference, here is the old brace-using definition:
@@ -568,7 +566,7 @@ shell_escape.initex = f
% for the purportedly safe shell_escape_commands above to system
% directories.
TEXMF_RESTRICTED_SCRIPTS = \
- {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
+ {!!$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)?
@@ -675,7 +673,7 @@ BIBTEX_CSFILE = 88591lat.csf
% For some xy-pic samples, you may need as much as 700000 words of memory.
% For the vast majority of documents, 60000 or less will do.
%
-main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
+main_memory = 5000000 % words of inimemory available; also applies to inimf&mp
extra_mem_top = 0 % extra high memory for chars, tokens, etc.
extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc.
@@ -685,17 +683,17 @@ extra_mem_bot.context = 4000000
% Words of font info for TeX (total size of all TFM files, approximately).
% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 3000000
+font_mem_size = 8000000
% 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.
-hash_extra = 200000
+hash_extra = 600000
% Max number of characters in all strings, including all error messages,
% help texts, font names, control sequences. These values apply to TeX.
-pool_size = 3250000
+pool_size = 6250000
% Minimum pool space after TeX's own strings; must be at least
% 25000 less than pool_size, but doesn't need to be nearly that large.
string_vacancies = 90000
@@ -723,7 +721,7 @@ nest_size = 500 % simultaneous semantic levels (e.g., groups)
max_in_open = 15 % simultaneous input files and error insertions,
% also applies to MetaPost
param_size = 10000 % simultaneous macro parameters, also applies to MP
-save_size = 50000 % for saving values outside current group
+save_size = 100000 % for saving values outside current group
stack_size = 5000 % simultaneous input sources
% These are Omega-specific.
diff --git a/Master/texmf-dist/web2c/texmfcnf.lua b/Master/texmf-dist/web2c/texmfcnf.lua
index 039426e9440..6a68f04832d 100644
--- a/Master/texmf-dist/web2c/texmfcnf.lua
+++ b/Master/texmf-dist/web2c/texmfcnf.lua
@@ -37,7 +37,7 @@ return {
-- TEXMFCNF = {
-- "selfautoparent:/texmf-local",
-- "selfautoparent:/texmf-local/web2c",
- -- "selfautoparent:/texmf",
+ -- "selfautoparent:/texmf-dist",
-- "selfautoparent:/texmf/web2c",
-- "selfautoparent:",
-- }
@@ -45,13 +45,13 @@ return {
-- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
TEXMFSYSVAR = "selfautoparent:texmf-var",
- TEXMFVAR = "home:.texlive2012/texmf-var",
+ TEXMFVAR = "home:.texlive2013/texmf-var",
-- We have only one cache path but there can be more. The first writable one
-- will be chosen but there can be more readable paths.
TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
- TEXMFCONFIG = "home:.texlive2012/texmf-config",
+ TEXMFCONFIG = "home:.texlive2013/texmf-config",
-- I don't like this texmf under home and texmf-home would make more
-- sense. One never knows what installers put under texmf anywhere and
@@ -62,8 +62,8 @@ return {
-- entry. This makes the tex root relocatable.
TEXMFOS = "selfautodir:",
- TEXMFMAIN = "selfautoparent:texmf",
TEXMFDIST = "selfautoparent:texmf-dist",
+ TEXMFMAIN = TEXMFDIST,
TEXMFLOCAL = texmflocal,
TEXMFSYSCONFIG = "selfautoparent:texmf-config",
@@ -76,7 +76,7 @@ return {
-- We need texmfos for a few rare files but as I have a few more bin trees
-- a hack is needed. Maybe other users also have texmf-platform-new trees.
- TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}",
+ TEXMF = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}",
TEXFONTMAPS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
ENCFONTS = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",