move unicode-data to ${global_latex_deps} and related+more updates to fmttriggers lists

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

12 files changed, 44 insertions, 19 deletions

diff --git a/Master/tlpkg/bin/tl-check-fmttriggers b/Master/tlpkg/bin/tl-check-fmttriggers
index 7ca90ba9f7a..94c50c0b736 100755
--- a/Master/tlpkg/bin/tl-check-fmttriggers
+++ b/Master/tlpkg/bin/tl-check-fmttriggers
@@ -288,10 +288,11 @@ sub pkgs_per_format {
 
 
 # Compare lists of packages required by building (PKGS_PER_FORMAT) with
-# lists of existing trigger directives (FMTTRIGGERS).  Return 0 if
-# identical, 1 otherwise (and report differences).  Ignore hyphenation
-# dependencies and the package itself containing the trigger directive
-# (FMTPKGCONTAINERS).
+# lists of existing trigger directives (FMTTRIGGERS). Return 0 if
+# identical, 1 otherwise (and report differences). Ignore hyphenation
+# dependencies, l3backend and other common LaTeX packages, and the
+# package itself containing the trigger directive (FMTPKGCONTAINERS).
+# (See 00texlive.autopatterns.tlpsrc for the story on l3backend, etc.)
 # 
 sub compare_pkgs_and_triggers {
   my ($pkgs_per_format,$fmttriggers,$fmtpkgcontainers) = @_;
@@ -333,6 +334,7 @@ sub compare_pkgs_and_triggers {
           # trigger list for an engine.format not in tlpdb.
           next if grep ($_ eq $r, @skip_pkgs);
           next if $r =~ /hyphen-.*/;
+          next if $r =~ /l3backend|l3kernel|tex-ini-files/;
           push (@recorded_only, $r);
         }
       }
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index cd38a4ff0d0..3bba7d8a4a4 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -14,11 +14,29 @@ longdesc currently implemented, though it could be done if useful.
 longdesc 
 longdesc See the TeXLive::TLPSRC documentation for more.
 
-# These packages are used by all LaTeX variants.
+# These ${global_latex_deps} packages are used by (nearly) all LaTeX variants.
+# 
 # After the TL 2020 release, there should be more commonalities between
 # latex-bin and latex-bin-dev that we can add here.
+# 
+# l3backend is not actually included in the .fmt (by design), but it is
+# used by the l3kernel code that is in the .fmt. It seems safer in
+# practice to just be sure we rebuild the fmt and have it (l3backend) as
+# an implicit dependency by listing it here.
+# 
+# tex-ini-files is not used by the e(u)ptex-based formats or eplain, but
+# it seems too painful to exclude it here and thus have to include it
+# everywhere else, or set up yet more variables. Seems fairly harmless.
+# 
+# Similarly, eplain does not (at this writing) need l3kernel for its
+# .fmt, but again, seems more maintainer to just use the variable as it is.
+# 
+# These special cases are also embedded in the tl-check-fmttriggers
+# code, so we don't get repeatedly warned about them. Maybe someday a
+# better approach will present itself.
+# 
 tlpsetvar global_latex_deps babel,cm,hyphen-base,latex-fonts,l3backend,\
-l3kernel,tex-ini-files
+l3kernel,tex-ini-files,unicode-data
 #
 # These packages are used by all LuaTeX variants - luatex, luajittex, luahbtex.
 tlpsetvar global_luatex_deps cm,etex,hyphen-base,knuth-lib,plain,\
diff --git a/Master/tlpkg/tlpsrc/aleph.tlpsrc b/Master/tlpkg/tlpsrc/aleph.tlpsrc
index 18cfb81920e..57a082173f5 100644
--- a/Master/tlpkg/tlpsrc/aleph.tlpsrc
+++ b/Master/tlpkg/tlpsrc/aleph.tlpsrc
@@ -8,7 +8,8 @@ execute AddFormat name=aleph engine=aleph options=*aleph.ini \
           fmttriggers=${fmtcomm},knuth-lib,plain
 execute AddFormat name=lamed engine=aleph patterns=language.dat \
           options=*lambda.ini \
-          fmttriggers=${fmtcomm},antomega,lambda,latex,latex-fonts,omega
+          fmttriggers=${fmtcomm},antomega,lambda,\
+latex,latex-fonts,omega,l3kernel
 
 binpattern f bin/${ARCH}/aleph
 binpattern f bin/${ARCH}/lamed
diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
index e4d98b2a259..b4fda05bd83 100644
--- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
@@ -1,6 +1,7 @@
 depend latex
 
-tlpsetvar fmtcomm cm,csplain,hyphen-base,latex-fonts,latex
+tlpsetvar fmtcomm cm,csplain,hyphen-base,\
+l3kernel,latex-fonts,latex,unicode-data
 #
 execute AddFormat name=cslatex engine=pdftex \
           options="-etex cslatex.ini" \
diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc
index 6aaa41e4bd2..5b38e5001bf 100644
--- a/Master/tlpkg/tlpsrc/eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc
@@ -1,6 +1,8 @@
 depend pdftex
+
 # although eplain is not at all LaTeX, it loads Babel, 
-# which turns out to be the same core LaTeX packages.
+# which turns out to need nearly all the core LaTeX packages.
+# Simplify maintenance by just using our global variable.
 execute AddFormat name=eplain engine=pdftex patterns=language.dat \
           options="-translate-file=cp227.tcx *eplain.ini" \
           fmttriggers=${global_latex_deps},dehyph,knuth-lib,plain
diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
index 83f256c6d47..9f745ac667e 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -8,11 +8,11 @@ tlpsetvar fmtcomm \
 amsfonts,atbegshi,atveryend,auxhook,babel,bigintcalc,bitset,cm,\
 colortbl,cyrillic,dehyph,ec,etexcmds,fancyhdr,graphics,\
 graphics-cfg,graphics-def,hycolor,hyperref,hyphen-base,iftex,\
-infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latex,\
+infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,l3kernel,latex,\
 latex-fonts,latexconfig,letltxmacro,ltxcmds,marvosym,\
 passivetex,pdfescape,pdftexcmds,psnfss,rerunfilecheck,stmaryrd,\
-symbol,tex-ini-files,tipa,tools,ulem,uniquecounter,url,wasysym,\
-zapfding
+symbol,tex-ini-files,tipa,tools,ulem,uniquecounter,unicode-data,url,\
+wasysym,zapfding
 #
 execute AddFormat name=jadetex engine=pdftex patterns=language.dat \
           options="*jadetex.ini" \
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index b5fcea6b7c0..f6d96f53322 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -15,7 +15,7 @@ depend latex-graphics-dev
 docpattern f texmf-dist/doc/man/man1/*latex-dev.*
 
 # cf. latex-bin.tlpsrc.
-tlpsetvar fmtcomm ${global_latex_deps},latex-base-dev,unicode-data
+tlpsetvar fmtcomm ${global_latex_deps},latex-base-dev
 #
 tlpsetvar nonluafmtdeps dehyph,latexconfig
 tlpsetvar luafmtdeps lm,luaotfload
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index de62cf40358..49c8e5eafac 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -8,7 +8,7 @@ depend latex
 # cf. latex-bin-dev.tlpsrc.
 tlpsetvar fmtcomm ${global_latex_deps},latex
 tlpsetvar nonluafmtdeps dehyph,latexconfig
-tlpsetvar luafmtdeps unicode-data,luaotfload
+tlpsetvar luafmtdeps lm,luaotfload
 
 docpattern f texmf-dist/doc/man/man1/latex.*
 binpattern f bin/${ARCH}/latex
diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc
index 64f058b3d12..3a1fc281421 100644
--- a/Master/tlpkg/tlpsrc/mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc
@@ -4,7 +4,8 @@ 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,dehyph,latex,latexconfig,latex-fonts
+          fmttriggers=${fmtdeps},babel,dehyph,l3kernel,\
+latex,latexconfig,latex-fonts,unicode-data
 #
 execute AddFormat name=mltex engine=pdftex \
            options="-translate-file=cp227.tcx -mltex mltex.ini" \
diff --git a/Master/tlpkg/tlpsrc/platex.tlpsrc b/Master/tlpkg/tlpsrc/platex.tlpsrc
index 3c5b5888d1a..0c3c5fb7e73 100644
--- a/Master/tlpkg/tlpsrc/platex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/platex.tlpsrc
@@ -6,7 +6,7 @@ execute AddFormat name=platex engine=eptex options="*platex.ini" \
 #
 execute AddFormat name=platex-dev engine=eptex options="*platex.ini" \
           patterns=language.dat \
-          fmttriggers=${fmtcomm},l3kernel,latex-base-dev,unicode-data
+          fmttriggers=${fmtcomm},l3kernel,latex-base-dev
 #
 binpattern f bin/${ARCH}/platex
 binpattern f bin/${ARCH}/platex-dev
diff --git a/Master/tlpkg/tlpsrc/uplatex.tlpsrc b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
index c3585e70dc3..0fab8d33c64 100644
--- a/Master/tlpkg/tlpsrc/uplatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
@@ -8,7 +8,7 @@ execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
 #
 execute AddFormat name=uplatex-dev engine=euptex options="*uplatex.ini" \
           patterns=language.dat \
-          fmttriggers=${fmtcomm},l3kernel,latex-base-dev,unicode-data
+          fmttriggers=${fmtcomm},l3kernel,latex-base-dev
 
 binpattern f bin/${ARCH}/uplatex
 binpattern f bin/${ARCH}/uplatex-dev
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index b6b7aaf1d4e..3236d137641 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -1,6 +1,6 @@
 category TLCore
 
-tlpsetvar fmtcomm cm,hyphen-base,tex-ini-files,unicode-data
+tlpsetvar fmtcomm cm,hyphen-base,tex-ini-files
 #
 execute AddFormat name=xetex engine=xetex patterns=language.def \
   options="-etex xetex.ini" \
@@ -8,7 +8,7 @@ execute AddFormat name=xetex engine=xetex patterns=language.def \
 #
 execute AddFormat name=xelatex engine=xetex patterns=language.dat \
   options="-etex xelatex.ini" \
-  fmttriggers=${fmtcomm},babel,latex,latex-fonts
+  fmttriggers=${fmtcomm},babel,l3kernel,latex,latex-fonts,lm,unicode-data
 
 # do fontconfig stuff, especially on Windows.
 postaction script file=tlpkg/tlpostcode/xetex.pl