From 6486ac961b9d7d4428f198b5e88e33c9f459d85f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Jul 2016 23:20:24 +0000 Subject: pst-pdf (15jul16) git-svn-id: svn://tug.org/texlive/trunk@41710 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/pst-pdf/CHANGES | 60 ++--- Master/texmf-dist/doc/latex/pst-pdf/Makefile | 128 ++++++++++ Master/texmf-dist/doc/latex/pst-pdf/README | 26 -- Master/texmf-dist/doc/latex/pst-pdf/README.md | 24 ++ Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-DE.pdf | Bin 492631 -> 507262 bytes .../doc/latex/pst-pdf/pst-pdf-example.pdf | Bin 0 -> 452296 bytes .../doc/latex/pst-pdf/pst-pdf-example.tex | 279 +++++++++++++++++++++ .../doc/latex/pst-pdf/pst-pdf-example1.pdf | Bin 107071 -> 0 bytes .../doc/latex/pst-pdf/pst-pdf-example1.tex | 129 ---------- .../doc/latex/pst-pdf/pst-pdf-example2.pdf | Bin 415008 -> 0 bytes .../doc/latex/pst-pdf/pst-pdf-example2.tex | 279 --------------------- Master/texmf-dist/doc/latex/pst-pdf/pst-pdf.pdf | Bin 501647 -> 516364 bytes 12 files changed, 462 insertions(+), 463 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/pst-pdf/Makefile delete mode 100644 Master/texmf-dist/doc/latex/pst-pdf/README create mode 100644 Master/texmf-dist/doc/latex/pst-pdf/README.md create 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-example.tex delete mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf delete mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex delete mode 100644 Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf delete 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 f026a29e858..b6f36d7b494 100644 --- a/Master/texmf-dist/doc/latex/pst-pdf/CHANGES +++ b/Master/texmf-dist/doc/latex/pst-pdf/CHANGES @@ -5,23 +5,23 @@ v1.0a v1.0b General: Some code and documentation cleaning. (RN) v1.0c - General: New options "pstricks", "nopstricks", "draft" and - "final". (RN) + General: New options “pstricks”, “nopstricks”, “draft” and + “final”. (RN) v1.0d General: Redefinition of \includegraphics in modes 0 und 1. Now using of eps graphics directly in pdfLaTeX is possible. (RN) v1.0e - postscript: "trim" option added. (RN) + postscript: “trim” option added. (RN) v1.0f - General: Config file loading added. (RN) \savepicture: New macro \savepspicture. (RN) \usepicture: New macro \usepspicture. Useful for putting a PSTricks graphic in a box or something else. (RN) + General: Config file loading added. (RN) v1.0g - General: Definition of \PDFcontainer now with \edef. (RN) \usepicture: Now \usepspicture does accept a numerical parameter. (RN) + General: Definition of \PDFcontainer now with \edef. (RN) v1.0h psmatrix: Based no more on the comment environment from the verbatim package. (RN) @@ -29,23 +29,23 @@ v1.0i \ppf@is@pdfTeX@graphic: No more errors for given files without extensions. (RN) v1.0j - General: Check AtBeginDocument for package `pstricks' even if - "nopstricks" is given. (RN) + General: Check AtBeginDocument for package ‘pstricks’ even if + “nopstricks” is given. (RN) v1.0k \Gin@setfile: Show also the pagenumber if exists. (RN) \Ginclude@graphics: Prevent division by zero. (RN) v1.0l - General: Options "framesep", "framerule", "linewidth" removed, - "fname" and "innerframe" added. (RN) + General: Options “framesep”, “framerule”, “linewidth” removed, + “fname” and “innerframe” added. (RN) v1.0m - General: New package option "notightpage" added. (RN) + General: New package option “notightpage” added. (RN) v1.0n General: Changed marcro names (\savepicture and \usepicture). (RN) Some code cleaning. (RN) v1.0o - General: New code for "notightpage". (RN) - Option "fname" renamed to "showname". (RN) + General: New code for “notightpage”. (RN) + Option “fname” renamed to “showname”. (RN) v1.0p General: Some code and documentation cleaning. (RN) v1.0q @@ -56,9 +56,9 @@ v1.0r \ppf@is@pdfTeX@graphic. Now pdfTEX graphics are prefered. (RN) v1.0s + \Gin@ii: Rewritten. (RN) General: Scaling e.g. of PostScript pictures now only in extraction mode. Some code cleaning. (RN) - \Gin@ii: Rewritten. (RN) v1.1a General: Support for the internal PSTricks macro \pst@object. (HjG/RN) @@ -66,21 +66,21 @@ v1.1b General: Ignore the call of \nofiles inside of preview. (RN) Some code and documentation cleaning. (RN) v1.1c - General: New package option "tightpage" added. (RN) - Special support for "tabularx". (RN) + General: New package option “tightpage” added. (RN) + Special support for “tabularx”. (RN) Supress handling of pdfLaTeX graphic formats in DVI mode. (RN) v1.1d - postscript: Support for PSTricks environment "psmatrix". (RN) + postscript: Support for PSTricks environment “psmatrix”. (RN) v1.1e - General: New option "displaymath" (see preview package). + General: New option “displaymath” (see preview package). (HjG/RN) v1.1f - General: Package option "ignore" reimplemented. Now the + General: Package option “ignore” reimplemented. Now the compilation of the dtx file in LaTeX mode is possible. (RN) v1.1g - postscript: "psmatrix" environment (preserve math mode). + postscript: “psmatrix” environment (preserve math mode). (RN/HjG) pspicture: pspicture environment must still parse its arguments. (RN/HjG) @@ -88,15 +88,15 @@ v1.1h \Ginclude@graphics: Check if inside of a PS-related environment (correct graphic inclusion). (RN) v1.1i - General: \ifpr@outer must be predefined. (HjG/RN) - Package option "final" also for "graphicx". (RN) \Ginclude@graphics: Correction of the inside check. (RN/HjG) + General: \ifpr@outer must be predefined. (HjG/RN) + Package option “final” also for “graphicx”. (RN) v1.1k General: New environment pst-pdf-defs: Support for PSTricks - environment "psmatrix" inside user definitions. + environment “psmatrix” inside user definitions. (RN,HjG) v1.1l - General: Support for the package "psfragx". (RN) + General: Support for the package “psfragx”. (RN) v1.1m General: Merge english and german version of the documentation. (RN) @@ -106,12 +106,12 @@ v1.1o \Gscale@@box: Disable scaling. (RN) v1.1p General: \nofiles makes \makeindex and \makeglossary to \relax. - \@empty is better because of later \renewcommand's. + \@empty is better because of later \renewcommand’s. v1.1p1 - General: \let\output\@gobble before loading of "preview" added. + General: \let\output\@gobble before loading of “preview” added. (RN) v1.1q - General: Problem with "tabularx" and "threeparttabel" solved. + General: Problem with “tabularx” and “threeparttabel” solved. (RN) v1.1r General: Fixed values for \PreviewBbAdjust because \paperwidth @@ -119,13 +119,15 @@ v1.1r v1.1s General: Dummy definition of the page key in DVI mode. v1.1t - General: Remove the line "\let\output\@gobble" because of bad + 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) v1.1u - General: \pdfoutput must be set when loading "pdftex.def" in DVI + 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) + General: Local redefinition of \pdfoutput to be a counter. (RN) +v1.2a + General: Engine tests changed (RN) diff --git a/Master/texmf-dist/doc/latex/pst-pdf/Makefile b/Master/texmf-dist/doc/latex/pst-pdf/Makefile new file mode 100644 index 00000000000..1e72ef57e3d --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/Makefile @@ -0,0 +1,128 @@ + +# `pst-pdf' -- Rolf Niepraschk, 2008-02-24, Rolf.Niepraschk@ptb.de + + +.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps + +PACKAGE = pst-pdf + +PDFLATEX = pdflatex + +LATEX = latex + +ARCHNAME = $(PACKAGE)-$(shell date +"%Y%m%d") +ARCHNAME_TDS = $(PACKAGE).tds + +EXAMPLE = $(PACKAGE)-example.tex + +ADDINPUTS = penguin.eps elephant.ps knuth.png psf-demo.eps \ + insect1.eps insect15.eps + +PDF_CONTAINER = $(EXAMPLE:.tex=-pics.pdf) + +ARCHFILES = $(PACKAGE).dtx $(PACKAGE).ins $(ADDINPUTS) Makefile \ + README.md CHANGES CHANGES.tex \ + $(PACKAGE).pdf $(PACKAGE)-DE.pdf $(EXAMPLE:.tex=.pdf) \ + ps4pdf \ + ps4pdf.bat \ + ps4pdf.bat.noMiKTeX \ + ps4pdf.bat.w95 \ + +PS2PDF = GS_OPTIONS=-dPDFSETTINGS=/prepress ps2pdf + +all : pdf doc example + +pdf : $(EXAMPLE:.tex=.pdf) + +doc : $(PACKAGE).pdf + +doc-DE : $(PACKAGE)-DE.pdf + +example : $(EXAMPLE:.tex=.pdf) + +$(EXAMPLE:.tex=.pdf) : $(EXAMPLE) $(ADDINPUTS) $(PDF_CONTAINER) $(PACKAGE).sty + $(PDFLATEX) $< + +dist : doc doc-DE pdf example + tar cvzf $(ARCHNAME).tar.gz $(ARCHFILES) + @ echo + @ echo $(ARCHNAME).tar.gz + +%.gls %.pdf : %.dtx $(PACKAGE).sty + test -f $(basename $<).glo || touch -f $(basename $<).glo + test -f $(basename $<).idx || touch -f $(basename $<).idx + makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ + $(basename $<).glo + makeindex -s gind.ist -t $(basename $<).ilg -o $(basename $<).ind \ + $(basename $<).idx + $(PDFLATEX) $< + +$(PACKAGE)-DE.gls $(PACKAGE)-DE.pdf : $(PACKAGE).dtx $(PACKAGE).sty + test -f $(basename $@).glo || touch -f $(basename $@).glo + test -f $(basename $@).idx || touch -f $(basename $@).idx + makeindex -s gglo.ist -t $(basename $@).glg -o $(basename $@).gls \ + $(basename $@).glo + makeindex -s gind.ist -t $(basename $@).ilg -o $(basename $@).ind \ + $(basename $@).idx + cp $< $(basename $@).dtx + $(PDFLATEX) '\newcommand*{\mainlang}{ngerman}\input{$(basename $@).dtx}' + $(RM) $(basename $@).dtx + +%.pdf : %.tex + $(PDFLATEX) $< + +$(PACKAGE).sty $(EXAMPLE) : $(PACKAGE).ins $(PACKAGE).dtx + tex $< + +$(EXAMPLE:.tex=.dvi) : $(EXAMPLE) $(ADDINPUTS) $(PACKAGE).sty + $(LATEX) $< + +$(PDF_CONTAINER:.pdf=.ps) : $(EXAMPLE:.tex=.dvi) + dvips -Ppdf -o $@ $< + +$(PDF_CONTAINER) : $(PDF_CONTAINER:.pdf=.ps) + @ if grep "needs cropping" $(<:-pics.ps=.log) > /dev/null; \ + then \ + $(PS2PDF) $< $@.tmp; pdfcrop $@.tmp $@ ; rm $@.tmp; \ + else \ + $(PS2PDF) $< $@; \ + fi + +CHANGES : CHANGES.pdf + pdftotext -enc UTF-8 -layout -nopgbrk $< $@ + +CHANGES.pdf : CHANGES.tex $(PACKAGE).gls + $(PDFLATEX) $< + +arch : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf + zip $(ARCHNAME).zip $(ARCHFILES) + +arch-tds : CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf + $(RM) $(ARCHNAME_TDS).zip + mkdir -p tds/tex/latex/pst-pdf + mkdir -p tds/doc/latex/pst-pdf + mkdir -p tds/source/latex/pst-pdf + mkdir -p tds/scripts/pst-pdf + cp pst-pdf.sty tds/tex/latex/pst-pdf/ + cp CHANGES pst-pdf.pdf pst-pdf-DE.pdf pst-pdf-example.pdf \ + README.md tds/doc/latex/pst-pdf/ + cp CHANGES.tex elephant.ps insect1.eps insect15.eps \ + knuth.png penguin.eps psf-demo.eps pst-pdf.dtx \ + pst-pdf.ins tds/source/latex/pst-pdf + cp ps4pdf ps4pdf.bat ps4pdf.bat.noMiKTeX \ + ps4pdf.bat.w95 tds/scripts/pst-pdf/ + cd tds ; zip -r ../$(ARCHNAME_TDS).zip tex doc source scripts + rm -rf tds + + +clean : + $(RM) $(addprefix $(PACKAGE), \ + .dvi .log .aux .bbl .blg .idx .ind .ilg .gls .glg .glo) \ + $(addprefix $(basename $(EXAMPLE)), .ps .dvi .log .aux) \ + $(EXAMPLE) $(PDF_CONTAINER:.pdf=.ps) $(PDF_CONTAINER) \ + CHANGES.pdf + +veryclean : clean + $(RM) $(PACKAGE).pdf pst-pdf-DE.pdf $(EXAMPLE:.tex=.pdf) CHANGES + +# EOF diff --git a/Master/texmf-dist/doc/latex/pst-pdf/README b/Master/texmf-dist/doc/latex/pst-pdf/README deleted file mode 100644 index e4d9e2fb316..00000000000 --- a/Master/texmf-dist/doc/latex/pst-pdf/README +++ /dev/null @@ -1,26 +0,0 @@ - -pst-pdf.sty - -A LaTeX package to integrate PostScript code into a PDF output. -Load the testfile pst-pdf-example.tex and run it with the shell script - -ps4pdf pst-pdf-example.tex - -it produces the output file pst-pdf-example.pdf. Be sure that the script is -executable. - -pst-pdf.sty -> $TEXMF-LOCAL -ps4pdf -> /usr/local/bin - the shell script for running latex->dvips->ps2pdf->pdflatex - - -without a shell script, run - -latex -dvips -Ppdf -o -pics.ps .dvi -ps2pdf -dAutoRotatePages=/None -pics.ps -pics.pdf -pdflatex - - Rolf Niepraschk, 2006-07-23 - - diff --git a/Master/texmf-dist/doc/latex/pst-pdf/README.md b/Master/texmf-dist/doc/latex/pst-pdf/README.md new file mode 100644 index 00000000000..f9150ab1671 --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/README.md @@ -0,0 +1,24 @@ +# pst-pdf + +A LaTeX package to integrate PostScript code into a PDF output. +Load the testfiles pst-pdf-example?.tex and run it with the shell script +``` +ps4pdf pst-pdf-example.tex +``` +It produces the output file pst-pdf-example.pdf. Be sure that the script is +executable. +``` +pst-pdf.sty -> $TEXMF-LOCAL +ps4pdf -> /usr/local/bin +``` +Without a shell script, run +``` +latex +dvips -Ppdf -o -pics.ps .dvi +ps2pdf -dAutoRotatePages=/None -pics.ps -pics.pdf +pdflatex +``` +For bug reports: https://github.com/rolfn/pst-pdf/issues + +Rolf Niepraschk, 2016-06-23 + 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 d8f280840ea..beb9eafee7b 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 new file mode 100644 index 00000000000..0e2ce00e6a1 Binary files /dev/null and b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.pdf differ diff --git a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex new file mode 100644 index 00000000000..dbcbae5ba7c --- /dev/null +++ b/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example.tex @@ -0,0 +1,279 @@ +%% +%% This is file `pst-pdf-example.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pst-pdf.dtx (with options: `example') +%% +%% 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-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 +%% +\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-example.tex'. 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 deleted file mode 100644 index 1c11131e2c7..00000000000 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.pdf and /dev/null 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 deleted file mode 100644 index 11cb6cd16f3..00000000000 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example1.tex +++ /dev/null @@ -1,129 +0,0 @@ -%% -%% 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 deleted file mode 100644 index 40cb0f6888c..00000000000 Binary files a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.pdf and /dev/null 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 deleted file mode 100644 index 1cfe003f77c..00000000000 --- a/Master/texmf-dist/doc/latex/pst-pdf/pst-pdf-example2.tex +++ /dev/null @@ -1,279 +0,0 @@ -%% -%% 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 87e0631ffc3..d8c341aedc2 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