latex-dev (19nov19)

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

4 files changed, 56 insertions, 26 deletions

diff --git a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
index 2dc3ea48b6a..6ffd3cf0a48 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/multicol.sty
@@ -107,7 +107,7 @@
 \DeclareCurrentRelease{}{2018-04-01}
 
 \ProvidesPackage{multicol}
-          [2019/03/01 v1.8w  multicolumn formatting (FMi)]
+          [2019/10/15 v1.8x  multicolumn formatting (FMi)]
 %%
 \DeclareOption{twocolumn}
    {\PackageWarning{multicol}{May not work
@@ -124,7 +124,7 @@
 \DeclareOption{debugshow}
     {\c@tracingmulticols5\relax}
 \let\mc@gridwarn\maxdimen
-\DeclareOption{grid}{\def\mc@gridwarn{\maxdepth}}
+\DeclareOption{grid}{\def\mc@gridwarn{\@maxdepth}}
 \DeclareOption{colaction}{%
   \def\mc@col@status@write{%
          \protected@write\@auxout{}%
@@ -421,7 +421,7 @@
 \def\reinsert@footnotes{\ifvoid\footins\else
          \insert\footins{}\fi}
 \def\vfilmaxdepth{\vskip \z@ \@plus .0001fil
-                           \@minus \maxdepth}
+                           \@minus \@maxdepth}
 \def\multi@column@out{%
    \ifnum\outputpenalty <-\@M
     \speci@ls \else
@@ -434,8 +434,8 @@
        \unvbox\@cclv}%
     \fi
    \splittopskip\topskip
-   \splitmaxdepth\maxdepth
-   \boxmaxdepth\maxdepth
+   \splitmaxdepth\@maxdepth
+   \boxmaxdepth\@maxdepth
    \dimen@\@colroom
    \divide\skip\footins\col@number
    \ifvoid\footins \else
@@ -550,7 +550,7 @@
                 \unvbox\colbreak@box
                 \penalty-\@Mv
               \fi
-              \boxmaxdepth\maxdepth
+              \boxmaxdepth\@maxdepth
               \setbox\@cclv\vbox{%
                  \unvbox\@cclv
                  \remove@discardable@items}%
@@ -637,8 +637,8 @@
    \splittopskip\@tempdima
        \@plus\multicolundershoot
        \@minus\multicolovershoot
-   \splitmaxdepth\maxdepth
-   \boxmaxdepth\maxdepth
+   \splitmaxdepth\@maxdepth
+   \boxmaxdepth\@maxdepth
    \setbox\@tempboxa\vsplit\mult@box to\z@
    \@tempdima\ht\mult@box
    \advance\@tempdima\dp\mult@box
diff --git a/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty b/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty
index d43eb9025ff..49b8970f685 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/shellesc.sty
+++ b/Master/texmf-dist/tex/latex-dev/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/11/08 v1.0c 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-dev/tools/varioref.sty b/Master/texmf-dist/tex/latex-dev/tools/varioref.sty
index 12b7d35cc33..cf5a7e7eccd 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex-dev/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)]
 %%
 
 
@@ -123,14 +123,14 @@
   }}
 \DeclareOption{arabic}
   {\vref@addto\extrasarabic{%
-    \def\reftextfaceafter {^^d8^^a8^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a9 \reftextvario{^^d8^^a7^^d9^^84^^d9^^85^^d9^^82^^d8^^a7^^d8^^a8^^d9^^84^^d8^^a9}{^^d8^^a7^^d9^^84^^d9^^84^^d8^^a7^^d8^^ad^^d9^^82^^d8^^a9}}%
-    \def\reftextfacebefore{^^d8^^a8^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a9 \reftextvario{^^d8^^a7^^d9^^84^^d9^^85^^d9^^82^^d8^^a7^^d8^^a8^^d9^^84^^d8^^a9}{^^d8^^a7^^d9^^84^^d9^^85^^d9^^8f^^d9^^86^^d9^^92^^d8^^b5^^d9^^8e^^d8^^b1^^d9^^90^^d9^^85^^d9^^8e^^d8^^a9^^d9^^8c}}%
-    \def\reftextafter     {^^d8^^a8^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a9 \reftextvario{^^d8^^a7^^d9^^84^^d9^^84^^d8^^a7^^d8^^ad^^d9^^82^^d8^^a9}{^^d8^^a7^^d9^^84^^d8^^aa^^d8^^a7^^d9^^84^^d9^^8a^^d8^^a9}}%
-    \def\reftextbefore    {^^d8^^a8^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a9 \reftextvario{^^d8^^a7^^d9^^84^^d8^^b3^^d8^^a7^^d8^^a8^^d9^^82^^d8^^a9}{^^d8^^a7^^d9^^84^^d9^^85^^d9^^8f^^d9^^86^^d9^^92^^d8^^b5^^d9^^8e^^d8^^b1^^d9^^90^^d9^^85^^d9^^8e^^d8^^a9^^d9^^8c}}%
-    \def\reftextcurrent   {^^d8^^a8\reftextvario{^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a9 ^^d8^^a7^^d9^^84^^d8^^ad^^d8^^a7^^d9^^84^^d9^^8a^^d8^^a9}{^^d9^^87^^d8^^b0^^d9^^87 ^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a9}}%
-    \def\reftextfaraway#1{^^d8^^a8^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a9 ^^d8^^b1^^d9^^82^^d9^^85~\pageref{#1}}%
-    \def\reftextpagerange#1#2{^^d8^^a8^^d8^^a7^^d9^^84^^d8^^b5^^d9^^81^^d8^^ad^^d8^^a7^^d8^^aa~\pageref{#1}--\pageref{#2}}%
-    \def\reftextlabelrange#1#2{\ref{#1} ^^d8^^ad^^d8^^aa^^d9^^89~\ref{#2}}%
+    \def\reftextfaceafter {بالصفحة \reftextvario{المقابلة}{اللاحقة}}%
+    \def\reftextfacebefore{بالصفحة \reftextvario{المقابلة}{المُنْصَرِمَةٌ}}%
+    \def\reftextafter     {بالصفحة \reftextvario{اللاحقة}{التالية}}%
+    \def\reftextbefore    {بالصفحة \reftextvario{السابقة}{المُنْصَرِمَةٌ}}%
+    \def\reftextcurrent   {ب\reftextvario{الصفحة الحالية}{هذه الصفحة}}%
+    \def\reftextfaraway#1{بالصفحة رقم~\pageref{#1}}%
+    \def\reftextpagerange#1#2{بالصفحات~\pageref{#1}--\pageref{#2}}%
+    \def\reftextlabelrange#1#2{\ref{#1} حتى~\ref{#2}}%
   }}
 \DeclareOption{austrian}
   {\vref@addto\extrasaustrian{%
@@ -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{%
diff --git a/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty b/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty
index f7bca458976..24041850624 100644
--- a/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty
+++ b/Master/texmf-dist/tex/latex-dev/tools/verbatim.sty
@@ -39,7 +39,7 @@
 %% Copyright (C) 1989--2003 by Rainer Sch\"opf. All rights reserved.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{verbatim}
-     [2014/10/28 v1.5q LaTeX2e package for verbatim enhancements]
+     [2019/11/10 v1.5r LaTeX2e package for verbatim enhancements]
 \@ifundefined{verbatim@@@}{}{\endinput}
 \newtoks\every@verbatim
 \every@verbatim={}
@@ -80,7 +80,9 @@
   \everypar \expandafter{\the\everypar \unpenalty}}
 \def\verbatim{\begingroup\@verbatim \frenchspacing\@vobeyspaces
               \verbatim@start}
-\@namedef{verbatim*}{\begingroup\@verbatim\verbatim@start}
+\@namedef{verbatim*}{\begingroup\@verbatim
+  \@setupverbvisiblespace\@vobeyspaces
+  \verbatim@start}
 \def\endverbatim{\endtrivlist\endgroup\@doendpe}
 \expandafter\let\csname endverbatim*\endcsname =\endverbatim
 \def\comment{\@bsphack