summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-22 22:44:16 +0000
committerKarl Berry <karl@freefriends.org>2022-02-22 22:44:16 +0000
commitdc3819dd7f22065d39143da49cfa98fe91901c74 (patch)
tree2c1e7e45f0950728d81c6188c370b1e7144096c9
parentb58ee08a4c930684f420d4f7cf5fca4b804f7744 (diff)
revert global_hyph_deps changes; just a mistake, i think
git-svn-id: svn://tug.org/texlive/trunk@62145 c570f23f-e606-0410-a88d-b1316a301751
-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
15 files changed, 24 insertions, 33 deletions
diff --git a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
index 882dc2abdde..c2e084b3043 100644
--- a/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc
@@ -34,12 +34,7 @@ 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
-#
-# Some languages have extra patterns.
-tlpsetvar global_hyph_deps \
-dehyph,dehyph-exptl,ruhyphen,ukrhyph
+l3backend,l3kernel,l3packages,latex,latex-fonts,tex-ini-files,unicode-data
#
# 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 cafaa10d762..1102cbeab5e 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,pdftex,unicode-data
+tlpsetvar fmtcomm atbegshi,atveryend,cm,csplain,everyshi,firstaid,hyphen-base,\
+l3kernel,l3packages,latex-fonts,latex,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 315dc861559..0dc5c02735f 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_hyph_deps},${global_latex_deps},hyph-utf8,knuth-lib,plain
+ fmttriggers=${global_latex_deps},dehyph,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 06e923f09ab..f20cf84fd32 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_hyph_deps},${global_latex_deps},\
+tlpsetvar fmtcomm ${global_latex_deps},\
amsfonts,auxhook,bigintcalc,bitset,\
-colortbl,cyrillic,ec,etexcmds,fancyhdr,graphics,\
+colortbl,cyrillic,dehyph,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,pdftex,pdftexcmds,psnfss,rerunfilecheck,stmaryrd,\
+passivetex,pdfescape,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 6d57fcc1c66..4efea8878cd 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 ${global_hyph_deps},hyph-utf8,latexconfig
+tlpsetvar nonluafmtdeps dehyph,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 8554da3615c..668961d3116 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 ${global_hyph_deps},hyph-utf8,latexconfig
+tlpsetvar nonluafmtdeps dehyph,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},pdftex
+ fmttriggers=${fmtcomm},${nonluafmtdeps}
#
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},pdftex
+ fmttriggers=${fmtcomm},${nonluafmtdeps}
#
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 4b065f75bcf..ac6a4c9b899 100644
--- a/Master/tlpkg/tlpsrc/mltex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mltex.tlpsrc
@@ -4,8 +4,7 @@ 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},${global_hyph_deps},\
-hyph-utf8,latex,latexconfig,pdftex
+ fmttriggers=${global_latex_deps},dehyph,hyph-utf8,latex,latexconfig
#
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 50acc64614e..20109ba9d35 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -1,7 +1,7 @@
category TLCore
depend kpathsea
-tlpsetvar fmtcomm cm,etex,knuth-lib,plain,${global_hyph_deps},hyph-utf8
+tlpsetvar fmtcomm cm,dehyph,etex,hyph-utf8,hyphen-base,knuth-lib,plain
#
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 51a03eba88b..535e62b5f09 100644
--- a/Master/tlpkg/tlpsrc/platex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/platex.tlpsrc
@@ -1,4 +1,4 @@
-tlpsetvar fmtcomm ${global_latex_deps},dehyph-exptl,ptex-fonts
+tlpsetvar fmtcomm ${global_latex_deps},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 52d2f7a7258..b70343ea004 100644
--- a/Master/tlpkg/tlpsrc/ptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ptex.tlpsrc
@@ -1,15 +1,14 @@
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},dehyph-exptl,etex
+ fmttriggers=${fmtcomm},etex
#
execute addKanjiMap ptex-@jaEmbed@@jaVariant@.map
diff --git a/Master/tlpkg/tlpsrc/uplatex.tlpsrc b/Master/tlpkg/tlpsrc/uplatex.tlpsrc
index 6c7acb48c9f..c9178be4c26 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},dehyph-exptl,uptex-fonts,platex
+tlpsetvar fmtcomm ${global_latex_deps},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 7d6c38ad0df..5ce50e5c115 100644
--- a/Master/tlpkg/tlpsrc/uptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex.tlpsrc
@@ -1,15 +1,14 @@
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},dehyph-exptl,etex,ptex-base
+ fmttriggers=${fmtcomm},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 67115babc40..4704544153f 100644
--- a/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xelatex-dev.tlpsrc
@@ -9,5 +9,4 @@ docpattern f ignore
execute AddFormat name=xelatex-dev engine=xetex patterns=language.dat \
options="-etex xelatex.ini" \
- fmttriggers=${global_latex_deps},dehyph-exptl,\
-latex-base-dev,latex-firstaid-dev,lm
+ fmttriggers=${global_latex_deps},latex-base-dev,latex-firstaid-dev,lm
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index 97f6f3baf70..f4b23cc3d2d 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,dehyph-exptl,hyphen-base,tex-ini-files,unicode-data
+tlpsetvar fmtcomm cm,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},dehyph-exptl,lm
+ fmttriggers=${global_latex_deps},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 104a3d04529..9c7ae26e65f 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_hyph_deps},${global_latex_deps},hyph-utf8,\
-latex,latexconfig,pdftex,tex-ini-files,xmltexconfig
+tlpsetvar fmtcomm ${global_latex_deps},dehyph,hyph-utf8,latex,latexconfig,\
+tex-ini-files,xmltexconfig
#
execute AddFormat name=xmltex engine=pdftex patterns=language.dat \
options="*xmltex.ini" \