diff options
author | Karl Berry <karl@freefriends.org> | 2019-11-17 17:05:39 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-11-17 17:05:39 +0000 |
commit | fb86552bbda96c8dc252a08c2cfee23497f8b81d (patch) | |
tree | adac4475a92f048a802f82f87044b78d9e55e16d | |
parent | 67a8f35d803320fb317eb344f0b4e81f10111b28 (diff) |
split luahbtex to its own package; update man pages
git-svn-id: svn://tug.org/texlive/trunk@52830 c570f23f-e606-0410-a88d-b1316a301751
33 files changed, 184 insertions, 53 deletions
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog index ad90435ff0f..e5bc56e9a01 100644 --- a/Build/source/texk/web2c/man/ChangeLog +++ b/Build/source/texk/web2c/man/ChangeLog @@ -1,3 +1,8 @@ +2019-11-17 Karl Berry <karl@tug.org> + + * latex-dev.man: new man page. + * Makefile.am (man1_links): add several links for latex-dev and luatex. + 2019-08-06 Karl Berry <karl@freefriends.org> * aleph.man, diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am index 97f80eba479..9be66048d7f 100644 --- a/Build/source/texk/web2c/man/Makefile.am +++ b/Build/source/texk/web2c/man/Makefile.am @@ -1,6 +1,6 @@ ## $Id$ ## Makefile.am for the TeX Live subdirectory texk/web2c/man/ -## Copyright 2018 Karl Berry <tex-live@tug.org> +## Copyright 2015-2019 Karl Berry <tex-live@tug.org> ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## @@ -62,7 +62,9 @@ EXTRA_DIST += ptex.man ppltotf.man ptftopl.man if LUATEX man_sources += luatex.man -man1_links += luatex:texlua luatex:texluac +man1_links += luatex:texlua luatex:texluac \ + luatex:luahbtex luatex:luajittex \ + luatex:dviluatex endif LUATEX EXTRA_DIST += luatex.man @@ -89,8 +91,16 @@ EXTRA_DIST += $(misc_man_sources) misc_man_sources = \ amstex.man \ latex.man \ + latex-dev.man \ pdfetex.man +man1_links += latex-dev:pdflatex-dev \ + latex-dev:xelatex-dev \ + latex-dev:lualatex-dev \ + latex-dev:dvilualatex-dev \ + latex-dev:platex-dev \ + latex-dev:uplatex-dev + include $(top_srcdir)/../../am/man.am include $(top_srcdir)/../../am/man1_links.am diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in index 9505be77709..df5623a7940 100644 --- a/Build/source/texk/web2c/man/Makefile.in +++ b/Build/source/texk/web2c/man/Makefile.in @@ -101,7 +101,10 @@ host_triplet = @host@ @PTEX_TRUE@am__append_12 = ptex:eptex ptex:euptex ptex:uptex \ @PTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl @LUATEX_TRUE@am__append_13 = luatex.man -@LUATEX_TRUE@am__append_14 = luatex:texlua luatex:texluac +@LUATEX_TRUE@am__append_14 = luatex:texlua luatex:texluac \ +@LUATEX_TRUE@ luatex:luahbtex luatex:luajittex \ +@LUATEX_TRUE@ luatex:dviluatex + @XETEX_TRUE@am__append_15 = xetex.man @OTANGLE_TRUE@am__append_16 = $(otangle_man_sources) @OTANGLE_TRUE@am__append_17 = dvicopy:odvicopy dvitype:odvitype tangle:otangle @@ -455,7 +458,10 @@ bootstrap_man_sources = ctie.man cweb.man ctwill.man tangle.man tie.man man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-refsort \ ctwill:ctwill-twinx $(am__append_3) $(am__append_5) \ $(am__append_6) $(am__append_10) $(am__append_12) \ - $(am__append_14) $(am__append_17) $(am__append_19) + $(am__append_14) $(am__append_17) $(am__append_19) \ + latex-dev:pdflatex-dev latex-dev:xelatex-dev \ + latex-dev:lualatex-dev latex-dev:dvilualatex-dev \ + latex-dev:platex-dev latex-dev:uplatex-dev web_man_sources = bibtex.man dvicopy.man dvitomp.man dvitype.man gftodvi.man \ gftopk.man gftype.man mft.man patgen.man pktogf.man pktype.man \ pltotf.man pooltype.man tftopl.man vftovp.man vptovf.man weave.man @@ -465,6 +471,7 @@ otangle_man_sources = ofm2opl.man opl2ofm.man ovf2ovp.man ovp2ovf.man misc_man_sources = \ amstex.man \ latex.man \ + latex-dev.man \ pdfetex.man SUFFIXES = .1 .man .ps .dvi diff --git a/Build/source/texk/web2c/man/latex-dev.man b/Build/source/texk/web2c/man/latex-dev.man new file mode 100644 index 00000000000..9edace40f40 --- /dev/null +++ b/Build/source/texk/web2c/man/latex-dev.man @@ -0,0 +1,28 @@ +.TH LATEX-DEV 1 "17 November 2019" "Web2C @VERSION@" +.SH NAME +latex-dev, pdflatex-dev, xelatex-dev, lualatex-dev, dvilualatex-dev, platex-dev, uplatex-dev \- release candidate LaTeX testing +.SH SYNOPSIS +.B latex-dev +.RI [ first-line ] +.\"===================================================================== +.SH DESCRIPTION +.PP +These -dev executables are intended for testing upcoming LaTeX2e kernel +changes. They correspond to new formats which have been tested by the +LaTeX team for stability and usability. Thus, they are not arbitrary +development snapshots; more like release candidates. +.PP +Wider testing by knowledgeable users is desired, indeed, is the main +purpose for these executables to exist. Simply replacing the regular +engine (e.g., pdflatex) with the -dev engine name (pdflatex-dev) is all +that should be needed. +.PP +The lualatex-dev format is based on luahbtex, the luatex variant with +harfbuzz enabled for glyph shaping. +.PP +Please report bugs in these -dev versions, like all LaTeX releases, +following the procedure at https://www.latex-project.org/bugs. +.SH "SEE ALSO" +.BR latex (1). +.PP +The LaTeX home page is https://latex-project.org. diff --git a/Build/source/texk/web2c/man/luatex.man b/Build/source/texk/web2c/man/luatex.man index 6f33f5e6690..d9525552896 100644 --- a/Build/source/texk/web2c/man/luatex.man +++ b/Build/source/texk/web2c/man/luatex.man @@ -1,4 +1,4 @@ -.TH LUATEX 1 "27 May 2018" "Web2C @VERSION@" +.TH LUATEX 1 "17 November 2019" "Web2C @VERSION@" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont @@ -8,8 +8,7 @@ .if t .ds WB W\s-2EB\s0 .\"===================================================================== .SH NAME -luatex, dviluatex, luajittex, texlua, texluac \- An extended version of pdfTeX using Lua as -an embedded scripting language +luatex, dviluatex, luahbtex, luajittex, texlua, texluac \- An extended version of TeX using Lua as an embedded scripting language .\"===================================================================== .SH SYNOPSIS .B luatex @@ -50,26 +49,32 @@ remaining arguments are processed as above. If no arguments or options are specified, prompt for input. -If called as \fBtexlua\fR it acts as lua interpreter. -If called as \fBtexluac\fR it acts as lua bytecode compiler. +If called as \fBtexlua\fR it acts as a Lua interpreter. +If called as \fBtexluac\fR it acts as a Lua bytecode compiler. -Lua\*(TX is an extended version of pdf\*(TX with Unicode and OpenType +Lua\*(TX began as an extended version of pdf\*(TX with Unicode and OpenType font support, embedded \fBLua\fR scripting language, the \fBe-\*(TX\fR -and \fBOmega\fR extensions, as well as integrated MetaPost engine, that +and \fBOmega\fR extensions, as well as an integrated MetaPost engine, that can create \fIPDF\fR files as well as \fIDVI\fR files. -For more information about luatex, see http://www.luatex.org, you can -read Lua\*(TX manual using texdoc utility (\fBtexdoc luatex\fR). +For more information about luatex, see http://www.luatex.org; and you can +read the Lua\*(TX manual using the texdoc utility (\fBtexdoc luatex\fR). -All Lua\*(TX text input and output is considered to be Unicode text. +All Lua\*(TX text input and output is considered to be Unicode text, +although various filters make it possible to support any encoding. -In \fIDVI\fR mode, lua\*(TX can be used as a complete replacement for +In \fIDVI\fR mode, Lua\*(TX can be used as a complete replacement for the \*(TX engine. -In \fIPDF\fR mode, lua\*(TX can natively handle the \fIPDF\fR, \fIJPG\fR, -\fIJBIG2\fR, and \fIPNG\fR graphics formats. lua\*(TX cannot include +In \fIPDF\fR mode, Lua\*(TX can natively handle the \fIPDF\fR, \fIJPG\fR, +\fIJBIG2\fR, and \fIPNG\fR graphics formats. Lua\*(TX cannot include PostScript or Encapsulated PostScript (EPS) graphics files; first convert them to PDF using \fBepstopdf\fR (1). +The luajittex variant includes the Lua just-in-time compiler. + +The luahbtex variant can use the HarfBuzz engine for glyph shaping, +instead of Lua\*(TX's built-in shaper. + .\"===================================================================== .SH "OPTIONS" When the Lua\*(TX executable starts, it looks for the \fB\-\-lua\fR diff --git a/Master/texmf-dist/doc/man/man1/Makefile b/Master/texmf-dist/doc/man/man1/Makefile index 753daa92f18..8ed85129489 100644 --- a/Master/texmf-dist/doc/man/man1/Makefile +++ b/Master/texmf-dist/doc/man/man1/Makefile @@ -67,9 +67,15 @@ man1/dvilj4l.man1.pdf: man1/dvilj4l.1 man1/dvilj.1 man1/dvilj6.man1.pdf: man1/dvilj6.1 man1/dvilj.1 $(MKPDF) +man1/dvilualatex-dev.man1.pdf: man1/dvilualatex-dev.1 man1/latex-dev.1 + $(MKPDF) + man1/dvilualatex.man1.pdf: man1/dvilualatex.1 man1/latex.1 $(MKPDF) +man1/dviluatex.man1.pdf: man1/dviluatex.1 man1/luatex.1 + $(MKPDF) + man1/dvipdfm.man1.pdf: man1/dvipdfm.1 man1/dvipdfmx.1 $(MKPDF) @@ -103,6 +109,15 @@ man1/kpsexpand.man1.pdf: man1/kpsexpand.1 man1/kpsetool.1 man1/lamed.man1.pdf: man1/lamed.1 man1/aleph.1 $(MKPDF) +man1/luahbtex.man1.pdf: man1/luahbtex.1 man1/luatex.1 + $(MKPDF) + +man1/luajittex.man1.pdf: man1/luajittex.1 man1/luatex.1 + $(MKPDF) + +man1/lualatex-dev.man1.pdf: man1/lualatex-dev.1 man1/latex-dev.1 + $(MKPDF) + man1/lualatex.man1.pdf: man1/lualatex.1 man1/latex.1 $(MKPDF) @@ -127,9 +142,15 @@ man1/pdfclose.man1.pdf: man1/pdfclose.1 man1/pdfopen.1 man1/pdfcslatex.man1.pdf: man1/pdfcslatex.1 man1/latex.1 $(MKPDF) +man1/pdflatex-dev.man1.pdf: man1/pdflatex-dev.1 man1/latex-dev.1 + $(MKPDF) + man1/pdflatex.man1.pdf: man1/pdflatex.1 man1/pdftex.1 $(MKPDF) +man1/platex-dev.man1.pdf: man1/platex-dev.1 man1/latex-dev.1 + $(MKPDF) + man1/platex.man1.pdf: man1/platex.1 man1/latex.1 $(MKPDF) @@ -154,15 +175,26 @@ man1/updmap-sys.man1.pdf: man1/updmap-sys.1 man1/updmap.1 man1/updmap-user.man1.pdf: man1/updmap-user.1 man1/updmap.1 $(MKPDF) +man1/uplatex-dev.man1.pdf: man1/uplatex-dev.1 man1/latex-dev.1 + $(MKPDF) + man1/uplatex.man1.pdf: man1/uplatex.1 man1/latex.1 $(MKPDF) +man1/uppltotf.man1.pdf: man1/uppltotf.1 man1/ppltotf.1 + $(MKPDF) + man1/uptex.man1.pdf: man1/uptex.1 man1/ptex.1 $(MKPDF) +man1/uptftopl.man1.pdf: man1/uptftopl.1 man1/ptftopl.1 + $(MKPDF) + man1/xdvipdfmx.man1.pdf: man1/xdvipdfmx.1 man1/dvipdfmx.1 $(MKPDF) -man1/xelatex.man1.pdf: man1/xelatex.1 man1/latex.1 +man1/xelatex-dev.man1.pdf: man1/xelatex-dev.1 man1/latex-dev.1 $(MKPDF) +man1/xelatex.man1.pdf: man1/xelatex.1 man1/latex.1 + $(MKPDF) diff --git a/Master/texmf-dist/doc/man/man1/dvilualatex-dev.1 b/Master/texmf-dist/doc/man/man1/dvilualatex-dev.1 new file mode 100644 index 00000000000..0f9f8159688 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/dvilualatex-dev.1 @@ -0,0 +1 @@ +.so man1/latex-dev.1 diff --git a/Master/texmf-dist/doc/man/man1/dvilualatex-dev.man1.pdf b/Master/texmf-dist/doc/man/man1/dvilualatex-dev.man1.pdf Binary files differnew file mode 100644 index 00000000000..5005d728067 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/dvilualatex-dev.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/dviluatex.1 b/Master/texmf-dist/doc/man/man1/dviluatex.1 new file mode 100644 index 00000000000..0dbf6fb682e --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/dviluatex.1 @@ -0,0 +1 @@ +.so man1/luatex.1 diff --git a/Master/texmf-dist/doc/man/man1/dviluatex.man1.pdf b/Master/texmf-dist/doc/man/man1/dviluatex.man1.pdf Binary files differnew file mode 100644 index 00000000000..23c1f13e266 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/dviluatex.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/latex-dev.1 b/Master/texmf-dist/doc/man/man1/latex-dev.1 index 3a430d484e3..ca9a604ef81 100644 --- a/Master/texmf-dist/doc/man/man1/latex-dev.1 +++ b/Master/texmf-dist/doc/man/man1/latex-dev.1 @@ -1,6 +1,6 @@ -.TH LATEX-DEV 1 "27 July 2019" "Web2C 2019" +.TH LATEX-DEV 1 "17 November 2019" "Web2C 2019" .SH NAME -latex-dev, pdflatex-dev, xelatex-dev, lualatex-dev, dvilualatex-dev, platex-dev,uplatex-dev \- release candidate LaTeX testing +latex-dev, pdflatex-dev, xelatex-dev, lualatex-dev, dvilualatex-dev, platex-dev, uplatex-dev \- release candidate LaTeX testing .SH SYNOPSIS .B latex-dev .RI [ first-line ] @@ -12,9 +12,13 @@ changes. They correspond to new formats which have been tested by the LaTeX team for stability and usability. Thus, they are not arbitrary development snapshots; more like release candidates. .PP -Wider testing by knowledgeable users is desired. Simply replacing the -regular engine (e.g., pdflatex) with the -dev engine name (pdflatex-dev) -is all that should be needed. +Wider testing by knowledgeable users is desired, indeed, is the main +purpose for these executables to exist. Simply replacing the regular +engine (e.g., pdflatex) with the -dev engine name (pdflatex-dev) is all +that should be needed. +.PP +The lualatex-dev format is based on luahbtex, the luatex variant with +harfbuzz enabled for glyph shaping. .PP Please report bugs in these -dev versions, like all LaTeX releases, following the procedure at https://www.latex-project.org/bugs. diff --git a/Master/texmf-dist/doc/man/man1/latex-dev.man1.pdf b/Master/texmf-dist/doc/man/man1/latex-dev.man1.pdf Binary files differindex 6d7b56d94a3..7a1dfb90178 100644 --- a/Master/texmf-dist/doc/man/man1/latex-dev.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/latex-dev.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/luahbtex.1 b/Master/texmf-dist/doc/man/man1/luahbtex.1 new file mode 100644 index 00000000000..0dbf6fb682e --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/luahbtex.1 @@ -0,0 +1 @@ +.so man1/luatex.1 diff --git a/Master/texmf-dist/doc/man/man1/luahbtex.man1.pdf b/Master/texmf-dist/doc/man/man1/luahbtex.man1.pdf Binary files differnew file mode 100644 index 00000000000..ffe0ff5e39e --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/luahbtex.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/luajittex.1 b/Master/texmf-dist/doc/man/man1/luajittex.1 new file mode 100644 index 00000000000..0dbf6fb682e --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/luajittex.1 @@ -0,0 +1 @@ +.so man1/luatex.1 diff --git a/Master/texmf-dist/doc/man/man1/luajittex.man1.pdf b/Master/texmf-dist/doc/man/man1/luajittex.man1.pdf Binary files differnew file mode 100644 index 00000000000..3b377a0472c --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/luajittex.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/lualatex-dev.1 b/Master/texmf-dist/doc/man/man1/lualatex-dev.1 new file mode 100644 index 00000000000..0f9f8159688 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/lualatex-dev.1 @@ -0,0 +1 @@ +.so man1/latex-dev.1 diff --git a/Master/texmf-dist/doc/man/man1/lualatex-dev.man1.pdf b/Master/texmf-dist/doc/man/man1/lualatex-dev.man1.pdf Binary files differnew file mode 100644 index 00000000000..9ca01ecc737 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/lualatex-dev.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/luatex.1 b/Master/texmf-dist/doc/man/man1/luatex.1 index 3f577e543db..169b12cf0e6 100644 --- a/Master/texmf-dist/doc/man/man1/luatex.1 +++ b/Master/texmf-dist/doc/man/man1/luatex.1 @@ -1,4 +1,4 @@ -.TH LUATEX 1 "27 May 2018" "Web2C 2019" +.TH LUATEX 1 "17 November 2019" "Web2C 2019" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont @@ -8,8 +8,7 @@ .if t .ds WB W\s-2EB\s0 .\"===================================================================== .SH NAME -luatex, dviluatex, luajittex, texlua, texluac \- An extended version of pdfTeX using Lua as -an embedded scripting language +luatex, dviluatex, luahbtex, luajittex, texlua, texluac \- An extended version of TeX using Lua as an embedded scripting language .\"===================================================================== .SH SYNOPSIS .B luatex @@ -50,26 +49,32 @@ remaining arguments are processed as above. If no arguments or options are specified, prompt for input. -If called as \fBtexlua\fR it acts as lua interpreter. -If called as \fBtexluac\fR it acts as lua bytecode compiler. +If called as \fBtexlua\fR it acts as a Lua interpreter. +If called as \fBtexluac\fR it acts as a Lua bytecode compiler. -Lua\*(TX is an extended version of pdf\*(TX with Unicode and OpenType +Lua\*(TX began as an extended version of pdf\*(TX with Unicode and OpenType font support, embedded \fBLua\fR scripting language, the \fBe-\*(TX\fR -and \fBOmega\fR extensions, as well as integrated MetaPost engine, that +and \fBOmega\fR extensions, as well as an integrated MetaPost engine, that can create \fIPDF\fR files as well as \fIDVI\fR files. -For more information about luatex, see http://www.luatex.org, you can -read Lua\*(TX manual using texdoc utility (\fBtexdoc luatex\fR). +For more information about luatex, see http://www.luatex.org; and you can +read the Lua\*(TX manual using the texdoc utility (\fBtexdoc luatex\fR). -All Lua\*(TX text input and output is considered to be Unicode text. +All Lua\*(TX text input and output is considered to be Unicode text, +although various filters make it possible to support any encoding. -In \fIDVI\fR mode, lua\*(TX can be used as a complete replacement for +In \fIDVI\fR mode, Lua\*(TX can be used as a complete replacement for the \*(TX engine. -In \fIPDF\fR mode, lua\*(TX can natively handle the \fIPDF\fR, \fIJPG\fR, -\fIJBIG2\fR, and \fIPNG\fR graphics formats. lua\*(TX cannot include +In \fIPDF\fR mode, Lua\*(TX can natively handle the \fIPDF\fR, \fIJPG\fR, +\fIJBIG2\fR, and \fIPNG\fR graphics formats. Lua\*(TX cannot include PostScript or Encapsulated PostScript (EPS) graphics files; first convert them to PDF using \fBepstopdf\fR (1). +The luajittex variant includes the Lua just-in-time compiler. + +The luahbtex variant can use the HarfBuzz engine for glyph shaping, +instead of Lua\*(TX's built-in shaper. + .\"===================================================================== .SH "OPTIONS" When the Lua\*(TX executable starts, it looks for the \fB\-\-lua\fR diff --git a/Master/texmf-dist/doc/man/man1/luatex.man1.pdf b/Master/texmf-dist/doc/man/man1/luatex.man1.pdf Binary files differindex b693b5e2c38..4bf0dd86bbe 100644 --- a/Master/texmf-dist/doc/man/man1/luatex.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/luatex.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/pdflatex-dev.1 b/Master/texmf-dist/doc/man/man1/pdflatex-dev.1 new file mode 100644 index 00000000000..0f9f8159688 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/pdflatex-dev.1 @@ -0,0 +1 @@ +.so man1/latex-dev.1 diff --git a/Master/texmf-dist/doc/man/man1/pdflatex-dev.man1.pdf b/Master/texmf-dist/doc/man/man1/pdflatex-dev.man1.pdf Binary files differnew file mode 100644 index 00000000000..ec8bad7b637 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/pdflatex-dev.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/platex-dev.1 b/Master/texmf-dist/doc/man/man1/platex-dev.1 new file mode 100644 index 00000000000..0f9f8159688 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/platex-dev.1 @@ -0,0 +1 @@ +.so man1/latex-dev.1 diff --git a/Master/texmf-dist/doc/man/man1/platex-dev.man1.pdf b/Master/texmf-dist/doc/man/man1/platex-dev.man1.pdf Binary files differnew file mode 100644 index 00000000000..3c3dbf650e3 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/platex-dev.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/uplatex-dev.1 b/Master/texmf-dist/doc/man/man1/uplatex-dev.1 new file mode 100644 index 00000000000..0f9f8159688 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/uplatex-dev.1 @@ -0,0 +1 @@ +.so man1/latex-dev.1 diff --git a/Master/texmf-dist/doc/man/man1/uplatex-dev.man1.pdf b/Master/texmf-dist/doc/man/man1/uplatex-dev.man1.pdf Binary files differnew file mode 100644 index 00000000000..421df840b1c --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/uplatex-dev.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/xelatex-dev.1 b/Master/texmf-dist/doc/man/man1/xelatex-dev.1 new file mode 100644 index 00000000000..0f9f8159688 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/xelatex-dev.1 @@ -0,0 +1 @@ +.so man1/latex-dev.1 diff --git a/Master/texmf-dist/doc/man/man1/xelatex-dev.man1.pdf b/Master/texmf-dist/doc/man/man1/xelatex-dev.man1.pdf Binary files differnew file mode 100644 index 00000000000..c41e60f7d26 --- /dev/null +++ b/Master/texmf-dist/doc/man/man1/xelatex-dev.man1.pdf diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index e7f9aa38e14..cb884206bba 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -5696,7 +5696,7 @@ sub check_executes { if ($engine eq "luajittex") { $pkg = "luajittex"; } elsif ($engine eq "luahbtex") { - $pkg = "latex-bin-dev"; + $pkg = "luahbtex"; } elsif ($engine eq "mfluajit") { $pkg = "mflua"; } else { 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 |