diff -ur tetex-src-3.0.orig03/texk/kpathsea/texmf.in tetex-src-3.0/texk/kpathsea/texmf.in --- tetex-src-3.0.orig03/texk/kpathsea/texmf.in 2005-02-06 03:04:35 +0300 +++ tetex-src-3.0/texk/kpathsea/texmf.in 2005-02-23 06:35:10 +0300 @@ -56,7 +56,7 @@ % The tree containing the runtime files closely related to the specific % program version used: -TEXMFMAIN = @texmf@ +TEXMFMAIN = $SELFAUTODIR/share/texmf % The main distribution tree: TEXMFDIST = @texmf@-dist @@ -64,7 +64,7 @@ % 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. -TEXMFLOCAL = @texmf@-local +TEXMFLOCAL = $SELFAUTODIR/local/share/texmf % TEXMFSYSVAR, where texconfig-sys stores variable runtime data. % With teTeX-3.0 or later, this must be set. @@ -72,7 +72,7 @@ % TEXMFSYSVAR = $TEXMFMAIN % For using a separate tree: % TEXMFSYSVAR = @texmf@-var -TEXMFSYSVAR = @texmf@-var +TEXMFSYSVAR = $SELFAUTODIR/../var/cache/texmf % TEXMFSYSCONFIG, where texconfig-sys stores configuration data. % With teTeX-3.0 or later, this must be set. @@ -80,7 +80,7 @@ % TEXMFSYSCONFIG = $TEXMFMAIN % For using a separate tree: % TEXMFSYSCONFIG = @texmf@-config -TEXMFSYSCONFIG = @texmf@-config +TEXMFSYSCONFIG = $SELFAUTODIR/../etc/texmf % User texmf trees can be catered for like this... % This used to be HOMETEXMF. @@ -92,7 +92,7 @@ % TEXMFVAR = $TEXMFMAIN % For using a separate tree: % TEXMFVAR = $HOME/.texmf-var -TEXMFVAR = $HOME/.texmf-var +TEXMFVAR = $HOME/.var/cache/texmf % TEXMFCONFIG, where texconfig stores configuration data. % With teTeX-3.0 or later, this must be set. @@ -102,7 +102,7 @@ % TEXMFCONFIG = $HOME/.texmf-config % For using a separate tree: % TEXMFCONFIG = @texmf@-config -TEXMFCONFIG = $HOME/.texmf-config +TEXMFCONFIG = $HOME/.etc/texmf % Now, list all the texmf trees. If you have multiple trees you can % use shell brace notation, like this: @@ -111,15 +111,15 @@ % % For texconfig to work properly, TEXMFCONGIG and TEXMFVAR should be named % explicitly and before all other trees. -TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} +TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL} % The system trees. These are the trees that are shared by all the users. -SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST +SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN % 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 % varfonts feature was enabled in MT_FEATURES in mktex.cnf. -VARTEXFONTS = @vartexfonts@ +VARTEXFONTS = $SELFAUTODIR/../var/lib/texmf % 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. @@ -147,6 +147,7 @@ % VARTEXFONTS = $TEXMFVAR/fonts % and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). +TEXFONTSCNF = $SELFAUTODIR/../etc/tex-fonts %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % Usually you will not need to edit any of the other variables in part 1. % @@ -162,6 +163,7 @@ % Plain TeX. Have the command tex check all directories as a last % resort, we may have plain-compatible stuff anywhere. TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.xmltex = .;$TEXMF/tex/{plain,generic,}// % Other plain-based formats. TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// @@ -205,6 +207,7 @@ TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.pdfxmltex = .;$TEXMF/{pdftex,tex}/{plain,generic,}// TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// @@ -274,7 +277,7 @@ MISCFONTS = .;$TEXMF/fonts/misc// % font name map files. -TEXFONTMAPS = .;$TEXMF/fonts/map// +TEXFONTMAPS = .;$TEXFONTSCNF;$TEXMF/fonts/map// % support non"k"-xdvi: PKFONTS.XDvi = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}// @@ -291,8 +294,8 @@ % PostScript headers and prologues (.pro); unfortunately, some programs % also use this for acessing font files (enc, type1, truetype) -TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type3}}// -TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type3,truetype}}// +TEXPSHEADERS = .;$TEXFONTSCNF;$TEXMF/{dvips,fonts/{enc,type1,type3}}// +TEXPSHEADERS.gsftopk = .;$TEXFONTSCNF;$TEXMF/{dvips,fonts/{enc,type1,type3,truetype}}// % PostScript Type 1 outline fonts. T1FONTS = .;$TEXMF/fonts/type1// @@ -310,7 +313,7 @@ LIGFONTS = .;$TEXMF/fonts/lig// % Dvips' config.* files (this name should not start with `TEX'!). -TEXCONFIG = $TEXMF/dvips// +TEXCONFIG = $TEXFONTSCNF;$TEXMF/dvips// % Makeindex style (.ist) files. INDEXSTYLE = .;$TEXMF/makeindex// @@ -382,7 +385,7 @@ % % For security reasons, it is better not to have . part of the path. % -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@ +TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,/local/share}/texmf/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@ # $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To # avoid empty expansions from binaries linked against an earlier @@ -523,10 +526,12 @@ buf_size = 200000 hyph_size = 1000 % number of hyphenation exceptions, >610 and <32767. -nest_size = 500 % simultaneous semantic levels (e.g., groups) -max_in_open = 15 % simultaneous input files and error insertions +nest_size = 1000 % simultaneous semantic levels (e.g., groups) +max_in_open = 50 % simultaneous input files and error insertions param_size = 5000 % simultaneous macro parameters save_size = 5000 % for saving values outside current group +save_size.xmltex = 150000 % for saving values outside current group +save_size.pdfxmltex = 150000 % for saving values outside current group stack_size = 1500 % simultaneous input sources % These are Omega-specific.