merge part 4 (TeX Live definitions) to main body; from Frank K, 10 Apr 2007 21:33:53

git-svn-id: svn://tug.org/texlive/trunk@4145 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 80 insertions, 164 deletions

diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index bbbe0a6d9bf..3752da58b4b 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -248,10 +248,27 @@ TEXINPUTS.pdfplatex     = .;$TEXMF/tex/{platex,latex,generic,}//
 % Earlier entries override later ones, so put this last.
 TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
 
+% extra format definitions for TeX Live
+
+TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
+TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
+TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
+TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
+TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
+
+TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
+
 % Metafont, MetaPost inputs.
 MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
 MPINPUTS = .;$TEXMF/metapost//
 
+% allow for compressed files, and various extenions
+TEXDOCSSUFFIX   = ;.pdf;.ps;.dvi;.html;.txt;.tex
+TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
+TEXDOCEXT       = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
+
 % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read (see web2c/INSTALL),
 % and string pools (.pool) for ini{tex,mf,mp}.  It is silly that we have six
 % paths and directories here (they all resolve to a single place by default),
@@ -298,6 +315,9 @@ TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
 % BibTeX bibliographies and style files.
 BIBINPUTS = .;$TEXMF/bibtex/bib//
 BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
+% For bibtex8. Do we really need to repeat the BIBINPUTS setting?
+BIBINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bib,}//
+BSTINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bst,csf,}//
 
 % MFT style files.
 MFTINPUTS = .;$TEXMF/mft//
@@ -392,9 +412,23 @@ OCPINPUTS = .;$TEXMF/omega/ocp//
 % search formats, you'll want to add their variables here as well.
 T4HTINPUTS   = .;$TEXMF/tex4ht//
 
+%% t4ht utility, sharing files with TeX4ht
+TEX4HTFONTSET=alias,iso8859,unicode
+TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
+
+% Part for scripts that are distributed/installed in the texmf tree.
+
 % Architecture independent executables.
 TEXMFSCRIPTS = $TEXMF/scripts/{$engine,$progname,}//
 
+% Perl, Python, Ruby, Java scripts
+JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
+LUAINPUTS    = .;$TEXMF/scripts/{$progname,$engine,}/lua//
+PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
+PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
+RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
+
+
 %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
 % KPSE_DOT = .
 
@@ -446,6 +480,12 @@ shell_escape = f
 openout_any = p
 openin_any = a
 
+% Disable search on multiple suffixes filenames. In many case, when `foo.bar'
+% is looked for, you do not want to look for `foo.bar.tex' before. This flag
+% disables searching for standard suffixes if the file name has already an
+% extension of 3 characters. Default value is true (old behaviour).
+allow_multiple_suffixes =                       f
+
 % Allow TeX, MF, and MP to parse the first line of an input file for
 % the %&format construct.
 parse_first_line = t
@@ -581,85 +621,3 @@ gf_buf_size = 16384  % MF
 error_line = 79
 half_error_line = 50
 max_print_line = 79
