summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/pst-pdf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2006-07-26 21:40:43 +0000
committerKarl Berry <karl@freefriends.org>2006-07-26 21:40:43 +0000
commit58ae8ff32e96babab9565a8a03521b84314b5ef5 (patch)
tree82a5f0c0fa96f45c449423e48d53a3e00f250997 /Master/texmf-dist/tex/latex/pst-pdf
parent0a57e6b100604ff3a5631232cdad6713dea9f5be (diff)
pst-pdf 1.1n (24jul06)
git-svn-id: svn://tug.org/texlive/trunk@1924 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pst-pdf')
-rw-r--r--Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty40
1 files changed, 34 insertions, 6 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 f595d7ff97b..1e4406c07f1 100644
--- a/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
+++ b/Master/texmf-dist/tex/latex/pst-pdf/pst-pdf.sty
@@ -22,8 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{pst-pdf}
- [2005/06/29 v1.1i PS graphics for pdfLaTeX (RN,HjG)]
-
+ [2006/07/14 v1.1n PS graphics for pdfLaTeX (RN,HjG)]
\newcommand*\ppf@TeX@mode{-1}
\newcommand*\ppf@draft{false}
\newif\if@ppf@PST@used\@ppf@PST@usedtrue
@@ -68,6 +67,13 @@
\newcommand*\ppf@other@extensions[1]{}
\newcommand*\usepicture[2][]{}
\newcommand*\savepicture[1]{}
+ \newenvironment*{pst-pdf-defs}%
+ {%
+ \endgroup
+ }{%
+ \begingroup
+ \def\@currenvir{pst-pdf-defs}%
+ }
\RequirePackage{graphicx}%
\let\ppf@Ginclude@graphics\Ginclude@graphics
\let\ppf@Gin@extensions\Gin@extensions
@@ -91,10 +97,11 @@
\endgroup
\if@ppf@pdftex@graphic#4\else#5\fi
}
- \if@ppf@PST@used\RequirePackage{pstricks}\fi
- \ifcase\ppf@TeX@mode\relax
+\ifcase\ppf@TeX@mode\relax
\PackageInfo{pst-pdf}{%
MODE: \ppf@TeX@mode\space (dvi -- extraction mode)}
+ \nofiles
+ \if@ppf@PST@used\RequirePackage{pstricks}\fi
\RequirePackage[active,dvips,tightpage]{preview}[2005/01/29]%
\newcommand*\ppf@PreviewBbAdjust{}
\newcommand*\ppf@RestoreBbAdjust{%
@@ -173,6 +180,8 @@
\def\tabularx#1#2{\tabular{#2}}%
\newcolumntype{X}{c}%
\let\endtabularx=\endtabular}%
+ \@ifundefined{pfx@includegraphicx}{}{%
+ \PreviewMacro[{{}{}}]{\pfx@includegraphicx}}%
}%
\def\Ginclude@graphics#1{%
\ifpr@outer
@@ -193,8 +202,13 @@
\@ifundefined{PSTricksLoaded}{}{%
\PSTricksOff
\@ifundefined{c@lor@to@ps}{\def\c@lor@to@ps#1 #2\@@{}}{}}}%
- \the\@temptokena
- \expandafter\AtBeginDocument\expandafter{\the\@temptokena}%
+ \if@ppf@PST@used
+ \let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble
+ \RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp
+ \fi
+ \the\@temptokena %%% ????
+ \expandafter\AtBeginDocument\expandafter
+ {\the\@temptokena\@temptokena{}}%
\@ifundefined{PSTricksLoaded}{}
{%
\newtoks\ppf@temptoken
@@ -376,6 +390,10 @@
\@ifundefined{psmatrix}{}%
{\let\psmatrix=\postscript\let\endpsmatrix=\endpostscript}%
}%
+ \@ifundefined{pfx@includegraphicx}{}{%
+ \let\includegraphics=\pfx@includegraphics
+ \def\pfx@includegraphicx#1#2{\ppf@@getpicture}%
+ }%
}%
\def\savepicture#1{%
\expandafter\xdef\csname ppf@@@#1\endcsname{\the\pdflastximage}}%
@@ -423,6 +441,16 @@
\expandafter\ppf@getpicture\expandafter{\ppf@Gin@keys}%
{\the\c@pspicture}%
\fi}%
+ \renewenvironment*{pst-pdf-defs}%
+ {%
+ \endgroup
+ \chardef\ppf@temp=\catcode`\&%
+ \@makeother\&%
+ }{%
+ \catcode`\&=\ppf@temp
+ \begingroup
+ \def\@currenvir{pst-pdf-defs}%
+ }
\else
\PackageInfo{pst-pdf}{MODE: \ppf@TeX@mode\space (inactive mode)}%
\newenvironment{postscript}[1][]{\ignorespaces}{}