6 files changed, 23 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
index 462062fcaa2..10adc23fc15 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
+++ b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
@@ -128,7 +128,7 @@ v1.1u
                  mode. (RN)
 v1.1v
          \Gin@ii: Key settings only for pdf graphics. (RN)
-         General: Local redefinition of \pdfoutput to be a counter.    (RN)
+         General: Local redefinition of \pdfoutput to be a counter.     (RN)
 v1.2a
          General: Engine tests changed (RN)
 v1.2b
@@ -136,3 +136,8 @@ v1.2b
 v1.2c
          General: “postscript” environment no more allowed before
                  \begin{document} (changed example file).
+v1.2d
+         General: \c@lor@to@ps must not be undefined before loading
+                 ‘PSTricks’
+             Version parameter for ‘graphicx’ and rename \GPT@page to
+                 \Gin@page at several places
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
index 617406b07d7..e9111d47776 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
index 09f8446c944..8c403ccddf9 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
index 1db5946b888..877c03418f8 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
diff --git a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
index b6e04367c4f..7dfccc7cd47 100644
--- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
+++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
@@ -24,7 +24,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{pst-pdf}
 %<*package>
-    [2017/04/24 v1.2c PS graphics for pdfLaTeX (RN,HjG)]
+    [2017/06/22 v1.2d PS graphics for pdfLaTeX (RN,HjG)]
 %</package>
 %
 %<*driver>
@@ -50,7 +50,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{829}
+% \CheckSum{832}
 %
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -695,8 +695,10 @@
 %    \end{macrocode}
 % \end{environment}
 %
+% \changes{v1.2d}{2017/06/22}{Version parameter for `graphicx' and rename 
+%   \cmd{\GPT@page} to \cmd{\Gin@page} at several places}
 %    \begin{macrocode}
-\RequirePackage{graphicx}%
+\RequirePackage{graphicx}[2017/06/01]%
 \let\ppf@Ginclude@graphics\Ginclude@graphics
 \let\ppf@Gin@extensions\Gin@extensions
 \let\ppf@Gin@ii\Gin@ii
@@ -896,7 +898,7 @@
   \define@key{Gin}{ignore}[true]{}%
   \define@key{Gin}{showname}[true]{}%
   \define@key{Gin}{namefont}{}%
-  \@ifundefined{GPT@page}{\define@key{Gin}{page}{}}{}
+  \@ifundefined{Gin@page}{\define@key{Gin}{page}{}}{}
 %    \end{macrocode}
 % \changes{v1.0o}{2005/03/12}{New code for ``notightpage''. (RN)}
 % \changes{v1.1r}{2008/05/02}{Fixed values for \cmd{\PreviewBbAdjust} 
@@ -1163,9 +1165,12 @@
 % \ifENGLISH
 % Prevent pdf\TeX's message \texttt{Non-PDF special ignored!}.
 % \fi
+% \changes{v1.2d}{2017/06/22}{\cmd{\c@lor@to@ps} must not be undefined before 
+%   loading `PSTricks'}
 %    \begin{macrocode}
   \if@ppf@PST@used
     \let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble
+    \def\c@lor@to@ps#1 #2\@@{}
     \RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp
   \fi
 %    \end{macrocode}
@@ -1350,7 +1355,7 @@
 %    \begin{macrocode}
   \def\Gin@setfile#1#2#3{\ppf@Gin@setfile{#1}{#2}{#3}%
     \xdef\ppf@filename{%
-      #3\ifx\GPT@page\@empty\else(\GPT@page)\fi}}%
+      #3\ifx\Gin@page\@empty\else(\Gin@page)\fi}}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\Gin@ii}
@@ -1405,7 +1410,7 @@
         {%
           \setkeys{Gin}{#1}%
           \ifx\ppf@tempb\PDFcontainer
-            \@temptokena{page=\GPT@page}%
+            \@temptokena{page=\Gin@page}%
           \fi
         }%
         {%
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 b892f7ffd8e..d39534a2762 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/04/24 v1.2c PS graphics for pdfLaTeX (RN,HjG)]
+    [2017/06/22 v1.2d PS graphics for pdfLaTeX (RN,HjG)]
 \newcommand*\ppf@TeX@mode{-1}
 \newcommand*\ppf@draft{false}
 \newif\if@ppf@PST@used\@ppf@PST@usedtrue
@@ -74,7 +74,7 @@
   \begingroup
   \def\@currenvir{pst-pdf-defs}%
 }
-\RequirePackage{graphicx}%
+\RequirePackage{graphicx}[2017/06/01]%
 \let\ppf@Ginclude@graphics\Ginclude@graphics
 \let\ppf@Gin@extensions\Gin@extensions
 \let\ppf@Gin@ii\Gin@ii
@@ -132,7 +132,7 @@
   \define@key{Gin}{ignore}[true]{}%
   \define@key{Gin}{showname}[true]{}%
   \define@key{Gin}{namefont}{}%
-  \@ifundefined{GPT@page}{\define@key{Gin}{page}{}}{}
+  \@ifundefined{Gin@page}{\define@key{Gin}{page}{}}{}
   \if@ppf@tightpage\else
     \def\PreviewBbAdjust{%
       -600pt -600pt 600pt 600pt}%
@@ -214,6 +214,7 @@
   \PackageInfo{pst-pdf}{MODE: \ppf@TeX@mode\space (pdfTeX mode)}%
   \if@ppf@PST@used
     \let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble
+    \def\c@lor@to@ps#1 #2\@@{}
     \RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp
   \fi
   \@temptokena{%
@@ -296,7 +297,7 @@
   \let\ppf@Gin@setfile\Gin@setfile
   \def\Gin@setfile#1#2#3{\ppf@Gin@setfile{#1}{#2}{#3}%
     \xdef\ppf@filename{%
-      #3\ifx\GPT@page\@empty\else(\GPT@page)\fi}}%
+      #3\ifx\Gin@page\@empty\else(\Gin@page)\fi}}%
   \def\Gin@ii[#1]#2{%
     \begingroup
       \@temptokena{#1}\def\ppf@tempb{#2}%
@@ -305,7 +306,7 @@
         {%
           \setkeys{Gin}{#1}%
           \ifx\ppf@tempb\PDFcontainer
-            \@temptokena{page=\GPT@page}%
+            \@temptokena{page=\Gin@page}%
           \fi
         }%
         {%