summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/pst-pdf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-07-15 23:20:24 +0000
committerKarl Berry <karl@freefriends.org>2016-07-15 23:20:24 +0000
commit6486ac961b9d7d4428f198b5e88e33c9f459d85f (patch)
tree2bfed077e080e0950d0f740898312f0fb7fab89d /Master/texmf-dist/source/latex/pst-pdf
parent8a661bd44c6de731f0ac566a5edb8782eddb3461 (diff)
pst-pdf (15jul16)
git-svn-id: svn://tug.org/texlive/trunk@41710 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/pst-pdf')
-rw-r--r--Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx169
-rw-r--r--Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins3
2 files changed, 30 insertions, 142 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 269271c1748..8246a03c8a4 100644
--- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
+++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.dtx
@@ -1,8 +1,8 @@
% \iffalse meta-comment
%
-% Copyright (C) 2005-2008
-% Rolf Niepraschk, <Rolf.Niepraschk@gmx.de>
-% Hubert Gaesslein
+% Copyright (C)
+% 2005--2008: Rolf Niepraschk, <Rolf.Niepraschk@gmx.de>, Hubert Gaesslein
+% 2008--: Rolf Niepraschk, <Rolf.Niepraschk@gmx.de>
% --------------------------------------------------------------
%
% This file may be distributed and/or modified under the
@@ -24,7 +24,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{pst-pdf}
%<*package>
- [2008/10/09 v1.1v PS graphics for pdfLaTeX (RN,HjG)]
+ [2016/07/11 v1.2a PS graphics for pdfLaTeX (RN,HjG)]
%</package>
%
%<*driver>
@@ -50,7 +50,7 @@
%</driver>
% \fi
%
-% \CheckSum{836}
+% \CheckSum{829}
%
% \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
@@ -637,41 +637,35 @@
% range of functions. This test is only executed when the options |active|
% or |inactive| were not given.
% \fi
+% \changes{v1.2a}{2016/07/11}{Engine tests changed (RN)}
% \begin{macrocode}
\ifnum\ppf@TeX@mode=-1\relax
- \begingroup
+ \RequirePackage{ifpdf,ifxetex,ifvtex}%
+ \ifpdf
% \end{macrocode}
-% Default (\TeX{} with a dvi-to-ps converter)
+% \quad$\Rightarrow$\,pdf\TeX{} or Lua\TeX{} are running in PDF mode
% \begin{macrocode}
- \chardef\x=0 %
+ \def\ppf@TeX@mode{1}%
+ \RequirePackage{luatex85}%
+ \else
+ \ifvtex
% \end{macrocode}
-% Check pdf\TeX{}
+% \quad$\Rightarrow$\,V\TeX{}
% \begin{macrocode}
- \@ifundefined{pdfoutput}{}{%
- \ifcase\pdfoutput\else
- \chardef\x=1 %
- \fi
- }%
+ \def\ppf@TeX@mode{9}%
+ \else
+ \ifxetex
% \end{macrocode}
-% Check V\TeX{}
+% \quad$\Rightarrow$\,Xe\TeX{}
% \begin{macrocode}
- \@ifundefined{OpMode}{}{\chardef\x=2 }%
- \expandafter\endgroup
- \ifcase\x
+ \def\ppf@TeX@mode{9}%
+ \else
% \end{macrocode}
% \quad$\Rightarrow$\,DVI mode
% \begin{macrocode}
- \def\ppf@TeX@mode{0}%
- \or
-% \end{macrocode}
-% \quad$\Rightarrow$\,pdf\TeX{} is running in PDF mode
-% \begin{macrocode}
- \def\ppf@TeX@mode{1}%
- \else
-% \end{macrocode}
-% \quad$\Rightarrow$\,V\TeX{} is running
-% \begin{macrocode}
- \def\ppf@TeX@mode{9}%
+ \def\ppf@TeX@mode{0}%
+ \fi
+ \fi
\fi
\fi
% \end{macrocode}
@@ -1754,118 +1748,13 @@
%\endinput
%
% 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>
+%<*example>
%% 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
+%% 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}
@@ -2115,4 +2004,4 @@ $
\mymatrix
\end{document}
-%</example2>
+%</example>
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 9b58cf757e7..85468249513 100644
--- a/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins
+++ b/Master/texmf-dist/source/latex/pst-pdf/pst-pdf.ins
@@ -24,8 +24,7 @@ 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-example1.tex}{\from{pst-pdf.dtx}{example1}}}
-\generate{\file{pst-pdf-example2.tex}{\from{pst-pdf.dtx}{example2}}}
+\generate{\file{pst-pdf-example.tex}{\from{pst-pdf.dtx}{example}}}
\obeyspaces
\Msg{*************************************************************}