summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/tlpkg/bin/tl-check-fmttriggers28
-rw-r--r--Master/tlpkg/dev/profiles/TLminall.pro14
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc7
-rw-r--r--Master/tlpkg/tlpsrc/cslatex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/eplain.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/jadetex.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/mltex.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/pdftex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/platex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/ptex.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/uplatex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/uptex.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc3
-rw-r--r--Master/tlpkg/tlpsrc/xetex.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/xmltex.tlpsrc4
17 files changed, 58 insertions, 41 deletions
diff --git a/Master/tlpkg/bin/tl-check-fmttriggers b/Master/tlpkg/bin/tl-check-fmttriggers
index 4f46229fd85..060e9893d23 100755
--- a/Master/tlpkg/bin/tl-check-fmttriggers
+++ b/Master/tlpkg/bin/tl-check-fmttriggers
@@ -7,6 +7,10 @@
# then map those files to TL packages,
# then check that exactly those packages are listed as triggers in the
# corresponding tlpsrc files.
+#
+# Cleaner approach: should output exact list of deps for each format,
+# and then use it. That would be easier to maintain than the current
+# complicated set of variables.
my $vc_id = '$Id$';
my $Master;
@@ -33,6 +37,7 @@ my $opt_analyze = 0;
my $opt_fmtargs = "--all";
my $opt_fmtdir = "/tmp/fmttriggers";
my $opt_rerecord = 1;
+my $opt_tlpdb = undef;
my $opt_help = 0;
my $opt_version = 0;
@@ -40,8 +45,9 @@ TeXLive::TLUtils::process_logging_options ();
GetOptions (
"analyze" => \$opt_analyze,
"fmtargs=s" => \$opt_fmtargs,
- "fmtdir" => \$opt_fmtdir,
+ "fmtdir=s" => \$opt_fmtdir,
"rerecord!" => \$opt_rerecord,
+ "tlpdb=s" => \$opt_tlpdb,
"version" => \$opt_version,
"help|?" => \$help) || pod2usage(1);
@@ -71,7 +77,7 @@ sub main {
#system ("bytime $opt_fmtdir");
# read tlpdb.
- my $tlpdb_file = "$Master/tlpkg/texlive.tlpdb";
+ my $tlpdb_file = $opt_tlpdb || "$Master/tlpkg/texlive.tlpdb";
my ($tlpdb,$fmttriggers,$fmtpkgcontainers) = &tlpdb_by_file ($tlpdb_file);
# if reporting on the trigger subsets, just do that and we're done.
@@ -248,7 +254,8 @@ sub tlpdb_by_file {
close ($tlpdb) || warn "close($tlpdb_file) failed: $!";
&info ("TLPDB files: " . scalar (keys %tlpfiles)
- . " triggers: " . scalar (keys %fmttriggers) . "\n");
+ . " triggers: " . scalar (keys %fmttriggers)
+ . " file: $tlpdb_file\n" );
return (\%tlpfiles, \%fmttriggers, \%fmtpkgcontainers);
}
@@ -302,15 +309,6 @@ sub compare_pkgs_and_triggers {
my $bad_p = 0;
my $all_pkgs = 0;
- # we don't include these as fmttriggers since when they meaningfully
- # change, fmtutil should get called anyway due to language.* changing.
- my @skip_recorded = qw(dehyph-exptl ruhyphen ukrhyph);
- #
- # similarly for this engine.
- push (@skip_recorded, "pdftex");
- #
- # Anything matching hyphen-.* is also ignored, but not hyph-utf8.
-
for my $ef (sort keys %$pkgs_per_format) {
my @recorded_pkgs = @{$pkgs_per_format->{$ef}};
$all_pkgs += @recorded_pkgs;
@@ -331,11 +329,7 @@ sub compare_pkgs_and_triggers {
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_recorded);
+ # The hyphen-* packages get loaded anyway? Not sure.
next if $r =~ /hyphen-.*/;
push (@recorded_only, $r);
}
diff --git a/Master/tlpkg/dev/profiles/TLminall.pro b/Master/tlpkg/dev/profiles/TLminall.pro
new file mode 100644
index 00000000000..5c51d65ab0e
--- /dev/null
+++ b/Master/tlpkg/dev/profiles/TLminall.pro
@@ -0,0 +1,14 @@
+# $Id$
+selected_scheme scheme-minimal
+TEXDIR /tmp/ki
+TEXMFHOME /tmp/ki/user/home
+TEXMFLOCAL /tmp/ki/texmf-local
+TEXMFSYSCONFIG /tmp/ki/sys/config
+TEXMFSYSVAR /tmp/ki/sys/var
+TEXMFCONFIG /tmp/ki/user/config
+TEXMFVAR /tmp/ki/user/var
+option_doc 1
+option_fmt 1
+option_letter 1
+option_src 1
+option_symlinks 0
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index c2e084b3043..882dc2abdde 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -34,7 +34,12 @@ longdesc See the TeXLive::TLPSRC documentation for more.
#
tlpsetvar global_latex_deps \
atbegshi,atveryend,babel,cm,everyshi,firstaid,hyphen-base,\
-l3backend,l3kernel,l3packages,latex,latex-fonts,tex-ini-files,unicode-data
+l3backend,l3kernel,l3packages,latex,latex-fonts,\
+tex-ini-files,unicode-data
+#
+# Some languages have extra patterns.
+tlpsetvar global_hyph_deps \
+dehyph,dehyph-exptl,ruhyphen,ukrhyph
#
# These packages are used by all LuaTeX variants - luatex, luajittex, luahbtex.
tlpsetvar global_luatex_deps \
diff --git a/Master/tlpkg/tlpsrc/cslatex.tlpsrc b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
index 1102cbeab5e..cafaa10d762 100644
--- a/Master/tlpkg/tlpsrc/cslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/cslatex.tlpsrc
@@ -1,7 +1,7 @@
depend latex
-tlpsetvar fmtcomm atbegshi,atveryend,cm,csplain,everyshi,firstaid,hyphen-base,\
-l3kernel,l3packages,latex-fonts,latex,unicode-data
+tlpsetvar fmtcomm atbegshi,atveryend,cm,csplain,everyshi,\
+firstaid,hyphen-base,l3kernel,l3packages,latex-fonts,latex,pdftex,unicode-data
#
execute AddFormat name=cslatex engine=pdftex \
options="-etex cslatex.ini" \
diff --git a/Master/tlpkg/tlpsrc/eplain.tlpsrc b/Master/tlpkg/tlpsrc/eplain.tlpsrc
index 0dc5c02735f..315dc861559 100644
--- a/Master/tlpkg/tlpsrc/eplain.tlpsrc
+++ b/Master/tlpkg/tlpsrc/eplain.tlpsrc
@@ -5,7 +5,7 @@ depend pdftex
# 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,hyph-utf8,knuth-lib,plain
+ fmttriggers=${global_hyph_deps},${global_latex_deps},hyph-utf8,knuth-lib,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 f20cf84fd32..06e923f09ab 100644
--- a/Master/tlpkg/tlpsrc/jadetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jadetex.tlpsrc
@@ -4,13 +4,13 @@ depend pdftex
depend tex
# most of these are due to hyperref.
-tlpsetvar fmtcomm ${global_latex_deps},\
+tlpsetvar fmtcomm ${global_hyph_deps},${global_latex_deps},\
amsfonts,auxhook,bigintcalc,bitset,\
-colortbl,cyrillic,dehyph,ec,etexcmds,fancyhdr,graphics,\
+colortbl,cyrillic,ec,etexcmds,fancyhdr,graphics,\
graphics-cfg,graphics-def,hycolor,hyperref,hyph-utf8,iftex,\
infwarerr,intcalc,kvdefinekeys,kvoptions,kvsetkeys,latex,\
latexconfig,letltxmacro,ltxcmds,marvosym,\
-passivetex,pdfescape,pdftexcmds,psnfss,rerunfilecheck,stmaryrd,\
+passivetex,pdfescape,pdftex,pdftexcmds,psnfss,rerunfilecheck,stmaryrd,\
symbol,tipa,tools,ulem,uniquecounter,url,\
wasysym,zapfding
#
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index 4efea8878cd..6d57fcc1c66 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -18,7 +18,7 @@ docpattern f texmf-dist/doc/man/man1/*latex-dev.*
# cf. latex-bin.tlpsrc.
tlpsetvar fmtcomm ${global_latex_deps},latex-base-dev,latex-firstaid-dev
#
-tlpsetvar nonluafmtdeps dehyph,hyph-utf8,latexconfig
+tlpsetvar nonluafmtdeps ${global_hyph_deps},hyph-utf8,latexconfig
tlpsetvar luafmtdeps lm,luaotfload
binpattern f bin/${ARCH}/latex-dev
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index 668961d3116..8554da3615c 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -15,7 +15,7 @@ depend graphics
# cf. latex-bin-dev.tlpsrc.
tlpsetvar fmtcomm ${global_latex_deps},latex
-tlpsetvar nonluafmtdeps dehyph,hyph-utf8,latexconfig
+tlpsetvar nonluafmtdeps ${global_hyph_deps},hyph-utf8,latexconfig
tlpsetvar luafmtdeps lm,luaotfload
docpattern f texmf-dist/doc/man/man1/latex.*
@@ -23,14 +23,14 @@ binpattern f bin/${ARCH}/latex
execute AddFormat name=latex engine=pdftex \
patterns=language.dat \
options="-translate-file=cp227.tcx *latex.ini" \
- fmttriggers=${fmtcomm},${nonluafmtdeps}
+ fmttriggers=${fmtcomm},${nonluafmtdeps},pdftex
#
docpattern f texmf-dist/doc/man/man1/pdflatex.*
binpattern f bin/${ARCH}/pdflatex
execute AddFormat name=pdflatex engine=pdftex \
patterns=language.dat \
options="-translate-file=cp227.tcx *pdflatex.ini" \
- fmttriggers=${fmtcomm},${nonluafmtdeps}
+ fmttriggers=${fmtcomm},${nonluafmtdeps},pdftex
#
docpattern f texmf-dist/doc/man/man1/dvilualatex.*
binpattern f bin/${ARCH}/dvilualatex
diff --git a/Master/tlpkg/tlpsrc/mltex.tlpsrc b/Master/tlpkg/tlpsrc/mltex.tlpsrc
index ac6a4c9b899..4b065f75bcf 100644
--- a/Master/tlpkg/tlpsrc/mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc
@@ -4,7 +4,8 @@ tlpsetvar fmtdeps cm,hyphen-base
#
execute AddFormat name=mllatex engine=pdftex patterns=language.dat \
options="-translate-file=cp227.tcx -mltex *mllatex.ini" \
- fmttriggers=${global_latex_deps},dehyph,hyph-utf8,latex,latexconfig
+ fmttriggers=${global_latex_deps},${global_hyph_deps},\
+hyph-utf8,latex,latexconfig,pdftex
#
execute AddFormat name=mltex engine=pdftex \
options="-translate-file=cp227.tcx -mltex mltex.ini" \
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index 20109ba9d35..50acc64614e 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -1,7 +1,7 @@
category TLCore
depend kpathsea
-tlpsetvar fmtcomm cm,dehyph,etex,hyph-utf8,hyphen-base,knuth-lib,plain
+tlpsetvar fmtcomm cm,etex,knuth-lib,plain,${global_hyph_deps},hyph-utf8
#
execute AddFormat name=pdftex engine=pdftex patterns=language.def \
options="-translate-file=cp227.tcx *pdfetex.ini" \
diff --git a/Master/tlpkg/tlpsrc/platex.tlpsrc b/Master/tlpkg/tlpsrc/platex.tlpsrc
index 535e62b5f09..51a03eba88b 100644
--- a/Master/tlpkg/tlpsrc/platex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/platex.tlpsrc
@@ -1,4 +1,4 @@
-tlpsetvar fmtcomm ${global_latex_deps},ptex-fonts
+tlpsetvar fmtcomm ${global_latex_deps},dehyph-exptl,ptex-fonts
#
execute AddFormat name=platex engine=eptex options="*platex.ini" \
patterns=language.dat \
diff --git a/Master/tlpkg/tlpsrc/ptex.tlpsrc b/Master/tlpkg/tlpsrc/ptex.tlpsrc
index b70343ea004..52d2f7a7258 100644
--- a/Master/tlpkg/tlpsrc/ptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ptex.tlpsrc
@@ -1,14 +1,15 @@
depend ptex-base
depend ptex-fonts
-tlpsetvar fmtcomm cm,hyphen-base,knuth-lib,plain,ptex-base,ptex-fonts
+tlpsetvar fmtcomm cm,hyphen-base,knuth-lib,plain,\
+ptex-base,ptex-fonts
#
execute AddFormat name=ptex engine=ptex options="ptex.ini" \
fmttriggers=${fmtcomm}
#
execute AddFormat name=eptex engine=eptex options="*eptex.ini" \
patterns=language.def \
- fmttriggers=${fmtcomm},etex
+ fmttriggers=${fmtcomm},dehyph-exptl,etex
#
execute addKanjiMap ptex-@jaEmbed@@jaVariant@.map
diff --git a/Master/tlpkg/tlpsrc/uplatex.tlpsrc b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
index c9178be4c26..6c7acb48c9f 100644
--- a/Master/tlpkg/tlpsrc/uplatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
@@ -1,6 +1,6 @@
# uplatex depends on platex (starting from 2018-03-09 release).
#
-tlpsetvar fmtcomm ${global_latex_deps},uptex-fonts,platex
+tlpsetvar fmtcomm ${global_latex_deps},dehyph-exptl,uptex-fonts,platex
#
execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" \
patterns=language.dat \
diff --git a/Master/tlpkg/tlpsrc/uptex.tlpsrc b/Master/tlpkg/tlpsrc/uptex.tlpsrc
index 5ce50e5c115..7d6c38ad0df 100644
--- a/Master/tlpkg/tlpsrc/uptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex.tlpsrc
@@ -1,14 +1,15 @@
depend uptex-base
depend uptex-fonts
-tlpsetvar fmtcomm cm,hyphen-base,knuth-lib,plain,uptex-base,uptex-fonts
+tlpsetvar fmtcomm cm,hyphen-base,knuth-lib,plain,\
+uptex-base,uptex-fonts
#
execute AddFormat name=uptex engine=uptex options="uptex.ini" \
fmttriggers=${fmtcomm}
#
execute AddFormat name=euptex engine=euptex options="*euptex.ini" \
patterns=language.def \
- fmttriggers=${fmtcomm},etex,ptex-base
+ fmttriggers=${fmtcomm},dehyph-exptl,etex,ptex-base
# euptex.fmt reads eptexdefs.lib from ptex-base
#
execute addKanjiMap uptex-@jaEmbed@@jaVariant@.map
diff --git a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
index 4704544153f..67115babc40 100644
--- a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
@@ -9,4 +9,5 @@ docpattern f ignore
execute AddFormat name=xelatex-dev engine=xetex patterns=language.dat \
options="-etex xelatex.ini" \
- fmttriggers=${global_latex_deps},latex-base-dev,latex-firstaid-dev,lm
+ fmttriggers=${global_latex_deps},dehyph-exptl,\
+latex-base-dev,latex-firstaid-dev,lm
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index f4b23cc3d2d..97f6f3baf70 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -4,7 +4,7 @@ depend xetexconfig
depend latex
depend dvipdfmx
-tlpsetvar fmtcomm cm,hyphen-base,tex-ini-files,unicode-data
+tlpsetvar fmtcomm cm,dehyph-exptl,hyphen-base,tex-ini-files,unicode-data
#
execute AddFormat name=xetex engine=xetex patterns=language.def \
options="-etex xetex.ini" \
@@ -12,7 +12,7 @@ execute AddFormat name=xetex engine=xetex patterns=language.def \
#
execute AddFormat name=xelatex engine=xetex patterns=language.dat \
options="-etex xelatex.ini" \
- fmttriggers=${global_latex_deps},lm
+ fmttriggers=${global_latex_deps},dehyph-exptl,lm
# do fontconfig stuff, especially on Windows.
postaction script file=tlpkg/tlpostcode/xetex.pl
diff --git a/Master/tlpkg/tlpsrc/xmltex.tlpsrc b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
index 9c7ae26e65f..104a3d04529 100644
--- a/Master/tlpkg/tlpsrc/xmltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xmltex.tlpsrc
@@ -3,8 +3,8 @@ depend pdftex
depend tex
depend xmltexconfig
-tlpsetvar fmtcomm ${global_latex_deps},dehyph,hyph-utf8,latex,latexconfig,\
-tex-ini-files,xmltexconfig
+tlpsetvar fmtcomm ${global_hyph_deps},${global_latex_deps},hyph-utf8,\
+latex,latexconfig,pdftex,tex-ini-files,xmltexconfig
#
execute AddFormat name=xmltex engine=pdftex patterns=language.dat \
options="*xmltex.ini" \