diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/tlpkg/bin/tl-check-fmttriggers | 13 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/Master/tlpkg/bin/tl-check-fmttriggers b/Master/tlpkg/bin/tl-check-fmttriggers index 3b9f66729b9..24535739cd3 100755 --- a/Master/tlpkg/bin/tl-check-fmttriggers +++ b/Master/tlpkg/bin/tl-check-fmttriggers @@ -289,8 +289,8 @@ 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, except hyph-utf8, l3backend, and the package itself +# identical, 1 otherwise (and report differences). Ignore some +# hyphenation dependencies and l3backend, and the package itself # containing the trigger directive (FMTPKGCONTAINERS). # sub compare_pkgs_and_triggers { @@ -300,9 +300,7 @@ sub compare_pkgs_and_triggers { # we don't include these as fmttriggers since when they meaningfully # change, fmtutil should get called anyway due to language.* changing. - # See 00texlive.autopatterns.tlpsrc for the story on l3backend. - my @skip_pkgs = qw(dehyph-exptl ruhyphen ukrhyph - l3backend); + my @skip_pkgs = qw(dehyph-exptl ruhyphen ukrhyph); # Anything matching hyphen-.* is also ignored, but not hyph-utf8. for my $ef (sort keys %$pkgs_per_format) { @@ -321,6 +319,11 @@ sub compare_pkgs_and_triggers { # It's used in the lualatex formats. delete $tlpdb_pkgs{"luaotfload"}; + # We intentionally include this as a fmttrigger in tlpdb even + # though it is not read at fmt creation time. See + # 00texlive.autopatterns.tlpsrc. + delete $tlpdb_pkgs{"l3backend"}; + my @recorded_only = (); for my $r (keys %recorded_pkgs) { # no need for a package to include itself as a fmttrigger. diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc index e2cc8436b72..2d5d679d740 100644 --- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc @@ -21,7 +21,7 @@ longdesc See the TeXLive::TLPSRC documentation for more. # # l3backend is not actually read when the .fmt is made (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 as needed, and have it +# practice to just rebuild the fmt anyway. It's also nice to 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 @@ -35,8 +35,8 @@ longdesc See the TeXLive::TLPSRC documentation for more. # 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,unicode-data +tlpsetvar global_latex_deps babel,cm,hypf-utf8,hyphen-base,\ +latex-fonts,l3backend,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,\ |