summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-22 22:34:35 +0000
committerKarl Berry <karl@freefriends.org>2017-06-22 22:34:35 +0000
commitc4913f1cd9801002d016b0b6efbee2029d45f435 (patch)
tree6484ab9ad846309ecb0396bc02c3224a463fbda0 /Master/texmf-dist/tex
parentd0f733c30d5967dc2a18e0879479b8fc7d85aabc (diff)
pst-pdf (22jun17)
git-svn-id: svn://tug.org/texlive/trunk@44665 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty11
1 files changed, 6 insertions, 5 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 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
}%
{%