From b6e5cf8a177685cf1050de7d1ab60182d67db558 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 3 Dec 2019 18:37:40 +0000 Subject: sync fmttriggers with packages split from oberdiek git-svn-id: svn://tug.org/texlive/trunk@53009 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-check-fmttriggers | 17 ++++++++++++++--- Master/tlpkg/tlpsrc/jadetex.tlpsrc | 4 ++-- Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc | 6 ++++-- Master/tlpkg/tlpsrc/luahbtex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/luajittex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/platex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/uplatex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc | 2 +- 8 files changed, 25 insertions(+), 12 deletions(-) diff --git a/Master/tlpkg/bin/tl-check-fmttriggers b/Master/tlpkg/bin/tl-check-fmttriggers index eca92140763..16dcce72a7d 100755 --- a/Master/tlpkg/bin/tl-check-fmttriggers +++ b/Master/tlpkg/bin/tl-check-fmttriggers @@ -49,6 +49,9 @@ if ($opt_version) { print "$vc_id\n"; exit 0; } $::installerdir = $Master; # TLUtils.pm should be smarter $ENV{'PATH'} = "$Master/bin/" . TeXLive::TLUtils::platform() . ":$ENV{PATH}"; +# These don't have triggers, and that's ok. +my $no_triggers_ok = '^(mf-nowin\.mf|(pdf|xe)tex\.cont-en)$'; + exit (&main()); @@ -203,8 +206,11 @@ sub tlpdb_by_file { tldie ("$prg: parse_AddFormat_line failed: $af{error}\n" . "line = $_\n"); } + + next if $af{"mode"} == 0; # skip disabled. + + my $ef = "$af{engine}.$af{name}"; if ($af{"fmttriggers"}) { - my $ef = "$af{engine}.$af{name}"; if (exists ($fmttriggers{$ef})) { tldie ("$prg: already saw triggers for $ef ($fmttriggers{$ef})," . " triggers now = $af{fmttriggers}\n"); @@ -213,7 +219,7 @@ sub tlpdb_by_file { $fmtpkgcontainers{$ef} = $pkg; #warn " fmtpkgcontainers{$ef} = $pkg\n"; } else { - tlwarn ("$prg: no fmttriggers: $_\n"); + tlwarn ("$prg: no fmttriggers: $_\n") unless $ef =~ /$no_triggers_ok/; } } elsif (s/^ //) { # notice file names @@ -249,6 +255,7 @@ sub pkgs_per_format { my %pkgs_for_this_format; my $files_ref = $files_per_format{$format}; for my $f (@$files_ref) { + next if $f eq "/dev/null"; if (exists $tlpdb->{$f}) { my $pkg = $tlpdb->{$f}; $pkgs_for_this_format{$pkg} = 1; @@ -300,6 +307,10 @@ sub compare_pkgs_and_triggers { my %tlpdb_pkgs; @tlpdb_pkgs{@tlpdb_pkgs} = (); # hash slice for tlpdb pkgs + # This does not show up in the recorder output, unfortunately. + # It's used in the lualatex formats. + delete $tlpdb_pkgs{"luaotfload"}; + my @recorded_only = (); for my $r (keys %recorded_pkgs) { # no need for a package to include itself as a fmttrigger. @@ -333,7 +344,7 @@ sub compare_pkgs_and_triggers { } else { # not in tlpdb at all; in a few cases, that is expected. # Otherwise, complain and output needed fmttriggers directive. - if ($ef =~ /^(mf-nowin\.mf|(pdf|xe)tex\.cont-en)$/) { + if ($ef =~ /$no_triggers_ok/) { delete $fmttriggers->{$ef}; # ok } else { tlwarn ("$prg: no fmttriggers in tlpdb: $ef\n" diff --git a/Master/tlpkg/tlpsrc/jadetex.tlpsrc b/Master/tlpkg/tlpsrc/jadetex.tlpsrc index 9065df64c97..f63a0206a34 100644 --- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc +++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc @@ -5,8 +5,8 @@ depend tex tlpsetvar fmtcomm amsfonts,babel,cm,colortbl,cyrillic,dehyph,\ ec,fancyhdr,graphics,graphics-cfg,graphics-def,hyperref,\ -hyphen-base,iftex,latex,\ -latex-fonts,latexconfig,marvosym,oberdiek,passivetex,psnfss,stmaryrd,\ +hyphen-base,iftex,kvoptions,latex,latex-fonts,\ +latexconfig,marvosym,oberdiek,passivetex,pdftexcmds,psnfss,stmaryrd,\ symbol,tex-ini-files,tipa,tools,ulem,url,wasysym,zapfding # execute AddFormat name=jadetex engine=pdftex patterns=language.dat \ diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc index 8641837fffc..d16d306691f 100644 --- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc +++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc @@ -15,9 +15,11 @@ depend latex-graphics-dev docpattern f texmf-dist/doc/man/man1/*latex-dev.* # Keep these variables in sync with latex-bin.tlpsrc. -tlpsetvar fmtcomm babel,cm,hyphen-base,latex-base-dev,latex-fonts,tex-ini-files +tlpsetvar fmtcomm babel,cm,hyphen-base,l3kernel,latex-base-dev,latex-fonts,\ +tex-ini-files,unicode-data +# tlpsetvar nonluafmtdeps dehyph,latexconfig -tlpsetvar luafmtdeps unicode-data,luaotfload +tlpsetvar luafmtdeps luaotfload binpattern f bin/${ARCH}/latex-dev execute AddFormat name=latex-dev engine=pdftex \ diff --git a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc index 2706c01f8b7..eec52d3c8ea 100644 --- a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc @@ -21,7 +21,7 @@ binpattern f/!${no_luahb_platforms} bin/${ARCH}/luahbtex execute AddFormat name=luahbtex engine=luahbtex \ patterns=language.def,language.dat.lua \ options="luatex.ini" \ - fmttriggers=${fmtdeps} + fmttriggers=${fmtdeps},luatex # can't have luahbtex without luatex. depend luatex diff --git a/Master/tlpkg/tlpsrc/luajittex.tlpsrc b/Master/tlpkg/tlpsrc/luajittex.tlpsrc index 1493487c2f7..2ab2f194b9c 100644 --- a/Master/tlpkg/tlpsrc/luajittex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luajittex.tlpsrc @@ -23,7 +23,7 @@ binpattern f/x86_64-cygwin bin/x86_64-cygwin/cygtexluajit*.dll # invoked by specifications in TLConfig.pm and tlmgr.pl. execute AddFormat name=luajittex engine=luajittex options="luatex.ini" \ patterns=language.def,language.dat.lua \ - fmttriggers=${fmtdeps} + fmttriggers=${fmtdeps},luatex # can't have luajittex without luatex. depend luatex diff --git a/Master/tlpkg/tlpsrc/platex.tlpsrc b/Master/tlpkg/tlpsrc/platex.tlpsrc index d7e0eb46f35..47c8fdd70ff 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},latex-base-dev + fmttriggers=${fmtcomm},l3kernel,latex-base-dev,unicode-data # 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 0fbcbcf513c..61a9668b1e2 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},latex-base-dev + fmttriggers=${fmtcomm},l3kernel,latex-base-dev,unicode-data binpattern f bin/${ARCH}/uplatex binpattern f bin/${ARCH}/uplatex-dev diff --git a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc index 1d0578fe3ce..3e96a1a4653 100644 --- a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc +++ b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc @@ -9,6 +9,6 @@ tlpsetvar fmtcomm cm,hyphen-base,tex-ini-files,unicode-data # execute AddFormat name=xelatex-dev engine=xetex patterns=language.dat \ options="-etex xelatex.ini" \ - fmttriggers=${fmtcomm},babel,latex-base-dev,latex-fonts + fmttriggers=${fmtcomm},babel,l3kernel,latex-base-dev,latex-fonts depend xetex -- cgit v1.2.3