summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-05-18 21:48:45 +0000
committerKarl Berry <karl@freefriends.org>2014-05-18 21:48:45 +0000
commit2c9fe895c462462b5d1a9b928c2b8485efcc86db (patch)
tree48f4fe630a15be02246506d46eb0d0979b42dd99 /Master/texmf-dist/tex
parentf478b27f4c3e827a33448774c884200ea9bcbbd9 (diff)
pstricks-add (18may14)
git-svn-id: svn://tug.org/texlive/trunk@34105 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex57
1 files changed, 28 insertions, 29 deletions
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