summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlpsrc
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-17 17:05:39 +0000
committerKarl Berry <karl@freefriends.org>2019-11-17 17:05:39 +0000
commitfb86552bbda96c8dc252a08c2cfee23497f8b81d (patch)
treeadac4475a92f048a802f82f87044b78d9e55e16d /Master/tlpkg/tlpsrc
parent67a8f35d803320fb317eb344f0b4e81f10111b28 (diff)
split luahbtex to its own package; update man pages
git-svn-id: svn://tug.org/texlive/trunk@52830 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlpsrc')
-rw-r--r--Master/tlpkg/tlpsrc/collection-luatex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc17
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin.tlpsrc15
-rw-r--r--Master/tlpkg/tlpsrc/luahbtex.tlpsrc25
4 files changed, 42 insertions, 16 deletions
diff --git a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
index e3bd90788be..7ae933977c1 100644
--- a/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-luatex.tlpsrc
@@ -19,6 +19,7 @@ depend kanaparser
depend lua-visual-debug
depend lua2dox
depend luacode
+depend luahbtex
depend luahyphenrules
depend luaimageembed
depend luaindex
diff --git a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
index edb82bede88..8641837fffc 100644
--- a/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin-dev.tlpsrc
@@ -4,6 +4,7 @@ longdesc See the latex-base-dev package for information.
# ensure files and engines are installed before we are run.
depend luatex
+depend luahbtex
depend pdftex
depend latexconfig
depend latex-fonts
@@ -11,20 +12,24 @@ depend latex-fonts
depend latex-base-dev
depend latex-graphics-dev
+docpattern f texmf-dist/doc/man/man1/*latex-dev.*
+
+# Keep these variables in sync with latex-bin.tlpsrc.
tlpsetvar fmtcomm babel,cm,hyphen-base,latex-base-dev,latex-fonts,tex-ini-files
+tlpsetvar nonluafmtdeps dehyph,latexconfig
tlpsetvar luafmtdeps unicode-data,luaotfload
binpattern f bin/${ARCH}/latex-dev
execute AddFormat name=latex-dev engine=pdftex \
patterns=language.dat \
options="-translate-file=cp227.tcx *latex.ini" \
- fmttriggers=${fmtcomm},dehyph,latexconfig
+ fmttriggers=${fmtcomm},${nonluafmtdeps}
#
binpattern f bin/${ARCH}/pdflatex-dev
execute AddFormat name=pdflatex-dev engine=pdftex \
patterns=language.dat \
options="-translate-file=cp227.tcx *pdflatex.ini" \
- fmttriggers=${fmtcomm},dehyph,latexconfig
+ fmttriggers=${fmtcomm},${nonluafmtdeps}
#
binpattern f bin/${ARCH}/dvilualatex-dev
execute AddFormat name=dvilualatex-dev engine=luatex \
@@ -38,14 +43,8 @@ execute AddFormat name=lualatex-dev engine=luahbtex \
options="lualatex.ini" \
fmttriggers=${fmtcomm},${luafmtdeps}
-docpattern f texmf-dist/doc/man/man1/latex-dev.*
-
-# before the TL'20 release, let's include luahbtex here.
-# We only have it for auto-built platforms and Windows,
-# via /home/texlive/luahbtmp on tug.
-#
+# keep in sync with luahbtex.tlpsrc.
tlpsetvar no_luahb_platforms \
amd64-netbsd,armhf-linux,i386-cygwin,i386-netbsd,x86_64-cygwin
#
-binpattern f/!${no_luahb_platforms} bin/${ARCH}/luahbtex
binpattern f/!${no_luahb_platforms} bin/${ARCH}/lualatex-dev
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index b44d303849e..323e59b6344 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -5,34 +5,35 @@ shortdesc LaTeX executables and man pages
# files are installed before we try to make the formats.
depend latex
+# Keep these variables in sync with latex-bin-dev.tlpsrc.
tlpsetvar fmtcomm babel,cm,hyphen-base,latex,latex-fonts,tex-ini-files
+tlpsetvar nonluafmtdeps dehyph,latexconfig
tlpsetvar luafmtdeps unicode-data,luaotfload
+docpattern f texmf-dist/doc/man/man1/latex.*
binpattern f bin/${ARCH}/latex
execute AddFormat name=latex engine=pdftex \
patterns=language.dat \
options="-translate-file=cp227.tcx *latex.ini" \
- fmttriggers=${fmtcomm},dehyph,latexconfig
+ 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},dehyph,latexconfig
+ fmttriggers=${fmtcomm},${nonluafmtdeps}
#
+docpattern f texmf-dist/doc/man/man1/dvilualatex.*
binpattern f bin/${ARCH}/dvilualatex
execute AddFormat name=dvilualatex engine=luatex \
patterns=language.dat,language.dat.lua \
options="dvilualatex.ini" \
fmttriggers=${fmtcomm},${luafmtdeps}
#
+docpattern f texmf-dist/doc/man/man1/lualatex.*
binpattern f bin/${ARCH}/lualatex
execute AddFormat name=lualatex engine=luatex \
patterns=language.dat,language.dat.lua \
options="lualatex.ini" \
fmttriggers=${fmtcomm},${luafmtdeps}
-
-docpattern f texmf-dist/doc/man/man1/latex.*
-docpattern f texmf-dist/doc/man/man1/dvilualatex.*
-docpattern f texmf-dist/doc/man/man1/lualatex.*
-docpattern f texmf-dist/doc/man/man1/pdflatex.*
diff --git a/Master/tlpkg/tlpsrc/luahbtex.tlpsrc b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
new file mode 100644
index 00000000000..4b5717ed441
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/luahbtex.tlpsrc
@@ -0,0 +1,25 @@
+# before the TL'20 release, let's include luahbtex here.
+# We only have it for auto-built platforms and Windows,
+# via /home/texlive/luahbtmp on tug.
+#
+# Keep in sync with latex-bin-dev.tlpsrc
+tlpsetvar no_luahb_platforms \
+ amd64-netbsd,armhf-linux,i386-cygwin,i386-netbsd,x86_64-cygwin
+#
+binpattern f/!${no_luahb_platforms} bin/${ARCH}/luahbtex
+
+# must keep in sync with luatex.tlpsrc.
+tlpsetvar fmtdeps cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files,\
+unicode-data
+
+# For the TL'20 release, we should have luahbtex for all platforms.
+# For now, on platforms where there is no luahbtex, it will be ignored
+# due to the special --no-error-if-no-engine option in fmtutil,
+# invoked by specifications in TLConfig.pm and tlmgr.pl.
+execute AddFormat name=luahbtex engine=luahbtex \
+ patterns=language.def,language.dat.lua \
+ options="luatex.ini" \
+ fmttriggers=${fmtdeps}
+
+# can't have luahbtex without luatex.
+depend luatex