l2e (6nov19)

git-svn-id: svn://tug.org/texlive/trunk@52656 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 36 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/tools/shellesc.sty b/Master/texmf-dist/tex/latex/tools/shellesc.sty
index d43eb9025ff..d7d0756fcbc 100644
--- a/Master/texmf-dist/tex/latex/tools/shellesc.sty
+++ b/Master/texmf-dist/tex/latex/tools/shellesc.sty
@@ -49,8 +49,12 @@
 \ifx\PackageWarning\undefined\def\PackageWarning#1#2{\wlog{#1: #2}}\fi
 \expandafter\next\fi
 \ProvidesPackage{shellesc}
-       [2016/06/07 v0.02b unified shell escape interface for LaTeX]
-\ifcase
+       [2019/10/17 v1.0b unified shell escape interface for LaTeX]
+\chardef\shellesc@quotecat\catcode`\"
+\chardef\shellesc@underscorecat\catcode`\_
+\@makeother\"
+\@makeother\_
+\chardef\ShellEscapeStatus
   \ifx\pdfshellescape\@undefined
     \ifx\shellescape\@undefined
       \ifx\directlua\@undefined
@@ -65,6 +69,7 @@
   \else
     \pdfshellescape
   \fi
+\ifcase\ShellEscapeStatus
   \PackageWarning{shellesc}{Shell escape disabled}
 \or
   \PackageInfo   {shellesc}{Unrestricted shell escape enabled}
@@ -74,16 +79,36 @@
 \ifx\lastsavedimageresourcepages\@undefined
   \protected\def\ShellEscape{\immediate\write18 }
 \else
-  \protected\def\ShellEscape#1{%
-    \directlua{os.execute("\luaescapestring{#1}")}}
+  \protected\def\ShellEscape{\directlua\ShellEscape@Lua}
 \fi
 \ifx\lastsavedimageresourcepages\@undefined
   \protected\def\DelayedShellEscape{\relax\write18 }
 \else
-  \protected\def\DelayedShellEscape#1{%
-    \latelua{os.execute("\luaescapestring{#1}")}}
+  \protected\def\DelayedShellEscape{\latelua\ShellEscape@Lua}
+\fi
+\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
+\ifx\lastsavedimageresourcepages\@undefined
+ \catcode`\"\shellesc@quotecat
+ \catcode`\_\shellesc@underscorecat
+ \expandafter\endinput
 \fi
-\ifx\lastsavedimageresourcepages\@undefined\expandafter\endinput\fi
 \directlua{%
 shellesc = shellesc or {}
 local function write_or_execute()
@@ -100,6 +125,8 @@ shellesc.write_or_execute=write_or_execute
 }
 \let\shellesc@write\write
 \protected\def\write{\directlua{shellesc.write_or_execute()}}
+\catcode`\"\shellesc@quotecat
+\catcode`\"\shellesc@underscorecat
 \endinput
 %%
 %% End of file `shellesc.sty'.
diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty
index eafa2b910ac..cf5a7e7eccd 100644
--- a/Master/texmf-dist/tex/latex/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex/tools/varioref.sty
@@ -52,7 +52,7 @@
 \DeclareCurrentRelease{}{2019-10-01}
 
 \ProvidesPackage{varioref}
-    [2019/09/08 v1.6b package for extended references (FMi)]
+    [2019/11/05 v1.6c package for extended references (FMi)]
 %%
 
 
@@ -648,6 +648,7 @@
   \@vpageref{\@vpageref[\reftextcurrent]}%
 }
 \let\vref@space\space
+\let\vref@maybe@space\space
 \def\@vpageref[#1]{\@ifnextchar[%
   {\@@vpageref{#1}}{\@@vpageref{#1}[]}}
 \def\@@vpageref#1[#2]#3{%