From b0aea042a14a4ee991ed80dbd4c5f6385a4cd30b Mon Sep 17 00:00:00 2001 From: Hans Wurst Date: Fri, 31 Jul 2015 03:04:33 +0200 Subject: [PATCH] committing changes in /etc after emerge run Package changes: --- texmf/ls-R | 4 -- texmf/web2c/fmtutil.cnf | 12 +++-- texmf/web2c/texmf.cnf | 110 ++++++++++++++++++++-------------------- 3 files changed, 63 insertions(+), 63 deletions(-) diff --git a/texmf/ls-R b/texmf/ls-R index b336b19..618df55 100644 --- a/texmf/ls-R +++ b/texmf/ls-R @@ -22,8 +22,6 @@ dvipdfmx.cfg dvipdfmx.cfg ./fmtutil.d: -._cfg0000_format.texlive-basic.cnf -._cfg0000_format.texlive-formatsextra.cnf format.texlive-basic.cnf format.texlive-formatsextra.cnf format.texlive-latex.cnf @@ -52,10 +50,8 @@ paper.cfg ./texmf.d: ._cfg0000_00header.cnf -._cfg0000_05searchpaths.cnf ._cfg0000_10standardpaths.cnf ._cfg0000_15options.cnf -._cfg0000_20sizes.cnf 00header.cnf 05searchpaths.cnf 10standardpaths.cnf diff --git a/texmf/web2c/fmtutil.cnf b/texmf/web2c/fmtutil.cnf index 4b0b2dd..399d6a6 100644 --- a/texmf/web2c/fmtutil.cnf +++ b/texmf/web2c/fmtutil.cnf @@ -1,14 +1,20 @@ -# Generated for texlive-basic by texlive-module.eclass +# Generated for texlive-basic by texlive-module.eclass dviluatex luatex language.def,language.dat.lua dviluatex.ini +luajittex luajittex language.def,language.dat.lua luatex.ini luatex luatex language.def,language.dat.lua luatex.ini mf mf-nowin - -translate-file=cp227.tcx mf.ini etex pdftex language.def -translate-file=cp227.tcx *etex.ini pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini pdftex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini tex tex - tex.ini -# Generated for texlive-formatsextra by texlive-module.eclass +# Generated for texlive-formatsextra by texlive-module.eclass eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini -mllatex pdftex language.dat -translate-file=cp227.tcx -mltex mllatex.ini +#! dvilollipop pdftex - -translate-file=cp227.tcx *lollipop.ini +#! dvilualollipop luatex - -translate-file=cp227.tcx lualollipop.ini +lollipop pdftex - -translate-file=cp227.tcx *lollipop.ini +lualollipop luatex - lualollipop.ini +xelollipop xetex - -etex xelollipop.ini +mllatex pdftex language.dat -translate-file=cp227.tcx -mltex *mllatex.ini mltex pdftex - -translate-file=cp227.tcx -mltex mltex.ini texsis pdftex - -translate-file=cp227.tcx texsis.ini # Generated for texlive-latex by texlive-module.eclass diff --git a/texmf/web2c/texmf.cnf b/texmf/web2c/texmf.cnf index dded415..68c8a23 100644 --- a/texmf/web2c/texmf.cnf +++ b/texmf/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/2014/texmf-dist/web2c/texmf.cnf, +% add your custom settings to /some/path/to/texlive/2014/texmf.cnf. % % What follows is a super-summary of what this .cnf file can % contain. Please read the Kpathsea manual for more information. @@ -40,7 +40,6 @@ % use of this. - % Part 1: Search paths and directories. % This is the parent directory of our several trees, i.e., @@ -54,13 +53,13 @@ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). TEXMFROOT = $SELFAUTODIR/share -% 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 + % The Gentoo site tree TEXMFSITE = $TEXMFROOT/texmf-site @@ -85,20 +84,17 @@ TEXMFVAR = ~/.texlive/texmf-var % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data. TEXMFCONFIG = ~/.texlive/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,!!$TEXMFSITE,!!$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,!!$TEXMFSITE,!!$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. @@ -106,13 +102,19 @@ 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,!!$TEXMFSITE,!!$TEXMFDIST} +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$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;$TEXMFSITE;$TEXMFDIST +SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFSITE;$TEXMFDIST + +% First writable tree here is used by Lua(La)TeX for the font cache. +% LuaLaTeX uses the value here, while ConTeXt uses the same variable but +% from texmfcnf.lua; therefore the two values should be kept in sync. +% (As should everything else in texmf.cnf <-> texmfcnf.lua.) +TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR % We use GLOBALVARTEXFONTS in order to always be able to search in the global % font cache even if VARTEXFONTS is overridden. @@ -134,6 +136,7 @@ VARTEXFONTS = $GLOBALVARTEXFONTS % one of the TEXMF directories (avoids overlapping ls-R files). + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Usually you will not need to edit any of the following variables. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -194,15 +197,11 @@ TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// -% pdfxTeX. -TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// -TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// -TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// - % LuaTeX. TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// -TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}// TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// % XeTeX. @@ -215,7 +214,7 @@ TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.elambda = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.eomega = .;$TEXMF/tex/{plain,generic,}// TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}// -TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}// +TEXINPUTS.lamed = .;$TEXMF/tex/{lambda,latex,generic,}// TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}// % p(La)TeX. @@ -389,8 +388,8 @@ MIMELIBDIR = $SELFAUTOPARENT/etc MAILCAPLIBDIR = $SELFAUTOPARENT/etc % Default settings for the fontconfig library as used by the Windows -% versions of xetex/xdvipdfmx. On Unixish systems, fontconfig ignores -% this. ConTeXT MkIV (all platforms) also use these values. +% versions of xetex/xdvipdfmx. Not used by xetex on Unixish systems. +% ConTeXT MkIV (all platforms) also use these values. % FONTCONFIG_FILE = fonts.conf FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf @@ -437,7 +436,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,}// @@ -465,20 +464,22 @@ 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 -% will take precedence over the distributed one under texmf/web2c. +% will take precedence over the distributed one. % % For security reasons, it is best not to include . in this path. % % 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. +% SELFAUTO{LOC,DIR,PARENT}, look in the directory, +% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf, +% then the subdirectories ./texmf-local, texmf-dist, ./texmf. +% At any given installation, most of these directories will not exist, +% but they all turn out to be useful somewhere. % -% However, we want to include one more directory: the +% Special addition -- 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 @@ -486,20 +487,13 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// % % 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. +% explicitly list every directory. Arguably more understandable 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\ +$SELFAUTODIR/share/texmf-dist/web2c,\ +$SELFAUTODIR/share/texmf/web2c,\ +$SELFAUTODIR/local/share/texmf/web2c,\ +$SELFAUTOPARENT/etc/texmf/web2c\ } % % For reference, here is the old brace-using definition: @@ -577,7 +571,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)? @@ -662,7 +656,8 @@ BIBTEX_CSFILE = 88591lat.csf %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0 -% Part 3: Array and other sizes for TeX (and Metafont). + +% Part 3: Array and other sizes for TeX, Metafont, etc. % % If you want to change some of these sizes only for a certain TeX % variant, the usual dot notation works, e.g., @@ -684,7 +679,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. @@ -694,17 +689,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 @@ -732,7 +727,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. @@ -771,4 +766,7 @@ line_length.gftype = 500 max_rows.gftype = 8191 max_cols.gftype = 8191 +% Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends? +% Default is 0, to not guess. +guess_input_kanji_encoding = 1