diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/pst-pdf')
| -rw-r--r-- | Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx | 315 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins | 20 |
2 files changed, 200 insertions, 135 deletions
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 feb9cd3106d..a378e5519e1 100644 --- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx +++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx @@ -1,7 +1,7 @@ % \iffalse meta-comment % -% Copyright (C) 2005--2008 -% Rolf Niepraschk, <Rolf.Niepraschk@ptb.de> +% Copyright (C) 2005-2008 +% Rolf Niepraschk, <Rolf.Niepraschk@gmx.de> % Hubert Gaesslein % -------------------------------------------------------------- % @@ -24,7 +24,7 @@ %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01] %<package>\ProvidesPackage{pst-pdf} %<*package> - [2008/05/02 v1.1r PS graphics for pdfLaTeX (RN,HjG)] + [2008/09/09 v1.1t PS graphics for pdfLaTeX (RN,HjG)] %</package> % %<*driver> @@ -32,7 +32,7 @@ \documentclass[a4paper]{ltxdoc} \usepackage[ignore]{pst-pdf} \providecommand*\mainlang{} -\usepackage[british,\mainlang]{babel} +\usepackage[english,\mainlang]{babel} \usepackage{booktabs,calc,array,url} \usepackage[T1]{fontenc} \usepackage{textcomp} @@ -42,7 +42,7 @@ \RecordChanges \begin{document} \DocInput{pst-pdf.dtx} - \begin{otherlanguage}{british} + \begin{otherlanguage}{english} \PrintChanges \clearpage \PrintIndex \end{otherlanguage} @@ -50,7 +50,7 @@ %</driver> % \fi % -% \CheckSum{857} +% \CheckSum{833} % % \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 @@ -155,7 +155,7 @@ % \fi % % \author{% -% Rolf Niepraschk\thanks{\texttt{Rolf.Niepraschk@ptb.de}} +% Rolf Niepraschk\thanks{\texttt{Rolf.Niepraschk@gmx.de}} % \and % Hubert G\"a{\ss}lein} % \date{\filedate} @@ -688,14 +688,13 @@ % % \begin{environment}{pst-pdf-defs} % \begin{macrocode} - \newenvironment*{pst-pdf-defs}% - {% - \endgroup +\newenvironment*{pst-pdf-defs}{% + \endgroup % ??? \@currenvline - }{% - \begingroup - \def\@currenvir{pst-pdf-defs}% - } +}{% + \begingroup + \def\@currenvir{pst-pdf-defs}% +} % \end{macrocode} % \end{environment} % @@ -886,12 +885,14 @@ % \ifENGLISH % No function in this mode. % \fi +% \changes{v1.1s}{2008/05/25}{Dummy definition of the page key in DVI mode.} % \begin{macrocode} \define@key{Gin}{innerframe}[true]{}% \define@key{Gin}{frame}[true]{}% \define@key{Gin}{ignore}[true]{}% \define@key{Gin}{showname}[true]{}% \define@key{Gin}{namefont}{}% + \@ifundefined{GPT@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} @@ -1151,6 +1152,20 @@ % \fi % \begin{macrocode} \PackageInfo{pst-pdf}{MODE: \ppf@TeX@mode\space (pdfTeX mode)}% +% \end{macrocode} +% \ifGERMAN +% Verhindert pdf\TeX{}s Warnung \texttt{Non-PDF special ignored!}. +% \fi +% \ifENGLISH +% Prevent pdf\TeX's message \texttt{Non-PDF special ignored!}. +% \fi +% \begin{macrocode} + \if@ppf@PST@used + \let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble + \RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp + \fi +% \end{macrocode} +% \begin{macrocode} \@temptokena{% \let\Gin@PS@file@header\@gobble\let\Gin@PS@literal@header\@gobble \let\Gin@PS@raw\@gobble\let\Gin@PS@restored\@gobble @@ -1167,29 +1182,16 @@ \@ifundefined{c@lor@to@ps}{\def\c@lor@to@ps#1 #2\@@{}}{}}}% % \end{macrocode} % \ifGERMAN -% Prevent pdf\TeX's message \texttt{Non-PDF special ignored!}. -% \fi -% \ifENGLISH -% Prevent pdf\TeX's message \texttt{Non-PDF special ignored!}. -% \fi -% \begin{macrocode} - \if@ppf@PST@used - \let\ppf@temp\AtBeginDvi\let\AtBeginDvi\@gobble - \RequirePackage{pstricks}\let\AtBeginDvi\ppf@temp - \fi -% \end{macrocode} -% \ifGERMAN % \PS-Ausgabe jetzt verhindern und sp\"ater noch einmal. % \fi % \ifENGLISH % \PS\ output is now inhibited and later once again. % \fi % \begin{macrocode} - \the\@temptokena %%% ???? + \the\@temptokena \expandafter\AtBeginDocument\expandafter {\the\@temptokena\@temptokena{}}% - \@ifundefined{PSTricksLoaded}{} - {% + \@ifundefined{PSTricksLoaded}{}{% % \end{macrocode} % \ifGERMAN % Zum Parsen der Argumente von PSTricks' \cmd{\pst@object} laden wir @@ -1214,17 +1216,20 @@ % \fi % \changes{v1.1b}{2005/04/09}{Ignore the call of % \cmd{\nofiles} inside of \pkgname{preview}. (RN)} -% \changes{v1.1p1}{2007/07/27}{\cmd{\let}\cmd{\output}\cmd{\@gobble} +% \changes{v1.1p1}{2007/07/27}{\cmd{\let}\cmd{\output}\cmd{\@gobble} % before loading of ``preview'' added. (RN)} -% \begin{macrocode} - \newtoks\ppf@temptoken - \ppf@temptoken\expandafter{\the\output}% - \let\output\@gobble - \let\ppf@nofiles\nofiles \let\nofiles\relax +% \changes{v1.1t}{2008/09/09}{Remove the line +% ``\cmd{\let}\cmd{\output}\cmd{\@gobble}'' because of bad side +% effects. (RN)} +% \begin{macrocode} + \newtoks\ppf@output + \ppf@output\expandafter{\the\output}% + \let\ppf@nofiles=\nofiles \let\nofiles=\relax + \let\ppf@shipout=\shipout \RequirePackage[active]{preview}[2005/01/29]% - \let\shipout=\pr@shipout \let\nofiles\ppf@nofiles - \output\expandafter{\the\ppf@temptoken}% - \ppf@temptoken{}% + \let\shipout=\ppf@shipout \let\ppf@shipout=\relax + \let\nofiles=\ppf@nofiles \let\ppf@nofiles=\relax + \output\expandafter{\the\ppf@output} \ppf@output{}% % \end{macrocode} % \ifGERMAN % \cmd{\pr@startbox}, \cmd{\pr@endbox}: Gegen\"uber Originaldefinition @@ -1235,21 +1240,21 @@ % \fi % \begin{macrocode} \long\def\pr@startbox#1#2{% - \ifpr@outer - \toks@{#2}% - \edef\pr@cleanup{\the\toks@}% - \setbox\@tempboxa\vbox\bgroup - \everydisplay{}% - \pr@outerfalse% - \expandafter\@firstofone - \else - \expandafter\@gobble - \fi{#1}}% + \ifpr@outer + \toks@{#2}% + \edef\pr@cleanup{\the\toks@}% + \setbox\@tempboxa\vbox\bgroup + \everydisplay{}% + \pr@outerfalse% + \expandafter\@firstofone + \else + \expandafter\@gobble + \fi{#1}}% \def\pr@endbox{% - \egroup - \setbox\@tempboxa\box\voidb@x - \ppf@@getpicture - \pr@cleanup}% + \egroup + \setbox\@tempboxa\box\voidb@x + \ppf@@getpicture + \pr@cleanup}% % \end{macrocode} % \ifGERMAN % (Siehe auch identische Definition im DVI-Modus.) @@ -1499,7 +1504,7 @@ \else\expandafter\@secondoftwo\fi}% % \end{macrocode} % \end{macro} -% \begin{environment}{postscript} +% \begin{environment}{psmatrix} % \changes{v1.0h}{2005/02/15}{Based no more on the comment environment % from the verbatim package. (RN)} % \begin{environment}{pspicture} @@ -1516,7 +1521,7 @@ % graphics out of the \cmd{\PDFcontainer} file. The value of the herein used % |pspicture| counter's value can be used in \cmd{\label}/\cmd{\ref}. % \fi -% \begin{environment}{psmatrix} +% \begin{environment}{postscript} % \changes{v1.1d}{2005/04/19}{Support for PSTricks environment % ``psmatrix''. (RN)} % \changes{v1.1g}{2005/05/28}{``psmatrix'' environment @@ -1534,55 +1539,27 @@ \let\ppf@set@mode=\@empty \fi } - \newenvironment{postscript}[1][] - {% - \ppf@test@mmode - \gdef\ppf@Gin@keys{}% - \def\@tempa{postscript}\ifx\@tempa\@currenvir\gdef\ppf@Gin@keys{#1}\fi -% \end{macrocode} -% \ifGERMAN -% Innerhalb der Umgebung ist das Parsen der Argumente von -% \cmd{\pst@object} unn\"otig, daher wieder Originaldefinition -% verwenden. -% \fi -% \ifENGLISH -% Inside this environment parsing of \cmd{\pst@object}'s arguments is not -% necessary, thus the original definition is used again. -% \fi -% \begin{macrocode} - \expandafter\let\expandafter\pst@object - \csname pr@\string\pst@object\endcsname - \pr@outerfalse % \end{macrocode} -% \ifGERMAN -% N\"otig f\"ur \cmd{\psmatrix}. -% \fi -% \ifENGLISH -% Needed for \cmd{\psmatrix}. -% \fi +% \changes{v1.1t}{2008/09/09}{Using \pkgname{environ} the environment +% \env{postscript} is now simple and more robust. (RN)} % \begin{macrocode} - \@makeother\&% - \def\Gin@ii[##1]##2{}\setbox\@tempboxa=\vbox\bgroup - \ppf@set@mode - }% - {\ppf@set@mode\egroup\aftergroup\ppf@@getpicture}% + \RequirePackage{environ}% + \newenvironment{postscript}[1][]{% + \def\@tempa{postscript}% + \ifx\@tempa\@currenvir + \def\ppf@Gin@keys{#1}% + \else + \def\ppf@Gin@keys{}% + \fi + \ppf@@getpicture + \Collect@Body\@gobble}{}% \AtBeginDocument{% - \@ifundefined{PSTricksLoaded}{}% - {% - \iffalse - \PreviewEnvironment{pspicture}% Why doesn't it work? - \g@addto@macro\pspicture{% - %%\pr@outerfalse% necessary, or already there anyway? - \@makeother\&% necessary? - \def\Gin@ii[#1]#2{}% - }% - \g@addto@macro\endpspicture{\ppf@@getpicture}% - \else - \def\pst@@@picture[#1](#2,#3)(#4,#5){\postscript}% - \def\endpspicture{\endpostscript\endgroup}% - \fi - \@ifundefined{psmatrix}{}% - {\let\psmatrix=\postscript\let\endpsmatrix=\endpostscript}% + \@ifundefined{PSTricksLoaded}{}{% + \def\pst@@@picture[#1](#2,#3)(#4,#5){\postscript}% + \def\endpspicture{\endpostscript\endgroup}% + \@ifundefined{psmatrix}{}{% + \let\psmatrix=\postscript + \let\endpsmatrix=\endpostscript}% }% \@ifundefined{pfx@includegraphicx}{}{% % \end{macrocode} @@ -1593,10 +1570,9 @@ % wird. % \fi % \ifENGLISH -% Die im pdf\TeX-Modus unn\"utze Umdefinition von -% \cmd{\includegraphics} (Paket \pkgname{psfragx}) f\"uhrt zu zweifachem -% Einfügen des Ergebnisses, weshalb die Originaldefition wiederhergestellt -% wird. +% The useless redefinition of \cmd{\includegraphics} in pdf\TeX\ mode +% (package \pkgname{psfragx}) is leading to double insertion of the result. +% We go back to the original meaning. % \fi % \begin{macrocode} \let\includegraphics=\pfx@includegraphics @@ -1716,16 +1692,12 @@ % \ifGERMAN % Umgebung, die keine eigene Gruppe aufmacht. Innerhalb der Umgebung % bekommt das Zeichen |&| den Kategoriecode "`other"'. Gedacht f\"ur -% eigene Makros, die z.\,B.\ eine \env{psmatrix} enthalten. -% (Einen ``Hook'' verwenden, falls andere Zeichen auch noch ben\"otigt -% werden!?) +% eigene Makrodefinitionen, die z.\,B.\ eine \env{psmatrix} enthalten. % \fi % \ifENGLISH -% Umgebung, die keine eigene Gruppe aufmacht. Innerhalb der Umgebung -% bekommt das Zeichen |&| den Kategoriecode "`other"'. Gedacht f\"ur -% eigene Makros, die z.\,B.\ eine \env{psmatrix} enthalten. -% (Einen ``Hook'' verwenden, falls andere Zeichen auch noch ben\"otigt -% werden!?) +% Environment without grouping. The character |&| has the catcode +% ``other''. Useful for user-defined macro definitions with e.\,g.\ % +% \env{psmatrix} inside. % \fi % \begin{macrocode} \renewenvironment*{pst-pdf-defs}% @@ -1773,14 +1745,119 @@ % \Finale %\endinput % -% And here comes the example document ... -%<*example> +% And here comes the example documents ... +%<*example1> +%% Process this file with the scripts `ps4pdf' or `ps4pdf.bat' or call +%% +%% latex pst-pdf-example1.tex +%% dvips -Ppdf -o pst-pdf-example1-pics.ps pst-pdf-example1.dvi +%% ps2pdf -dAutoRotatePages=/None pst-pdf-example1-pics.ps pst-pdf-example1-pics.pdf +%% pdflatex pst-pdf-example1.tex +%% +\listfiles +\documentclass[12pt,a4paper]{article} +\usepackage[margin={25mm,30mm}]{geometry} + +\usepackage[dvipsnames]{pstricks} +\usepackage{pst-node,pst-tree,psfrag} +\usepackage{pst-pdf} + +\pagestyle{empty} + +\begin{document} + +\section*{\textsf{pst-pdf:} A short example document} + +\subsection*{png graphic and postscript graphic together} + +\noindent\includegraphics[width=.35\textwidth]{knuth}% A none-ps graphic +\hfill +\includegraphics[width=.60\textwidth]{elephant}% A ps graphic + +\subsection*{PSTricks code inside a pspicture environment} + +\newpsobject{showgrid}{psgrid}{subgriddiv=1,griddots=10,gridlabels=8pt} + +\begin{center} +\begin{pspicture}(-5.25,-5.25)(5.25,5.25)% + \pscircle*[linecolor=Apricot]{5} + \rput(0,0.5){\includegraphics[width=8\psxunit]{elephant}} + \Huge\sffamily\bfseries + \rput(-4.5,4.5){A} \rput(4.5,4.5){B} + \rput(-4.5,-4.5){C}\rput(4.5,-4.5){D} + \rmfamily + \rput(0,-3.8){PSTricks} + \rput(0,3.8){\LaTeX} + \showgrid +\end{pspicture} +\end{center} + +\subsection*{PSTricks code without a pspicture environment} + +%%---------------------------------------------------------------------- +%% From: The \LaTeX\ Graphics Companion; first release. +\definecolor{pink}{rgb}{1, .75, .8} +\renewcommand\psedge{\nccurve} +\newcommand{\Female}[2][]{{\psset{linecolor=pink}\TR[#1]{\emph{#2}}}} +\newcommand{\Male}[2][]{{\psset{linecolor=blue}\TR[#1]{#2}}} +\psset{nodesep=2pt,angleA=90,angleB=-90} +\footnotesize + +\pstree[treemode=U]{\Female{{\bfseries Matilde}}}{% + \pstree{\Male{Sebastian}}{% + \pstree{\Male[name=P]{Philip}}{\Male{Frederick}\Female{Ethel}} + \pstree{\Female[name=W]{Mary}}{\Male{Lionel}\Female{Agnes}}} + \pstree{\Female{Leonor}}{% + \pstree{\Male[name=R]{Ra\'ul}}{\Male{Joaquim}\Female{J\'ulia}} + \pstree{\Female[name=A]{Am\'elia}}{\Male{\'Alvaro}\Female{Augusta}}} +} + +%%---------------------------------------------------------------------- + +\subsection*{psfrag demo} + +\normalsize + +\noindent +\includegraphics[width=.475\textwidth]{psf-demo.eps} +\hfill +\begin{psfrags} + \psfragscanon + \psfrag{x1}[br][ ]{\LaTeX} \psfrag{x2}[br][br]{\LaTeX} + \psfrag{x3}[br][tl]{\LaTeX} \psfrag{x4}[br][Br]{\LaTeX} + \psfrag{x5}[Br][ r][1.15][45]{\Huge\LaTeX} + \psfrag{x6}[tl][ l][1.15][45]{\Huge\LaTeX} + \includegraphics[width=.475\textwidth]{psf-demo} +\end{psfrags} + +\subsection*{The postscript environment} + +\begin{center} +\begin{postscript} +\Large +\noindent +$ + \bordermatrix{% + & A & B & C\cr + & \rnode{D}{D} & E & \rnode{F}{F}\cr + & G & H & I\cr + & \rnode{J}{J} & K & M + } +$ +\ncline[nodesep=-1em,linecolor=red]{D}{F} +\ncline[nodesep=-1em,linecolor=red]{D}{J} +\end{postscript} +\end{center} + +\end{document} +%</example1> +%<*example2> %% Process this file with the scripts `ps4pdf' or `ps4pdf.bat' or call %% -%% latex pst-pdf-example.tex -%% dvips -Ppdf -o pst-pdf-example-pics.ps pst-pdf-example.dvi -%% ps2pdf -dAutoRotatePages=/None pst-pdf-example-pics.ps pst-pdf-example-pics.pdf -%% pdflatex pst-pdf-example.tex +%% latex pst-pdf-example2.tex +%% dvips -Ppdf -o pst-pdf-example2-pics.ps pst-pdf-example2.dvi +%% ps2pdf -dAutoRotatePages=/None pst-pdf-example2-pics.ps pst-pdf-example2-pics.pdf +%% pdflatex pst-pdf-example2.tex %% \listfiles\errorcontextlines=100\relax \documentclass[12pt]{article} @@ -2030,4 +2107,4 @@ \mymatrix \end{document} -%</example> +%</example2> diff --git a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins index 30a9df58bf0..9b58cf757e7 100644 --- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins +++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins @@ -1,17 +1,3 @@ -%% -%% Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de> -%% -%% This file may be distributed and/or modified under the conditions of -%% the LaTeX Project Public License, either version 1.2 of this license -%% or (at your option) any later version. The latest version of this -%% license is in: -%% -%% http://www.latex-project.org/lppl.txt -%% -%% and version 1.2 or later is part of all distributions of LaTeX version -%% 1999/12/01 or later. -%% - \input docstrip.tex \keepsilent \askforoverwritefalse @@ -22,7 +8,8 @@ This is a generated file. -Copyright (C) 2004 by Rolf Niepraschk <Rolf.Niepraschk@ptb.de> +Copyright (C) 2004-2008 by Rolf Niepraschk <Rolf.Niepraschk@gmx.de> + and Hubert Gaesslein This file may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.2 of this license @@ -37,7 +24,8 @@ and version 1.2 or later is part of all distributions of LaTeX version \endpreamble \generate{\file{pst-pdf.sty}{\from{pst-pdf.dtx}{package}}} -\generate{\file{pst-pdf-example.tex}{\from{pst-pdf.dtx}{example}}} +\generate{\file{pst-pdf-example1.tex}{\from{pst-pdf.dtx}{example1}}} +\generate{\file{pst-pdf-example2.tex}{\from{pst-pdf.dtx}{example2}}} \obeyspaces \Msg{*************************************************************} |