pst-pdf (16nov19)

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

1 files changed, 11 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
index d39534a2762..949806e6fa8 100644
--- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
@@ -24,7 +24,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{pst-pdf}
-    [2017/06/22 v1.2d PS graphics for pdfLaTeX (RN,HjG)]
+    [2019/11/15 v1.2e PS graphics for pdfLaTeX (RN,HjG)]
 \newcommand*\ppf@TeX@mode{-1}
 \newcommand*\ppf@draft{false}
 \newif\if@ppf@PST@used\@ppf@PST@usedtrue
@@ -87,11 +87,10 @@
 \newcommand*\ppf@is@pdfTeX@graphic[5]{%
   \@ppf@pdftex@graphicfalse%
   \begingroup
-    \edef\pdfTeXext{#2}%
+    \edef\pdfTeXext{\detokenize\expandafter{#2}}%
     \def\Gin@setfile##1##2##3{%
-      \edef\@tempb{##2}%
-      \@for\@tempa:=\pdfTeXext\do{%
-        \ifx\@tempa\@tempb\global\@ppf@pdftex@graphictrue\fi}}%
+      \@expandtwoargs\in@{,\detokenize\expandafter{##2},}{,\pdfTeXext,}%
+      \ifin@\global\@ppf@pdftex@graphictrue\fi}%
     \edef\Gin@extensions{#2,#3}%
     \pr@outerfalse\ppf@Ginclude@graphics{#1}%
   \endgroup
@@ -101,7 +100,10 @@
   \PackageInfo{pst-pdf}{%
     MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}
   \nofiles
-  \let\makeindex\@empty \let\makeglossary\@empty
+  \let\makeindex\@empty \let\makeglossary\@empty \let\printindex\@empty
+  \renewcommand*\makeindex[1][]{}%
+  \renewcommand*\makeglossary[1][]{}%
+  \renewcommand*\printindex[1][]{}%
   \AtBeginDocument{\overfullrule=\z@}%
   \if@ppf@PST@used\RequirePackage{pstricks}\fi
   \RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
@@ -222,7 +224,9 @@
     \let\Gin@PS@raw\@gobble\let\Gin@PS@restored\@gobble
     \@ifundefined{PSTricksLoaded}{}{%
       \PSTricksOff
-      \@ifundefined{c@lor@to@ps}{\def\c@lor@to@ps#1 #2\@@{}}{}}}%
+      \def\c@lor@to@ps#1 #2\@@{}
+    }%
+  }%
   \the\@temptokena
   \expandafter\AtBeginDocument\expandafter
     {\the\@temptokena\@temptokena{}}%