summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-02-06 18:59:05 +0000
committerKarl Berry <karl@freefriends.org>2009-02-06 18:59:05 +0000
commit1bbfee9f72b7a66c2cb2704d16ebe9f724eebda7 (patch)
tree5f6a87771a4f845c936564357ed12d1467b638a2
parentdb8ceff2d90eba30a9f41e04d121f69ff8d03161 (diff)
add TEXINPUTS definitions for luatex, lualatex, pdfluatex, pdflualatex
git-svn-id: svn://tug.org/texlive/trunk@12107 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/texmf.cnf61
-rw-r--r--Master/texmf/web2c/texmf.cnf61
3 files changed, 69 insertions, 58 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 8aa46e9b03d..724977cd267 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-06 Karl Berry <karl@tug.org>
+
+ * texmf.cnf (TEXINPUTS.lua*): add definitions for
+ luatex, lualatex, pdfluatex, pdflualatex.
+
2008-12-31 Karl Berry <karl@tug.org>
* kpsewhich.c (find_format): special-case XDvi to
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index b999d85936d..709aba5f2c4 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -152,7 +152,7 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMF
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the other variables in part 1. %
+% Usually you will not need to edit any of the following variables.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% WEB2C is for Web2C specific files. The current directory may not be
@@ -160,12 +160,16 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMF
WEB2C = $TEXMF/web2c
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc.
+% or \openin, including .sty, .eps, etc. We specify paths for all known
+% formats, past or present. Not all of them are built these days.
% 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,}//
+% Fontinst needs to read afm files.
+TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
+
% Other plain-based formats.
TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}//
TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}//
@@ -174,7 +178,6 @@ TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}//
TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}//
TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
% LaTeX 2e specific macros are stored in latex/, macros that can only be
% used with 2.09 in latex209/. In addition, we look in the directory
@@ -182,12 +185,8 @@ TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
% mention 2e at all, but can be used with 2e.
TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
+TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
% MLTeX.
TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}//
@@ -195,13 +194,11 @@ TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}//
TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}//
-% e-TeX. This form of the input paths is borrowed from teTeX. A certain
-% variant of TDS is assumed here, unaffected by the build variables.
+% e-TeX.
TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
-% pdfTeX. This form of the input paths is borrowed from teTeX. A certain
-% variant of TDS is assumed here, unaffected by the build variables.
+% pdfTeX.
TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}//
TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
@@ -218,39 +215,45 @@ 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,}//
-% XeTeX
+% LuaTeX.
+TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,generic,}//
+TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
+TEXINPUTS.pdflualatex = .;$TEXMF/tex/{lualatex,latex,generic,}//
+TEXINPUTS.pdfluatex = .;$TEXMF/tex/{lualatex,latex,generic,}//
+
+% XeTeX.
TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,generic,}//
TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,generic,}//
TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
-% Omega / Aleph
-TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
+% Omega / Aleph.
+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.omega = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}//
-% ConTeXt
+% ConTeXt.
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
-% odd formats needing their own paths
+% XMLTeX.
+TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
+
+% Miscellany, no longer built.
TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}//
TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,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,}//
+% Earlier entries override later ones, so put this generic one last.
+TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
+
+% ttf2tfm.
TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
% Metafont, MetaPost inputs.
diff --git a/Master/texmf/web2c/texmf.cnf b/Master/texmf/web2c/texmf.cnf
index b999d85936d..709aba5f2c4 100644
--- a/Master/texmf/web2c/texmf.cnf
+++ b/Master/texmf/web2c/texmf.cnf
@@ -152,7 +152,7 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMF
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Usually you will not need to edit any of the other variables in part 1. %
+% Usually you will not need to edit any of the following variables.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% WEB2C is for Web2C specific files. The current directory may not be
@@ -160,12 +160,16 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMF
WEB2C = $TEXMF/web2c
% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
-% or \openin, including .sty, .eps, etc.
+% or \openin, including .sty, .eps, etc. We specify paths for all known
+% formats, past or present. Not all of them are built these days.
% 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,}//
+% Fontinst needs to read afm files.
+TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
+
% Other plain-based formats.
TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}//
TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}//
@@ -174,7 +178,6 @@ TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}//
TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}//
TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
-TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
% LaTeX 2e specific macros are stored in latex/, macros that can only be
% used with 2.09 in latex209/. In addition, we look in the directory
@@ -182,12 +185,8 @@ TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
% mention 2e at all, but can be used with 2e.
TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
-TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
-TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,generic,}//
-
-% Fontinst needs to read afm files.
-TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
+TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
% MLTeX.
TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}//
@@ -195,13 +194,11 @@ TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}//
TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}//
-% e-TeX. This form of the input paths is borrowed from teTeX. A certain
-% variant of TDS is assumed here, unaffected by the build variables.
+% e-TeX.
TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}//
TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}//
-% pdfTeX. This form of the input paths is borrowed from teTeX. A certain
-% variant of TDS is assumed here, unaffected by the build variables.
+% pdfTeX.
TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}//
TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
@@ -218,39 +215,45 @@ 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,}//
-% XeTeX
+% LuaTeX.
+TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,generic,}//
+TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
+TEXINPUTS.pdflualatex = .;$TEXMF/tex/{lualatex,latex,generic,}//
+TEXINPUTS.pdfluatex = .;$TEXMF/tex/{lualatex,latex,generic,}//
+
+% XeTeX.
TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,generic,}//
TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,generic,}//
TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}//
-% Omega / Aleph
-TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
+% Omega / Aleph.
+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.omega = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}//
-% ConTeXt
+% ConTeXt.
TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
-% odd formats needing their own paths
+% XMLTeX.
+TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
+TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
+
+% Miscellany, no longer built.
TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}//
TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,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,}//
+% Earlier entries override later ones, so put this generic one last.
+TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
+
+% ttf2tfm.
TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
% Metafont, MetaPost inputs.