texlive[45678] Master/tlpkg: packages need not list themselves as
commits+karl at tug.org
commits+karl at tug.org
Fri Nov 3 18:55:13 CET 2017
Revision: 45678
http://tug.org/svn/texlive?view=revision&revision=45678
Author: karl
Date: 2017-11-03 18:55:12 +0100 (Fri, 03 Nov 2017)
Log Message:
-----------
packages need not list themselves as fmttriggers; check this (from texlive at schoepfer.info, 6 Oct 2017 23:22:57)
Modified Paths:
--------------
trunk/Master/tlpkg/bin/check-fmttriggers
trunk/Master/tlpkg/tlpsrc/amstex.tlpsrc
trunk/Master/tlpkg/tlpsrc/context.tlpsrc
trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc
trunk/Master/tlpkg/tlpsrc/csplain.tlpsrc
trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
trunk/Master/tlpkg/tlpsrc/lollipop.tlpsrc
trunk/Master/tlpkg/tlpsrc/luatex.tlpsrc
trunk/Master/tlpkg/tlpsrc/metafont.tlpsrc
trunk/Master/tlpkg/tlpsrc/mex.tlpsrc
trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
trunk/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
trunk/Master/tlpkg/tlpsrc/texsis.tlpsrc
trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc
Modified: trunk/Master/tlpkg/bin/check-fmttriggers
===================================================================
--- trunk/Master/tlpkg/bin/check-fmttriggers 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/bin/check-fmttriggers 2017-11-03 17:55:12 UTC (rev 45678)
@@ -273,7 +273,7 @@
# 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 @@
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);
}
}
Modified: trunk/Master/tlpkg/tlpsrc/amstex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/amstex.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/amstex.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -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.*
#
Modified: trunk/Master/tlpkg/tlpsrc/context.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/context.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/context.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -17,9 +17,9 @@
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 \
Modified: trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -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" \
Modified: trunk/Master/tlpkg/tlpsrc/csplain.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/csplain.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/csplain.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -2,7 +2,7 @@
# 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" \
Modified: trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -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
Modified: trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -4,7 +4,7 @@
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
#
Modified: trunk/Master/tlpkg/tlpsrc/lollipop.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/lollipop.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/lollipop.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -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
Modified: trunk/Master/tlpkg/tlpsrc/luatex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/luatex.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/luatex.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -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" \
Modified: trunk/Master/tlpkg/tlpsrc/metafont.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/metafont.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/metafont.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -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
#
Modified: trunk/Master/tlpkg/tlpsrc/mex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/mex.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/mex.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -3,8 +3,7 @@
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" \
Modified: trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -8,7 +8,7 @@
#
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
Modified: trunk/Master/tlpkg/tlpsrc/mptopdf.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/mptopdf.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/mptopdf.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -12,7 +12,7 @@
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
Modified: trunk/Master/tlpkg/tlpsrc/texsis.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/texsis.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/texsis.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -2,6 +2,6 @@
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
Modified: trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc 2017-11-03 16:51:59 UTC (rev 45677)
+++ trunk/Master/tlpkg/tlpsrc/xmltex.tlpsrc 2017-11-03 17:55:12 UTC (rev 45678)
@@ -4,7 +4,7 @@
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" \
More information about the tex-live-commits
mailing list