mistaken early commit of fmttriggers, back to previous

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

21 files changed, 79 insertions, 177 deletions

diff --git a/Master/tlpkg/tlpsrc/aleph.tlpsrc b/Master/tlpkg/tlpsrc/aleph.tlpsrc
index d8477aed84c..ea6c137ef3f 100644
--- a/Master/tlpkg/tlpsrc/aleph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/aleph.tlpsrc
@@ -2,11 +2,9 @@ depend latex
 depend plain
 depend lambda
 #
-execute AddFormat name=aleph engine=aleph options=*aleph.ini \
-          fmttriggers=cm,hyphen-base,knuth-lib,plain
+execute AddFormat name=aleph engine=aleph options=*aleph.ini
 execute AddFormat name=lamed engine=aleph patterns=language.dat \
-          options=*lambda.ini \
-          fmttriggers=antomega,cm,hyphen-base,lambda,latex,latex-fonts,omega
+                  options=*lambda.ini 
 binpattern f bin/${ARCH}/aleph
 binpattern f bin/${ARCH}/lamed
 docpattern +f texmf-dist/doc/man/man1/aleph.*
diff --git a/Master/tlpkg/tlpsrc/amstex.tlpsrc b/Master/tlpkg/tlpsrc/amstex.tlpsrc
index 133a174b8df..be90344d3a7 100644
--- a/Master/tlpkg/tlpsrc/amstex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/amstex.tlpsrc
@@ -1,7 +1,6 @@
 depend tex
 execute AddFormat name=amstex engine=pdftex \
-          options="-translate-file=cp227.tcx *amstex.ini" \
-          fmttriggers=amsfonts,amstex,cm,hyphen-base,knuth-lib,plain
+                  options="-translate-file=cp227.tcx *amstex.ini"
 #
 docpattern +f texmf-dist/doc/man/man1/amstex.*
 #
diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index d8944ba94bf..504c3f97fd0 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -17,19 +17,19 @@ depend mflogo-font
 depend stmaryrd
 #
 execute AddFormat name=cont-en engine=pdftex \
-        patterns=cont-usr.tex options="-8bit *cont-en.mkii" fmttriggers=context
+        patterns=cont-usr.tex options="-8bit *cont-en.mkii"
 execute AddFormat name=cont-en engine=xetex \
-        patterns=cont-usr.tex options="-8bit *cont-en.mkii" fmttriggers=context
+        patterns=cont-usr.tex options="-8bit *cont-en.mkii" 
 #
 # disabled context formats:
 execute AddFormat name=cont-fr mode=disabled engine=pdftex \
-        patterns=cont-usr.tex options="-8bit *cont-fr.mkii" fmttriggers=context
+        patterns=cont-usr.tex options="-8bit *cont-fr.mkii"
 execute AddFormat name=cont-it mode=disabled engine=pdftex \
-        patterns=cont-usr.tex options="-8bit *cont-it.mkii" fmttriggers=context
+        patterns=cont-usr.tex options="-8bit *cont-it.mkii"
 execute AddFormat name=cont-nl mode=disabled engine=pdftex \
-        patterns=cont-usr.tex options="-8bit *cont-nl.mkii" fmttriggers=context
+        patterns=cont-usr.tex options="-8bit *cont-nl.mkii"
 execute AddFormat name=cont-ro mode=disabled engine=pdftex \
-        patterns=cont-usr.tex options="-8bit *cont-ro.mkii" fmttriggers=context
+        patterns=cont-usr.tex options="-8bit *cont-ro.mkii"
 #
 # contnav, hans, hans-sh fonts.
 execute addMap original-context-symbol.map
diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
index 192f69c863b..1630221b21d 100644
--- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
@@ -1,14 +1,9 @@
 depend latex
-
-tlpsetvar fmtcomm cm,hyphen-base
 #
 execute AddFormat name=cslatex engine=pdftex \
-          options="-etex cslatex.ini" \
-          fmttriggers=${fmtcomm}
-#
+                  options="-etex cslatex.ini"
 execute AddFormat name=pdfcslatex engine=pdftex \
