From 4cac597e2157f85af33f27815f21878922131176 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 30 Jun 2009 18:00:18 +0000 Subject: make luatex output pdf by default, and dviluatex output dvi git-svn-id: svn://tug.org/texlive/trunk@14025 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/latexconfig/dvilualatex.ini | 10 ++++++++++ Master/texmf-dist/tex/latex/latexconfig/lualatex.ini | 11 ++++------- .../texmf-dist/tex/latex/latexconfig/pdflualatex.ini | 6 ------ Master/texmf-dist/tex/plain/config/dviluatex.ini | 5 +++++ Master/texmf-dist/tex/plain/config/luatex.ini | 6 ++++-- Master/texmf-dist/tex/plain/config/pdfluatex.ini | 6 ------ Master/texmf/tex/generic/config/luatexiniconfig.tex | 1 + Master/tlpkg/tlpsrc/latex.tlpsrc | 20 ++++++++++++++------ Master/tlpkg/tlpsrc/luatex.tlpsrc | 8 ++++---- 9 files changed, 42 insertions(+), 31 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini delete mode 100644 Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini create mode 100644 Master/texmf-dist/tex/plain/config/dviluatex.ini delete mode 100644 Master/texmf-dist/tex/plain/config/pdfluatex.ini diff --git a/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini new file mode 100644 index 00000000000..a35581d9531 --- /dev/null +++ b/Master/texmf-dist/tex/latex/latexconfig/dvilualatex.ini @@ -0,0 +1,10 @@ +% $Id$ +% Karl Berry, originally written 2008. public domain. +% +\input luatexiniconfig.tex +\input pdftexconfig +\pdfoutput=0 % dvi output by default +% +% the usual format initialization. +\scrollmode +\input latex.ltx diff --git a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini index 378680cee89..00404d7e71d 100644 --- a/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini +++ b/Master/texmf-dist/tex/latex/latexconfig/lualatex.ini @@ -1,11 +1,8 @@ % $Id$ -% Karl Berry, 2008. public domain. -% +% Karl Berry, originally written 2008. public domain. \input luatexiniconfig.tex -\input pdftexconfig -\pdfoutput=0 % dvi output by default -% -% the usual format initialization. +\input pdftexconfig.tex +% pdf output by default. \scrollmode \input latex.ltx -\endinput + diff --git a/Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini b/Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini deleted file mode 100644 index ef6dc9dc69f..00000000000 --- a/Master/texmf-dist/tex/latex/latexconfig/pdflualatex.ini +++ /dev/null @@ -1,6 +0,0 @@ -% Karl Berry, 2008. public domain. -\input luatexiniconfig.tex -\input pdftexconfig.tex -\scrollmode -\input latex.ltx -\endinput diff --git a/Master/texmf-dist/tex/plain/config/dviluatex.ini b/Master/texmf-dist/tex/plain/config/dviluatex.ini new file mode 100644 index 00000000000..7c93be69dca --- /dev/null +++ b/Master/texmf-dist/tex/plain/config/dviluatex.ini @@ -0,0 +1,5 @@ +% $Id$ +% Karl Berry, originally written 2008. Public domain. +% DVI output by default. +\input luatexiniconfig.tex +\input etex.ini diff --git a/Master/texmf-dist/tex/plain/config/luatex.ini b/Master/texmf-dist/tex/plain/config/luatex.ini index f14b595317e..38ea1dbed44 100644 --- a/Master/texmf-dist/tex/plain/config/luatex.ini +++ b/Master/texmf-dist/tex/plain/config/luatex.ini @@ -1,4 +1,6 @@ -% Karl Berry, 2008. Public domain. -% DVI-output plain luatex. +% $Id$ +% Karl Berry, originally written 2008. Public domain. +% PDF output by default. \input luatexiniconfig.tex +\input pdftexconfig.tex \input etex.ini diff --git a/Master/texmf-dist/tex/plain/config/pdfluatex.ini b/Master/texmf-dist/tex/plain/config/pdfluatex.ini deleted file mode 100644 index 7a334590db5..00000000000 --- a/Master/texmf-dist/tex/plain/config/pdfluatex.ini +++ /dev/null @@ -1,6 +0,0 @@ -% Karl Berry, 2008. Public domain. -\input luatexiniconfig.tex -\input pdftexconfig.tex -\input plain -\dump -\endinput diff --git a/Master/texmf/tex/generic/config/luatexiniconfig.tex b/Master/texmf/tex/generic/config/luatexiniconfig.tex index a6d8f1baaa4..396237e5c50 100644 --- a/Master/texmf/tex/generic/config/luatexiniconfig.tex +++ b/Master/texmf/tex/generic/config/luatexiniconfig.tex @@ -1,3 +1,4 @@ +% $Id$ % Enable LuaTeX primitives for INI mode (needed since 0.39.0) % Élie Roux & Manuel Pégourié-Gonnard, 2009. Public domain. \begingroup diff --git a/Master/tlpkg/tlpsrc/latex.tlpsrc b/Master/tlpkg/tlpsrc/latex.tlpsrc index 7f208feaf30..6a1da9c9ca3 100644 --- a/Master/tlpkg/tlpsrc/latex.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex.tlpsrc @@ -2,18 +2,26 @@ depend luatex depend pdftex depend latexconfig depend latex-fonts -execute AddFormat name=latex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *latex.ini" -execute AddFormat name=pdflatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *pdflatex.ini" -execute AddFormat name=lualatex engine=luatex patterns=language.dat options="lualatex.ini" -execute AddFormat name=pdflualatex engine=luatex patterns=language.dat options="pdflualatex.ini" +# +execute AddFormat name=latex engine=pdftex patterns=language.dat \ + options="-translate-file=cp227.tcx *latex.ini" +execute AddFormat name=pdflatex engine=pdftex patterns=language.dat \ + options="-translate-file=cp227.tcx *pdflatex.ini" +execute AddFormat name=dvilualatex engine=luatex patterns=language.dat \ + options="dvilualatex.ini" +execute AddFormat name=lualatex engine=luatex patterns=language.dat \ + options="lualatex.ini" +# srcpattern d texmf-dist/source/latex/base runpattern d texmf-dist/makeindex/latex runpattern d texmf-dist/tex/latex/base runpattern d texmf/tex/latex/config +# docpattern d texmf-dist/doc/latex/base docpattern f texmf/doc/man/man1/latex.* docpattern f texmf/doc/man/man1/pdflatex.* +# binpattern f bin/${ARCH}/latex -binpattern f bin/${ARCH}/lualatex binpattern f bin/${ARCH}/pdflatex -binpattern f bin/${ARCH}/pdflualatex +binpattern f bin/${ARCH}/dvilualatex +binpattern f bin/${ARCH}/lualatex diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc index 68337d15d2d..c5f7a6df623 100644 --- a/Master/tlpkg/tlpsrc/luatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc @@ -1,12 +1,12 @@ category TLCore shortdesc The LuaTeX engine. longdesc LuaTeX is an extended version of pdfTeX using Lua as an embedded -longdesc scripting language. The LuaTeX projects main objective is to provide an -longdesc open and configurable variant of TeX while at the same time offering -longdesc downward compatibility. http://luatex.org/ +longdesc scripting language. The LuaTeX projects main objective is to provide +longdesc an open and configurable variant of TeX while at the same time +longdesc offering downward compatibility. http://luatex.org/ # execute AddFormat name=luatex engine=luatex options="luatex.ini" -execute AddFormat name=pdfluatex engine=luatex options="pdfluatex.ini" +execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" # docpattern d texmf-dist/doc/luatex/base docpattern f texmf/doc/man/man1/luatex.* -- cgit v1.2.3