From 2c9fe895c462462b5d1a9b928c2b8485efcc86db Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 18 May 2014 21:48:45 +0000 Subject: pstricks-add (18may14) git-svn-id: svn://tug.org/texlive/trunk@34105 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pstricks-add/Changes | 3 +- .../doc/generic/pstricks-add/pstricks-add-doc.pdf | Bin 5112439 -> 5112398 bytes .../doc/generic/pstricks-add/pstricks-add-doc.tex | 10 +++- .../tex/generic/pstricks-add/pstricks-add.tex | 57 ++++++++++----------- 4 files changed, 39 insertions(+), 31 deletions(-) diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index 5c3eb4820bc..88e985b699d 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/Changes +++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes @@ -1,4 +1,4 @@ -%% $Id: Changes 873 2014-01-22 14:18:25Z herbert $ +%% $Id: Changes 914 2014-05-17 20:02:53Z herbert $ %% pstricks-add.pro ----------- 0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY @@ -39,6 +39,7 @@ pstricks-add.sty ----------- (hv) pstricks-add.tex ----------- (hv) + v 3.68 2014-05-17 - another minor fixe to \psStep v 3.67 2014-05-07 - some minor fixes to \psStep v 3.66 2014-04-17 - added \psBigArrow v 3.65 2014-01-21 - added \ignorespaces for \psStartPoint diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf index a17da1ef47e..925fc26054c 100644 Binary files a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf and b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex index 9e44051b63a..72530064e63 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add-doc.tex 874 2014-01-22 14:25:35Z herbert $ +%% $Id: pstricks-add-doc.tex 914 2014-05-17 20:02:53Z herbert $ \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings headexclude,footexclude,oneside]{pst-doc} \listfiles @@ -4128,6 +4128,8 @@ overpainted by the line. \end{LTXexample} + + %-------------------------------------------------------------------------------------- \subsection{Examples} %-------------------------------------------------------------------------------------- @@ -4157,6 +4159,7 @@ All examples are printed with \verb|\psset{arrowscale=2,linecolor=red}|. \end{pspicture} \end{LTXexample} + \begin{LTXexample}[width=2.5cm] \begin{pspicture}(2,2) \psset{arrowscale=2,ArrowFill=true} @@ -4235,6 +4238,7 @@ All examples are printed with \verb|\psset{arrowscale=2,linecolor=red}|. \end{pspicture} \end{LTXexample} + %-------------------------------------------------------------------------------------- \subsubsection{\nxLcs{pspolygon}} %-------------------------------------------------------------------------------------- @@ -4574,6 +4578,8 @@ Possible optional arguments are + + \subsection{Special arrow option \texttt{arrowLW}} Only for the arrowtype \Lnotation{o} and \Lnotation{*} it is possible to @@ -4799,6 +4805,8 @@ end } \end{pspicture} \end{LTXexample} + + \clearpage Once again the same data, but with metric equal to the x coordinate. Change the last few lines to: diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index f431518cf14..f7751f1c9d1 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.tex 908 2014-04-17 20:48:05Z herbert $ +%% $Id: pstricks-add.tex 914 2014-05-17 20:02:53Z herbert $ %% %% This is file `pstricks-add.tex', %% @@ -30,8 +30,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.67} -\def\filedate{2014/05/07} +\def\fileversion{3.68} +\def\filedate{2014/05/17} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -345,7 +345,7 @@ a add \addbefore@par{doublesep=1cm} \begin@ClosedObj \pssetlength\pst@dimm{\psdoublesep} - \pst@getcoor{#1}\pst@tempA + \pst@getcoor{#1}\pst@tempA \pst@getcoor{#2}\pst@tempB \addto@pscode{ /Width \pst@number\pst@dimm def @@ -1370,11 +1370,11 @@ a add x dx add yMax lineto dx neg 0 \ifPst@noVerticalLines rmoveto \else rlineto \fi x yMin \ifPst@noVerticalLines moveto \else lineto \fi - closepath + closepath } repeat \or % 3->inf(imum) - x scx 0 moveto #3 { + x scx 0 moveto \ifPst@algebraic Func \else #4 \fi /y0 ED % left value f(x) /xOld x def /x x dx add def @@ -1383,11 +1383,11 @@ a add scy dup xOld scx exch \ifPst@noVerticalLines moveto \else lineto \fi x scx exch lineto x scx 0 \ifPst@noVerticalLines moveto \else lineto \fi - closepath + closepath } repeat \or % 4-> sup(remum) - x scx 0 moveto #3 { + x scx 0 moveto \ifPst@algebraic Func \else #4 \fi /y0 ED % left value f(x) /x x dx add def \ifPst@algebraic Func \else #4 \fi /y1 ED % right value f(x+dx) @@ -1395,7 +1395,7 @@ a add scy dup x dx sub scx exch \ifPst@noVerticalLines moveto \else lineto \fi x scx exch lineto x scx 0 \ifPst@noVerticalLines moveto \else lineto \fi - closepath + closepath } repeat \fi }% @@ -1493,42 +1493,41 @@ a add \def\psplotTangent{\@ifnextchar*{\@startrue\psplotTangent@i}{\@starfalse\psplotTangent@i*}} \def\psplotTangent@i*{\@ifnextchar[{\psplotTangent@ii}{\psplotTangent@ii[]}} \def\psplotTangent@ii[#1]#2#3#4{% - \pst@killglue% - \expandafter\psplotTangent@x#3,,\@nil\relax% - \begingroup% + \pst@killglue + \expandafter\psplotTangent@x#3,,\@nil\relax + \begingroup \ifx\relax#1\relax\else\psset{linestyle=solid,#1}\fi% - \ifx\psk@Derive\@empty\ifPst@algebraic\def\psk@Derive{NOT@EMPTY}\fi\fi%%dr 0606 hv 1003 - \pst@addarrowdef% - \addto@pscode{% + \ifx\psk@Derive\@empty\ifPst@algebraic\def\psk@Derive{NOT@EMPTY}\fi\fi %%dr 0606 hv 1003 + \pst@addarrowdef + \addto@pscode{ /F@pstplot \ifPst@algebraic (#4) tx@addDict begin AlgParser end cvx \else { #4 } \fi def % define function \ifx\psk@Derive\@empty\else - \ifx\psk@Derive\@NOTEMPTY\else%%dr 0606 - /FDer@pstplot % do we have a derivation defined? + \ifx\psk@Derive\@NOTEMPTY\else %%dr 0606 + /FDer@pstplot % do we have a derivation defined? \ifPst@algebraic (\psk@Derive) tx@addDict begin AlgParser end cvx \else { \psk@Derive } \fi def % define derivation - \fi%%dr 0606 + \fi %%dr 0606 \fi% - /@parametric false def %%dr 0606 + /@parametric false def %%dr 0606 % first we calculate the origin - #2 dup /x ED /t ED tx@addDict begin mark F@pstplot end counttomark 1 gt % test, if we have parametricplot - %%{ /y ED /x ED } % if yes, then we have 2 values - { /y ED /x ED /@parametric true def } % if yes, then we have 2 values%%dr 0606 + #2 dup /x ED /t ED tx@addDict begin mark F@pstplot end counttomark 1 gt % test, if we have parametricplot + { /y ED /x ED /@parametric true def } % if yes, then we have 2 values %%dr 0606 { \ifPst@polarplot x \ifPst@algebraic RadtoDeg \fi PtoC /y ED /x ED \else /y ED \fi } ifelse cleartomark - \ifx\psk@Derive\@NOTEMPTY %%begin dr 0606 - %% algebraic we can use the derivative machine + \ifx\psk@Derive\@NOTEMPTY %%begin dr 0606 + %% algebraic we can use the derivative machine /FDer@pstplot (#4) @parametric { (t) } { (x) } ifelse tx@Derive begin Derive end tx@addDict begin AlgParser end cvx def - \fi %%end dr 0606 + \fi %%end dr 0606 x \pst@number\psxunit mul y \pst@number\psyunit mul translate % define the temporary origin % now we calculate the slope of the tangent - \ifx\psk@Derive\@empty% de we have a derivation defined? - #2 abs 1.0e-6 lt % no, we choose secant for the tangent + \ifx\psk@Derive\@empty % de we have a derivation defined? + #2 abs 1.0e-6 lt % no, we choose secant for the tangent { #2 0.0005 add dup /x ED /t ED tx@addDict begin mark F@pstplot end counttomark 1 gt % test, if we have parametricplot - { /y2 ED /x2 ED } % we have 2 values + { /y2 ED /x2 ED } % we have 2 values { \ifPst@polarplot dup x \ifPst@algebraic RadtoDeg \fi cos mul /x2 ED x \ifPst@algebraic RadtoDeg \fi sin mul \else /x2 x def \fi /y2 ED } ifelse - cleartomark % delete the mark + cleartomark % delete the mark #2 0.0005 sub dup /x ED /t ED tx@addDict begin mark F@pstplot end counttomark 1 gt % test, if we have parametricplot { /y1 ED /x1 ED } { \ifPst@polarplot dup x \ifPst@algebraic RadtoDeg \fi -- cgit v1.2.3