move over the tlpsrc files from branch

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

40 files changed, 103 insertions, 73 deletions

diff --git a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
index f45356d3a07..fa0d3efb30b 100644
--- a/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-aleph.tlpsrc
@@ -1,7 +1,7 @@
 name bin-aleph
 category TLCore
 depend bin-omega
-execute BuildFormat aleph
-runpattern f texmf/fmtutil/format.aleph.cnf
+execute AddFormat name=aleph engine=aleph options=*aleph.ini
+execute AddFormat name=lamed engine=aleph patterns=language.dat options=*lambda.ini
 binpattern f bin/${ARCH}/aleph
 binpattern f bin/${ARCH}/lamed
diff --git a/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc b/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
index 137f4b75705..6a247fdb361 100644
--- a/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-amstex.tlpsrc
@@ -1,7 +1,7 @@
 name bin-amstex
 category TLCore
 depend bin-tex
-execute BuildFormat amstex
-runpattern f texmf/fmtutil/format.amstex.cnf
+execute AddFormat name=amstex engine=pdftex options="-translate-file=cp227.tcx *amstex.ini"
+execute AddFormat name=pdfamstex mode=disabled engine=pdftex options="-translate-file=cp227.tcx *pdfamstex.ini"
 docpattern f texmf/doc/man/man1/amstex.*
 binpattern f bin/${ARCH}/amstex
diff --git a/Master/tlpkg/tlpsrc/bin-context.tlpsrc b/Master/tlpkg/tlpsrc/bin-context.tlpsrc
index de58e037b0d..e7adbcc0e55 100644
--- a/Master/tlpkg/tlpsrc/bin-context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-context.tlpsrc
@@ -1,9 +1,15 @@
 name bin-context
 category TLCore
 depend pdftex
-execute BuildFormat context
+execute AddFormat name=cont-en engine=pdftex patterns=cont-usr.tex options="-8bit *cont-en.ini"
+execute AddFormat name=cont-cz mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-cz.ini"
+execute AddFormat name=cont-de mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-de.ini"
+execute AddFormat name=cont-nl mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-nl.ini"
+execute AddFormat name=cont-uk mode=disabled engine=pdftex patterns=cont-usr.tex options="-8bit *cont-uk.ini"
+execute AddFormat name=cont-en engine=xetex patterns=cont-usr.tex options="-8bit *cont-en.ini"
+execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex"
+execute AddFormat name=metafun engine=mpost options="-translate-file=cp227.tcx metafun.mp"
 runpattern f texmf-dist/tex/mptopdf/config/mptopdf.ini
-runpattern f texmf/fmtutil/format.context.cnf
 docpattern f texmf/doc/man/man1/ctxtools.*
 docpattern f texmf/doc/man/man1/makempy.*
 docpattern f texmf/doc/man/man1/mptopdf.*
diff --git a/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc b/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
index c5a20093df9..411300bd8e6 100644
--- a/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-cslatex.tlpsrc
@@ -1,7 +1,7 @@
 name bin-cslatex
 category TLCore
 depend bin-latex
-execute BuildFormat cslatex
-runpattern f texmf/fmtutil/format.cslatex.cnf
+execute AddFormat name=cslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini"
+execute AddFormat name=pdfcslatex engine=pdftex options="-etex -translate-file=cp227.tcx cslatex.ini"
 binpattern f bin/${ARCH}/cslatex
 binpattern f bin/${ARCH}/pdfcslatex
diff --git a/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc b/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
index b3640660fc2..faf2c4f86d3 100644
--- a/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-csplain.tlpsrc
@@ -1,7 +1,7 @@
 name bin-csplain
 category TLCore
 depend bin-tex
-execute BuildFormat csplain
-runpattern f texmf/fmtutil/format.csplain.cnf
+execute AddFormat name=csplain engine=pdftex options="-etex -translate-file=cp227.tcx csplain.ini"
+execute AddFormat name=pdfcsplain engine=pdftex options="-etex -translate-file=cp227.tcx csplain.ini"
 binpattern f bin/${ARCH}/csplain
 binpattern f bin/${ARCH}/pdfcsplain
