11 files changed, 23 insertions, 21 deletions
diff --git a/Master/tlpkg/bin/check-fmttriggers b/Master/tlpkg/bin/check-fmttriggers
index f20711a0ecc..60cbca9d533 100755
--- a/Master/tlpkg/bin/check-fmttriggers
+++ b/Master/tlpkg/bin/check-fmttriggers
@@ -299,12 +299,12 @@ sub compare_pkgs_and_triggers {
       }
       if (keys %tlpdb_pkgs) {
         tlwarn ("$prg: $ef triggers only in tlpdb: "
-                . join (",", keys %tlpdb_pkgs) . "\n");
+                . join (",", sort keys %tlpdb_pkgs) . "\n");
         $bad_p = 1;
       }
       if (@recorded_only) {
         tlwarn ("$prg: $ef triggers only in recorder: "
-                . join (",", @recorded_only) . "\n");
+                . join (",", sort @recorded_only) . "\n");
         $bad_p = 1;
       }
       
@@ -319,8 +319,8 @@ sub compare_pkgs_and_triggers {
   }
   
   for my $ef (sort keys %$fmttriggers) {
-    my $trig = join (",", @{$fmttriggers->{$ef}});
-    tlwarn ("$prg: fmttriggers in tlpdb only, not recorder: "
+    my $trig = join (",", sort @{$fmttriggers->{$ef}});
+    tlwarn ("$prg: format in tlpdb only: "
             . "$ef ($trig)\n");
     $bad_p = 1;
   }
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index f0f854ef7d8..9d996fd011e 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -77,7 +77,7 @@ MAKEINST ()
   echo "-- `date` writing iso to $iso"
 
   # remove old images, checksums, signatures, versioned and generic.
-  rm -f $iso* $prefix.iso*
+  rm -f $iso* $prefix*.iso*
 
   # the image consists of the tlnet tree and the top-level files
   # from master, more or less.
diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
index 931ed76cbb1..7be7a3fc34c 100644
--- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
@@ -8,7 +8,7 @@ execute AddFormat name=cslatex engine=pdftex \
 #
 execute AddFormat name=pdfcslatex engine=pdftex \
           options="-etex cslatex.ini" \
-          fmttriggers=${fmtcomm},pdftex
+          fmttriggers=${fmtcomm},tex-ini-files
 
 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 dc3cdf7cba2..109bd9401af 100644
--- a/Master/tlpkg/tlpsrc/csplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/csplain.tlpsrc
@@ -10,7 +10,7 @@ execute AddFormat name=csplain engine=pdftex \
 #
 execute AddFormat name=pdfcsplain engine=pdftex \
           options="-etex -enc csplain-utf8.ini" \
-          fmttriggers=${fmtcomm},enctex,pdftex
+          fmttriggers=${fmtcomm},enctex,tex-ini-files
 #
 # intentionally no user-level executables for these formats, also named
 # pdfcsplain (a la ConTeXt), by author's request.
@@ -20,7 +20,7 @@ execute AddFormat name=pdfcsplain engine=xetex \
 #
 execute AddFormat name=pdfcsplain engine=luatex \
           options="-etex csplain.ini" \
-          fmttriggers=${fmtcomm},luatex,pdftex
+          fmttriggers=${fmtcomm},luatex,tex-ini-files,luatex85
 #
 binpattern f bin/${ARCH}/csplain
 binpattern f bin/${ARCH}/pdfcsplain
diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
index a03a087b729..9cc5305de27 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -4,9 +4,9 @@ depend pdftex
 depend tex
 
 tlpsetvar fmtcomm amsfonts,babel,cm,colortbl,cyrillic,ec,fancyhdr,graphics,\
-hyperref,hyphen-base,ifxetex,jadetex,latex,latex-fonts,\
-latexconfig,marvosym,oberdiek,passivetex,pdftex,psnfss,stmaryrd,\
-symbol,tipa,tools,ulem,url,wasysym,zapfding
+graphics-cfg,hyperref,hyphen-base,ifxetex,jadetex,latex,latex-fonts,\
+latexconfig,marvosym,oberdiek,passivetex,psnfss,stmaryrd,\
+symbol,tex-ini-files,tipa,tools,ulem,url,wasysym,zapfding
 #
 execute AddFormat name=jadetex engine=pdftex patterns=language.dat \
           options="*jadetex.ini" \
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index 51ecbb1143f..42067d16432 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -5,7 +5,8 @@ shortdesc LaTeX executables and man pages.
 # files are installed before we try to make the formats.
 depend latex
 
-tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latexconfig,latex-fonts,pdftex
+tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latexconfig,latex-fonts,\
+tex-ini-files
 #
 binpattern f bin/${ARCH}/latex
 execute AddFormat name=latex engine=pdftex \
diff --git a/Master/tlpkg/tlpsrc/lollipop.tlpsrc b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
index 8a5c4068dff..9f3a9748588 100644
--- a/Master/tlpkg/tlpsrc/lollipop.tlpsrc
+++ b/Master/tlpkg/tlpsrc/lollipop.tlpsrc
@@ -3,7 +3,7 @@ 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
+          fmttriggers=${fmtcomm},tex-ini-files
 #
 binpattern f bin/${ARCH}/lualollipop
 execute AddFormat name=lualollipop engine=luatex \
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index a66189b2e1a..0186762d546 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -1,10 +1,10 @@
 category TLCore
 #
-tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,luatex,plain
+tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,luatex,plain,tex-ini-files
 #
 execute AddFormat name=luatex engine=luatex options="luatex.ini" \
   patterns=language.def,language.dat.lua \
-  fmttriggers=${fmtdeps},pdftex
+  fmttriggers=${fmtdeps}
 #
 execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" \
   patterns=language.def,language.dat.lua \
@@ -14,7 +14,7 @@ execute AddFormat name=dviluatex engine=luatex options="dviluatex.ini" \
 # due to special options in fmtutil, TLConfig.pm, tlmgr.
 execute AddFormat name=luajittex engine=luajittex options="luatex.ini" \
   patterns=language.def,language.dat.lua \
-  fmttriggers=${fmtdeps},pdftex
+  fmttriggers=${fmtdeps}
 #
 docpattern d texmf-dist/doc/luatex/base
 docpattern f texmf-dist/doc/man/man1/luatex.*
diff --git a/Master/tlpkg/tlpsrc/mex.tlpsrc b/Master/tlpkg/tlpsrc/mex.tlpsrc
index dc9d5c0b9e1..7178407c982 100644
--- a/Master/tlpkg/tlpsrc/mex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mex.tlpsrc
@@ -3,7 +3,8 @@ depend hyphen-polish
 depend pdftex
 depend tex
 
-tlpsetvar fmtcomm hyphen-base,knuth-lib,mex,pdftex,pl,plain
+tlpsetvar fmtcomm hyphen-base,hyphen-polish,knuth-lib,mex,pl,plain,\
+tex-ini-files
 #
 execute AddFormat name=mex engine=pdftex patterns=mexconf.tex \
           options="-translate-file=cp227.tcx *mex.ini" \
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index 6ee4d958f3b..1b7fec01aa3 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -5,7 +5,7 @@ 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},pdftex
+          fmttriggers=${fmtcomm},tex-ini-files
 #
 execute AddFormat name=etex engine=pdftex patterns=language.def \
           options="-translate-file=cp227.tcx *etex.ini" \
@@ -13,7 +13,7 @@ execute AddFormat name=etex engine=pdftex patterns=language.def \
 #
 execute AddFormat name=pdfetex engine=pdftex patterns=language.def \
           options="-translate-file=cp227.tcx *pdfetex.ini" \
-          fmttriggers=${fmtcomm},pdftex
+          fmttriggers=${fmtcomm},tex-ini-files
 
 # A trivial font needed by the fake-interword-space feature.
 execute addMap dummy-space.map
diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
index 0d1b21c58eb..fe6597affe0 100644
--- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
@@ -3,8 +3,8 @@ depend pdftex
 depend tex
 depend xmltexconfig
 
-tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latex-fonts,latexconfig,pdftex,\
-xmltex,xmltexconfig
+tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latex-fonts,latexconfig,\
+tex-ini-files,xmltex,xmltexconfig
 #
 execute AddFormat name=xmltex engine=pdftex patterns=language.dat \
           options="*xmltex.ini" \