summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-09-17 22:01:50 +0000
committerKarl Berry <karl@freefriends.org>2016-09-17 22:01:50 +0000
commitf9e7ca3a9f5935c140c8ad548c61ea13d14e0bf1 (patch)
tree98eebfe9b0850b3646a6ee62ada04b41ea253a83
parent1a99ceb79bc0478bdef9c8c60eb8a7455be0a087 (diff)
pstricks (17sep16)
git-svn-id: svn://tug.org/texlive/trunk@42090 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/PSTricks.bib6
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news16.pdfbin40110 -> 45071 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pstricks/pst-news16.tex21
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex21
-rw-r--r--Master/texmf-dist/tex/latex/pstricks/pst-doc.cls6
5 files changed, 38 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
index 1ded07ee525..b77962ea5a0 100644
--- a/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
+++ b/Master/texmf-dist/doc/generic/pstricks/PSTricks.bib
@@ -82,10 +82,10 @@
@Book{PSTricks2,
author = {Herbert Vo\ss},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {7},
+ edition = 7,
publisher = {DANTE -- Lehmanns Media},
year = {2016},
- address = {Heidelberg/Berlin}
+ address = {Heidelberg and Berlin}
}
@Book{PSTricksE,
@@ -103,7 +103,7 @@
edition = {2.},
publisher = {DANTE -- lehmanns media},
year = {2010},
- address = {Heidelberg/Hamburg}
+ address = {Heidelberg and Berlin}
}
@Book{LaTeXRefE,
author = {Herbert Vo\ss},
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
index 2c740033dc4..91d4560901b 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
index b5af96b97c0..c1f16a56381 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news16.tex
@@ -41,7 +41,7 @@ basic package \nxLFile{pstricks}}
This version fixes a bug with \verb|pst@refangle| which is used inside PostScript.
\begin{LTXexample}[pos=t]
-\begin{pspicture}(-1,-1)(10,4)
+\begin{pspicture}(-1,-1)(10,3.5)
\psparametricplot[algebraic]{0}{9}{t^2/9 | sin(t)+1}%
\pscurvepoints{0}{9}{(t^2)/9 | sin(t)+1}{P}%
\pspolylineticks[metricInitValue=1,ticksize=-2pt 2pt,Os=1,Ds=.2]{P}{ ds }{1}{56}%
@@ -50,6 +50,25 @@ This version fixes a bug with \verb|pst@refangle| which is used inside PostScrip
\end{pspicture}
\end{LTXexample}
+\begin{sloppypar}
+There is a new optional argument \Lkeyword{draft} which has the same meaning as
+the one for \Lcs{includegraphics}. The PSTricks image is not drawn, only the
+area of the \Lenv{pspicture} coordinates is seen by a rectangle if (only for \LaTeX).
+\end{sloppypar}
+
+\begin{LTXexample}[pos=t]
+\psset{draft}
+\begin{pspicture}(-1,-1)(10,3.5)
+\psparametricplot[algebraic]{0}{9}{t^2/9 | sin(t)+1}%
+\pscurvepoints{0}{9}{(t^2)/9 | sin(t)+1}{P}%
+\pspolylineticks[metricInitValue=1,ticksize=-2pt 2pt,Os=1,Ds=.2]{P}{ ds }{1}{56}%
+\pspolylineticks[metricInitValue=1,Os=1,Ds=2]{P}{ ds }{0}{6}%
+\multido{\iA=1+1,\iB=3+2}{5}{\Put{6pt;(PNormal\iA)}(PTick\iA){\tiny \iB}}
+\end{pspicture}
+\end{LTXexample}
+
+
+
\clearpage
\nocite{*}
\bibliographystyle{plain}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 63f12e9e309..a8e729e96aa 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,7 +1,7 @@
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2016 Herbert Voss
+%% Copyright 2004-2017 Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -126,19 +126,19 @@
\fi
\XKV@tempa
}
-
+%
\def\ProvidesPackageRCS{\@ifnextchar[\ProvidesPackageRCS@i{\ProvidesPackageRCS@i[] }} %$
\def\ProvidesPackageRCS@i[#1] $#2${} %$
\catcode`\@=\PstAtCode\relax
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
-
+%
\input pgfutil-common.tex
\input pgfkeys.code.tex
\input pgffor.code.tex
\let\pgfforeach\foreach
%
-\def\fileversion{2.68}
-\def\filedate{2016/06/09}
+\def\fileversion{2.69}
+\def\filedate{2016/09/16}
\catcode`\@=11\relax
\pst@addfams{pstricks}
%
@@ -154,7 +154,7 @@
\long\def\@forloop#1,#2,#3\@@#4#5{\def#4{#1}\ifx#4\@nnil \else
#5\def#4{#2}\ifx#4\@nnil \else\global\advance\psLoopIndex by \@ne\relax
#5\@iforloop #3\@@#4{#5}\fi\fi}
-
+%
\long\def\@iforloop#1,#2\@@#3#4{\global\advance\psLoopIndex by \@ne\relax%
\def#3{#1}\ifx #3\@nnil
\expandafter\@fornoop \else
@@ -701,8 +701,9 @@
\newrgbcolor{cyan}{0 1 1}
\newrgbcolor{magenta}{1 0 1}
%
+\define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{}
\define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture
-\psset[pstricks]{bgcolor={}}% \pst@bgcolor is \@empty
+\psset[pstricks]{bgcolor={},draft=false}% \pst@bgcolor is \@empty
\define@key[psset]{pstricks}{style}{%
\@ifundefined{pscs@#1}%
@@ -4446,15 +4447,15 @@ pop
\kern\pst@dimc}%
\if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi
\leavevmode
- \ifdim\overfullrule=\z@
- \box\pst@hbox
- \else
+ \ifPst@draft
\expandafter\ifx\csname @latexerr\endcsname\relax
\box\pst@hbox
\else % do we have LaTeX?
\fboxsep=0pt
\fbox{\rule[-\pst@shift]{0pt}{\ht\pst@hbox}\rule{\wd\pst@hbox}{0pt}}%
\fi
+ \else
+ \box\pst@hbox
\fi
\endgroup
\psset[pstricks]{shift=0}% reset value
diff --git a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
index 7521a82a09f..85015b16e53 100644
--- a/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
+++ b/Master/texmf-dist/tex/latex/pstricks/pst-doc.cls
@@ -19,8 +19,7 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
\ProcessOptions\relax
%
-\LoadClass[%titlepage,
-DIV13]{scrartcl}
+\LoadClass{scrartcl}
%
\RequirePackage[dvipsnames,x11names,svgnames,table]{xcolor}
\RequirePackage{ifxetex}
@@ -36,6 +35,7 @@ DIV13]{scrartcl}
\RequirePackage{bera}
%\RequirePackage[scaled=0.85]{luximono}
\fi
+\usepackage[includeheadfoot,lmargin=2cm,tmargin=1cm,bmargin=1.5cm,rmargin=1.5cm]{geometry}
\RequirePackage{ifpdf}
% Define commands that don't eat spaces.
\RequirePackage{xspace}
@@ -327,6 +327,8 @@ xleftmargin=0pt,xrightmargin=0pt,
\let\nxLkeyval\nxLkeyword
\let\nxLenv\nxLkeyword
\let\nxLps\nxLkeyword
+\def\LColor#1{\texttt{#1}\xLColor{#1}}
+\def\xLColor#1{\index{#1@\texttt{#1}}\index{Color!#1@\texttt{#1}}}
\def\Lkeyval#1{\texttt{#1}\xLkeyval{#1}}
\def\xLkeyval#1{\index{#1@\texttt{#1}}\index{Keyvalue!#1@\texttt{#1}}}
\def\xLoption#1{\index{#1@\texttt{#1}}\index{Package option!#1@\texttt{#1}}}