-
-
-%  Part 4: extra format definitions for TeX Live
-
-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
-
-% For bibtex8. Do we really need to repeat the BIBINPUTS setting?
-BIBINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bib,}//
-BSTINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bst,csf,}//
-
-% allow for compressed files, and various extenions
-TEXDOCSSUFFIX   = ;.pdf;.ps;.dvi;.html;.txt;.tex
-TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
-TEXDOCEXT       = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% Part for scripts that are distributed/installed in the texmf tree.
-
-% Perl, Python, Ruby, Java scripts (Win32 only)
-% This is used by the irun.exe program which simulates a symlink
-% but also makes use of kpathsea to retrieve the target
-JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
-LUAINPUTS    = .;$TEXMF/scripts/{$progname,$engine,}/lua//
-PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-% Suggestions for editor settings under Windows. Uncomment your
-% preferred option. The corresponding MFEDIT can also be set for use with
-% Metafont.
-%
-% Winedt:
-%  TEXEDIT=C:\WinEdt\WinEdt.exe "[Open('%s');SelLine(%d,7)]
-% Textpad:
-%  TEXEDIT =                    c:\Progra~1\TextPad\System\Ddeopn32 TextPad %s(%d)
-% UltraEdit (newer Win32 versions):
-%  TEXEDIT =                    uedit32 %s/%d/1
-% WinTeXShell32:
-%  TEXEDIT =                    texshell.exe /l=%d %s
-% vi, vim, gvim. here we show Windows gvim.exe:
-%  TEXEDIT =                    gvim.exe %s +%d
-% PFE:
-%  TEXEDIT=pfe32/g%d  %s
-% MED:
-%  TEXEDIT=med.exe "%s" %d
-% TSE:
-%  TEXEDIT=e32.exe "%s" -n%d
-% Epsilon (Lugaru)            http://www.lugaru.com/
-%  TEXEDIT="c:\Program Files\eps90\bin\e32.exe" +%d %s
-% WinShell
-% TEXEDIT=C:\Progra~1\WinShell\WinShell.exe -c %s -l %d
-% notepad
-% TEXEDIT = notepad %s
-
-% For unix
-%
-% vi, vim, NEdit, (X)Emacs, pico, jed
-% TEXEDIT =                     vi     +%d %s
-% TEXEDIT =                     vim    +%d %s
-% TEXEDIT =                     nedit  +%d %s
-% TEXEDIT =                     xemacs +%d %s
-% TEXEDIT =                     emacs +%d %s
-
-%(x)fte:
-% TEXEDIT =                     xfte   -l%d %s
-
-% Disable search on multiple suffixes filenames. In many case, when `foo.bar'
-% is looked for, you do not want to look for `foo.bar.tex' before. This flag
-% disables searching for standard suffixes if the file name has already an
-% extension of 3 characters. Default value is true (old behaviour).
-allow_multiple_suffixes =                       f
diff --git a/Master/texmf/web2c/texmf.cnf-4WIN b/Master/texmf/web2c/texmf.cnf-4WIN
index 8f98112ecd9..2feedc3383c 100644
--- a/Master/texmf/web2c/texmf.cnf-4WIN
+++ b/Master/texmf/web2c/texmf.cnf-4WIN
@@ -258,10 +258,27 @@ TEXINPUTS.pdfplatex     = .;$TEXMF/tex/{platex,latex,generic,}//
 % Earlier entries override later ones, so put this last.
 TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
 
+% extra format definitions for TeX Live
+
+TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
+TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
+TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
+TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
+TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
+TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
+
+TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
+
 % Metafont, MetaPost inputs.
 MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
 MPINPUTS = .;$TEXMF/metapost//
 
+% allow for compressed files, and various extenions
+TEXDOCSSUFFIX   = ;.pdf;.ps;.dvi;.html;.txt;.tex
+TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
+TEXDOCEXT       = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
+
 % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read (see web2c/INSTALL),
 % and string pools (.pool) for ini{tex,mf,mp}.  It is silly that we have six
 % paths and directories here (they all resolve to a single place by default),
@@ -308,6 +325,9 @@ TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}//
 % BibTeX bibliographies and style files.
 BIBINPUTS = .;$TEXMF/bibtex/bib//
 BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
+% For bibtex8. Do we really need to repeat the BIBINPUTS setting?
+BIBINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bib,}//
+BSTINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bst,csf,}//
 
 % MFT style files.
 MFTINPUTS = .;$TEXMF/mft//
@@ -406,9 +426,23 @@ OCPINPUTS = .;$TEXMF/omega/ocp//
 % search formats, you'll want to add their variables here as well.
 T4HTINPUTS   = .;$TEXMF/tex4ht//
 
+%% t4ht utility, sharing files with TeX4ht
+TEX4HTFONTSET=alias,iso8859,unicode
+TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
+
+% Part for scripts that are distributed/installed in the texmf tree.
+
 % Architecture independent executables.
 TEXMFSCRIPTS = $TEXMF/scripts/{$engine,$progname,}//
 
+% Perl, Python, Ruby, Java scripts
+JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
+LUAINPUTS    = .;$TEXMF/scripts/{$progname,$engine,}/lua//
+PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
+PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
+RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
+
+
 %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
 % KPSE_DOT = .
 