-          options="-etex cslatex.ini" \
-          fmttriggers=${fmtcomm}
-
+                  options="-etex cslatex.ini"
+#
 binpattern f bin/${ARCH}/cslatex
 binpattern f bin/${ARCH}/pdfcslatex
diff --git a/Master/tlpkg/tlpsrc/csplain.tlpsrc b/Master/tlpkg/tlpsrc/csplain.tlpsrc
index 157236b1f1a..43e11b65815 100644
--- a/Master/tlpkg/tlpsrc/csplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/csplain.tlpsrc
@@ -1,26 +1,17 @@
 depend tex
-
-# these invocations per author (Petr Olsak.)
-#
-tlpsetvar fmtcomm cm,cs,csplain,hyphen-base,plain
 #
+# these invocations from Petr Olsak.
 execute AddFormat name=csplain engine=pdftex \
-          options="-etex -enc csplain-utf8.ini" \
-          fmttriggers=${fmtcomm},enctex
-#
+                  options="-etex -enc csplain-utf8.ini"
 execute AddFormat name=pdfcsplain engine=pdftex \
-          options="-etex -enc csplain-utf8.ini" \
-          fmttriggers=${fmtcomm},enctex
+                  options="-etex -enc csplain-utf8.ini"
 #
 # intentionally no user-level executables for these formats, also named
-# pdfcsplain (a la ConTeXt), by author's request.
+# pdfcsplain (a la ConTeXt).
 execute AddFormat name=pdfcsplain engine=xetex \
-          options="-etex csplain.ini" \
-          fmttriggers=${fmtcomm}
-#
+                  options="-etex csplain.ini"
 execute AddFormat name=pdfcsplain engine=luatex \
-          options="-etex csplain.ini" \
-          fmttriggers=${fmtcomm},luatex,pdftex
+                  options="-etex csplain.ini"
 #
 binpattern f bin/${ARCH}/csplain
 binpattern f bin/${ARCH}/pdfcsplain
diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc
index c7f241e487a..a612de62e19 100644
--- a/Master/tlpkg/tlpsrc/eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc
@@ -1,7 +1,6 @@
 depend pdftex
 execute AddFormat name=eplain engine=pdftex patterns=language.dat \
-          options="-translate-file=cp227.tcx *eplain.ini" \
-          fmttriggers=babel,cm,eplain,hyphen-base,knuth-lib,latex-fonts,plain
+        options="-translate-file=cp227.tcx *eplain.ini"
 docpattern +f texmf-dist/doc/info/eplain.info
 docpattern +f texmf-dist/doc/man/man1/eplain.*
 binpattern f bin/${ARCH}/eplain
diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
index 8462aa9d634..58e1e609bea 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -2,20 +2,12 @@ depend latex
 depend passivetex
 depend pdftex
 depend tex
-
-tlpsetvar fmtcomm amsfonts,babel,cm,colortbl,cyrillic,ec,fancyhdr,graphics,\
-hyperref,hyphen-base,hyphen-german,ifxetex,jadetex,latex,latex-fonts,\
-latexconfig,marvosym,oberdiek,passivetex,pdftex,psnfss,ruhyphen,stmaryrd,\
-symbol,tipa,tools,ukrhyph,ulem,url,wasysym,zapfding
 #
 execute AddFormat name=jadetex engine=pdftex patterns=language.dat \
-          options="*jadetex.ini" \
-          fmttriggers=${fmtcomm}
-#
+        options="*jadetex.ini" 
 execute AddFormat name=pdfjadetex engine=pdftex patterns=language.dat \
-          options="*pdfjadetex.ini" \
-          fmttriggers=${fmtcomm},pdftex-def
-
+        options="*pdfjadetex.ini"
+#
 binpattern f bin/${ARCH}/jadetex
 binpattern f bin/${ARCH}/pdfjadetex
 #
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index 8ae44c5417d..c1efd6824ea 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -7,25 +7,21 @@ depend latex
 #
 binpattern f bin/${ARCH}/latex
 execute AddFormat name=latex engine=pdftex patterns=language.dat \