diff --git a/Master/tlpkg/tlpsrc/bin-cyrillic.tlpsrc b/Master/tlpkg/tlpsrc/bin-cyrillic.tlpsrc
index 70c33f4794e..4a347e28ccd 100644
--- a/Master/tlpkg/tlpsrc/bin-cyrillic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-cyrillic.tlpsrc
@@ -4,6 +4,3 @@ docpattern f texmf/doc/man/man1/rubibtex.*
 docpattern f texmf/doc/man/man1/rumakeindex.*
 binpattern f bin/${ARCH}/rubibtex
 binpattern f bin/${ARCH}/rumakeindex
-runpattern f texmf/fmtutil/format.cyramstex.cnf
-runpattern f texmf/fmtutil/format.cyrtex.cnf
-runpattern f texmf/fmtutil/format.cyrtexinfo.cnf
diff --git a/Master/tlpkg/tlpsrc/bin-dviout.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-dviout.win32.tlpsrc
index 80646efe0bf..3f22ae46ce1 100644
--- a/Master/tlpkg/tlpsrc/bin-dviout.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-dviout.win32.tlpsrc
@@ -2,3 +2,4 @@ name bin-dviout.win32
 category TLCore
 binpattern d/win32 tlpkg/dviout
 binpattern f bin/win32/dviout.vbs
+postaction shortcut type=menu name="DVIOUT Dvi Viewer" cmd=wscript args=TEXDIR/bin/win32/dviout.vbs hide=1
diff --git a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
index 12189c094d6..724e7832c53 100644
--- a/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-eplain.tlpsrc
@@ -1,8 +1,7 @@
 name bin-eplain
 category TLCore
 depend pdftex
-execute BuildFormat eplain
-runpattern f texmf/fmtutil/format.eplain.cnf
+execute AddFormat name=eplain engine=pdftex options="-translate-file=cp227.tcx *eplain.ini"
 docpattern f texmf/doc/info/eplain.info
 docpattern f texmf/doc/man/man1/eplain.*
 binpattern f bin/${ARCH}/eplain
diff --git a/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
index d41a2df9e9e..319e4959a74 100644
--- a/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-jadetex.tlpsrc
@@ -2,7 +2,7 @@ name bin-jadetex
 category TLCore
 depend pdftex
 depend bin-tex
-execute BuildFormat jadetex
-runpattern f texmf/fmtutil/format.jadetex.cnf
+execute AddFormat name=jadetex engine=pdftex patterns=language.dat options="&latex jadetex.ini"
+execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat options="&pdflatex pdfjadetex.ini"
 binpattern f bin/${ARCH}/jadetex
 binpattern f bin/${ARCH}/pdfjadetex
