From a4e7b650b36655b60114b5bcf614496a9dfcfc31 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 10 Oct 2008 23:11:47 +0000 Subject: pst-pdf update (10oct08) git-svn-id: svn://tug.org/texlive/trunk@10914 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex') 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 9c2ebf80663..b9e7b76c4a7 100644 --- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty +++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty @@ -23,7 +23,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{pst-pdf} - [2008/09/16 v1.1u PS graphics for pdfLaTeX (RN,HjG)] + [2008/10/09 v1.1v PS graphics for pdfLaTeX (RN,HjG)] \newcommand*\ppf@TeX@mode{-1} \newcommand*\ppf@draft{false} \newif\if@ppf@PST@used\@ppf@PST@usedtrue @@ -111,7 +111,8 @@ \begingroup \let\AtBeginDocument\@gobble \let\PackageWarningNoLine\@gobbletwo \chardef\pdftexversion=121 % - \chardef\pdfoutput=1 % + \newcount\pdfoutput + \pdfoutput=1 % \input{pdftex.def}% \edef\x{\endgroup\def\noexpand\ppf@other@extensions{\Gin@extensions} }% @@ -298,23 +299,23 @@ #3\ifx\GPT@page\@empty\else(\GPT@page)\fi}}% \def\Gin@ii[#1]#2{% \begingroup - \setkeys{Gin}{#1}% - \@temptokena{#1}\def\@tempb{#2}% - \ifx\@tempb\@empty\else + \@temptokena{#1}\def\ppf@tempb{#2}% + \ifx\ppf@tempb\@empty\else \ppf@is@pdfTeX@graphic{#2}{\Gin@extensions}{\ppf@other@extensions}% {% - \ifx\@tempb\PDFcontainer + \setkeys{Gin}{#1}% + \ifx\ppf@tempb\PDFcontainer \@temptokena{page=\GPT@page}% \fi }% {% \refstepcounter{pspicture}% - \@temptokena{page=\the\c@pspicture}\def\@tempb{\PDFcontainer}% + \@temptokena{page=\the\c@pspicture}\def\ppf@tempb{\PDFcontainer}% }% \fi \ifGin@ignore\else \edef\@tempa{\noexpand\ppf@Gin@ii[frame@@=0,\the\@temptokena, - frame@@=1]{\@tempb}}% + frame@@=1]{\ppf@tempb}}% \@tempa \ifGin@showname \ppf@namefont -- cgit v1.2.3