-                             options="-translate-file=cp227.tcx *latex.ini" \
-        fmttriggers=babel,cm,hyphen-base,latex,latexconfig,latex-fonts
+                             options="-translate-file=cp227.tcx *latex.ini" 
 #
 binpattern f bin/${ARCH}/pdflatex
 execute AddFormat name=pdflatex engine=pdftex patterns=language.dat \
-                             options="-translate-file=cp227.tcx *pdflatex.ini" \
-        fmttriggers=babel,cm,hyphen-base,latex,latexconfig,latex-fonts
+                             options="-translate-file=cp227.tcx *pdflatex.ini" 
 #
 binpattern f bin/${ARCH}/dvilualatex
 execute AddFormat name=dvilualatex engine=luatex \
                              patterns=language.dat,language.dat.lua \
-                             options="dvilualatex.ini" \
-        fmttriggers=babel,cm,hyphen-base,latex,latexconfig,latex-fonts
+                             options="dvilualatex.ini"
 #
 binpattern f bin/${ARCH}/lualatex
 execute AddFormat name=lualatex engine=luatex \
                              patterns=language.dat,language.dat.lua \
-                             options="lualatex.ini" \
-        fmttriggers=babel,cm,hyphen-base,latex,latexconfig,latex-fonts
+                             options="lualatex.ini" 
 #
 docpattern f texmf-dist/doc/man/man1/latex.*
 docpattern f texmf-dist/doc/man/man1/pdflatex.*
@@ -35,5 +31,4 @@ docpattern f texmf-dist/doc/man/man1/pdflatex.*
 #binpattern f bin/${ARCH}/luajitlatex
 execute AddFormat name=luajitlatex mode=disabled engine=luajittex \
                              patterns=language.dat,language.dat.lua \
-                             options="lualatex.ini" \
-        fmttriggers=babel,cm,hyphen-base,latex,latexconfig,latex-fonts
+                             options="lualatex.ini" 
diff --git a/Master/tlpkg/tlpsrc/lollipop.tlpsrc b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
index 0dbed2a99f7..37d93b3ce3b 100644
--- a/Master/tlpkg/tlpsrc/lollipop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
@@ -1,25 +1,17 @@
-tlpsetvar fmtcomm cm,hyphen-base,lollipop
-
 binpattern f bin/${ARCH}/lollipop
 execute AddFormat name=lollipop engine=pdftex \
-          options="-translate-file=cp227.tcx *lollipop.ini" \
-          fmttriggers=${fmtcomm},pdftex
+        options="-translate-file=cp227.tcx *lollipop.ini" 
 #
 binpattern f bin/${ARCH}/lualollipop
 execute AddFormat name=lualollipop engine=luatex \
-          options="lualollipop.ini" \
-          fmttriggers=${fmtcomm},pdftex,luatex
+        options="lualollipop.ini" 
 #
 binpattern f bin/${ARCH}/xelollipop
 execute AddFormat name=xelollipop engine=xetex \
-          options="-etex xelollipop.ini" 
-          fmttriggers=${fmtcomm},xetexconfig
+        options="-etex xelollipop.ini" 
 #
-# dvi formats disabled by default, users can set \pdfoutput=0.
+# leave dvi formats disabled, users can set \pdfoutput=0.
 execute AddFormat name=dvilollipop mode=disabled engine=pdftex \
-          options="-translate-file=cp227.tcx *lollipop.ini" \
-          fmttriggers=${fmtcomm},luatex,pdftex
-#
+        options="-translate-file=cp227.tcx *lollipop.ini"
 execute AddFormat name=dvilualollipop mode=disabled engine=luatex \
-          options="-translate-file=cp227.tcx lualollipop.ini" \
-          fmttriggers=${fmtcomm},luatex,pdftex
+        options="-translate-file=cp227.tcx lualollipop.ini"
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index ebac3b968bd..e216a9c651f 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -1,20 +1,17 @@
 category TLCore
 #
-tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,luatex,plain
-#
-execute AddFormat name=luatex engine=luatex options="luatex.ini" \
-  patterns=language.def,language.dat.lua \
-  fmttriggers=${fmtdeps},pdftex
-#
-execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" \
-  patterns=language.def,language.dat.lua \
-  fmttriggers=${fmtdeps}
+execute AddFormat \
+  name=luatex    engine=luatex patterns=language.def,language.dat.lua \
+  options="luatex.ini"
+execute AddFormat \
+  name=dviluatex engine=luatex patterns=language.def,language.dat.lua \
+  options="dviluatex.ini"
 #
 # On platforms where there is no luajittex, it will be ignored
 # due to special options in fmtutil and TLConfig.pm.
-execute AddFormat name=luajittex engine=luajittex options="luatex.ini" \
-  patterns=language.def,language.dat.lua \
-  fmttriggers=${fmtdeps},pdftex
+execute AddFormat \
+  name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
+  options="luatex.ini"
 #
 docpattern d texmf-dist/doc/luatex/base
 docpattern f texmf-dist/doc/man/man1/luatex.*
diff --git a/Master/tlpkg/tlpsrc/metafont.tlpsrc b/Master/tlpkg/tlpsrc/metafont.tlpsrc
index ab31b97b483..019dfbc4dda 100644
--- a/Master/tlpkg/tlpsrc/metafont.tlpsrc
+++ b/Master/tlpkg/tlpsrc/metafont.tlpsrc
@@ -1,9 +1,7 @@
 depend kpathsea
-
 execute AddFormat name=mf engine=mf-nowin \
-          options="-translate-file=cp227.tcx mf.ini" \
-          fmttriggers=metafont
-
+                  options="-translate-file=cp227.tcx mf.ini"
+#
 srcpattern f ignore
 #
 runpattern d texmf-dist/metafont/base
diff --git a/Master/tlpkg/tlpsrc/mex.tlpsrc b/Master/tlpkg/tlpsrc/mex.tlpsrc
index dc9d5c0b9e1..a6de17090fb 100644
--- a/Master/tlpkg/tlpsrc/mex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mex.tlpsrc
@@ -2,20 +2,12 @@ depend pl
 depend hyphen-polish
 depend pdftex
 depend tex
-
-tlpsetvar fmtcomm hyphen-base,knuth-lib,mex,pdftex,pl,plain
-#
 execute AddFormat name=mex engine=pdftex patterns=mexconf.tex \
-          options="-translate-file=cp227.tcx *mex.ini" \
-          fmttriggers=${fmtcomm}
-#
+                  options="-translate-file=cp227.tcx *mex.ini"
 execute AddFormat name=pdfmex engine=pdftex patterns=mexconf.tex \
-          options="-translate-file=cp227.tcx *pdfmex.ini" \
-          fmttriggers=${fmtcomm}
-#
+                  options="-translate-file=cp227.tcx *pdfmex.ini"
 execute AddFormat name=utf8mex engine=pdftex patterns=mexconf.tex \
-           options="-enc *utf8mex.ini" \
-           fmttriggers=${fmtcomm},enctex,utf8mex
+                  options="-enc *utf8mex.ini"
 #
 runpattern +!d texmf-dist/tex/mex/utf8mex
 #
diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc
index d6b01bbf53e..fa132abcf46 100644
--- a/Master/tlpkg/tlpsrc/mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc
@@ -1,14 +1,8 @@
 depend latex
-
-tlpsetvar fmtdeps cm,hyphen-base
-#
 execute AddFormat name=mllatex engine=pdftex patterns=language.dat \
-          options="-translate-file=cp227.tcx -mltex *mllatex.ini" \
-          fmttriggers=${fmtdeps},babel,latex,latexconfig,latex-fonts
-#
+                  options="-translate-file=cp227.tcx -mltex *mllatex.ini"
 execute AddFormat name=mltex engine=pdftex \
-           options="-translate-file=cp227.tcx -mltex mltex.ini" \
-           fmttriggers=${fmtdeps},knuth-lib,mltex,plain
-
+                  options="-translate-file=cp227.tcx -mltex mltex.ini"
+#
 binpattern f bin/${ARCH}/mllatex
 binpattern f bin/${ARCH}/mltex
