diff options
author | Norbert Preining <norbert@preining.info> | 2019-11-07 03:01:39 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-11-07 03:01:39 +0000 |
commit | 2e1d63b8ed8c6b7c6d206bfe9e2712797108e8bd (patch) | |
tree | 7ea198b043998590117b2730e9dec10327ef3da3 /macros/latex/required/tools | |
parent | 590fd8b560523cdaea19c59aea61e781138e87f8 (diff) |
CTAN sync 201911070301
Diffstat (limited to 'macros/latex/required/tools')
32 files changed, 97 insertions, 16 deletions
diff --git a/macros/latex/required/tools/README.md b/macros/latex/required/tools/README.md index b7ee5b94d4..d0111164d7 100644 --- a/macros/latex/required/tools/README.md +++ b/macros/latex/required/tools/README.md @@ -1,7 +1,7 @@ The LaTeX `tools` bundle ======================== -Release 2019-10-01 +Release 2019-10-01 patch level 2 Overview -------- diff --git a/macros/latex/required/tools/afterpage.pdf b/macros/latex/required/tools/afterpage.pdf Binary files differindex af05f90040..d22b85aaf3 100644 --- a/macros/latex/required/tools/afterpage.pdf +++ b/macros/latex/required/tools/afterpage.pdf diff --git a/macros/latex/required/tools/array.pdf b/macros/latex/required/tools/array.pdf Binary files differindex b02b32ac9a..ce8b96718d 100644 --- a/macros/latex/required/tools/array.pdf +++ b/macros/latex/required/tools/array.pdf diff --git a/macros/latex/required/tools/bm.pdf b/macros/latex/required/tools/bm.pdf Binary files differindex 1aa401beea..e38ee218c0 100644 --- a/macros/latex/required/tools/bm.pdf +++ b/macros/latex/required/tools/bm.pdf diff --git a/macros/latex/required/tools/calc.pdf b/macros/latex/required/tools/calc.pdf Binary files differindex 1f7f4eb9f2..073ca7a1ec 100644 --- a/macros/latex/required/tools/calc.pdf +++ b/macros/latex/required/tools/calc.pdf diff --git a/macros/latex/required/tools/changes.txt b/macros/latex/required/tools/changes.txt index a8ff7087b5..2d509d58ce 100644 --- a/macros/latex/required/tools/changes.txt +++ b/macros/latex/required/tools/changes.txt @@ -1,3 +1,4 @@ + ======================================================================= This file lists changes to the LaTeX2e files in reverse chronological order. It is provided for convenience only. It therefore makes no claims to @@ -6,6 +7,23 @@ are not part of the distribution. ======================================================================= ######################### +# 2019-10-01 PL 2 Release +######################### + +2019-11-05 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + + * varioref.dtx (subsection{Defining the main macros}): + Support (mis)use of internal interface by fancyref (sx/515106) + +2019-10-17 David Carlisle <David.Carlisle@latex-project.org> + + * shellesc.dtx: protect against active _ and " + +2019-10-13 David Carlisle <David.Carlisle@latex-project.org> + + * shellesc.dtx: add logging in luatex and \ShellEscapeStatus (gh/195) + +######################### # 2019-10-01 Release ######################### diff --git a/macros/latex/required/tools/dcolumn.pdf b/macros/latex/required/tools/dcolumn.pdf Binary files differindex 9ce64ebc36..1fd28e5f7c 100644 --- a/macros/latex/required/tools/dcolumn.pdf +++ b/macros/latex/required/tools/dcolumn.pdf diff --git a/macros/latex/required/tools/delarray.pdf b/macros/latex/required/tools/delarray.pdf Binary files differindex 6059773f58..febc5ff254 100644 --- a/macros/latex/required/tools/delarray.pdf +++ b/macros/latex/required/tools/delarray.pdf diff --git a/macros/latex/required/tools/enumerate.pdf b/macros/latex/required/tools/enumerate.pdf Binary files differindex fafb1862fa..31c894c693 100644 --- a/macros/latex/required/tools/enumerate.pdf +++ b/macros/latex/required/tools/enumerate.pdf diff --git a/macros/latex/required/tools/fileerr.pdf b/macros/latex/required/tools/fileerr.pdf Binary files differindex b808721fbe..912b68e77c 100644 --- a/macros/latex/required/tools/fileerr.pdf +++ b/macros/latex/required/tools/fileerr.pdf diff --git a/macros/latex/required/tools/fontsmpl.pdf b/macros/latex/required/tools/fontsmpl.pdf Binary files differindex 614b08e688..0b3de542d0 100644 --- a/macros/latex/required/tools/fontsmpl.pdf +++ b/macros/latex/required/tools/fontsmpl.pdf diff --git a/macros/latex/required/tools/ftnright.pdf b/macros/latex/required/tools/ftnright.pdf Binary files differindex 8736abc411..de7afd82c0 100644 --- a/macros/latex/required/tools/ftnright.pdf +++ b/macros/latex/required/tools/ftnright.pdf diff --git a/macros/latex/required/tools/hhline.pdf b/macros/latex/required/tools/hhline.pdf Binary files differindex b85807d304..2a43812121 100644 --- a/macros/latex/required/tools/hhline.pdf +++ b/macros/latex/required/tools/hhline.pdf diff --git a/macros/latex/required/tools/indentfirst.pdf b/macros/latex/required/tools/indentfirst.pdf Binary files differindex 397f857ef2..c35c061234 100644 --- a/macros/latex/required/tools/indentfirst.pdf +++ b/macros/latex/required/tools/indentfirst.pdf diff --git a/macros/latex/required/tools/layout.pdf b/macros/latex/required/tools/layout.pdf Binary files differindex 1266716aae..164accfa12 100644 --- a/macros/latex/required/tools/layout.pdf +++ b/macros/latex/required/tools/layout.pdf diff --git a/macros/latex/required/tools/longtable.pdf b/macros/latex/required/tools/longtable.pdf Binary files differindex 025f679fff..54b3740ccd 100644 --- a/macros/latex/required/tools/longtable.pdf +++ b/macros/latex/required/tools/longtable.pdf diff --git a/macros/latex/required/tools/multicol.pdf b/macros/latex/required/tools/multicol.pdf Binary files differindex 88afd1e80b..b2ed225236 100644 --- a/macros/latex/required/tools/multicol.pdf +++ b/macros/latex/required/tools/multicol.pdf diff --git a/macros/latex/required/tools/rawfonts.pdf b/macros/latex/required/tools/rawfonts.pdf Binary files differindex b47017ecc4..cfc1094223 100644 --- a/macros/latex/required/tools/rawfonts.pdf +++ b/macros/latex/required/tools/rawfonts.pdf diff --git a/macros/latex/required/tools/shellesc.dtx b/macros/latex/required/tools/shellesc.dtx index 061ea4457c..46f2343b01 100644 --- a/macros/latex/required/tools/shellesc.dtx +++ b/macros/latex/required/tools/shellesc.dtx @@ -20,7 +20,7 @@ %<driver> \ProvidesFile{shellesc.drv} % \fi % \ProvidesFile{shellesc.dtx} - [2016/06/07 v0.02b unified shell escape interface for LaTeX] + [2019/10/17 v1.0b unified shell escape interface for LaTeX] % % \iffalse %<*driver> @@ -36,10 +36,15 @@ % \title{The \textsf{shellesc} Package\thanks{This file % has version number \fileversion, last % revised \filedate.}} -% \author{LaTeX3 project} +% \author{\LaTeX3 project} % \date{\filedate} +% +% % \maketitle % +% \vspace*{-\baselineskip} +% \enlargethispage{\baselineskip} +% % \changes{v0.1b}{2016/02/02}{Doc typo fixes (JB)} % \changes{v0.2a}{2016/06/07}{Improve use with plain TeX} % \section{Introduction} @@ -57,7 +62,7 @@ % so a command to remove a file on a unix-like system could be % specified using \verb|\ShellEscape{rm file.txt}| (or \verb|del| in % windows). Note that by default system access is not allowed and -% latex will typically need to be called with the \verb|--shell-escape| +% \LaTeX\ will typically need to be called with the \verb|--shell-escape| % command line option. % % The package may be used with standard \texttt{latex} or @@ -76,6 +81,9 @@ % (\verb|\latelua|). This package provides \verb|\DelayedShellEscape| % as a common syntax for this use. % +% The shell escape status may be queried by checking the integer (chardef) +% command \verb|\ShellEscapeStatus|, 0 (disabled) 1 (enabled) 2 (restricted). +% % To aid porting existing documents to Lua\TeX~0.87 this package does % overload the \verb|\write| command so that % \verb|\write18{rm file.txt}| @@ -95,12 +103,25 @@ %<*package> % \end{macrocode} % +% \changes{v1.0b}{2019/10/17}{Catcode protection} +% \begin{macrocode} +\chardef\shellesc@quotecat\catcode`\" +\chardef\shellesc@underscorecat\catcode`\_ +\@makeother\" +\@makeother\_ +% \end{macrocode} +% % \subsection{Status Check} % % -% \changes{v0.2a}{2016/06/07}{spelling in messages} +% \subsection{The shellesc package interface} +% +% \begin{macro}{\ShellEscapeStatus} +% \changes{v1.0a}{2019/10/13}{Command Introduced} +% Integer value with meanings 0 (shell escape disabled), 1 (shell escape allowed), 2 (Restricted shell escape). +% % \begin{macrocode} -\ifcase +\chardef\ShellEscapeStatus \ifx\pdfshellescape\@undefined \ifx\shellescape\@undefined \ifx\directlua\@undefined @@ -115,6 +136,12 @@ \else \pdfshellescape \fi +% \end{macrocode} +% \end{macro} +% +% \changes{v0.2a}{2016/06/07}{spelling in messages} +% \begin{macrocode} +\ifcase\ShellEscapeStatus \PackageWarning{shellesc}{Shell escape disabled} \or \PackageInfo {shellesc}{Unrestricted shell escape enabled} @@ -123,9 +150,9 @@ \fi % \end{macrocode} % -% \subsection{The shellesc package interface} % % \begin{macro}{\ShellEscape} +% \changes{v1.0a}{2019/10/13}{Lua logging for gh/195} % Execute the supplied tokens as a system dependent command, assuming % such execution is allowed. % \begin{macrocode} @@ -135,14 +162,14 @@ % % \begin{macrocode} \else - \protected\def\ShellEscape#1{% - \directlua{os.execute("\luaescapestring{#1}")}} + \protected\def\ShellEscape{\directlua\ShellEscape@Lua} \fi % \end{macrocode} % \end{macro} % % \begin{macro}{\DelayedShellEscape} % \changes{v0.1c}{2016/04/29}{Define \cs{DelayedShellEscape} not \cs{ShellEscape}(UF)} +% \changes{v1.0a}{2019/10/13}{Lua logging for gh/195} % Execute the supplied tokens as a system dependent command, when this % node is shipped out with the completed page, assuming % such execution is allowed. @@ -153,14 +180,38 @@ % % \begin{macrocode} \else - \protected\def\DelayedShellEscape#1{% - \latelua{os.execute("\luaescapestring{#1}")}} + \protected\def\DelayedShellEscape{\latelua\ShellEscape@Lua} \fi % \end{macrocode} % \end{macro} % % % +% \begin{macro}{\ShellEscape@Lua} +% \changes{v1.0a}{2019/10/13}{loging for gh/195} +% Shared Lua code for \verb|\DelayedShellEscape| and \verb|\ShellEscape|. +% \begin{macrocode} +\ifx\directlua\@undefined\else +\protected\def\ShellEscape@Lua#1{{% +local status, msg = os.execute("\luaescapestring{#1}")% +if status == nil then + texio.write_nl("log",% + "runsystem(" .. "\luaescapestring{#1}"% + .. ")...(" .. msg .. ")\string\n") + elseif status == 0 then + texio.write_nl("log",% + "runsystem(" .. "\luaescapestring{#1}"% + .. ")...executed\string\n") + else + texio.write_nl("log",% + "runsystem(" .. "\luaescapestring{#1}"% + .. ")...failed " .. (msg or "") .. "\string\n") + end +}} +\fi +% \end{macrocode} +% \end{macro} +% % \subsection{The write18 package interface} % % In web2c based engines other than Lua\TeX, |\write18| may be used @@ -189,7 +240,11 @@ % % Stop at this point if not a recent Lua\TeX. % \begin{macrocode} -\ifx\lastsavedimageresourcepages\@undefined\expandafter\endinput\fi +\ifx\lastsavedimageresourcepages\@undefined + \catcode`\"\shellesc@quotecat + \catcode`\_\shellesc@underscorecat + \expandafter\endinput +\fi % \end{macrocode} % % \begin{macrocode} @@ -233,7 +288,10 @@ shellesc.write_or_execute=write_or_execute \protected\def\write{\directlua{shellesc.write_or_execute()}} % \end{macrocode} % -% +% \begin{macrocode} +\catcode`\"\shellesc@quotecat +\catcode`\"\shellesc@underscorecat +% \end{macrocode} % % \begin{macrocode} %</package> diff --git a/macros/latex/required/tools/shellesc.pdf b/macros/latex/required/tools/shellesc.pdf Binary files differindex 69b3289947..f9b4fdc1c3 100644 --- a/macros/latex/required/tools/shellesc.pdf +++ b/macros/latex/required/tools/shellesc.pdf diff --git a/macros/latex/required/tools/showkeys.pdf b/macros/latex/required/tools/showkeys.pdf Binary files differindex 0ddb96c908..241cfce3cc 100644 --- a/macros/latex/required/tools/showkeys.pdf +++ b/macros/latex/required/tools/showkeys.pdf diff --git a/macros/latex/required/tools/somedefs.pdf b/macros/latex/required/tools/somedefs.pdf Binary files differindex 3068bfd379..4dc217d2a1 100644 --- a/macros/latex/required/tools/somedefs.pdf +++ b/macros/latex/required/tools/somedefs.pdf diff --git a/macros/latex/required/tools/tabularx.pdf b/macros/latex/required/tools/tabularx.pdf Binary files differindex 45703e2f09..f494e5fb55 100644 --- a/macros/latex/required/tools/tabularx.pdf +++ b/macros/latex/required/tools/tabularx.pdf diff --git a/macros/latex/required/tools/theorem.pdf b/macros/latex/required/tools/theorem.pdf Binary files differindex 03872edcc9..13ef94b59b 100644 --- a/macros/latex/required/tools/theorem.pdf +++ b/macros/latex/required/tools/theorem.pdf diff --git a/macros/latex/required/tools/tools-overview.pdf b/macros/latex/required/tools/tools-overview.pdf Binary files differindex 5e4a3cc5bf..179c0629bb 100644 --- a/macros/latex/required/tools/tools-overview.pdf +++ b/macros/latex/required/tools/tools-overview.pdf diff --git a/macros/latex/required/tools/trace.pdf b/macros/latex/required/tools/trace.pdf Binary files differindex c073ba3ef9..8239534507 100644 --- a/macros/latex/required/tools/trace.pdf +++ b/macros/latex/required/tools/trace.pdf diff --git a/macros/latex/required/tools/varioref.dtx b/macros/latex/required/tools/varioref.dtx index 049bd0d55e..b8392c76f2 100644 --- a/macros/latex/required/tools/varioref.dtx +++ b/macros/latex/required/tools/varioref.dtx @@ -40,7 +40,7 @@ %<package>\DeclareCurrentRelease{}{2019-10-01} %<package> %<package>\ProvidesPackage{varioref} -%<package> [2019/09/08 v1.6b package for extended references (FMi)] +%<package> [2019/11/05 v1.6c package for extended references (FMi)] % \fi % %% @@ -730,7 +730,7 @@ % workflow uses pdf\TeX{} the Arabic letters can't be displayed % easily, so you will see missing glyphs below. To see the real % letters you have to look at the source or package file. -% \changes{v1.6b}{2019/09/8}{Option arabic added} +% \changes{v1.6b}{2019/09/08}{Option arabic added} % \begin{allowtofu} % \begin{macrocode} \DeclareOption{arabic} @@ -1642,16 +1642,21 @@ % \end{macro} % % \begin{macro}{\vref@space} +% \begin{macro}{\vref@maybe@space} % \changes{v1.4a}{2002/03/06}{Default added} % A default for |\vref@space|. This isn't really needed except in % the case that somebody has hooked into the \pkg{varioref} % interfaces at a lower level (which isn't really supported, % but\ldots). So giving a default will prevent an error message in % that case (and should hopefully produce the same behavior as before). +% \changes{v1.6c}{2019/11/05}{Support (mis)use of internal interface by +% fancyref (sx/515106)} % \begin{macrocode} \let\vref@space\space +\let\vref@maybe@space\space % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\@vpageref} % More parsing\ldots diff --git a/macros/latex/required/tools/varioref.pdf b/macros/latex/required/tools/varioref.pdf Binary files differindex 07c44afe87..4375776488 100644 --- a/macros/latex/required/tools/varioref.pdf +++ b/macros/latex/required/tools/varioref.pdf diff --git a/macros/latex/required/tools/verbatim.pdf b/macros/latex/required/tools/verbatim.pdf Binary files differindex c5a2f07310..284b4a28d0 100644 --- a/macros/latex/required/tools/verbatim.pdf +++ b/macros/latex/required/tools/verbatim.pdf diff --git a/macros/latex/required/tools/xr.dtx b/macros/latex/required/tools/xr.dtx index 417a98c1c1..97c4c68084 100644 --- a/macros/latex/required/tools/xr.dtx +++ b/macros/latex/required/tools/xr.dtx @@ -86,7 +86,7 @@ % % As first suggested in Enrico Gregorio's |xcite| package, the current version % also allows |\cite| to reference |\bibitem| in the external document. -% For fcompatibility with |xcite|, |\externalcitedocument| is made available +% For compatibility with |xcite|, |\externalcitedocument| is made available % as an alias for |\externaldocument| % % \StopEventually{} diff --git a/macros/latex/required/tools/xr.pdf b/macros/latex/required/tools/xr.pdf Binary files differindex ab030f7f30..605d356b06 100644 --- a/macros/latex/required/tools/xr.pdf +++ b/macros/latex/required/tools/xr.pdf diff --git a/macros/latex/required/tools/xspace.pdf b/macros/latex/required/tools/xspace.pdf Binary files differindex c26c52db9f..0dcd797a28 100644 --- a/macros/latex/required/tools/xspace.pdf +++ b/macros/latex/required/tools/xspace.pdf |