@@ -460,6 +494,12 @@ shell_escape = f
 openout_any = p
 openin_any = a
 
+% Disable search on multiple suffixes filenames. In many case, when `foo.bar'
+% is looked for, you do not want to look for `foo.bar.tex' before. This flag
+% disables searching for standard suffixes if the file name has already an
+% extension of 3 characters. Default value is true (old behaviour).
+allow_multiple_suffixes =                       f
+
 % Allow TeX, MF, and MP to parse the first line of an input file for
 % the %&format construct.
 parse_first_line = t
@@ -595,85 +635,3 @@ gf_buf_size = 16384  % MF
 error_line = 79
 half_error_line = 50
 max_print_line = 79
-
-
-%  Part 4: extra format definitions for TeX Live
-
-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
-TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
-TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
-
-TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
-
-% For bibtex8. Do we really need to repeat the BIBINPUTS setting?
-BIBINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bib,}//
-BSTINPUTS.bibtex8 =             .;$TEXMF/bibtex/{bst,csf,}//
-
-% allow for compressed files, and various extenions
-TEXDOCSSUFFIX   = ;.pdf;.ps;.dvi;.html;.txt;.tex
-TEXDOCSCOMPRESS = ;.gz;.bz2;.zip;.Z
-TEXDOCEXT       = {$TEXDOCSSUFFIX}{$TEXDOCSCOMPRESS}
-
-%% t4ht utility, sharing files with TeX4ht
-TEX4HTFONTSET=alias,iso8859,unicode
-TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}//
-
-% Part for scripts that are distributed/installed in the texmf tree.
-
-% Perl, Python, Ruby, Java scripts (Win32 only)
-% This is used by the irun.exe program which simulates a symlink
-% but also makes use of kpathsea to retrieve the target
-JAVAINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/java//
-LUAINPUTS    = .;$TEXMF/scripts/{$progname,$engine,}/lua//
-PERLINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/perl//
-PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python//
-RUBYINPUTS   = .;$TEXMF/scripts/{$progname,$engine,}/ruby//
-
-% Suggestions for editor settings under Windows. Uncomment your
-% preferred option. The corresponding MFEDIT can also be set for use with
-% Metafont.
-%
-% Winedt:
-%  TEXEDIT=C:\WinEdt\WinEdt.exe "[Open('%s');SelLine(%d,7)]
-% Textpad:
-%  TEXEDIT =                    c:\Progra~1\TextPad\System\Ddeopn32 TextPad %s(%d)
-% UltraEdit (newer Win32 versions):
-%  TEXEDIT =                    uedit32 %s/%d/1
-% WinTeXShell32:
-%  TEXEDIT =                    texshell.exe /l=%d %s
-% vi, vim, gvim. here we show Windows gvim.exe:
-%  TEXEDIT =                    gvim.exe %s +%d
-% PFE:
-%  TEXEDIT=pfe32/g%d  %s
-% MED:
-%  TEXEDIT=med.exe "%s" %d
-% TSE:
-%  TEXEDIT=e32.exe "%s" -n%d
-% Epsilon (Lugaru)            http://www.lugaru.com/
-%  TEXEDIT="c:\Program Files\eps90\bin\e32.exe" +%d %s
-% WinShell
-% TEXEDIT=C:\Progra~1\WinShell\WinShell.exe -c %s -l %d
-% notepad
-% TEXEDIT = notepad %s
-
-% For unix
-%
-% vi, vim, NEdit, (X)Emacs, pico, jed
-% TEXEDIT =                     vi     +%d %s
-% TEXEDIT =                     vim    +%d %s
-% TEXEDIT =                     nedit  +%d %s
-% TEXEDIT =                     xemacs +%d %s
-% TEXEDIT =                     emacs +%d %s
-
-%(x)fte:
-% TEXEDIT =                     xfte   -l%d %s
-
-% Disable search on multiple suffixes filenames. In many case, when `foo.bar'
-% is looked for, you do not want to look for `foo.bar.tex' before. This flag
-% disables searching for standard suffixes if the file name has already an
-% extension of 3 characters. Default value is true (old behaviour).
-allow_multiple_suffixes =                       f