From dd06d4496374d098aa8082c27f4ebfe8ab0bdab1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 23 Oct 2019 21:51:29 +0000 Subject: l3kernel (22oct19) git-svn-id: svn://tug.org/texlive/trunk@52510 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md | 19 +++++- Master/texmf-dist/doc/latex/l3kernel/README.md | 2 +- Master/texmf-dist/doc/latex/l3kernel/expl3.pdf | Bin 585016 -> 584850 bytes .../texmf-dist/doc/latex/l3kernel/interface3.pdf | Bin 1534391 -> 1534739 bytes .../texmf-dist/doc/latex/l3kernel/interface3.tex | 2 +- .../texmf-dist/doc/latex/l3kernel/l3docstrip.pdf | Bin 263427 -> 263278 bytes .../texmf-dist/doc/latex/l3kernel/l3prefixes.pdf | Bin 59064 -> 59064 bytes .../texmf-dist/doc/latex/l3kernel/l3styleguide.pdf | Bin 280134 -> 279983 bytes .../texmf-dist/doc/latex/l3kernel/l3styleguide.tex | 2 +- .../doc/latex/l3kernel/l3syntax-changes.pdf | Bin 227863 -> 227703 bytes .../doc/latex/l3kernel/l3syntax-changes.tex | 2 +- .../doc/latex/l3kernel/l3term-glossary.pdf | Bin 186644 -> 186491 bytes .../doc/latex/l3kernel/l3term-glossary.tex | 2 +- Master/texmf-dist/doc/latex/l3kernel/source3.pdf | Bin 5685304 -> 5696096 bytes Master/texmf-dist/doc/latex/l3kernel/source3.tex | 2 +- Master/texmf-dist/source/latex/l3kernel/expl3.dtx | 4 +- .../texmf-dist/source/latex/l3kernel/l3alloc.dtx | 8 ++- .../texmf-dist/source/latex/l3kernel/l3basics.dtx | 10 ++- .../source/latex/l3kernel/l3bootstrap.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3box.dtx | 2 +- .../source/latex/l3kernel/l3candidates.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3clist.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3coffins.dtx | 2 +- .../source/latex/l3kernel/l3color-base.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3debug.dtx | 2 +- .../source/latex/l3kernel/l3deprecation.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3doc.dtx | 2 +- .../source/latex/l3kernel/l3docstrip.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3expan.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3file.dtx | 43 ++++++++++++- .../texmf-dist/source/latex/l3kernel/l3final.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3flag.dtx | 2 +- .../source/latex/l3kernel/l3fp-assign.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3fp-aux.dtx | 2 +- .../source/latex/l3kernel/l3fp-basics.dtx | 2 +- .../source/latex/l3kernel/l3fp-convert.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3fp-expo.dtx | 2 +- .../source/latex/l3kernel/l3fp-extended.dtx | 2 +- .../source/latex/l3kernel/l3fp-logic.dtx | 2 +- .../source/latex/l3kernel/l3fp-parse.dtx | 2 +- .../source/latex/l3kernel/l3fp-random.dtx | 2 +- .../source/latex/l3kernel/l3fp-round.dtx | 2 +- .../source/latex/l3kernel/l3fp-traps.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3fp-trig.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3fp.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3fparray.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3int.dtx | 13 ++-- .../source/latex/l3kernel/l3intarray.dtx | 2 +- .../source/latex/l3kernel/l3kernel-functions.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3keys.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3legacy.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3luatex.dtx | 29 ++++++++- Master/texmf-dist/source/latex/l3kernel/l3msg.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3names.dtx | 33 ++++++++-- Master/texmf-dist/source/latex/l3kernel/l3prg.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3prop.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3quark.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3regex.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3seq.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3skip.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3sort.dtx | 2 +- .../source/latex/l3kernel/l3str-convert.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3str.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3sys.dtx | 6 +- .../source/latex/l3kernel/l3tl-analysis.dtx | 2 +- Master/texmf-dist/source/latex/l3kernel/l3tl.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3token.dtx | 2 +- .../texmf-dist/source/latex/l3kernel/l3unicode.dtx | 2 +- .../texmf-dist/tex/latex/l3kernel/expl3-code.tex | 68 ++++++++++++++++----- .../tex/latex/l3kernel/expl3-generic.tex | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.ltx | 2 +- Master/texmf-dist/tex/latex/l3kernel/expl3.lua | 14 +++++ Master/texmf-dist/tex/latex/l3kernel/expl3.sty | 2 +- 73 files changed, 260 insertions(+), 95 deletions(-) diff --git a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md index 85fbfb5031e..6b70a9cd601 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3kernel/CHANGELOG.md @@ -7,6 +7,22 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2019-10-21] + +### Added + +- Lua function `l3kernel.shellescape()` + +### Changed + +- Better coverage of (u)pTeX primitives following publication of + pTeX manual in English +- Trim spaces surrounding file names + +### Removed + +- HarfTeX primitives + ## [2019-10-14] ### Fixed @@ -562,7 +578,8 @@ this project uses date-based 'snapshot' version identifiers. - Step func­tions have been added for dim vari­ables, e.g. `\dim_step_in­line:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2019-10-14...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2019-10-21...HEAD +[2019-10-21]: https://github.com/latex3/latex3/compare/2019-10-14...2019-10-21 [2019-10-14]: https://github.com/latex3/latex3/compare/2019-10-11...2019-10-14 [2019-10-11]: https://github.com/latex3/latex3/compare/2019-10-02...2019-10-11 [2019-10-02]: https://github.com/latex3/latex3/compare/2019-09-30...2019-10-02 diff --git a/Master/texmf-dist/doc/latex/l3kernel/README.md b/Master/texmf-dist/doc/latex/l3kernel/README.md index 1ea787bc59a..ffbbb816063 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/README.md +++ b/Master/texmf-dist/doc/latex/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2019-10-14 +Release 2019-10-21 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf index 36a3ba6d703..973fa0880c8 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf and b/Master/texmf-dist/doc/latex/l3kernel/expl3.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf index 2e40d09a02b..5295e1c0e2b 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf and b/Master/texmf-dist/doc/latex/l3kernel/interface3.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex index 15517a998e5..7248ad387c2 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/interface3.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/interface3.tex @@ -54,7 +54,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \pagenumbering{roman} \maketitle diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf index 84b1b5744f7..1e80cda2fcd 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3docstrip.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf index 53f533d99cf..44b47156ee2 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3prefixes.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf index 511b22fec9f..6c53631dcda 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex index 47db34fc94c..c2c12020e67 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \begin{document} diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf index 30ee597ba01..a3735172645 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex index c990f1cfc85..41230dd97cd 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \newcommand{\TF}{\textit{(TF)}} diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf index 029d33af416..fe3e68b4bc5 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf and b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex index d7ec25e4c06..4bd29c2daa4 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \newcommand{\TF}{\textit{(TF)}} diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf index 76d72e97302..d4e15440195 100644 Binary files a/Master/texmf-dist/doc/latex/l3kernel/source3.pdf and b/Master/texmf-dist/doc/latex/l3kernel/source3.pdf differ diff --git a/Master/texmf-dist/doc/latex/l3kernel/source3.tex b/Master/texmf-dist/doc/latex/l3kernel/source3.tex index 81167d41d8c..d13109340fe 100644 --- a/Master/texmf-dist/doc/latex/l3kernel/source3.tex +++ b/Master/texmf-dist/doc/latex/l3kernel/source3.tex @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2019-10-14} +\date{Released 2019-10-21} \pagenumbering{roman} \maketitle diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx index 07dea81cb60..e9d6fd84ad8 100644 --- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> % -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx index edc3fb9ddc5..4e8d1c4f596 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3alloc.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -145,7 +145,11 @@ \exp_not:N \@@_reg:nNnN { box } \cs_if_exist:NTF \tex_luatexversion:D { \tex_chardef:D } - { \tex_mathchardef:D } + { + \cs_if_exist:NTF \tex_omathchardef:D + { \tex_omathchardef:D } + { \tex_mathchardef:D } + } \c_max_register_int #1 } diff --git a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx index 3046fbdf499..412dabcdc28 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -1508,11 +1508,17 @@ % \begin{variable}{\c_max_register_int} % This is here as this particular integer is needed both in package % mode and to bootstrap \pkg{l3alloc}, and is documented in \pkg{l3int}. +% \LuaTeX{} and those which contain parts of the Omega extensions have +% more registers available than \eTeX{}. % \begin{macrocode} \tex_ifdefined:D \tex_luatexversion:D \tex_chardef:D \c_max_register_int = 65 535 ~ \tex_else:D - \tex_mathchardef:D \c_max_register_int = 32 767 ~ + \tex_ifdefined:D \tex_omathchardef:D + \tex_omathchardef:D \c_max_register_int = 65535 ~ + \tex_else:D + \tex_mathchardef:D \c_max_register_int = 32767 ~ + \tex_fi:D \tex_fi:D % \end{macrocode} % \end{variable} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx index a5510eb607a..015aa0d455c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx index e99446ad461..c72c9fa5879 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3box.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx index 03b29462eac..bfbe86059bb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx index 6e99f0d28b8..fb63bdac210 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx index b40469d9cc6..c0d393bbaa2 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx b/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx index 429e8068ed9..9b80753bdac 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3color-base.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx b/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx index d8a79ea4e0c..898152fd13c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3debug.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx index e3f6389977c..e3dd8581ee7 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx index 84ab65f36fe..5ad6932e9e0 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3doc.dtx @@ -79,7 +79,7 @@ and all files in that bundle must be distributed together. % % \title{The \cls{l3doc} class} % \author{\Team} -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % \maketitle % \tableofcontents % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx index ed00bd90f60..1ecd193852f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx index ea5de204286..c06f0c2981a 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx index 6f39937f85d..19807253e38 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3file.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -69,6 +69,11 @@ % using |"| tokens if they contain spaces: as a result, |"| tokens are % \emph{not} permitted in file names. % +% Spaces are trimmed at the beginning and end of the file name: +% this reflects the fact that some file systems do not allow or interact +% unpredictably with spaces in these positions. When no extension is given, +% this will trim spaces from the start of the name only. +% % \section{Input--output stream management} % % As \TeX{} engines have a limited number of input and output streams, direct @@ -2362,6 +2367,10 @@ % \begin{macro}[rEXP]{\__kernel_file_name_expand_N_type:Nw} % \begin{macro}[rEXP]{\__kernel_file_name_expand_group:nw} % \begin{macro}[rEXP]{\__kernel_file_name_expand_space:w} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces:n} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces:nw} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces_aux:n} +% \begin{macro}[rEXP]{\__kernel_file_name_trim_spaces_aux:w} % Expanding the file name without expanding active characters is done % using the same token-by-token approach as for example case changing. % The finale outcome only need be \texttt{e}-type expandable, so there @@ -2369,8 +2378,11 @@ % \begin{macrocode} \cs_new:Npn \__kernel_file_name_sanitize:n #1 { - \__kernel_file_name_expand_loop:w #1 - \q_recursion_tail \q_recursion_stop + \exp_args:Ne \__kernel_file_name_trim_spaces:n + { + \__kernel_file_name_expand_loop:w #1 + \q_recursion_tail \q_recursion_stop + } } \cs_new:Npn \__kernel_file_name_expand_loop:w #1 \q_recursion_stop { @@ -2419,6 +2431,31 @@ \exp_not:N \__kernel_file_name_expand_loop:w } % \end{macrocode} +% Spaces need to be trimmed from the start of the name and from the end of +% any extension. However, the name we are passed might not have an extension: +% that means we have to look for one. If there is no extension, we still use +% the standard trimming function but deliberately prevent any spaces being +% removed at the end. +% \begin{macrocode} +\cs_new:Npn \__kernel_file_name_trim_spaces:n #1 + { \__kernel_file_name_trim_spaces:nw {#1} #1 . \q_nil . \q_stop } +\cs_new:Npn \__kernel_file_name_trim_spaces:nw #1#2 . #3 . #4 \q_stop + { + \quark_if_nil:nTF {#3} + { + \exp_args:Ne \__kernel_file_name_trim_spaces_aux:n + { \tl_trim_spaces:n { #1 \s_stop } } + } + { \tl_trim_spaces:n {#1} } + } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:n #1 + { \__kernel_file_name_trim_spaces_aux:w #1 } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:w #1 \s_stop {#1} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{macro} % \end{macro} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx index d30b1ff5544..1854521b7d5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3final.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3final.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx index 044e1cf7442..809e4f57ae6 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx index a042a9f0100..0fc8aab6b68 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % \maketitle % % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx index 3fdc8a731b5..437f05d0e3e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx index dacd2763441..81d6720ef69 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx index 5c36e99032c..f0279aeb49d 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx index b037145d193..9fa0d3c9fe5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx index fba15dc56ab..a244448ff57 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx index ac5ed471b5b..d1a58ad4339 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx index 45360c47ea9..89347e5ef0e 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx index 4029ad93985..37434dd256b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx index 5f59d49e3c7..1cdf625a2db 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx index a40cf74bda6..ab486d81dcb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % \maketitle % % \begin{documentation} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx index 19b5c894bfa..a1d63f396b4 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx index 779e38c1adf..ad4011b6d52 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx index 326374b8e7d..4476f0377e7 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx index ca0f8c0bbaa..52d769c49ad 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -1285,12 +1285,11 @@ } \cs_generate_variant:Nn \int_const:Nn { c } \if_int_odd:w 0 - \cs_if_exist:NT \tex_luatexversion:D { 1 } - \cs_if_exist:NT \tex_disablecjktoken:D - { \if_int_compare:w \tex_jis:D "2121 = "3000 ~ 1 \fi: } - \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ - \cs_if_exist:NTF \tex_disablecjktoken:D - { \cs_new_eq:NN \@@_constdef:Nw \tex_kchardef:D } + \cs_if_exist:NT \tex_luatexversion:D { 1 } + \cs_if_exist:NT \tex_omathchardef:D { 1 } + \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ + \cs_if_exist:NTF \tex_omathchardef:D + { \cs_new_eq:NN \@@_constdef:Nw \tex_omathchardef:D } { \cs_new_eq:NN \@@_constdef:Nw \tex_chardef:D } \@@_constdef:Nw \c_@@_max_constdef_int 1114111 ~ \else: diff --git a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx index 66d2c25ce00..dad25796c3a 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx index c321be6548f..ed13c7b9932 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx index 53370f6f23a..b1533c8f200 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx b/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx index a5ac73c890e..c5528a78899 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx index 03b55440163..199db4a628d 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -183,6 +183,13 @@ % Resets the timer used by |l3kernel.elapsetime|. % \end{function} % +% \begin{function}{l3kernel.shellescape} +% \begin{syntax} +% |l3kernel.shellescape(|\meta{cmd}|)| +% \end{syntax} +% Executes the \meta{cmd} and prints to the log as for \pdfTeX{}. +% \end{function} +% % \begin{function}{l3kernel.strcmp} % \begin{syntax} % |l3kernel.strcmp(|\meta{str one}, \meta{str two}|)| @@ -311,6 +318,7 @@ local md5 = md5 local os = os local string = string local tex = tex +local texio = texio local unicode = unicode % \end{macrocode} % @@ -326,10 +334,12 @@ local md5_sum = md5.sum local open = io.open local os_clock = os.clock local os_date = os.date +local os_exec = os.execute local setcatcode = tex.setcatcode local sprint = tex.sprint local cprint = tex.cprint local write = tex.write +local write_nl = texio.write_nl % \end{macrocode} % % Newer Con\TeX{}t releases replace the |unicode| library by |utf|. @@ -492,6 +502,23 @@ l3kernel.strcmp = strcmp % \end{macrocode} % \end{macro} % +% \begin{macro}{l3kernel.shellescape} +% Replicating the \pdfTeX{} log interaction for shell escape. +% \begin{macrocode} +local function shellescape(cmd) + local status,msg = os_exec(cmd) + if status == nil then + write_nl("log","runsystem(" .. cmd .. ")...(" .. msg .. ")\n") + elseif status == 0 then + write_nl("log","runsystem(" .. cmd .. ")...executed\n") + else + write_nl("log","runsystem(" .. cmd .. ")...failed " .. (msg or "") .. "\n") + end +end +l3kernel.shellescape = shellescape +% \end{macrocode} +% \end{macro} +% % \subsection{Generic \Lua{} and font support} % % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx index 9dd5a55d587..64608fb5415 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx index e93f8c5db19..72a8af0373f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3names.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -571,6 +571,7 @@ \@@_primitive:NN \pdflastximagepages \tex_pdflastximagepages:D \@@_primitive:NN \pdflinkmargin \tex_pdflinkmargin:D \@@_primitive:NN \pdfliteral \tex_pdfliteral:D + \@@_primitive:NN \pdfmajorversion \tex_pdfmajorversion:D \@@_primitive:NN \pdfminorversion \tex_pdfminorversion:D \@@_primitive:NN \pdfnames \tex_pdfnames:D \@@_primitive:NN \pdfobj \tex_pdfobj:D @@ -1108,21 +1109,19 @@ \@@_primitive:NN \Uunderdelimiter \tex_Uunderdelimiter:D \@@_primitive:NN \Uvextensible \tex_Uvextensible:D % \end{macrocode} -% Primitives from Harf\TeX{}. -% \begin{macrocode} - \@@_primitive:NN \harftexrevision \tex_harftexrevision:D - \@@_primitive:NN \harftexversion \tex_harftexversion:D -% \end{macrocode} % Primitives from \pTeX{}. % \begin{macrocode} \@@_primitive:NN \autospacing \tex_autospacing:D \@@_primitive:NN \autoxspacing \tex_autoxspacing:D + \@@_primitive:NN \disinhibitglue \tex_disinhibitglue:D \@@_primitive:NN \dtou \tex_dtou:D \@@_primitive:NN \epTeXinputencoding \tex_epTeXinputencoding:D \@@_primitive:NN \epTeXversion \tex_epTeXversion:D \@@_primitive:NN \euc \tex_euc:D + \@@_primitive:NN \hfi \tex_hfi:D \@@_primitive:NN \ifdbox \tex_ifdbox:D \@@_primitive:NN \ifddir \tex_ifddir:D + \@@_primitive:NN \ifmbox \tex_ifmbox:D \@@_primitive:NN \ifmdir \tex_ifmdir:D \@@_primitive:NN \iftbox \tex_iftbox:D \@@_primitive:NN \iftdir \tex_iftdir:D @@ -1139,22 +1138,33 @@ \@@_primitive:NN \kansujichar \tex_kansujichar:D \@@_primitive:NN \kcatcode \tex_kcatcode:D \@@_primitive:NN \kuten \tex_kuten:D + \@@_primitive:NN \lastnodechar \tex_lastnodechar:D + \@@_primitive:NN \lastnodesubtype \tex_lastnodesubtype:D \@@_primitive:NN \noautospacing \tex_noautospacing:D \@@_primitive:NN \noautoxspacing \tex_noautoxspacing:D + \@@_primitive:NN \pagefistretch \tex_pagefistretch:D \@@_primitive:NN \postbreakpenalty \tex_postbreakpenalty:D \@@_primitive:NN \prebreakpenalty \tex_prebreakpenalty:D \@@_primitive:NN \ptexminorversion \tex_ptexminorversion:D \@@_primitive:NN \ptexrevision \tex_ptexrevision:D \@@_primitive:NN \ptexversion \tex_ptexversion:D + \@@_primitive:NN \readpapersizespecial \tex_readpapersizespecial:D + \@@_primitive:NN \scriptbaselineshiftfactor + \tex_scriptbaselineshiftfactor:D + \@@_primitive:NN \scriptscriptbaselineshiftfactor + \tex_scriptscriptbaselineshiftfactor:D \@@_primitive:NN \showmode \tex_showmode:D \@@_primitive:NN \sjis \tex_sjis:D \@@_primitive:NN \tate \tex_tate:D \@@_primitive:NN \tbaselineshift \tex_tbaselineshift:D + \@@_primitive:NN \textbaselineshiftfactor + \tex_textbaselineshiftfactor:D \@@_primitive:NN \tfont \tex_tfont:D \@@_primitive:NN \xkanjiskip \tex_xkanjiskip:D \@@_primitive:NN \xspcode \tex_xspcode:D \@@_primitive:NN \ybaselineshift \tex_ybaselineshift:D \@@_primitive:NN \yoko \tex_yoko:D + \@@_primitive:NN \vfi \tex_vfi:D % \end{macrocode} % Primitives from \upTeX{}. % \begin{macrocode} @@ -1168,6 +1178,17 @@ \@@_primitive:NN \uptexrevision \tex_uptexrevision:D \@@_primitive:NN \uptexversion \tex_uptexversion:D % \end{macrocode} +% Omega primitives provided by \pTeX{} (listed separately mainly to allow +% understanding of their source). +% \begin{macrocode} + \@@_primitive:NN \odelcode \tex_odelcode:D + \@@_primitive:NN \odelimiter \tex_odelimiter:D + \@@_primitive:NN \omathaccent \tex_omathaccent:D + \@@_primitive:NN \omathchar \tex_omathchar:D + \@@_primitive:NN \omathchardef \tex_omathchardef:D + \@@_primitive:NN \omathcode \tex_omathcode:D + \@@_primitive:NN \oradical \tex_oradical:D +% \end{macrocode} % End of the \enquote{just the names} part of the source. % \begin{macrocode} % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx index a70270880b0..835d0058603 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx index fac6ffaf3d2..570b7a7ade1 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx index 1fb098ed190..dbe2e6e8171 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx index 0bc5f5cb005..deda64aa3a9 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx index 0c7c33e475c..b376d5644e6 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx index 69174666e73..86cc965c919 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx index 682caff3aec..bea3f770303 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx index 2fe91d7f9ed..e6b49a4d393 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx index 1cda403937f..09ed5b723e7 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3str.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx index 06ef4cd7316..c2a6e791425 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % @@ -556,7 +556,7 @@ \cs_new_protected:Npn \sys_shell_now:n #1 { \lua_now:e - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { @@ -575,7 +575,7 @@ \cs_new_protected:Npn \sys_shell_shipout:n #1 { \lua_shipout_e:n - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx index aaaea4a2fa8..fe34f9698e5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx index 8d810681a95..5e8551a7b1f 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx index ba412276825..3ac24900eeb 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3token.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx index fe60c0c7e5d..45bedf0cbf1 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2019-10-14} +% \date{Released 2019-10-21} % % \maketitle % diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 81fdc1aa525..beba4ee3583 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -65,7 +65,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -733,6 +733,7 @@ \__kernel_primitive:NN \pdflastximagepages \tex_pdflastximagepages:D \__kernel_primitive:NN \pdflinkmargin \tex_pdflinkmargin:D \__kernel_primitive:NN \pdfliteral \tex_pdfliteral:D + \__kernel_primitive:NN \pdfmajorversion \tex_pdfmajorversion:D \__kernel_primitive:NN \pdfminorversion \tex_pdfminorversion:D \__kernel_primitive:NN \pdfnames \tex_pdfnames:D \__kernel_primitive:NN \pdfobj \tex_pdfobj:D @@ -1220,16 +1221,17 @@ \__kernel_primitive:NN \Usuperscript \tex_Usuperscript:D \__kernel_primitive:NN \Uunderdelimiter \tex_Uunderdelimiter:D \__kernel_primitive:NN \Uvextensible \tex_Uvextensible:D - \__kernel_primitive:NN \harftexrevision \tex_harftexrevision:D - \__kernel_primitive:NN \harftexversion \tex_harftexversion:D \__kernel_primitive:NN \autospacing \tex_autospacing:D \__kernel_primitive:NN \autoxspacing \tex_autoxspacing:D + \__kernel_primitive:NN \disinhibitglue \tex_disinhibitglue:D \__kernel_primitive:NN \dtou \tex_dtou:D \__kernel_primitive:NN \epTeXinputencoding \tex_epTeXinputencoding:D \__kernel_primitive:NN \epTeXversion \tex_epTeXversion:D \__kernel_primitive:NN \euc \tex_euc:D + \__kernel_primitive:NN \hfi \tex_hfi:D \__kernel_primitive:NN \ifdbox \tex_ifdbox:D \__kernel_primitive:NN \ifddir \tex_ifddir:D + \__kernel_primitive:NN \ifmbox \tex_ifmbox:D \__kernel_primitive:NN \ifmdir \tex_ifmdir:D \__kernel_primitive:NN \iftbox \tex_iftbox:D \__kernel_primitive:NN \iftdir \tex_iftdir:D @@ -1246,22 +1248,33 @@ \__kernel_primitive:NN \kansujichar \tex_kansujichar:D \__kernel_primitive:NN \kcatcode \tex_kcatcode:D \__kernel_primitive:NN \kuten \tex_kuten:D + \__kernel_primitive:NN \lastnodechar \tex_lastnodechar:D + \__kernel_primitive:NN \lastnodesubtype \tex_lastnodesubtype:D \__kernel_primitive:NN \noautospacing \tex_noautospacing:D \__kernel_primitive:NN \noautoxspacing \tex_noautoxspacing:D + \__kernel_primitive:NN \pagefistretch \tex_pagefistretch:D \__kernel_primitive:NN \postbreakpenalty \tex_postbreakpenalty:D \__kernel_primitive:NN \prebreakpenalty \tex_prebreakpenalty:D \__kernel_primitive:NN \ptexminorversion \tex_ptexminorversion:D \__kernel_primitive:NN \ptexrevision \tex_ptexrevision:D \__kernel_primitive:NN \ptexversion \tex_ptexversion:D + \__kernel_primitive:NN \readpapersizespecial \tex_readpapersizespecial:D + \__kernel_primitive:NN \scriptbaselineshiftfactor + \tex_scriptbaselineshiftfactor:D + \__kernel_primitive:NN \scriptscriptbaselineshiftfactor + \tex_scriptscriptbaselineshiftfactor:D \__kernel_primitive:NN \showmode \tex_showmode:D \__kernel_primitive:NN \sjis \tex_sjis:D \__kernel_primitive:NN \tate \tex_tate:D \__kernel_primitive:NN \tbaselineshift \tex_tbaselineshift:D + \__kernel_primitive:NN \textbaselineshiftfactor + \tex_textbaselineshiftfactor:D \__kernel_primitive:NN \tfont \tex_tfont:D \__kernel_primitive:NN \xkanjiskip \tex_xkanjiskip:D \__kernel_primitive:NN \xspcode \tex_xspcode:D \__kernel_primitive:NN \ybaselineshift \tex_ybaselineshift:D \__kernel_primitive:NN \yoko \tex_yoko:D + \__kernel_primitive:NN \vfi \tex_vfi:D \__kernel_primitive:NN \disablecjktoken \tex_disablecjktoken:D \__kernel_primitive:NN \enablecjktoken \tex_enablecjktoken:D \__kernel_primitive:NN \forcecjktoken \tex_forcecjktoken:D @@ -1271,6 +1284,13 @@ \__kernel_primitive:NN \ucs \tex_ucs:D \__kernel_primitive:NN \uptexrevision \tex_uptexrevision:D \__kernel_primitive:NN \uptexversion \tex_uptexversion:D + \__kernel_primitive:NN \odelcode \tex_odelcode:D + \__kernel_primitive:NN \odelimiter \tex_odelimiter:D + \__kernel_primitive:NN \omathaccent \tex_omathaccent:D + \__kernel_primitive:NN \omathchar \tex_omathchar:D + \__kernel_primitive:NN \omathchardef \tex_omathchardef:D + \__kernel_primitive:NN \omathcode \tex_omathcode:D + \__kernel_primitive:NN \oradical \tex_oradical:D \tex_endgroup:D \tex_ifdefined:D \@@end \tex_let:D \tex_end:D \@@end @@ -2129,7 +2149,11 @@ \tex_ifdefined:D \tex_luatexversion:D \tex_chardef:D \c_max_register_int = 65 535 ~ \tex_else:D - \tex_mathchardef:D \c_max_register_int = 32 767 ~ + \tex_ifdefined:D \tex_omathchardef:D + \tex_omathchardef:D \c_max_register_int = 65535 ~ + \tex_else:D + \tex_mathchardef:D \c_max_register_int = 32767 ~ + \tex_fi:D \tex_fi:D \tex_let:D \cs_set_nopar:Npn \tex_def:D \tex_let:D \cs_set_nopar:Npx \tex_edef:D @@ -6395,12 +6419,11 @@ } \cs_generate_variant:Nn \int_const:Nn { c } \if_int_odd:w 0 - \cs_if_exist:NT \tex_luatexversion:D { 1 } - \cs_if_exist:NT \tex_disablecjktoken:D - { \if_int_compare:w \tex_jis:D "2121 = "3000 ~ 1 \fi: } - \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ - \cs_if_exist:NTF \tex_disablecjktoken:D - { \cs_new_eq:NN \__int_constdef:Nw \tex_kchardef:D } + \cs_if_exist:NT \tex_luatexversion:D { 1 } + \cs_if_exist:NT \tex_omathchardef:D { 1 } + \cs_if_exist:NT \tex_XeTeXversion:D { 1 } ~ + \cs_if_exist:NTF \tex_omathchardef:D + { \cs_new_eq:NN \__int_constdef:Nw \tex_omathchardef:D } { \cs_new_eq:NN \__int_constdef:Nw \tex_chardef:D } \__int_constdef:Nw \c__int_max_constdef_int 1114111 ~ \else: @@ -7587,7 +7610,7 @@ \cs_new_protected:Npn \sys_shell_now:n #1 { \lua_now:e - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { @@ -7600,7 +7623,7 @@ \cs_new_protected:Npn \sys_shell_shipout:n #1 { \lua_shipout_e:n - { os.execute(" \lua_escape:e { \tl_to_str:n {#1} } ") } + { l3kernel.shellescape(" \lua_escape:e { \tl_to_str:n {#1} } ") } } } { @@ -10983,8 +11006,11 @@ \seq_new:N \l__file_tmp_seq \cs_new:Npn \__kernel_file_name_sanitize:n #1 { - \__kernel_file_name_expand_loop:w #1 - \q_recursion_tail \q_recursion_stop + \exp_args:Ne \__kernel_file_name_trim_spaces:n + { + \__kernel_file_name_expand_loop:w #1 + \q_recursion_tail \q_recursion_stop + } } \cs_new:Npn \__kernel_file_name_expand_loop:w #1 \q_recursion_stop { @@ -11032,6 +11058,20 @@ \c_space_tl \exp_not:N \__kernel_file_name_expand_loop:w } +\cs_new:Npn \__kernel_file_name_trim_spaces:n #1 + { \__kernel_file_name_trim_spaces:nw {#1} #1 . \q_nil . \q_stop } +\cs_new:Npn \__kernel_file_name_trim_spaces:nw #1#2 . #3 . #4 \q_stop + { + \quark_if_nil:nTF {#3} + { + \exp_args:Ne \__kernel_file_name_trim_spaces_aux:n + { \tl_trim_spaces:n { #1 \s_stop } } + } + { \tl_trim_spaces:n {#1} } + } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:n #1 + { \__kernel_file_name_trim_spaces_aux:w #1 } +\cs_new:Npn \__kernel_file_name_trim_spaces_aux:w #1 \s_stop {#1} \cs_new:Npn \__kernel_file_name_quote:n #1 { \__kernel_file_name_quote_auxi:nnnw {#1} { 0 } { } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 35ed78283cf..258765ae5fb 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \def\tempa{LaTeX2e}% diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index bb613fa4f80..50a4d8b52b8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \let\ExplLoaderFileDate\ExplFileDate \everyjob\expandafter{\the\everyjob \message{expl3 <\ExplFileDate> L3 programming layer}% diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua index 835051a40fe..eeafb132f55 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.lua +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.lua @@ -28,6 +28,7 @@ local md5 = md5 local os = os local string = string local tex = tex +local texio = texio local unicode = unicode local abs = math.abs local byte = string.byte @@ -39,10 +40,12 @@ local md5_sum = md5.sum local open = io.open local os_clock = os.clock local os_date = os.date +local os_exec = os.execute local setcatcode = tex.setcatcode local sprint = tex.sprint local cprint = tex.cprint local write = tex.write +local write_nl = texio.write_nl local utf8_char = (utf and utf.char) or unicode.utf8.char local kpse_find = (resolvers and resolvers.findfile) or kpse.find_file local function escapehex(str) @@ -144,3 +147,14 @@ local function strcmp(A, B) end end l3kernel.strcmp = strcmp +local function shellescape(cmd) + local status,msg = os_exec(cmd) + if status == nil then + write_nl("log","runsystem(" .. cmd .. ")...(" .. msg .. ")\n") + elseif status == 0 then + write_nl("log","runsystem(" .. cmd .. ")...executed\n") + else + write_nl("log","runsystem(" .. cmd .. ")...failed " .. (msg or "") .. "\n") + end +end +l3kernel.shellescape = shellescape diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index 8794caa1df6..bf0dac992fd 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2019-10-14}% +\def\ExplFileDate{2019-10-21}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% -- cgit v1.2.3