summaryrefslogtreecommitdiff
path: root/macros/latex/required
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-11-07 03:01:39 +0000
committerNorbert Preining <norbert@preining.info>2019-11-07 03:01:39 +0000
commit2e1d63b8ed8c6b7c6d206bfe9e2712797108e8bd (patch)
tree7ea198b043998590117b2730e9dec10327ef3da3 /macros/latex/required
parent590fd8b560523cdaea19c59aea61e781138e87f8 (diff)
CTAN sync 201911070301
Diffstat (limited to 'macros/latex/required')
-rw-r--r--macros/latex/required/graphics/README.md2
-rw-r--r--macros/latex/required/graphics/cat-eps-converted-to.pdf84
-rw-r--r--macros/latex/required/graphics/changes.txt10
-rw-r--r--macros/latex/required/graphics/color.pdfbin201382 -> 201496 bytes
-rw-r--r--macros/latex/required/graphics/drivers.pdfbin263544 -> 263534 bytes
-rw-r--r--macros/latex/required/graphics/epsfig.pdfbin154496 -> 154483 bytes
-rw-r--r--macros/latex/required/graphics/graphics.dtx55
-rw-r--r--macros/latex/required/graphics/graphics.pdfbin283250 -> 284134 bytes
-rw-r--r--macros/latex/required/graphics/graphicx.pdfbin232393 -> 232381 bytes
-rw-r--r--macros/latex/required/graphics/grfguide.pdfbin310551 -> 310537 bytes
-rw-r--r--macros/latex/required/graphics/keyval.pdfbin222527 -> 222662 bytes
-rw-r--r--macros/latex/required/graphics/lscape.pdfbin150118 -> 150107 bytes
-rw-r--r--macros/latex/required/graphics/rotating.pdfbin245753 -> 246267 bytes
-rw-r--r--macros/latex/required/graphics/rotex.pdfbin162260 -> 162245 bytes
-rw-r--r--macros/latex/required/graphics/trig.pdfbin191705 -> 191693 bytes
-rw-r--r--macros/latex/required/tools/README.md2
-rw-r--r--macros/latex/required/tools/afterpage.pdfbin189866 -> 189846 bytes
-rw-r--r--macros/latex/required/tools/array.pdfbin481190 -> 481448 bytes
-rw-r--r--macros/latex/required/tools/bm.pdfbin306803 -> 306897 bytes
-rw-r--r--macros/latex/required/tools/calc.pdfbin340620 -> 340721 bytes
-rw-r--r--macros/latex/required/tools/changes.txt18
-rw-r--r--macros/latex/required/tools/dcolumn.pdfbin199062 -> 199167 bytes
-rw-r--r--macros/latex/required/tools/delarray.pdfbin183449 -> 183545 bytes
-rw-r--r--macros/latex/required/tools/enumerate.pdfbin199071 -> 199167 bytes
-rw-r--r--macros/latex/required/tools/fileerr.pdfbin180042 -> 180558 bytes
-rw-r--r--macros/latex/required/tools/fontsmpl.pdfbin144837 -> 144819 bytes
-rw-r--r--macros/latex/required/tools/ftnright.pdfbin346868 -> 347512 bytes
-rw-r--r--macros/latex/required/tools/hhline.pdfbin175737 -> 175864 bytes
-rw-r--r--macros/latex/required/tools/indentfirst.pdfbin144797 -> 144778 bytes
-rw-r--r--macros/latex/required/tools/layout.pdfbin246978 -> 246960 bytes
-rw-r--r--macros/latex/required/tools/longtable.pdfbin350094 -> 350173 bytes
-rw-r--r--macros/latex/required/tools/multicol.pdfbin490262 -> 490615 bytes
-rw-r--r--macros/latex/required/tools/rawfonts.pdfbin135706 -> 135836 bytes
-rw-r--r--macros/latex/required/tools/shellesc.dtx82
-rw-r--r--macros/latex/required/tools/shellesc.pdfbin167032 -> 169535 bytes
-rw-r--r--macros/latex/required/tools/showkeys.pdfbin242802 -> 242895 bytes
-rw-r--r--macros/latex/required/tools/somedefs.pdfbin156478 -> 156606 bytes
-rw-r--r--macros/latex/required/tools/tabularx.pdfbin254101 -> 254083 bytes
-rw-r--r--macros/latex/required/tools/theorem.pdfbin322979 -> 323622 bytes
-rw-r--r--macros/latex/required/tools/tools-overview.pdfbin68306 -> 68288 bytes
-rw-r--r--macros/latex/required/tools/trace.pdfbin212749 -> 212938 bytes
-rw-r--r--macros/latex/required/tools/varioref.dtx9
-rw-r--r--macros/latex/required/tools/varioref.pdfbin354967 -> 355308 bytes
-rw-r--r--macros/latex/required/tools/verbatim.pdfbin309055 -> 309003 bytes
-rw-r--r--macros/latex/required/tools/xr.dtx2
-rw-r--r--macros/latex/required/tools/xr.pdfbin163818 -> 163791 bytes
-rw-r--r--macros/latex/required/tools/xspace.pdfbin238029 -> 238117 bytes
47 files changed, 242 insertions, 22 deletions
diff --git a/macros/latex/required/graphics/README.md b/macros/latex/required/graphics/README.md
index a3fbe5d733..6567a09f2f 100644
--- a/macros/latex/required/graphics/README.md
+++ b/macros/latex/required/graphics/README.md
@@ -1,7 +1,7 @@
The LaTeX `graphics` bundle
===========================
-Release 2019-10-01 patch level 1
+Release 2019-10-01 patch level 2
Overview
--------
diff --git a/macros/latex/required/graphics/cat-eps-converted-to.pdf b/macros/latex/required/graphics/cat-eps-converted-to.pdf
new file mode 100644
index 0000000000..7da1b3dcd5
--- /dev/null
+++ b/macros/latex/required/graphics/cat-eps-converted-to.pdf
@@ -0,0 +1,84 @@
+%PDF-1.5
+%쏢
+5 0 obj
+<</Length 6 0 R/Filter /FlateDecode>>
+stream
+xUUKU! U$,@'=}[ sIFGWmџsn_0khRn@{݈/`v6:+uhr1N{=tDOE,tڜitn,}b0ζ=PxBE|-rϚ9HI뵛l9fn^n/;{Ǯ˸:ȋAɍbƕJӈ,P۷BS`<)h(LHĔqN*Xq‽?;9_W(l#ܜCfj sBUCcWu~cyV$(1WH]7+/mA"znYRU1j1GKV{2, V!YB.R%]>Kج,)gxkT(iRښ(ٷwи'Qk{T
+*Bd5d[<h7N @YݚdξջiMg`i[d k B0I-3
+yVD'1۫_+(x5"<Y?AE5f'gρ tYic5R8t`>3b|!e}!Q I։φTceu9yy=?/ F\endstream
+endobj
+6 0 obj
+686
+endobj
+4 0 obj
+<</Type/Page/MediaBox [0 0 36 32]
+/Parent 3 0 R
+/Resources<</ProcSet[/PDF]
+/ExtGState 8 0 R
+>>
+/Contents 5 0 R
+>>
+endobj
+3 0 obj
+<< /Type /Pages /Kids [
+4 0 R
+] /Count 1
+>>
+endobj
+1 0 obj
+<</Type /Catalog /Pages 3 0 R
+/Metadata 9 0 R
+>>
+endobj
+7 0 obj
+<</Type/ExtGState
+/OPM 1>>endobj
+8 0 obj
+<</R7
+7 0 R>>
+endobj
+9 0 obj
+<</Type/Metadata
+/Subtype/XML/Length 1335>>stream
+<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<?adobe-xap-filters esc="CRLF"?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/' x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>
+<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:iX='http://ns.adobe.com/iX/1.0/'>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:pdf='http://ns.adobe.com/pdf/1.3/' pdf:Producer='GPL Ghostscript 9.27'/>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xmp='http://ns.adobe.com/xap/1.0/'><xmp:ModifyDate>2019-07-20T10:14:48+01:00</xmp:ModifyDate>
+<xmp:CreateDate>2019-07-20T10:14:48+01:00</xmp:CreateDate>
+<xmp:CreatorTool>COREL DRAW</xmp:CreatorTool></rdf:Description>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:xapMM='http://ns.adobe.com/xap/1.0/mm/' xapMM:DocumentID='uuid:5f138aac-e2eb-11f4-0000-b0069176419e'/>
+<rdf:Description rdf:about='uuid:5f138aac-e2eb-11f4-0000-b0069176419e' xmlns:dc='http://purl.org/dc/elements/1.1/' dc:format='application/pdf'><dc:title><rdf:Alt><rdf:li xml:lang='x-default'>CAT.TMP</rdf:li></rdf:Alt></dc:title></rdf:Description>
+</rdf:RDF>
+</x:xmpmeta>
+
+
+<?xpacket end='w'?>
+endstream
+endobj
+2 0 obj
+<</Producer(GPL Ghostscript 9.27)
+/CreationDate(D:20190720101448+01'00')
+/ModDate(D:20190720101448+01'00')
+/Creator(COREL DRAW)
+/Title(CAT.TMP)>>endobj
+xref
+0 10
+0000000000 65535 f
+0000000978 00000 n
+0000002523 00000 n
+0000000919 00000 n
+0000000790 00000 n
+0000000015 00000 n
+0000000771 00000 n
+0000001042 00000 n
+0000001083 00000 n
+0000001112 00000 n
+trailer
+<< /Size 10 /Root 1 0 R /Info 2 0 R
+/ID [<A1B9BB71BF53A8513F7E1A14881A66CA><A1B9BB71BF53A8513F7E1A14881A66CA>]
+>>
+startxref
+2683
+%%EOF
diff --git a/macros/latex/required/graphics/changes.txt b/macros/latex/required/graphics/changes.txt
index 71e91fc85f..f4343bc2c3 100644
--- a/macros/latex/required/graphics/changes.txt
+++ b/macros/latex/required/graphics/changes.txt
@@ -4,6 +4,16 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+#########################
+# 2019-10-01 PL 2 Release
+#########################
+
+2019-11-03 David Carlisle <David.Carlisle@latex-project.org>
+
+ * graphics.dtx: add additional trial with known
+ extensions if supplied filename has a . but the file is not found
+ (gh/204)
+
2019-10-08 David Carlisle <David.Carlisle@latex-project.org>
* graphics.dtx: fallback definitions of \set@curr@file etc added
diff --git a/macros/latex/required/graphics/color.pdf b/macros/latex/required/graphics/color.pdf
index e92ca964da..c7360251f1 100644
--- a/macros/latex/required/graphics/color.pdf
+++ b/macros/latex/required/graphics/color.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/drivers.pdf b/macros/latex/required/graphics/drivers.pdf
index 85849cfb08..9d9ac44a91 100644
--- a/macros/latex/required/graphics/drivers.pdf
+++ b/macros/latex/required/graphics/drivers.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/epsfig.pdf b/macros/latex/required/graphics/epsfig.pdf
index 6f3b273256..953af25b5f 100644
--- a/macros/latex/required/graphics/epsfig.pdf
+++ b/macros/latex/required/graphics/epsfig.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphics.dtx b/macros/latex/required/graphics/graphics.dtx
index b6de6023d4..ac570c0227 100644
--- a/macros/latex/required/graphics/graphics.dtx
+++ b/macros/latex/required/graphics/graphics.dtx
@@ -25,7 +25,7 @@
%<driver> \ProvidesFile{graphics.drv}
% \fi
% \ProvidesFile{graphics.dtx}
- [2019/10/08 v1.3c Standard LaTeX Graphics (DPC,SPQR)]
+ [2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)]
%
% \iffalse
%<*driver>
@@ -1036,11 +1036,18 @@
% \begin{macro}{\Gin@sepdefault}
% \changes{v0.6a}{1994/11/29}
% {remove \cs{Gin@sep}}
+% \begin{macro}{\Gin@gzext}
+% \changes{v1.3d}{2019/11/01}
+% {macro added}
% This must match the token used by |\filename@parse| to delimit the
% extension.
% \begin{macrocode}
\def\Gin@sepdefault{.}
% \end{macrocode}
+%
+% \begin{macrocode}
+\edef\Gin@gzext{\detokenize{gz}}
+% \edef{macrocode}
% \end{macro}
%
% \begin{macro}{\set@curr@file}
@@ -1102,12 +1109,22 @@
% \end{macrocode}
% A lot of quote juggling going on here (room for improvements).
%
+% \changes{v1.3d}{2019/11/01}
+% {\cs{curr@name} now unquoted}
% \begin{macrocode}
\set@curr@file{#1}%
- \edef\uq@curr@file{\expandafter\unquote@name\expandafter{\@curr@file}}%
- \expandafter\filename@parse\expandafter{\uq@curr@file}%
- \edef\filename@area{\expandafter\quote@name\expandafter{\filename@area}}%
- \edef\filename@base{\expandafter\quote@name\expandafter{\filename@base}}%
+ \expandafter\filename@parse\expandafter{\@curr@file}%
+% \end{macrocode}
+% If extension is |.gz| tack on to previous extension, eg |.eps.gz| if available.
+% \begin{macrocode}
+ \ifx\filename@ext\Gin@gzext
+ \expandafter\filename@parse\expandafter{\filename@base}%
+ \ifx\filename@ext\relax
+ \let\filename@ext\Gin@gzext
+ \else
+ \edef\Gin@ext{\Gin@ext\Gin@sepdefault\Gin@gzext}%
+ \fi
+ \fi
\ifx\filename@ext\relax
\@for\Gin@temp:=\Gin@extensions\do{%
\ifx\Gin@ext\relax
@@ -1116,6 +1133,34 @@
\else
\Gin@getbase{\Gin@sepdefault\filename@ext}%
% \end{macrocode}
+% At this point try adding an extension, even if the filename has one so
+% that \verb|a.b| may find \verb|a.b.png| if no file is found then revert
+% to the extension as given to get better error reporting.
+%
+% \changes{v1.3d}{2019/11/01}
+% {Try adding an extension even if the filenam had a dot.}
+% \begin{macrocode}
+\ifx\Gin@ext\relax
+\let\Gin@savedbase\filename@base
+\let\Gin@savedext\filename@ext
+ \edef\filename@base{\filename@base\Gin@sepdefault\filename@ext}%
+ \let\filename@ext\relax
+ \@for\Gin@temp:=\Gin@extensions\do{%
+ \ifx\Gin@ext\relax
+ \Gin@getbase\Gin@temp
+ \fi}%
+% \end{macrocode}
+% Restore if no file found using theknown extensions.
+% \begin{macrocode}
+ \ifx\Gin@ext\relax
+ \let\filename@base\Gin@savedbase
+ \let\filename@ext\Gin@savedext
+ \fi
+\fi
+% \end{macrocode}
+%
+% \begin{macrocode}
+% \end{macrocode}
% \changes{v0.4d}{1994/05/06}
% {Make file not found a warning not an error}
% \changes{v0.6a}{1994/11/29}
diff --git a/macros/latex/required/graphics/graphics.pdf b/macros/latex/required/graphics/graphics.pdf
index 59f74f7709..918a377b0c 100644
--- a/macros/latex/required/graphics/graphics.pdf
+++ b/macros/latex/required/graphics/graphics.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/graphicx.pdf b/macros/latex/required/graphics/graphicx.pdf
index 70a0feb1fb..8e2772f5b5 100644
--- a/macros/latex/required/graphics/graphicx.pdf
+++ b/macros/latex/required/graphics/graphicx.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/grfguide.pdf b/macros/latex/required/graphics/grfguide.pdf
index f73199435e..80aebf496f 100644
--- a/macros/latex/required/graphics/grfguide.pdf
+++ b/macros/latex/required/graphics/grfguide.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/keyval.pdf b/macros/latex/required/graphics/keyval.pdf
index 96954471f1..375ae88b39 100644
--- a/macros/latex/required/graphics/keyval.pdf
+++ b/macros/latex/required/graphics/keyval.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/lscape.pdf b/macros/latex/required/graphics/lscape.pdf
index b5b1b4bd11..69cab578f1 100644
--- a/macros/latex/required/graphics/lscape.pdf
+++ b/macros/latex/required/graphics/lscape.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotating.pdf b/macros/latex/required/graphics/rotating.pdf
index 523c139cb8..704c4e11e5 100644
--- a/macros/latex/required/graphics/rotating.pdf
+++ b/macros/latex/required/graphics/rotating.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/rotex.pdf b/macros/latex/required/graphics/rotex.pdf
index 0fd60e327a..12ff8587b1 100644
--- a/macros/latex/required/graphics/rotex.pdf
+++ b/macros/latex/required/graphics/rotex.pdf
Binary files differ
diff --git a/macros/latex/required/graphics/trig.pdf b/macros/latex/required/graphics/trig.pdf
index 067a595954..f8af90699c 100644
--- a/macros/latex/required/graphics/trig.pdf
+++ b/macros/latex/required/graphics/trig.pdf
Binary files differ
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
index af05f90040..d22b85aaf3 100644
--- a/macros/latex/required/tools/afterpage.pdf
+++ b/macros/latex/required/tools/afterpage.pdf
Binary files differ
diff --git a/macros/latex/required/tools/array.pdf b/macros/latex/required/tools/array.pdf
index b02b32ac9a..ce8b96718d 100644
--- a/macros/latex/required/tools/array.pdf
+++ b/macros/latex/required/tools/array.pdf
Binary files differ
diff --git a/macros/latex/required/tools/bm.pdf b/macros/latex/required/tools/bm.pdf
index 1aa401beea..e38ee218c0 100644
--- a/macros/latex/required/tools/bm.pdf
+++ b/macros/latex/required/tools/bm.pdf
Binary files differ
diff --git a/macros/latex/required/tools/calc.pdf b/macros/latex/required/tools/calc.pdf
index 1f7f4eb9f2..073ca7a1ec 100644
--- a/macros/latex/required/tools/calc.pdf
+++ b/macros/latex/required/tools/calc.pdf
Binary files differ
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
index 9ce64ebc36..1fd28e5f7c 100644
--- a/macros/latex/required/tools/dcolumn.pdf
+++ b/macros/latex/required/tools/dcolumn.pdf
Binary files differ
diff --git a/macros/latex/required/tools/delarray.pdf b/macros/latex/required/tools/delarray.pdf
index 6059773f58..febc5ff254 100644
--- a/macros/latex/required/tools/delarray.pdf
+++ b/macros/latex/required/tools/delarray.pdf
Binary files differ
diff --git a/macros/latex/required/tools/enumerate.pdf b/macros/latex/required/tools/enumerate.pdf
index fafb1862fa..31c894c693 100644
--- a/macros/latex/required/tools/enumerate.pdf
+++ b/macros/latex/required/tools/enumerate.pdf
Binary files differ
diff --git a/macros/latex/required/tools/fileerr.pdf b/macros/latex/required/tools/fileerr.pdf
index b808721fbe..912b68e77c 100644
--- a/macros/latex/required/tools/fileerr.pdf
+++ b/macros/latex/required/tools/fileerr.pdf
Binary files differ
diff --git a/macros/latex/required/tools/fontsmpl.pdf b/macros/latex/required/tools/fontsmpl.pdf
index 614b08e688..0b3de542d0 100644
--- a/macros/latex/required/tools/fontsmpl.pdf
+++ b/macros/latex/required/tools/fontsmpl.pdf
Binary files differ
diff --git a/macros/latex/required/tools/ftnright.pdf b/macros/latex/required/tools/ftnright.pdf
index 8736abc411..de7afd82c0 100644
--- a/macros/latex/required/tools/ftnright.pdf
+++ b/macros/latex/required/tools/ftnright.pdf
Binary files differ
diff --git a/macros/latex/required/tools/hhline.pdf b/macros/latex/required/tools/hhline.pdf
index b85807d304..2a43812121 100644
--- a/macros/latex/required/tools/hhline.pdf
+++ b/macros/latex/required/tools/hhline.pdf
Binary files differ
diff --git a/macros/latex/required/tools/indentfirst.pdf b/macros/latex/required/tools/indentfirst.pdf
index 397f857ef2..c35c061234 100644
--- a/macros/latex/required/tools/indentfirst.pdf
+++ b/macros/latex/required/tools/indentfirst.pdf
Binary files differ
diff --git a/macros/latex/required/tools/layout.pdf b/macros/latex/required/tools/layout.pdf
index 1266716aae..164accfa12 100644
--- a/macros/latex/required/tools/layout.pdf
+++ b/macros/latex/required/tools/layout.pdf
Binary files differ
diff --git a/macros/latex/required/tools/longtable.pdf b/macros/latex/required/tools/longtable.pdf
index 025f679fff..54b3740ccd 100644
--- a/macros/latex/required/tools/longtable.pdf
+++ b/macros/latex/required/tools/longtable.pdf
Binary files differ
diff --git a/macros/latex/required/tools/multicol.pdf b/macros/latex/required/tools/multicol.pdf
index 88afd1e80b..b2ed225236 100644
--- a/macros/latex/required/tools/multicol.pdf
+++ b/macros/latex/required/tools/multicol.pdf
Binary files differ
diff --git a/macros/latex/required/tools/rawfonts.pdf b/macros/latex/required/tools/rawfonts.pdf
index b47017ecc4..cfc1094223 100644
--- a/macros/latex/required/tools/rawfonts.pdf
+++ b/macros/latex/required/tools/rawfonts.pdf
Binary files differ
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
index 69b3289947..f9b4fdc1c3 100644
--- a/macros/latex/required/tools/shellesc.pdf
+++ b/macros/latex/required/tools/shellesc.pdf
Binary files differ
diff --git a/macros/latex/required/tools/showkeys.pdf b/macros/latex/required/tools/showkeys.pdf
index 0ddb96c908..241cfce3cc 100644
--- a/macros/latex/required/tools/showkeys.pdf
+++ b/macros/latex/required/tools/showkeys.pdf
Binary files differ
diff --git a/macros/latex/required/tools/somedefs.pdf b/macros/latex/required/tools/somedefs.pdf
index 3068bfd379..4dc217d2a1 100644
--- a/macros/latex/required/tools/somedefs.pdf
+++ b/macros/latex/required/tools/somedefs.pdf
Binary files differ
diff --git a/macros/latex/required/tools/tabularx.pdf b/macros/latex/required/tools/tabularx.pdf
index 45703e2f09..f494e5fb55 100644
--- a/macros/latex/required/tools/tabularx.pdf
+++ b/macros/latex/required/tools/tabularx.pdf
Binary files differ
diff --git a/macros/latex/required/tools/theorem.pdf b/macros/latex/required/tools/theorem.pdf
index 03872edcc9..13ef94b59b 100644
--- a/macros/latex/required/tools/theorem.pdf
+++ b/macros/latex/required/tools/theorem.pdf
Binary files differ
diff --git a/macros/latex/required/tools/tools-overview.pdf b/macros/latex/required/tools/tools-overview.pdf
index 5e4a3cc5bf..179c0629bb 100644
--- a/macros/latex/required/tools/tools-overview.pdf
+++ b/macros/latex/required/tools/tools-overview.pdf
Binary files differ
diff --git a/macros/latex/required/tools/trace.pdf b/macros/latex/required/tools/trace.pdf
index c073ba3ef9..8239534507 100644
--- a/macros/latex/required/tools/trace.pdf
+++ b/macros/latex/required/tools/trace.pdf
Binary files differ
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
index 07c44afe87..4375776488 100644
--- a/macros/latex/required/tools/varioref.pdf
+++ b/macros/latex/required/tools/varioref.pdf
Binary files differ
diff --git a/macros/latex/required/tools/verbatim.pdf b/macros/latex/required/tools/verbatim.pdf
index c5a2f07310..284b4a28d0 100644
--- a/macros/latex/required/tools/verbatim.pdf
+++ b/macros/latex/required/tools/verbatim.pdf
Binary files differ
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
index ab030f7f30..605d356b06 100644
--- a/macros/latex/required/tools/xr.pdf
+++ b/macros/latex/required/tools/xr.pdf
Binary files differ
diff --git a/macros/latex/required/tools/xspace.pdf b/macros/latex/required/tools/xspace.pdf
index c26c52db9f..0dcd797a28 100644
--- a/macros/latex/required/tools/xspace.pdf
+++ b/macros/latex/required/tools/xspace.pdf
Binary files differ