texlive[53786] Master/tlpkg: move unicode-data to
commits+karl at tug.org
commits+karl at tug.org
Sat Feb 15 00:45:35 CET 2020
Revision: 53786
http://tug.org/svn/texlive?view=revision&revision=53786
Author: karl
Date: 2020-02-15 00:45:34 +0100 (Sat, 15 Feb 2020)
Log Message:
-----------
move unicode-data to ${global_latex_deps} and related+more updates to fmttriggers lists
Modified Paths:
--------------
trunk/Master/tlpkg/bin/tl-check-fmttriggers
trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
trunk/Master/tlpkg/tlpsrc/aleph.tlpsrc
trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc
trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
trunk/Master/tlpkg/tlpsrc/platex.tlpsrc
trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc
trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc
Modified: trunk/Master/tlpkg/bin/tl-check-fmttriggers
===================================================================
--- trunk/Master/tlpkg/bin/tl-check-fmttriggers 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/bin/tl-check-fmttriggers 2020-02-14 23:45:34 UTC (rev 53786)
@@ -288,10 +288,11 @@
# 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 @@
# 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);
}
}
Modified: trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -14,11 +14,29 @@
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,\
Modified: trunk/Master/tlpkg/tlpsrc/aleph.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/aleph.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/aleph.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -8,7 +8,8 @@
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
Modified: trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/cslatex.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -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" \
Modified: trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/eplain.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -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
Modified: trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/jadetex.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -8,11 +8,11 @@
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" \
Modified: trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -15,7 +15,7 @@
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
Modified: trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/latex-bin.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -8,7 +8,7 @@
# 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
Modified: trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/mltex.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -4,7 +4,8 @@
#
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" \
Modified: trunk/Master/tlpkg/tlpsrc/platex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/platex.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/platex.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -6,7 +6,7 @@
#
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
Modified: trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/uplatex.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -8,7 +8,7 @@
#
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
Modified: trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc
===================================================================
--- trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc 2020-02-14 22:58:28 UTC (rev 53785)
+++ trunk/Master/tlpkg/tlpsrc/xetex.tlpsrc 2020-02-14 23:45:34 UTC (rev 53786)
@@ -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=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
More information about the tex-live-commits
mailing list.