From 976dd4b4e298f349b6f4b37b0b4be9a66f60c1c6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 3 Nov 2017 17:55:12 +0000 Subject: packages need not list themselves as fmttriggers; check this (from texlive@schoepfer.info, 6 Oct 2017 23:22:57) git-svn-id: svn://tug.org/texlive/trunk@45678 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/check-fmttriggers | 12 +++++++++--- Master/tlpkg/tlpsrc/amstex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/context.tlpsrc | 4 ++-- Master/tlpkg/tlpsrc/cslatex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/csplain.tlpsrc | 2 +- Master/tlpkg/tlpsrc/eplain.tlpsrc | 2 +- Master/tlpkg/tlpsrc/jadetex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/lollipop.tlpsrc | 5 +++-- Master/tlpkg/tlpsrc/luatex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/metafont.tlpsrc | 3 +-- Master/tlpkg/tlpsrc/mex.tlpsrc | 3 +-- Master/tlpkg/tlpsrc/mltex.tlpsrc | 2 +- Master/tlpkg/tlpsrc/mptopdf.tlpsrc | 2 +- Master/tlpkg/tlpsrc/texsis.tlpsrc | 2 +- Master/tlpkg/tlpsrc/xmltex.tlpsrc | 2 +- 15 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Master/tlpkg/bin/check-fmttriggers b/Master/tlpkg/bin/check-fmttriggers index 3939fd1bc67..7d8b85b8c3c 100755 --- a/Master/tlpkg/bin/check-fmttriggers +++ b/Master/tlpkg/bin/check-fmttriggers @@ -273,7 +273,7 @@ sub pkgs_per_format { # Compare lists of packages required by building (PKGS_PER_FORMAT) with -# lists of existing trigger directives (FMTTRIGGER). Return 0 if +# 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). @@ -299,15 +299,21 @@ sub compare_pkgs_and_triggers { my @tlpdb_pkgs = @{$fmttriggers->{$ef}}; my %tlpdb_pkgs; @tlpdb_pkgs{@tlpdb_pkgs} = (); # hash slice for tlpdb pkgs - + my @recorded_only = (); for my $r (keys %recorded_pkgs) { + # no need for a package to include itself as a fmttrigger. + next if $r eq $fmtpkgcontainers->{$ef}; + if (exists $tlpdb_pkgs{$r}) { delete $tlpdb_pkgs{$r}; # ok, in both } else { + # sometimes we like to include the hyphenation packages as + # triggers in the tlpdb, for no particular reason. Let that be + # ok, and only check for the skipped packages when making the + # trigger list for an engine.format not in tlpdb. next if grep ($_ eq $r, @skip_pkgs); next if $r =~ /hyphen-.*/; - next if $r eq $fmtpkgcontainers->{$ef}; push (@recorded_only, $r); } } diff --git a/Master/tlpkg/tlpsrc/amstex.tlpsrc b/Master/tlpkg/tlpsrc/amstex.tlpsrc index 133a174b8df..7ad3867ae8d 100644 --- a/Master/tlpkg/tlpsrc/amstex.tlpsrc +++ b/Master/tlpkg/tlpsrc/amstex.tlpsrc @@ -1,7 +1,7 @@ depend tex execute AddFormat name=amstex engine=pdftex \ options="-translate-file=cp227.tcx *amstex.ini" \ - fmttriggers=amsfonts,amstex,cm,hyphen-base,knuth-lib,plain + fmttriggers=amsfonts,cm,hyphen-base,knuth-lib,plain # docpattern +f texmf-dist/doc/man/man1/amstex.* # diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc index 409813b380f..01cad6910e3 100644 --- a/Master/tlpkg/tlpsrc/context.tlpsrc +++ b/Master/tlpkg/tlpsrc/context.tlpsrc @@ -17,9 +17,9 @@ 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 \ diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc index 7be7a3fc34c..244eed0eca9 100644 --- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc @@ -1,6 +1,6 @@ depend latex -tlpsetvar fmtcomm cm,cslatex,csplain,hyphen-base,latex-fonts,latex +tlpsetvar fmtcomm cm,csplain,hyphen-base,latex-fonts,latex # execute AddFormat name=cslatex engine=pdftex \ options="-etex cslatex.ini" \ diff --git a/Master/tlpkg/tlpsrc/csplain.tlpsrc b/Master/tlpkg/tlpsrc/csplain.tlpsrc index 109bd9401af..dbb078ef1cf 100644 --- a/Master/tlpkg/tlpsrc/csplain.tlpsrc +++ b/Master/tlpkg/tlpsrc/csplain.tlpsrc @@ -2,7 +2,7 @@ depend tex # these invocations per author (Petr Olsak). # -tlpsetvar fmtcomm cm,cs,csplain,hyphen-base,plain +tlpsetvar fmtcomm cm,cs,hyphen-base,plain # execute AddFormat name=csplain engine=pdftex \ options="-etex -enc csplain-utf8.ini" \ diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc index c7f241e487a..69c280c8bfe 100644 --- a/Master/tlpkg/tlpsrc/eplain.tlpsrc +++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc @@ -1,7 +1,7 @@ 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 + fmttriggers=babel,cm,hyphen-base,knuth-lib,latex-fonts,plain 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 ccf2eeef9e1..f5b72c62962 100644 --- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc +++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc @@ -4,7 +4,7 @@ depend pdftex depend tex tlpsetvar fmtcomm amsfonts,babel,cm,colortbl,cyrillic,ec,fancyhdr,graphics,\ -graphics-cfg,graphics-def,hyperref,hyphen-base,ifxetex,jadetex,latex,\ +graphics-cfg,graphics-def,hyperref,hyphen-base,ifxetex,latex,\ latex-fonts,latexconfig,marvosym,oberdiek,passivetex,psnfss,stmaryrd,\ symbol,tex-ini-files,tipa,tools,ulem,url,wasysym,zapfding # diff --git a/Master/tlpkg/tlpsrc/lollipop.tlpsrc b/Master/tlpkg/tlpsrc/lollipop.tlpsrc index 4fbacde00bf..f5a602d0608 100644 --- a/Master/tlpkg/tlpsrc/lollipop.tlpsrc +++ b/Master/tlpkg/tlpsrc/lollipop.tlpsrc @@ -1,4 +1,5 @@ -binpattern f bin/${ARCH}/lollipop execute AddFormat name=lollipop engine=tex \ options="lollipop.ini" \ - fmttriggers=cm,hyphen-base,lollipop + fmttriggers=cm,hyphen-base + +binpattern f bin/${ARCH}/lollipop diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc index 65f4c765a52..2e52702ab46 100644 --- a/Master/tlpkg/tlpsrc/luatex.tlpsrc +++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc @@ -1,6 +1,6 @@ category TLCore # -tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,luatex,plain,tex-ini-files,\ +tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,\ unicode-data # execute AddFormat name=luatex engine=luatex options="luatex.ini" \ diff --git a/Master/tlpkg/tlpsrc/metafont.tlpsrc b/Master/tlpkg/tlpsrc/metafont.tlpsrc index e009f074c3d..c7840d7729d 100644 --- a/Master/tlpkg/tlpsrc/metafont.tlpsrc +++ b/Master/tlpkg/tlpsrc/metafont.tlpsrc @@ -1,8 +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 # diff --git a/Master/tlpkg/tlpsrc/mex.tlpsrc b/Master/tlpkg/tlpsrc/mex.tlpsrc index 7178407c982..f19992b4fe4 100644 --- a/Master/tlpkg/tlpsrc/mex.tlpsrc +++ b/Master/tlpkg/tlpsrc/mex.tlpsrc @@ -3,8 +3,7 @@ depend hyphen-polish depend pdftex depend tex -tlpsetvar fmtcomm hyphen-base,hyphen-polish,knuth-lib,mex,pl,plain,\ -tex-ini-files +tlpsetvar fmtcomm hyphen-base,hyphen-polish,knuth-lib,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/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc index d6b01bbf53e..32fdedcbd12 100644 --- a/Master/tlpkg/tlpsrc/mltex.tlpsrc +++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc @@ -8,7 +8,7 @@ execute AddFormat name=mllatex engine=pdftex patterns=language.dat \ # execute AddFormat name=mltex engine=pdftex \ options="-translate-file=cp227.tcx -mltex mltex.ini" \ - fmttriggers=${fmtdeps},knuth-lib,mltex,plain + fmttriggers=${fmtdeps},knuth-lib,plain 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 f187c70985b..b5086c82478 100644 --- a/Master/tlpkg/tlpsrc/mptopdf.tlpsrc +++ b/Master/tlpkg/tlpsrc/mptopdf.tlpsrc @@ -12,7 +12,7 @@ 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 + fmttriggers=plain runpattern f texmf-dist/tex/context/base/mkii/supp-mis.mkii runpattern f texmf-dist/tex/context/base/mkii/supp-mpe.mkii diff --git a/Master/tlpkg/tlpsrc/texsis.tlpsrc b/Master/tlpkg/tlpsrc/texsis.tlpsrc index 9bcf2d281d2..1732c3832d5 100644 --- a/Master/tlpkg/tlpsrc/texsis.tlpsrc +++ b/Master/tlpkg/tlpsrc/texsis.tlpsrc @@ -2,6 +2,6 @@ depend tex execute AddFormat name=texsis engine=pdftex \ options="-translate-file=cp227.tcx texsis.ini" \ - fmttriggers=cm,hyphen-base,knuth-lib,plain,texsis + fmttriggers=cm,hyphen-base,knuth-lib,plain binpattern f bin/${ARCH}/texsis diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc index fe6597affe0..034960b4dd5 100644 --- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc +++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc @@ -4,7 +4,7 @@ depend tex depend xmltexconfig tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latex-fonts,latexconfig,\ -tex-ini-files,xmltex,xmltexconfig +tex-ini-files,xmltexconfig # execute AddFormat name=xmltex engine=pdftex patterns=language.dat \ options="*xmltex.ini" \ -- cgit v1.2.3