From 8de464391f34ff48f5909697c17029955fab69ba Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Mar 2017 21:48:50 +0000 Subject: oberdiek (26mar17) git-svn-id: svn://tug.org/texlive/trunk@43610 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/oberdiek/hobsub-generic.sty | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty') diff --git a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty index 6a12c245b19..95716b31369 100644 --- a/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty +++ b/Master/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty @@ -3402,16 +3402,16 @@ $ \next \hobsub@StopPackage \hobsub@StartPackage{ifpdf} %% Source File: ifpdf.dtx -%% Copyright 2016 Heiko Oberdiek and LaTeX3 project +%% Copyright 2016-2017 Heiko Oberdiek and LaTeX3 project %% %% This file may be distributed under the terms of the LPPL. -%% See README for details. +%% https://www.latex-project.org/lppl/ \ifx\ProvidesPackage\undefined \def\next#1#2[#3]{\wlog{#2 #3}\expandafter\gdef -\csname ver@ifpdf.sty\endcsname{#3}} +\csname ver\string @ifpdf.sty\endcsname{#3}} \expandafter\next\fi \ProvidesPackage{ifpdf} -[2016/05/14 v3.1 Provides the ifpdf switch] +[2017/03/15 v3.2 Provides the ifpdf switch] \expandafter\ifx\csname ifpdf\endcsname\relax \csname newif\expandafter\endcsname\csname ifpdf\endcsname \else @@ -4561,7 +4561,7 @@ $ \x \fi \expandafter\x\csname ver@pdftexcmds.sty\endcsname \ProvidesPackage{pdftexcmds}% - [2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)]% + [2017/03/19 v0.25 Utility functions of pdfTeX for LuaTeX (HO)]% \begingroup\catcode61\catcode48\catcode32=10\relax% \catcode13=5 % ^^M \endlinechar=13 % @@ -4936,6 +4936,7 @@ $ \x \else \expandafter\pdftexcmds@AtEnd \fi% +\ifnum\luatexversion<80 \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname RequirePackage\endcsname\relax \def\TMP@RequirePackage#1[#2]{% @@ -4948,8 +4949,9 @@ $ \x \else \RequirePackage{luatex-loader}[2009/04/10]% \fi +\fi \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% } \ifnum\luatexversion>37 % \ifnum0% @@ -4961,13 +4963,13 @@ $ \x \everyjob\expandafter{% \the\everyjob \pdftexcmds@directlua{% - require("oberdiek.pdftexcmds")% + require("pdftexcmds")% }% }% \fi \fi \begingroup -\def\x{2016/05/21 v0.22}% +\def\x{2017/03/19 v0.25}% \ltx@onelevel@sanitize\x \edef\y{% \pdftexcmds@directlua{% @@ -5164,11 +5166,8 @@ $ \x \fi \ifnum\luatexversion<68 % \else -\def\pdf@shellescape{% -\directlua0{% - oberdiek.pdftexcmds.shellescape()% -}% -}% +\protected\edef\pdf@shellescape{% +\numexpr\directlua{tex.sprint(status.shell_escape)}\relax} \fi \def\pdf@system#1{% \directlua0{% -- cgit v1.2.3