summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-10-10 23:11:47 +0000
committerKarl Berry <karl@freefriends.org>2008-10-10 23:11:47 +0000
commita4e7b650b36655b60114b5bcf614496a9dfcfc31 (patch)
tree7cbcf9bab45e6e0c3499462e83afd423d5e48d23
parent6d03e07d9bd45fc60951dd1683897ae60409fc62 (diff)
pst-pdf update (10oct08)
git-svn-id: svn://tug.org/texlive/trunk@10914 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/pst-pdf/CHANGES3
-rw-r--r--Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdfbin492983 -> 492631 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdfbin107089 -> 107071 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdfbin414839 -> 415008 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdfbin501576 -> 501647 bytes
-rw-r--r--Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx22
-rw-r--r--Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty17
7 files changed, 25 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
index 5f3f6f5c3f3..f026a29e858 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
+++ b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES
@@ -126,3 +126,6 @@ v1.1t
v1.1u
General: \pdfoutput must be set when loading "pdftex.def" in DVI
mode. (RN)
+v1.1v
+ General: Local redefinition of \pdfoutput to be a counter. (RN)
+ \Gin@ii: Key settings only for pdf graphics. (RN)
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 7bc72df96c6..d8f280840ea 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf
index b4fb2b95cf2..1c11131e2c7 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf
index 5163e1731bd..40cb0f6888c 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf
Binary files differ
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 05ab6a766cf..87e0631ffc3 100644
--- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
+++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf
Binary files differ
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 36daa316af3..269271c1748 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>
- [2008/09/16 v1.1u PS graphics for pdfLaTeX (RN,HjG)]
+ [2008/10/09 v1.1v PS graphics for pdfLaTeX (RN,HjG)]
%</package>
%
%<*driver>
@@ -50,7 +50,7 @@
%</driver>
% \fi
%
-% \CheckSum{835}
+% \CheckSum{836}
%
% \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
@@ -840,11 +840,14 @@
% \fi
% \changes{v1.1u}{2008/09/16}{\cmd{\pdfoutput} must be set when
% loading ``pdftex.def'' in DVI mode. (RN)}
+% \changes{v1.1v}{2008/10/09}{Local redefinition of \cmd{\pdfoutput} to be a
+% counter. (RN)}
% \begin{macrocode}
\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}
}%
@@ -1380,8 +1383,7 @@
% too. Thus beforehand and protected inside a group examine the options.
% \fi
% \begin{macrocode}
- \setkeys{Gin}{#1}%
- \@temptokena{#1}\def\@tempb{#2}%
+ \@temptokena{#1}\def\ppf@tempb{#2}%
% \end{macrocode}
% \ifGERMAN
% Leerer Dateiname beim Aufruf von \cmd{\usepicture} aus.
@@ -1390,7 +1392,7 @@
% Finds empty file name when calling \cmd{\usepicture}.
% \fi
% \begin{macrocode}
- \ifx\@tempb\@empty\else
+ \ifx\ppf@tempb\@empty\else
\ppf@is@pdfTeX@graphic{#2}{\Gin@extensions}{\ppf@other@extensions}%
% \end{macrocode}
% \ifGERMAN
@@ -1401,15 +1403,17 @@
% Graphics out of \cmd{\PDFcontainer} are complete -- scaled, rotated, etc.
% Don't apply these things again and therefore ignore the optional parameters.
% \fi
+% \changes{v1.1v}{2008/10/09}{Key settings only for pdf graphics. (RN)}
% \begin{macrocode}
{%
- \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
@@ -1423,7 +1427,7 @@
% \fi
% \begin{macrocode}
\edef\@tempa{\noexpand\ppf@Gin@ii[frame@@=0,\the\@temptokena,
- frame@@=1]{\@tempb}}%
+ frame@@=1]{\ppf@tempb}}%
\@tempa
\ifGin@showname
\ppf@namefont
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