diff --git a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
index adbe8d9df08..0a2adca27e8 100644
--- a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
@@ -11,8 +11,7 @@ longdesc
 longdesc This can be found on CTAN in macros/pdftex/graphics.
 
 execute AddFormat name=mptopdf engine=pdftex \
-          options="-translate-file=cp227.tcx mptopdf.tex" \
-          fmttriggers=mptopdf,plain
+        options="-translate-file=cp227.tcx mptopdf.tex"
 
 runpattern f texmf-dist/tex/context/base/supp-mis.mkii
 runpattern f texmf-dist/tex/context/base/supp-mpe.mkii
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index b6c65d5f25e..1beb760d823 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -1,23 +1,16 @@
 category TLCore
 depend kpathsea
-
-tlpsetvar fmtcomm cm,etex,hyphen-base,knuth-lib,plain
-#
-execute AddFormat name=pdftex engine=pdftex patterns=language.def \
-          options="-translate-file=cp227.tcx *pdfetex.ini" \
-          fmttriggers=${fmtcomm}
-#
-execute AddFormat name=etex engine=pdftex patterns=language.def \
-          options="-translate-file=cp227.tcx *etex.ini" \
-          fmttriggers=${fmtcomm}
 #
+execute AddFormat name=pdftex  engine=pdftex patterns=language.def \
+                    options="-translate-file=cp227.tcx *pdfetex.ini" 
+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" \
-          fmttriggers=${fmtcomm}
-
+                    options="-translate-file=cp227.tcx *pdfetex.ini" 
+#
 # A trivial font needed by the fake-interword-space feature.
 execute addMap dummy-space.map
-
+#
 runpattern f texmf-dist/tex/generic/config/pdftex*.tex
 runpattern d texmf-dist/tex/generic/pdftex
 runpattern d texmf-dist/fonts/map/pdftex/updmap
diff --git a/Master/tlpkg/tlpsrc/ptex.tlpsrc b/Master/tlpkg/tlpsrc/ptex.tlpsrc
index c3a4eb46774..f6c0c037d82 100644
--- a/Master/tlpkg/tlpsrc/ptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ptex.tlpsrc
@@ -5,20 +5,12 @@ depend adobemapping
 depend ipaex
 depend japanese
 depend japanese-otf
-
-tlpsetvar fmtcomm cm,hyphen-base,knuth-lib,plain,ptex
-#
-execute AddFormat name=ptex engine=ptex options="ptex.ini" \
-          fmttriggers=${fmtcomm}
-#
-execute AddFormat name=eptex engine=eptex options="*eptex.ini" \
-          patterns=language.def \
-	  fmttriggers=${fmtcomm},etex
 #
+execute AddFormat name=ptex   engine=ptex options="ptex.ini"
+execute AddFormat name=eptex  engine=eptex options="*eptex.ini" \
+                              patterns=language.def
 execute AddFormat name=platex engine=eptex options="*platex.ini" \
-          patterns=language.dat \
-          fmttriggers=${fmtcomm},babel,latex,latex-fonts
-
+                              patterns=language.dat
 execute addKanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map
 execute addKanjiMap morisawa.map
 #
diff --git a/Master/tlpkg/tlpsrc/tex.tlpsrc b/Master/tlpkg/tlpsrc/tex.tlpsrc
index 1bfa474fef7..9dd4e6d1c27 100644
--- a/Master/tlpkg/tlpsrc/tex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex.tlpsrc
@@ -1,10 +1,9 @@
 category TLCore
+execute AddFormat name=tex engine=tex options="tex.ini"
+#
 depend kpathsea
 depend plain
-
-execute AddFormat name=tex engine=tex options="tex.ini" \
-  fmttriggers=cm,hyphen-base,knuth-lib,plain
-
+#
 docpattern f texmf-dist/doc/man/man1/tex.*
 #
 binpattern f bin/${ARCH}/initex
diff --git a/Master/tlpkg/tlpsrc/texsis.tlpsrc b/Master/tlpkg/tlpsrc/texsis.tlpsrc
index 9bcf2d281d2..56b8f514a93 100644
--- a/Master/tlpkg/tlpsrc/texsis.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texsis.tlpsrc
@@ -1,7 +1,4 @@
 depend tex
