From f3fe45d3bc69ef621d0db8f5c93cfcbb5a761747 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Wed, 10 Sep 2008 20:15:16 +0000 Subject: pst-pdf update (2008/09/10) git-svn-id: svn://tug.org/texlive/trunk@10547 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pst-pdf/CHANGES | 14 +- Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf | Bin 483990 -> 492298 bytes .../doc/latex/pst-pdf/pst-pdf-example.pdf | Bin 418361 -> 0 bytes .../doc/latex/pst-pdf/pst-pdf-example1.pdf | Bin 0 -> 107089 bytes .../doc/latex/pst-pdf/pst-pdf-example1.tex | 129 ++++++++++ .../doc/latex/pst-pdf/pst-pdf-example2.pdf | Bin 0 -> 414507 bytes .../doc/latex/pst-pdf/pst-pdf-example2.tex | 279 +++++++++++++++++++++ Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf | Bin 499163 -> 500857 bytes 8 files changed, 419 insertions(+), 3 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf create mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf create mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex create mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf create mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.tex (limited to 'Master/texmf-dist/doc/latex/pst-pdf') diff --git a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES index 1f1a8a298d1..8d795ebd400 100644 --- a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES +++ b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES @@ -23,7 +23,7 @@ v1.0g \usepicture: Now \usepspicture does accept a numerical parameter. (RN) v1.0h - postscript: Based no more on the comment environment from the + psmatrix: Based no more on the comment environment from the verbatim package. (RN) v1.0i \ppf@is@pdfTeX@graphic: No more errors for given files without @@ -71,7 +71,7 @@ v1.1c Supress handling of pdfLaTeX graphic formats in DVI mode. (RN) v1.1d - psmatrix: Support for PSTricks environment "psmatrix". (RN) + postscript: Support for PSTricks environment "psmatrix". (RN) v1.1e General: New option "displaymath" (see preview package). (HjG/RN) @@ -80,7 +80,8 @@ v1.1f compilation of the dtx file in LaTeX mode is possible. (RN) v1.1g - psmatrix: "psmatrix" environment (preserve math mode). (RN/HjG) + postscript: "psmatrix" environment (preserve math mode). + (RN/HjG) pspicture: pspicture environment must still parse its arguments. (RN/HjG) v1.1h @@ -115,3 +116,10 @@ v1.1q v1.1r General: Fixed values for \PreviewBbAdjust because \paperwidth is not allways defined (suggested by Will Robertson). +v1.1s + General: Dummy definition of the page key in DVI mode. +v1.1t + General: Remove the line "\let\output\@gobble" because of bad + side effects. (RN) + postscript: Using environ the environment postscript is now + simple and more robust. (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 88f7e0fe8e7..da40c518d28 100644 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf differ diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf deleted file mode 100644 index ddd38196c06..00000000000 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf and /dev/null 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 new file mode 100644 index 00000000000..eafc459977d Binary files /dev/null and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf differ diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex new file mode 100644 index 00000000000..11cb6cd16f3 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex @@ -0,0 +1,129 @@ +%% +%% This is file `pst-pdf-example1.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pst-pdf.dtx (with options: `example1') +%% +%% This is a generated file. +%% +%% Copyright (C) 2004-2008 by Rolf Niepraschk +%% 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 +%% 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. +%% +%% 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} +\endinput +%% +%% End of file `pst-pdf-example1.tex'. 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 new file mode 100644 index 00000000000..f451f6b6981 Binary files /dev/null and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf differ diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.tex b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.tex new file mode 100644 index 00000000000..1cfe003f77c --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.tex @@ -0,0 +1,279 @@ +%% +%% This is file `pst-pdf-example2.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pst-pdf.dtx (with options: `example2') +%% +%% This is a generated file. +%% +%% Copyright (C) 2004-2008 by Rolf Niepraschk +%% 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 +%% 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. +%% +%% Process this file with the scripts `ps4pdf' or `ps4pdf.bat' or call +%% +%% 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} + +%% before `psfrag'! +\usepackage[displaymath,dvipsnames]{pst-pdf} +%%\usepackage[displaymath,dvipsnames,notightpage]{pst-pdf} + +\usepackage{pst-node,pst-tree} + +\usepackage{psfrag,tabularx} + +\pagestyle{empty} + +\begin{postscript}[trim=0 0 0 0,ignore] + \includegraphics[width=.475\textwidth]{penguin.eps} +\end{postscript} +\savepicture{ps:A} + +\begin{pst-pdf-defs}% + +%% This definition must be within the pst-pdf-defs environment! +\newcommand*\mytree{% + \begin{psmatrix}[rowsep=.2cm,colsep=2cm] + & & E \\ + & A & \\ + & & F \\ + $\bullet$ & & \\ + & & G \\ + & B & \\ + & & H \\ + \scriptsize + \psset{shortput=nab,arrows=->,labelsep=2pt,nodesep=2pt,nrot=:U} + + \ncline{4,1}{2,2}\ncput*{$0,2$} + \ncline{4,1}{6,2}\ncput*{$x$} + + \ncline{2,2}{1,3}\ncput*{$0,3$} + \ncline{2,2}{3,3}\ncput*{$y$} + + \ncline{6,2}{5,3}\ncput*{$z$} + \ncline{6,2}{7,3}\ncput*{$0,8$} + \end{psmatrix}% +} + +\end{pst-pdf-defs}% + +%% This works without the pst-pdf-defs environment! +\newcommand*\mymatrix{% + \begin{postscript} + \[ + \begin{array}{rcl} + a & b & c \\ + 1 & 2 & 3 \\ + \end{array} + \] + \end{postscript}% +} + +\begin{document} + +\setkeys{Gin}{showname,frame}% + +\psset{unit=0.0714\textwidth}% 1/14 * \textwidth +\newpsobject{showgrid}{psgrid}{subgriddiv=1,griddots=10,gridlabels=6pt} + +\newcommand*\BASEMARKER{\rule{.5em}{.4pt}} + +\setlength\parindent{0pt} + +\centering + +\section*{\textsf{pst-pdf:} + PSTricks and other PostScript code in pdf\LaTeX\ documents} + +\vfill + +\begin{pspicture}(-5.5,-5.25)(5.25,5.25)% +%%\begin{pspicture}[trim=-.5 -.25 .25 .25,frame](-5,-5)(5,5)% PSTricks2 + \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}\savepicture{ps:B} + +\vfill\null\newpage + +\usepicture{ps:A} +\hfill +\includegraphics[width=.475\textwidth]{insect1} + +\vfill + +\usepicture[angle=180,origin=c]{ps:A} +\hfill +\usepicture[width=.47\textwidth]{ps:B} + +\includegraphics[width=.475\textwidth,frame=false, + namefont={\Huge\itshape}]{knuth} +\hfill +\usepicture[angle=45,origin=bl,width=.475\textwidth,innerframe]{1}% + +\vfill + +\includegraphics[width=.47\textwidth]{psf-demo} +\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=.47\textwidth]{psf-demo} +\end{psfrags} + +\includegraphics[width=\textwidth,showname=false,frame=false]{insect15} + +\bigskip + +\Large + +\begin{equation} + \sigma(t)=\frac{1}{\sqrt{2\pi}} + \int^t_0 e^{-x^2/2} dx +\end{equation} + +\clearpage + +\setkeys{Gin}{showname=false,frame=false}% + +{ \Huge \renewcommand*\arraystretch{1.5} + + \noindent + \begin{tabularx}{\textwidth}{|@{}>{\centering}X@{}|} \hline + + \psframebox*[fillcolor=green,framearc=.6]{HUGO}\BASEMARKER + \fbox{\BASEMARKER GUSTAV} \tabularnewline + + \begin{postscript} + \psframebox*[fillcolor=green,framearc=.6]{HUGO}\BASEMARKER + \fbox{\BASEMARKER GUSTAV} + \end{postscript} \tabularnewline \hline + + \end{tabularx} + +} + +\bigskip + +\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 + + %% From: The \LaTeX\ Graphics Companion; first release. + \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}}} + } + + \iffalse % --> Cannot work outside of a special environment! + \psset{linecolor=green,doubleline=true,linestyle=dotted} + \ncline{P}{W}\nbput{1940} + \ncline{R}{A}\nbput{1954} + \fi +} + +\bigskip + +\psset{arrows=->,fillcolor=white,fillstyle=solid} + +\footnotesize + +\newcommand{\Show}[1]{\psshadowbox{#1}} + +\begin{psmatrix}[mnode=r,ref=t,unit=.3] + \psframebox[linestyle=none,framesep=.75]{% + \begin{psmatrix}[name=A,ref=c] + \Show{Stakeholder} + \end{psmatrix}} & + \psframebox[fillstyle=solid,fillcolor=pink,framesep=.95]{% + \rule{1cm}{0pt} + \begin{psmatrix}[ref=c] + [name=B]\Show{Goal} & \Show{Criteria}\\ + \Show{Sub-goal} & \Show{Justification} + \ncline{1,1}{1,2} + \ncline{1,1}{2,2} + \ncline{1,1}{2,1}\tlput{Strategy} + \ncline{2,1}{2,2} + \end{psmatrix}} + \ncline[angleB=180]{A}{B}\naput[npos=.7]{Model} +\end{psmatrix} + +\begin{postscript}[angle=90,height=\textheight,frame=false] + +\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}}} +} + +\psset{linecolor=green,doubleline=true,linestyle=dotted} +\ncline{P}{W}\nbput{1940} +\ncline{R}{A}\nbput{1954} + +\end{postscript} + +\bigskip + +\psset{arrows=-} + +\begin{displaymath} + \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{displaymath} + +\bigskip + +\mytree + +\bigskip + +\mymatrix + +\end{document} +\endinput +%% +%% End of file `pst-pdf-example2.tex'. 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 c5ccfa516b8..e0a2644f735 100644 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf differ -- cgit v1.2.3