From 08627691402a42859c7f9f555582d79570442ce9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 15 May 2016 22:08:28 +0000 Subject: abc (15may16) git-svn-id: svn://tug.org/texlive/trunk@41157 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/abc/abc.sty | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/tex/latex/abc') diff --git a/Master/texmf-dist/tex/latex/abc/abc.sty b/Master/texmf-dist/tex/latex/abc/abc.sty index 1833e9a3634..29fd83da7c1 100644 --- a/Master/texmf-dist/tex/latex/abc/abc.sty +++ b/Master/texmf-dist/tex/latex/abc/abc.sty @@ -19,8 +19,9 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{abc} - [2015/09/09 v2.0a Enrico Gregorio] + [2016/05/15 v2.0b Enrico Gregorio] +\RequirePackage{ifluatex} \newif\ifabc@shellescape \newif\ifabc@generate \newif\ifabc@warning @@ -39,6 +40,9 @@ \DeclareOption{ps2epsi}{\def\abc@pscmd{ps2epsi}\def\abc@epsext{epsi}} \DeclareOption{ps2epsidos}{\def\abc@pscmd{ps2epsi}\def\abc@epsext{epi}} \ExecuteOptions{generate,shellescape,nosaveall,ps2eps} +\ifluatex + \ExecuteOptions{saveall} +\fi \ProcessOptions\relax \RequirePackage{verbatim} \RequirePackage{keyval} @@ -94,8 +98,15 @@ \@esphack \abc@process } +\ifluatex + \IfFileExists{shellesc.sty} + {\RequirePackage{shellesc}\let\abc@shell\ShellEscape} + {\def\abc@shell{\immediate\write18}} +\else + \def\abc@shell{\immediate\write18} +\fi \def\abc@doshellcommand{% - \immediate\write18{% + \abc@shell{% \ifabc@mup \abc@cmd\space \abc@opt\space @@ -108,12 +119,15 @@ \abc@tempfile\abc@ext\space \fi \ifx\abc@postopt\@empty - \else\space\abc@postopt\fi}% - \immediate\write18{% - \abc@pscmd\space\abc@tempfile.ps}% + \else\space\abc@postopt\fi + }% + \abc@shell{% + \abc@pscmd\space\abc@tempfile.ps + }% \ifpdf - \immediate\write18{% - \abc@epstopdfcmd\space\abc@tempfile.\abc@epsext}% + \abc@shell{% + \abc@epstopdfcmd\space\abc@tempfile.\abc@epsext + }% \fi } \def\abc@nodoshellcommand{% -- cgit v1.2.3