--- teTeX-src-beta-20030107/texk/kpathsea/texmf.in.defaults-alt-texmf	2003-01-06 15:22:29 +0200

+++ teTeX-src-beta-20030107/texk/kpathsea/texmf.in	2003-01-12 11:23:44 +0200

@@ -55,18 +55,20 @@

 % below of TEXMFCNF.

 % The main tree, which must be mentioned in $TEXMF, below:

-TEXMFMAIN = @texmf@

+TEXMFMAIN = $SELFAUTODIR/share/texmf

 % A place for local additions to a "standard" texmf tree.  For example:

-TEXMFLOCAL = @texmf@-local

+TEXMFLOCAL = $SELFAUTODIR/local/share/texmf

 % If defined, teTeX's texconfig stores modifications here (instead of the

 % TEXMFMAIN tree).

-%   VARTEXMF = @texmf@-var

+VARTEXMF = $SELFAUTODIR/../var/cache/texmf

 % User texmf trees can be catered for like this...

 HOMETEXMF = $HOME/texmf

+TEXFONTSCNF = $SELFAUTODIR/../etc/tex-fonts

+  

 % Now, list all the texmf trees. If you have multiple trees you can

 % use shell brace notation, like this:

 % TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}

@@ -74,7 +76,7 @@

 %   - list $VARTEXMF in the TEXMF definition;

 %   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.

 % TEXMF = $TEXMFMAIN

-TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}

+TEXMF = {$HOMETEXMF,!!$TEXFONTSCNF,!!$VARTEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}

 % The system trees.  These are the trees that are shared by all the users.

 SYSTEXMF = $TEXMF

@@ -82,7 +84,7 @@

 % 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.

@@ -125,6 +127,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,}//

@@ -166,6 +169,7 @@

 TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//

 TEXINPUTS.pdfmex   = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//

 TEXINPUTS.pdftex   = .;$TEXMF/{pdftex,tex}/{plain,generic,}//

+TEXINPUTS.pdfxmltex   = .;$TEXMF/{pdftex,tex}/{plain,generic,}//

 TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}//

 TEXINPUTS.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,plain,generic,}//

@@ -230,7 +234,7 @@

 % For texfonts.map and included map files used by mktexpk.

 % See ftp://ftp.tug.org/tex/fontname.tar.gz.

-TEXFONTMAPS = .;$TEXMF/fontname

+TEXFONTMAPS = .;$TEXFONTSCNF;$TEXMF/fontname

 % BibTeX bibliographies and style files.

 BIBINPUTS = .;$TEXMF/bibtex/{bib,}//

@@ -240,8 +244,8 @@

 MFTINPUTS = .;$TEXMF/mft//

 % PostScript headers, prologues (.pro), encodings (.enc) and fonts.

-TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//

-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}//

+TEXPSHEADERS = .;$TEXFONTSCNF;$TEXMF/{dvips,pdftex,tex,fonts/type1}//

+TEXPSHEADERS.gsftopk = .;$TEXFONTSCNF;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}//

 % PostScript Type 1 outline fonts.

 T1FONTS = .;$TEXMF/fonts/type1//

@@ -256,7 +260,7 @@

 T42FONTS = .;$TEXMF/fonts/type42//

 % Dvips' config.* files (this name should not start with `TEX'!).

-TEXCONFIG = $TEXMF/dvips//

+TEXCONFIG = $TEXFONTSCNF;$TEXMF/dvips//

 % Makeindex style (.ist) files.

 INDEXSTYLE = .;$TEXMF/makeindex//

@@ -296,8 +300,8 @@

 T4HTINPUTS   = .;$TEXMF/tex4ht//

 % xdvik and dvipdfm can share some files with dvips

-XDVIINPUTS = .;$TEXMF/{xdvi,dvips}//

-DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}//

+XDVIINPUTS = .;$TEXFONTSCNF;$TEXMF/{xdvi,dvips}//

+DVIPDFMINPUTS = .;$TEXFONTSCNF;$TEXMF/{dvipdfm,dvips}//

 %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.

 % KPSE_DOT = .

@@ -312,7 +316,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@

@@ -444,10 +448,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.