diff --git a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
index 7f43d3a7cd0..811b96e924f 100644
--- a/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-kpathsea.tlpsrc
@@ -1,6 +1,7 @@
 name bin-kpathsea
 category TLCore
 runpattern f texmf/web2c/*.cnf
+runpattern !f texmf/web2c/fmtutil-hdr.cnf
 runpattern f texmf/web2c/*.opt
 runpattern f texmf/web2c/*.tcx
 runpattern f texmf/web2c/mktexdir
diff --git a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
index 620892e2376..b24dd2eef59 100644
--- a/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-latex.tlpsrc
@@ -4,12 +4,14 @@ depend luatex
 depend pdftex
 depend latexconfig
 depend latex-fonts
-execute BuildFormat latex
+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"
 binpattern f bin/${ARCH}/latex
 binpattern f/!hppa-hpux bin/${ARCH}/lualatex
 binpattern f bin/${ARCH}/pdflatex
 binpattern f/!hppa-hpux bin/${ARCH}/pdflualatex
 docpattern f texmf/doc/man/man1/latex.*
 docpattern f texmf/doc/man/man1/pdflatex.*
-runpattern f texmf/fmtutil/format.latex.cnf
 runpattern d texmf/tex/latex/config
diff --git a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
index 2dd91933f0a..e81ede17f81 100644
--- a/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metafont.tlpsrc
@@ -1,8 +1,7 @@
 name bin-metafont
 category TLCore
 depend bin-kpathsea
-execute BuildFormat metafont
-runpattern f texmf/fmtutil/format.metafont.cnf
+execute AddFormat name=mf engine=mf-nowin options="-translate-file=cp227.tcx mf.ini"
 docpattern f texmf/doc/man/man1/mf-nowin.*
 docpattern f texmf/doc/man/man1/mf.*
 binpattern f bin/${ARCH}/mf
diff --git a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
index bc3213bca6b..c422f89a2a3 100644
--- a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
@@ -1,8 +1,8 @@
 name bin-metapost
 category TLCore
 depend bin-kpathsea
-execute BuildFormat metapost
-runpattern f texmf/fmtutil/format.metapost.cnf
+execute AddFormat name=mpost engine=mpost options="-translate-file=cp227.tcx mpost.mp"
+execute AddFormat name=mfplain engine=mpost options="-translate-file=cp227.tcx mfplain.ini"
 docpattern f texmf/doc/man/man1/dmp.*
 docpattern f texmf/doc/man/man1/dvitomp.*
 docpattern f texmf/doc/man/man1/makempx.*
diff --git a/Master/tlpkg/tlpsrc/bin-mex.tlpsrc b/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
index b9f72ca2ed6..6953e2d1500 100644
--- a/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-mex.tlpsrc
@@ -2,10 +2,9 @@ name bin-mex
 category TLCore
 depend pdftex
 depend bin-tex
-execute BuildFormat mex
-execute BuildFormat utf8mex
-runpattern f texmf/fmtutil/format.mex.cnf
-runpattern f texmf/fmtutil/format.utf8mex.cnf
+execute AddFormat name=mex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *mex.ini"
+execute AddFormat name=pdfmex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *pdfmex.ini"
+execute AddFormat name=utf8mex engine=pdftex patterns=mexconf.tex options="-enc *utf8mex.ini"
 binpattern f bin/${ARCH}/mex
 binpattern f bin/${ARCH}/pdfmex
 binpattern f bin/${ARCH}/utf8mex
diff --git a/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
index b652e9e196d..f9372d7a74a 100644
--- a/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-mltex.tlpsrc
@@ -1,7 +1,7 @@
 name bin-mltex
 category TLCore
 depend bin-latex
-execute BuildFormat mltex
-runpattern f texmf/fmtutil/format.mltex.cnf
+execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini"
+execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex mllatex.ini"
 binpattern f bin/${ARCH}/mllatex
 binpattern f bin/${ARCH}/mltex
diff --git a/Master/tlpkg/tlpsrc/bin-omega.tlpsrc b/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
index 3ce77cae90f..da8f8d0eaaa 100644
--- a/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-omega.tlpsrc
@@ -1,7 +1,7 @@
 name bin-omega
 category TLCore
-execute BuildFormat omega
-runpattern f texmf/fmtutil/format.omega.cnf
+execute AddFormat name=omega engine=omega options="omega.ini"
+execute AddFormat name=lambda engine=omega patterns=language.dat options="lambda.ini"
 docpattern f texmf/doc/man/man1/lambda.*
 docpattern f texmf/doc/man/man1/omega.*
 binpattern f bin/${ARCH}/lambda
diff --git a/Master/tlpkg/tlpsrc/bin-physe.tlpsrc b/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
index bf6ea4237d9..0ea7436b7bf 100644
--- a/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-physe.tlpsrc
@@ -1,6 +1,5 @@
 name bin-physe
 category TLCore
 depend bin-tex
-execute BuildFormat physe
-runpattern f texmf/fmtutil/format.physe.cnf
+execute AddFormat name=physe engine=pdftex options="physe.ini"
 binpattern f bin/${ARCH}/physe
diff --git a/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc b/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
index 0044e7f1211..2aa67c5287b 100644
--- a/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-phyzzx.tlpsrc
@@ -1,6 +1,5 @@
 name bin-phyzzx
 category TLCore
 depend bin-tex
-execute BuildFormat phyzzx
-runpattern f texmf/fmtutil/format.phyzzx.cnf
+execute AddFormat name=phyzzx engine=pdftex options="physe.ini"
 binpattern f bin/${ARCH}/phyzzx
diff --git a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
index 0350a7cdd47..62cd05cf1d7 100644
--- a/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tex.tlpsrc
@@ -1,7 +1,6 @@
 name bin-tex
 category TLCore
 depend bin-kpathsea
-execute BuildFormat tex
-runpattern f texmf/fmtutil/format.tex.cnf
+execute AddFormat name=tex engine=tex options="tex.ini"
 docpattern f texmf/doc/man/man1/tex.*
 binpattern f bin/${ARCH}/tex
diff --git a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
index db0e3bbca85..0a54b0854f7 100644
--- a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc
@@ -1,6 +1,7 @@
 name bin-texdoc
 category TLCore
 depend bin-kpathsea
+postaction shortcut type=menu name="TeXdoc GUI" cmd="TEXDIR/bin/win32/texdoctk.bat" hide=1
 runpattern f texmf/scripts/tetex/texdoctk.pl
 runpattern f texmf/scripts/texdoc/*
 runpattern f texmf/texdoctk/*
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index bb242de8831..859766aeaef 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -1,27 +1,11 @@
 name bin-texlive
 category TLCore
 shortdesc executables and files maintained as part of TeX Live
-longdesc This packages contains the binaries of the TeX Live tools (notably
-longdesc tlmgr). Together with texlive.infra, it provides all the basic TeX
-longdesc Live infrastructure.
+longdesc This packages contains the binaries of the TeX Live tools. 
 depend texlive.infra
-runpattern f texmf/fmtutil/fmtutil-hdr.cnf
 runpattern d texmf/scripts/texlive/lua
-runpattern d texmf/scripts/texlive/tlmgrgui
-runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui1.pl
-runpattern !f texmf/scripts/texlive/tlmgrgui/gui-config1.pl
-runpattern !f texmf/scripts/texlive/tlmgrgui/gui-arch1.pl
-runpattern !f texmf/scripts/texlive/tlmgrgui/tlmgrgui-real.pl
 runpattern f texmf/scripts/texlive/rungs.tlu
 runpattern f texmf/scripts/texlive/test-tlpdb.tlu
 runpattern f texmf/scripts/texlive/texconf.tlu
-runpattern f texmf/scripts/texlive/tlmgr.pl
-runpattern !f texmf/scripts/texlive/tlmgr1.pl
-runpattern f texmf/scripts/texlive/uninstall-win32.pl
-runpattern f texmf/web2c/updmap-hdr.cfg
-docpattern f texmf/doc/man/man1/tlmgr.*
-binpattern f bin/${ARCH}/tlmgr
 binpattern f bin/${ARCH}/rungs
-binpattern f bin/win32/tl-w32-wrapper.texlua
 binpattern f bin/win32/symlinks4cygwin.sh
-binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
diff --git a/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc b/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
index 4bc68530b2c..637004fc810 100644
--- a/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texsis.tlpsrc
@@ -1,6 +1,5 @@
 name bin-texsis
 category TLCore
 depend bin-tex
-execute BuildFormat texsis
-runpattern f texmf/fmtutil/format.texsis.cnf
+execute AddFormat name=texsis engine=pdftex options="-translate-file=cp227.tcx texsis.ini"
 binpattern f bin/${ARCH}/texsis
diff --git a/Master/tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc
index cff48f95573..9dbbef0f023 100644
--- a/Master/tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tlpsv.win32.tlpsrc
@@ -5,3 +5,5 @@ category TLCore
 runpattern f bin/win32/psv.bat
 runpattern f texmf/scripts/texlive/psv.tlu
 runpattern d tlpkg/tlpsv
+postaction shortcut type=menu name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd=TEXDIR/bin/win32/psv.bat hide=1
+postaction shortcut type=desktop name="PS_View" icon=TEXDIR/tlpkg/tlpsv/psv.exe cmd=TEXDIR/bin/win32/psv.bat hide=1
diff --git a/Master/tlpkg/tlpsrc/bin-wintools.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-wintools.win32.tlpsrc
index 26779d1cff3..98e49e1b9bd 100644
--- a/Master/tlpkg/tlpsrc/bin-wintools.win32.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-wintools.win32.tlpsrc
@@ -14,6 +14,10 @@ binpattern f bin/win32/tomac.exe
 binpattern f bin/win32/tounix.exe
 binpattern f bin/win32/type1afm.exe
 binpattern f bin/win32/unzip.exe
+# from bin-chktex.win32
+runpattern f texmf/chktex/*
+docpattern f texmf/doc/chktex/*
+binpattern f bin/win32/chktex.exe
 # from bin-gzip.win32
 docpattern f texmf/doc/gzip/*
 binpattern f bin/win32/gunzip.exe
diff --git a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
index 32e866f0d86..75eeec5fc7b 100644
--- a/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-xmltex.tlpsrc
@@ -2,7 +2,7 @@ name bin-xmltex
 category TLCore
 depend pdftex
 depend bin-tex
-execute BuildFormat xmltex
-runpattern f texmf/fmtutil/format.xmltex.cnf
+execute AddFormat name=xmltex engine=pdftex patterns=language.dat options="&latex xmltex.ini"
+execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat options="&pdflatex pdfxmltex.ini"
 binpattern f bin/${ARCH}/pdfxmltex
 binpattern f bin/${ARCH}/xmltex
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index 54972d08b3d..481c9451264 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -14,6 +14,7 @@ depend enctex
 depend etex
 depend etex-pkg
 depend hyph-utf8
+depend ifluatex
 depend ifxetex
 depend makeindex
 depend metafont
diff --git a/Master/tlpkg/tlpsrc/epspdf.tlpsrc b/Master/tlpkg/tlpsrc/epspdf.tlpsrc
index c5880990b44..9feb749da43 100644
--- a/Master/tlpkg/tlpsrc/epspdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/epspdf.tlpsrc
@@ -1,4 +1,6 @@
 name epspdf
 category Package
+docpattern d texmf-dist/doc/epspdf
+runpattern d texmf-dist/scripts/epspdf
 binpattern f bin/${ARCH}/epspdf
 binpattern f bin/${ARCH}/epspdftk
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 1ceafd1dc09..3718a820668 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -5,11 +5,11 @@ 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/
-execute BuildFormat luatex
+execute AddFormat name=luatex engine=luatex options="luatex.ini"
+execute AddFormat name=pdfluatex engine=luatex options="pdfluatex.ini"
 docpattern d texmf-dist/doc/luatex
 docpattern f texmf/doc/man/man1/luatex.*
 docpattern f texmf/doc/man/man1/texlua*
-runpattern f texmf/fmtutil/format.luatex.cnf
 runpattern f texmf/tex/generic/config/luatexiniconfig.tex
 binpattern f/!hppa-hpux bin/${ARCH}/luatex
 binpattern f/!hppa-hpux bin/${ARCH}/pdfluatex
diff --git a/Master/tlpkg/tlpsrc/oberdiek.tlpsrc b/Master/tlpkg/tlpsrc/oberdiek.tlpsrc
index 07dd46a0f56..8cd04510955 100644
--- a/Master/tlpkg/tlpsrc/oberdiek.tlpsrc
+++ b/Master/tlpkg/tlpsrc/oberdiek.tlpsrc
@@ -1,2 +1,7 @@
 name oberdiek
 category Package
+# ignore ifluatex since it is split off
+docpattern +!f texmf-dist/doc/latex/oberdiek/ifluatex.pdf
+docpattern +!f texmf-dist/doc/latex/oberdiek/test/ifluatex*
+srcpattern +!f texmf-dist/source/latex/oberdiek/ifluatex.dtx
+runpattern +!f texmf-dist/tex/generic/oberdiek/ifluatex.sty
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index 721b2c8a9c6..7c43ecf8296 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -1,8 +1,9 @@
 name pdftex
 category TLCore
 depend bin-kpathsea
-execute BuildFormat pdftex
-runpattern f texmf/fmtutil/format.pdftex.cnf
+execute AddFormat name=etex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *etex.ini"
+execute AddFormat name=pdfetex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini"
+execute AddFormat name=pdftex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini"
 runpattern f texmf/fonts/map/pdftex/updmap/*
 runpattern f texmf/tex/generic/config/pdftex*.tex
 runpattern f texmf/tex/generic/pdftex/*
diff --git a/Master/tlpkg/tlpsrc/t2.tlpsrc b/Master/tlpkg/tlpsrc/t2.tlpsrc
index 43bbdc51ca9..9d9e3c0a943 100644
--- a/Master/tlpkg/tlpsrc/t2.tlpsrc
+++ b/Master/tlpkg/tlpsrc/t2.tlpsrc
@@ -1,5 +1,5 @@
 name t2
 category Package
-execute BuildFormat cyramstex
-execute BuildFormat cyrtex
-execute BuildFormat cyrtexinfo
+execute AddFormat name=cyramstex mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyramstx.ini"
+execute AddFormat name=cyrtex mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyrtex.ini"
+execute AddFormat name=cyrtexinfo mode=disabled engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *cyrtxinf.ini"
diff --git a/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc b/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc
index 4056f5eea62..658388971d5 100644
--- a/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-cz.tlpsrc
@@ -1,2 +1,4 @@
 name texlive-cz
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (cz) (PDF)" cmd=TEXDIR/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.pdf
+postaction shortcut type=menu name="TeX Live Manual (cz) (HTML)" cmd=TEXDIR/texmf-doc/doc/czechslovak/texlive-cz/texlive-cz.html
diff --git a/Master/tlpkg/tlpsrc/texlive-de.tlpsrc b/Master/tlpkg/tlpsrc/texlive-de.tlpsrc
index 1f3cdb430e2..8a69b6d68c5 100644
--- a/Master/tlpkg/tlpsrc/texlive-de.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-de.tlpsrc
@@ -1,2 +1,4 @@
 name texlive-de
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (de) (PDF)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.pdf
+postaction shortcut type=menu name="TeX Live Manual (de) (HTML)" cmd=TEXDIR/texmf-doc/doc/german/texlive-de/texlive-de.html
diff --git a/Master/tlpkg/tlpsrc/texlive-en.tlpsrc b/Master/tlpkg/tlpsrc/texlive-en.tlpsrc
index 1a0b6d94caa..2093f760f1e 100644
--- a/Master/tlpkg/tlpsrc/texlive-en.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-en.tlpsrc
@@ -1,2 +1,4 @@
 name texlive-en
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (en) (PDF)" cmd=TEXDIR/texmf-doc/doc/english/texlive-en/texlive-en.pdf
+postaction shortcut type=menu name="TeX Live Manual (en) (HTML)" cmd=TEXDIR/texmf-doc/doc/english/texlive-en/texlive-en.html
diff --git a/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc b/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc
index d12675827ad..7fb28006300 100644
--- a/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-fr.tlpsrc
@@ -1,2 +1,4 @@
 name texlive-fr
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (fr) (PDF)" cmd=TEXDIR/texmf-doc/doc/french/texlive-fr/texlive-fr.pdf
+postaction shortcut type=menu name="TeX Live Manual (fr) (HTML)" cmd=TEXDIR/texmf-doc/doc/french/texlive-fr/texlive-fr.html
diff --git a/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc b/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc
index c22a60fab8c..13550693a65 100644
--- a/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-pl.tlpsrc
@@ -1,2 +1,4 @@
 name texlive-pl
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (pl) (PDF)" cmd=TEXDIR/texmf-doc/doc/polish/texlive-pl/texlive-pl.pdf
+postaction shortcut type=menu name="TeX Live Manual (pl) (HTML)" cmd=TEXDIR/texmf-doc/doc/polish/texlive-pl/texlive-pl.html
diff --git a/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc b/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc
index 537e4e2ae5c..789ecb79b4f 100644
--- a/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-ru.tlpsrc
@@ -1,2 +1,4 @@
 name texlive-ru
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (ru) (PDF)" cmd=TEXDIR/texmf-doc/doc/russian/texlive-ru/texlive-ru.pdf
+postaction shortcut type=menu name="TeX Live Manual (ru) (HTML)" cmd=TEXDIR/texmf-doc/doc/russian/texlive-ru/texlive-ru.html
diff --git a/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc b/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
index 0250986cad9..a56cb0329c6 100644
--- a/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-zh-cn.tlpsrc
@@ -1,2 +1,3 @@
 name texlive-zh-cn
 category Documentation
+postaction shortcut type=menu name="TeX Live Manual (zh-cn) (PDF)" cmd=TEXDIR/texmf-doc/doc/chinese/texlive-zh-cn/texlive-zh-cn.pdf
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 9253507fa05..1197f2b7c6e 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -3,7 +3,7 @@ category TLCore
 shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get the TeX Live
 longdesc tools (notably tlmgr) running. That comprises the perl modules,
-longdesc documentation, and the lzma binaries, plus tar and wget, sometimes.
+longdesc documentation, and the xz binaries, plus tar and wget, sometimes.
 longdesc These files end up in the install packages.
 #
 # Until TL'09, reduce installed doc to just this file (which was present
@@ -27,12 +27,28 @@ runpattern f index.html
 runpattern f release-texlive.txt
 #
 binpattern f/win32 tlpkg/installer/tar.exe
-binpattern f/win32 tlpkg/installer/lzma/lzmadec.win32.exe
-binpattern f/win32 tlpkg/installer/lzma/lzma.exe
+binpattern f/win32 tlpkg/installer/xz/xzdec.exe
+binpattern f/win32 tlpkg/installer/xz/xz.exe
 binpattern f/win32 tlpkg/installer/wget/wget.exe
-binpattern f tlpkg/installer/lzma/lzmadec.${ARCH}
-binpattern f tlpkg/installer/lzma/lzma.${ARCH}
+binpattern f/i386-cygwin tlpkg/installer/xz/xzdec.i386-cygwin.exe
+binpattern f/i386-cygwin tlpkg/installer/xz/xz.i386-cygwin.exe
+binpattern f/!i386-cygwin tlpkg/installer/xz/xzdec.${ARCH}
+binpattern f/!i386-cygwin tlpkg/installer/xz/xz.${ARCH}
 # we count on lots of platforms providing their own wget.
 binpattern f/!i386-solaris,i386-linux,mips-irix,sparc-linux,alpha-linux,\
 powerpc-linux,i386-freebsd,x86_64-linux \
   tlpkg/installer/wget/wget.${ARCH}
+# former tlmgr stuff
+runpattern f texmf/web2c/fmtutil-hdr.cnf
+runpattern d texmf/scripts/texlive/tlmgrgui
+runpattern f texmf/scripts/texlive/tlmgr.pl
+runpattern f texmf/scripts/texlive/uninstall-win32.pl
+runpattern f texmf/web2c/updmap-hdr.cfg
+docpattern f texmf/doc/man/man1/tlmgr.*
+binpattern f bin/${ARCH}/tlmgr
+binpattern f bin/win32/tl-w32-wrapper.texlua
+binpattern f/win32 texmf/scripts/texlive/updater-w32.bat
+# post actions
+postaction shortcut type=menu name="TeX Live Toplevel Readme Index" cmd=TEXDIR/index.html
+postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlmgr.bat args=gui hide=1
+postaction shortcut type=menu name="Release notes" cmd="http://tug.org/texlive/windows.html"
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index 12300476570..bb6505f8ca6 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -1,8 +1,10 @@
 name xetex
 category TLCore
 #
-execute BuildFormat xetex
-runpattern f texmf/fmtutil/format.xetex.cnf
+execute AddFormat name=xetex engine=xetex patterns=language.def options="-etex xetex.ini"
+execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini"
+postaction script file=tlpkg/tlpostcode/xetex.pl
+runpattern f tlpkg/tlpostcode/xetex.pl
 #
 # these are only needed for darwin only, so 
 # use  arch specific patterns to avoid warnings about not-hit patterns.
@@ -23,4 +25,3 @@ binpattern f bin/win32/teckit_compile.exe
 binpattern f bin/win32/fc-*
 binpattern f bin/win32/icu*.dll
 depend xetexconfig
-