-
 execute AddFormat name=texsis engine=pdftex \
-          options="-translate-file=cp227.tcx texsis.ini" \
-          fmttriggers=cm,hyphen-base,knuth-lib,plain,texsis
-
+                  options="-translate-file=cp227.tcx texsis.ini"
 binpattern f bin/${ARCH}/texsis
diff --git a/Master/tlpkg/tlpsrc/uptex.tlpsrc b/Master/tlpkg/tlpsrc/uptex.tlpsrc
index f486c334d15..4e8434dfd28 100644
--- a/Master/tlpkg/tlpsrc/uptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex.tlpsrc
@@ -7,19 +7,11 @@ depend japanese
 depend japanese-otf
 depend latex
 #
-tlpsetvar fmtcomm cm,hyphen-base,uptex
-#
-execute AddFormat name=uptex engine=uptex options="uptex.ini" \
-          fmttriggers=${fmtcomm},knuth-lib,plain,uptex
-#
-execute AddFormat name=euptex engine=euptex options="*euptex.ini" \
-          patterns=language.def \
-          fmttriggers=${fmtcomm},etex,knuth-lib,plain,ptex
-#
+execute AddFormat name=uptex   engine=uptex options="uptex.ini"
+execute AddFormat name=euptex  engine=euptex options="*euptex.ini" \
+                               patterns=language.def
 execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
-          patterns=language.dat \
-          fmttriggers=${fmtcomm},babel,latex,latex-fonts,ptex
-#
+                               patterns=language.dat
 execute addKanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map
 #
 binpattern f bin/${ARCH}/euptex
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index ac472af5008..2c062ef7f89 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -1,26 +1,20 @@
 category TLCore
 shortdesc Unicode and OpenType-enabled TeX engine.
 longdesc See http://tug.org/xetex.
-
-tlpsetvar fmtcomm cm,hyphen-base
 #
 execute AddFormat name=xetex engine=xetex patterns=language.def \
-          options="-etex xetex.ini" \
-          fmttriggers=${fmtcomm},etex,plain
-#
+                             options="-etex xetex.ini"
 execute AddFormat name=xelatex engine=xetex patterns=language.dat \
-          options="-etex xelatex.ini" \
-          fmttriggers=${fmtcomm},babel,latex,latexconfig,latex-fonts
-
-# do fontconfig stuff, especially on Windows.
+                             options="-etex xelatex.ini" 
+#
 postaction script file=tlpkg/tlpostcode/xetex.pl
 runpattern f tlpkg/tlpostcode/xetex.pl
 binpattern f bin/win32/fc-*
 binpattern f bin/win32/icu*.dll
 #
-# this subdir is only used on Windows.
+# this is only used in windows installation
 binpattern d/win32 tlpkg/tlpostcode/xetex
-
+#
 docpattern d texmf-dist/doc/xetex/base
 #
 runpattern d texmf-dist/fonts/misc/xetex/fontmapping/base
@@ -30,6 +24,6 @@ binpattern f bin/${ARCH}/xdvipdfmx
 binpattern f bin/${ARCH}/xelatex
 binpattern f bin/${ARCH}/xetex
 binpattern f bin/${ARCH}/teckit_compile
-
+#
 depend xetexconfig
 depend latex
diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
index 0d1b21c58eb..1e6c6f37f8f 100644
--- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
@@ -2,18 +2,12 @@ depend latex
 depend pdftex
 depend tex
 depend xmltexconfig
-
-tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latex-fonts,latexconfig,pdftex,\
-xmltex,xmltexconfig
 #
 execute AddFormat name=xmltex engine=pdftex patterns=language.dat \
-          options="*xmltex.ini" \
-          fmttriggers=${fmtcomm}
-#
+        options="*xmltex.ini"
 execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat \
-          options="*pdfxmltex.ini" \
-          fmttriggers=${fmtcomm}
-
+        options="*pdfxmltex.ini"
+#
 runpattern d texmf-dist/tex/xmltex/base
 #
 binpattern f bin/${ARCH}/pdfxmltex