From 7c55167ecf36309f45793303eea23651cb983f12 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 6 Nov 2019 22:12:38 +0000 Subject: l2e (6nov19) git-svn-id: svn://tug.org/texlive/trunk@52656 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/base/article.cls | 2 +- Master/texmf-dist/tex/latex/base/bk10.clo | 6 ++- Master/texmf-dist/tex/latex/base/bk11.clo | 6 ++- Master/texmf-dist/tex/latex/base/bk12.clo | 6 ++- Master/texmf-dist/tex/latex/base/book.cls | 2 +- Master/texmf-dist/tex/latex/base/doc.sty | 9 +--- Master/texmf-dist/tex/latex/base/latex.ltx | 52 +++++++++++++--------- Master/texmf-dist/tex/latex/base/latexrelease.sty | 54 ++++++++++++++++++----- Master/texmf-dist/tex/latex/base/ltluatex.lua | 4 +- Master/texmf-dist/tex/latex/base/ltluatex.tex | 2 +- Master/texmf-dist/tex/latex/base/report.cls | 2 +- Master/texmf-dist/tex/latex/base/shortvrb.sty | 2 +- Master/texmf-dist/tex/latex/base/size10.clo | 6 ++- Master/texmf-dist/tex/latex/base/size11.clo | 6 ++- Master/texmf-dist/tex/latex/base/size12.clo | 6 ++- Master/texmf-dist/tex/latex/graphics/graphics.sty | 30 ++++++++++--- Master/texmf-dist/tex/latex/tools/shellesc.sty | 41 ++++++++++++++--- Master/texmf-dist/tex/latex/tools/varioref.sty | 3 +- 18 files changed, 170 insertions(+), 69 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/base/article.cls b/Master/texmf-dist/tex/latex/base/article.cls index 58c3dcf18c1..ca7ad61b726 100644 --- a/Master/texmf-dist/tex/latex/base/article.cls +++ b/Master/texmf-dist/tex/latex/base/article.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{article} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex/base/bk10.clo b/Master/texmf-dist/tex/latex/base/bk10.clo index d697237cf7d..e03adb87f91 100644 --- a/Master/texmf-dist/tex/latex/base/bk10.clo +++ b/Master/texmf-dist/tex/latex/base/bk10.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk10.clo} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt @@ -52,7 +52,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \DeclareRobustCommand\small{% \@setfontsize\small\@ixpt{11}% \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ diff --git a/Master/texmf-dist/tex/latex/base/bk11.clo b/Master/texmf-dist/tex/latex/base/bk11.clo index ac0925f943c..fb6b1adb519 100644 --- a/Master/texmf-dist/tex/latex/base/bk11.clo +++ b/Master/texmf-dist/tex/latex/base/bk11.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk11.clo} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% @@ -52,7 +52,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \DeclareRobustCommand\small{% \@setfontsize\small\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ diff --git a/Master/texmf-dist/tex/latex/base/bk12.clo b/Master/texmf-dist/tex/latex/base/bk12.clo index 0cf523d6d7f..b5509293afd 100644 --- a/Master/texmf-dist/tex/latex/base/bk12.clo +++ b/Master/texmf-dist/tex/latex/base/bk12.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{bk12.clo} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% @@ -52,7 +52,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \DeclareRobustCommand\small{% \@setfontsize\small\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ diff --git a/Master/texmf-dist/tex/latex/base/book.cls b/Master/texmf-dist/tex/latex/base/book.cls index 9752aaa13d6..29e6ef039c2 100644 --- a/Master/texmf-dist/tex/latex/base/book.cls +++ b/Master/texmf-dist/tex/latex/base/book.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{book} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex/base/doc.sty b/Master/texmf-dist/tex/latex/base/doc.sty index 54cd4f68de5..1a8abfbec79 100644 --- a/Master/texmf-dist/tex/latex/base/doc.sty +++ b/Master/texmf-dist/tex/latex/base/doc.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{doc} - [2018/09/25 v2.1i + [2019/11/03 v2.1j Standard LaTeX documentation package (FMi)] %% %% Package `doc' to use with LaTeX 2e @@ -243,6 +243,7 @@ {\catcode`\|=\z@ \catcode`\\=12 |gdef|bslash{\}} \def\verbatim{\@beginparpenalty \predisplaypenalty \@verbatim + \@setupverbvisiblespace \MacroFont \frenchspacing \@vobeyspaces \@xverbatim} \@namedef{verbatim*}{\@beginparpenalty \predisplaypenalty \@verbatim \MacroFont \@sxverbatim} @@ -274,12 +275,6 @@ \def^^M{\verb@egroup\@latex@error{% Text for \noexpand\verb command ended by end of line}\@ehc}}% \endgroup -\def\@sverb#1{% - \catcode`#1\active \lccode`\~`#1% - \gdef\verb@balance@group{\verb@egroup - \@latex@error{Illegal use of \noexpand\verb command}\@ehc}% - \aftergroup\verb@balance@group - \lowercase{\let~\verb@egroup}} \def\verbatim@nolig@list{\do\`\do\<\do\>\do\,\do\'\do\-} \def\do@noligs#1{% \catcode`#1\active diff --git a/Master/texmf-dist/tex/latex/base/latex.ltx b/Master/texmf-dist/tex/latex/base/latex.ltx index e1729727086..bfc59b91d2b 100644 --- a/Master/texmf-dist/tex/latex/base/latex.ltx +++ b/Master/texmf-dist/tex/latex/base/latex.ltx @@ -254,13 +254,20 @@ \let\filename@area\@empty \expandafter\filename@simple#1.\\} \fi\fi\fi - \def\filename@simple#1.#2\\{% - \ifx\\#2\\% - \let\filename@ext\relax - \else - \edef\filename@ext{\filename@dot#2\\}% - \fi - \edef\filename@base{#1}} +\def\filename@simple#1.#2\\{% + \ifx\\#2\\% + \let\filename@ext\relax + \edef\filename@base{#1}% + \else + \filename@dots{#1}#2\\% + \fi} +\def\filename@dots#1#2.#3\\{% + \ifx\\#3\\% + \def\filename@ext{#2}% + \edef\filename@base{#1}% + \else + \filename@dots{#1.#2}#3\\% + \fi} \def\filename@dot#1.\\{#1} \else \typeout{^^J^^J% @@ -701,7 +708,7 @@ \def\fmtname{LaTeX2e} \edef\fmtversion {2019-10-01} -\def\patch@level{1} +\def\patch@level{2} \edef\development@branch@name{} \iffalse \def\reserved@a#1/#2/#3\@nil{% @@ -1844,7 +1851,9 @@ Type H for immediate help.}% \def\set@curr@file#1{% \begingroup \escapechar\m@ne - \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}% + \xdef\@curr@file{% + \expandafter\string + \csname\expandafter\unquote@name\expandafter{\@firstofone#1\@empty}\endcsname}% \endgroup } \def\quote@name#1{"\quote@@name#1\@gobble""} @@ -1852,10 +1861,9 @@ Type H for immediate help.}% \def\unquote@name#1{\quote@@name#1\@gobble"} \DeclareRobustCommand\IfFileExists[1]{% \set@curr@file{#1}% - \edef\q@curr@file{\expandafter\quote@name\expandafter{\@curr@file}}% - \expandafter\IfFileExists@\expandafter{\q@curr@file}} + \expandafter\IfFileExists@\expandafter{\@curr@file}} \long\def \IfFileExists@#1#2#3{% - \openin\@inputcheck#1 % + \openin\@inputcheck"#1" % \ifeof\@inputcheck \ifx\input@path\@undefined \def\reserved@a{#3}% @@ -1864,7 +1872,7 @@ Type H for immediate help.}% \fi \else \closein\@inputcheck - \edef\@filef@und{#1 }% + \edef\@filef@und{"#1" }% \def\reserved@a{#2}% \fi \reserved@a} @@ -1872,9 +1880,9 @@ Type H for immediate help.}% \let\reserved@a\@secondoftwo \expandafter\@tfor\expandafter\reserved@b\expandafter :\expandafter=\input@path\do{% - \openin\@inputcheck\reserved@b#1 % + \openin\@inputcheck\expandafter\quote@name\expandafter{\reserved@b#1} % \ifeof\@inputcheck\else - \edef\@filef@und{\reserved@b#1 }% + \edef\@filef@und{"\reserved@b#1" }% \let\reserved@a\@firstoftwo% \closein\@inputcheck \@break@tfor @@ -4334,14 +4342,18 @@ Type H for immediate help.}% \reserved@a \else \@tempswatrue \fi} \protected\def\protected@file@percent{} -\begingroup -\catcode`\%=12 \catcode`\^^A=9 \long\gdef\add@percent@to@temptokena #1\protected@file@percent#2\add@percent@to@temptokena - {\ifx!#2!\@temptokena\expandafter{#1}\else - \@temptokena\expandafter{#1%^^A - }\fi} + {\ifx!#2!\expandafter\dont@add@percent@to@temptokena\else + \expandafter\do@add@percent@to@temptokena\fi{#1}} +\long\def\dont@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1}} +\begingroup +\catcode`\%=12 +\long\gdef\do@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1%^^A + }} \endgroup \long\def\@writefile#1#2{% \@ifundefined{tf@#1}\relax diff --git a/Master/texmf-dist/tex/latex/base/latexrelease.sty b/Master/texmf-dist/tex/latex/base/latexrelease.sty index 541cad79dc6..0dcc571680a 100644 --- a/Master/texmf-dist/tex/latex/base/latexrelease.sty +++ b/Master/texmf-dist/tex/latex/base/latexrelease.sty @@ -419,6 +419,33 @@ of this package available from CTAN} } \EndIncludeInRelease \fi +\IncludeInRelease{2019/10/01}{\filename@simple} + {Final dot for extension}% +\def\filename@simple#1.#2\\{% + \ifx\\#2\\% + \let\filename@ext\relax + \edef\filename@base{#1}% + \else + \filename@dots{#1}#2\\% + \fi} +\def\filename@dots#1#2.#3\\{% + \ifx\\#3\\% + \def\filename@ext{#2}% + \edef\filename@base{#1}% + \else + \filename@dots{#1.#2}#3\\% + \fi} +\EndIncludeInRelease +\IncludeInRelease{0000/00/00}{\filename@simple} + {Final dot for extension}% + \def\filename@simple#1.#2\\{% + \ifx\\#2\\% + \let\filename@ext\relax + \else + \edef\filename@ext{\filename@dot#2\\}% + \fi + \edef\filename@base{#1}} +\EndIncludeInRelease %%% From File: ltdefns.dtx \IncludeInRelease{2019/10/01}{\MakeRobust}{\MakeRobust}% \def\MakeRobust#1{% @@ -1201,7 +1228,9 @@ of this package available from CTAN} \def\set@curr@file#1{% \begingroup \escapechar\m@ne - \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}% + \xdef\@curr@file{% + \expandafter\string + \csname\expandafter\unquote@name\expandafter{\@firstofone#1\@empty}\endcsname}% \endgroup } \def\quote@name#1{"\quote@@name#1\@gobble""} @@ -1209,10 +1238,9 @@ of this package available from CTAN} \def\unquote@name#1{\quote@@name#1\@gobble"} \DeclareRobustCommand\IfFileExists[1]{% \set@curr@file{#1}% - \edef\q@curr@file{\expandafter\quote@name\expandafter{\@curr@file}}% - \expandafter\IfFileExists@\expandafter{\q@curr@file}} + \expandafter\IfFileExists@\expandafter{\@curr@file}} \long\def \IfFileExists@#1#2#3{% - \openin\@inputcheck#1 % + \openin\@inputcheck"#1" % \ifeof\@inputcheck \ifx\input@path\@undefined \def\reserved@a{#3}% @@ -1221,7 +1249,7 @@ of this package available from CTAN} \fi \else \closein\@inputcheck - \edef\@filef@und{#1 }% + \edef\@filef@und{"#1" }% \def\reserved@a{#2}% \fi \reserved@a} @@ -4206,14 +4234,18 @@ of this package available from CTAN} {\protected@file@percent}{Mask line endings}% \protected\def\protected@file@percent{} -\begingroup -\catcode`\%=12 \catcode`\^^A=9 \long\gdef\add@percent@to@temptokena #1\protected@file@percent#2\add@percent@to@temptokena - {\ifx!#2!\@temptokena\expandafter{#1}\else - \@temptokena\expandafter{#1%^^A - }\fi} + {\ifx!#2!\expandafter\dont@add@percent@to@temptokena\else + \expandafter\do@add@percent@to@temptokena\fi{#1}} +\long\def\dont@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1}} +\begingroup +\catcode`\%=12 +\long\gdef\do@add@percent@to@temptokena#1{% + \@temptokena\expandafter{#1%^^A + }} \endgroup \long\def\@writefile#1#2{% \@ifundefined{tf@#1}\relax @@ -4229,6 +4261,8 @@ of this package available from CTAN} {\protected@file@percent}{Mask line endings}% \let\protected@file@percent\@undefined \let\add@percent@to@temptokena\@undefined +\let\do@add@percent@to@temptokena\@undefined +\let\dont@add@percent@to@temptokena\@undefined \long\def\@writefile#1#2{% \@ifundefined{tf@#1}\relax {\@temptokena{#2}% diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.lua b/Master/texmf-dist/tex/latex/base/ltluatex.lua index 581e0762c2f..1730c72787f 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.lua +++ b/Master/texmf-dist/tex/latex/base/ltluatex.lua @@ -312,8 +312,8 @@ local callbacktypes = callbacktypes or { wrapup_run = simple, finish_pdffile = data, finish_pdfpage = data, - page_objnum_provider = simple, - process_pdf_image_content = simple, + page_objnum_provider = data, + process_pdf_image_content = data, define_font = exclusive, glyph_not_found = exclusive, glyph_stream_provider = exclusive, diff --git a/Master/texmf-dist/tex/latex/base/ltluatex.tex b/Master/texmf-dist/tex/latex/base/ltluatex.tex index b34aca5d547..4adb38d71ff 100644 --- a/Master/texmf-dist/tex/latex/base/ltluatex.tex +++ b/Master/texmf-dist/tex/latex/base/ltluatex.tex @@ -47,7 +47,7 @@ #1#2[#3]{\endgroup\immediate\write-1{File: #1 #3}} \fi \ProvidesFile{ltluatex.tex} -[2018/10/21 v1.1i +[2019/10/22 v1.1j LuaTeX support for plain TeX (core) ] \edef\etatcatcode{\the\catcode`\@} diff --git a/Master/texmf-dist/tex/latex/base/report.cls b/Master/texmf-dist/tex/latex/base/report.cls index 1101f8fa919..87e1b9c1f47 100644 --- a/Master/texmf-dist/tex/latex/base/report.cls +++ b/Master/texmf-dist/tex/latex/base/report.cls @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{report} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX document class] \newcommand\@ptsize{} \newif\if@restonecol diff --git a/Master/texmf-dist/tex/latex/base/shortvrb.sty b/Master/texmf-dist/tex/latex/base/shortvrb.sty index fe2cd61977b..51ad651c6ef 100644 --- a/Master/texmf-dist/tex/latex/base/shortvrb.sty +++ b/Master/texmf-dist/tex/latex/base/shortvrb.sty @@ -43,7 +43,7 @@ %% extension .ins) which are part of the distribution. \NeedsTeXFormat{LaTeX2e}[1994/12/01] \ProvidesPackage{shortvrb} - [2018/09/25 v2.1i + [2019/11/03 v2.1j Standard LaTeX documentation package (FMi)] %% %% Package `doc' to use with LaTeX 2e diff --git a/Master/texmf-dist/tex/latex/base/size10.clo b/Master/texmf-dist/tex/latex/base/size10.clo index 7b98ee411d5..1a387e60bfe 100644 --- a/Master/texmf-dist/tex/latex/base/size10.clo +++ b/Master/texmf-dist/tex/latex/base/size10.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size10.clo} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xpt\@xiipt @@ -52,7 +52,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \DeclareRobustCommand\small{% \@setfontsize\small\@ixpt{11}% \abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@ diff --git a/Master/texmf-dist/tex/latex/base/size11.clo b/Master/texmf-dist/tex/latex/base/size11.clo index 7822a848ddd..4409f801021 100644 --- a/Master/texmf-dist/tex/latex/base/size11.clo +++ b/Master/texmf-dist/tex/latex/base/size11.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size11.clo} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xipt{13.6}% @@ -52,7 +52,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \DeclareRobustCommand\small{% \@setfontsize\small\@xpt\@xiipt \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@ diff --git a/Master/texmf-dist/tex/latex/base/size12.clo b/Master/texmf-dist/tex/latex/base/size12.clo index e9c67bd1e63..6b3943f0b19 100644 --- a/Master/texmf-dist/tex/latex/base/size12.clo +++ b/Master/texmf-dist/tex/latex/base/size12.clo @@ -42,7 +42,7 @@ %% and covered by LPPL is defined by the unpacking scripts (with %% extension .ins) which are part of the distribution. \ProvidesFile{size12.clo} - [2019/08/27 v1.4j + [2019/10/25 v1.4k Standard LaTeX file (size option)] \renewcommand\normalsize{% \@setfontsize\normalsize\@xiipt{14.5}% @@ -52,7 +52,9 @@ \belowdisplayskip \abovedisplayskip \let\@listi\@listI} \normalsize -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi \DeclareRobustCommand\small{% \@setfontsize\small\@xipt{13.6}% \abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@ diff --git a/Master/texmf-dist/tex/latex/graphics/graphics.sty b/Master/texmf-dist/tex/latex/graphics/graphics.sty index 06f25bcec51..e6bdc2f8669 100644 --- a/Master/texmf-dist/tex/latex/graphics/graphics.sty +++ b/Master/texmf-dist/tex/latex/graphics/graphics.sty @@ -29,7 +29,7 @@ \DeclareCurrentRelease{}{2019-10-01} \ProvidesPackage{graphics} - [2019/10/08 v1.3c Standard LaTeX Graphics (DPC,SPQR)] + [2019/11/01 v1.3d Standard LaTeX Graphics (DPC,SPQR)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax \catcode`\noexpand\"\the\catcode`\"\relax @@ -168,6 +168,7 @@ \edef\Gin@ext{#1}}{}}% \let\Gin@ext\relax \def\Gin@sepdefault{.} +\edef\Gin@gzext{\detokenize{gz}} \def\Gin@temp#1{% \begingroup \escapechar\m@ne @@ -195,10 +196,15 @@ \begingroup \let\input@path\Ginput@path \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}% + \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 @@ -206,6 +212,20 @@ \fi}% \else \Gin@getbase{\Gin@sepdefault\filename@ext}% +\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}% + \ifx\Gin@ext\relax + \let\filename@base\Gin@savedbase + \let\filename@ext\Gin@savedext + \fi +\fi \ifx\Gin@ext\relax \@warning{File `#1' not found}% \def\Gin@base{\filename@area\filename@base}% 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{% -- cgit v1.2.3