summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/generic/pst-func/pst-func.tex')
-rw-r--r--Master/texmf-dist/tex/generic/pst-func/pst-func.tex20
1 files changed, 11 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
index a1490b48993..253e3f48ce6 100644
--- a/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
+++ b/Master/texmf-dist/tex/generic/pst-func/pst-func.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-func.tex 920 2014-05-20 18:21:51Z herbert $
+%% $Id: pst-func.tex 861 2018-12-13 20:40:06Z herbert $
%%
%% This is file `pst-func.tex',
%%
@@ -31,8 +31,8 @@
% interface to the `xkeyval' package
\pst@addfams{pst-func}
%
-\def\fileversion{0.91}
-\def\filedate{2018/11/15}
+\def\fileversion{0.92}
+\def\filedate{2018/12/13}
\message{`PST-func' v\fileversion, \filedate\space (hv)}
%
\pstheader{pst-func.pro}
@@ -306,7 +306,7 @@
% a scx 0 moveto
a scx 0 \@nameuse{beginqp@\psplotstyle}
\psk@plotpoints 1 sub {
- a b \psk@Simpson % a b M on Stack
+ a b \psk@Simpson false % a b M useXval on Stack
tx@FuncDict begin Simpson I end % y value on stack
scy b scx exch \@nameuse{doqp@\psplotstyle} %lineto
/b b dx add def
@@ -470,10 +470,12 @@
/b a dx add def
/scx { \pst@number\psxunit mul } def
/scy { \pst@number\psyunit mul } def
- tx@FuncDict begin /SFunc { #3 } def end
+ tx@FuncDict begin
+ /SFunc \ifPst@algebraic (#3) tx@AlgToPs begin AlgToPs end cvx \else { #3 } \fi def
+ end
a scx 0 moveto
\psk@plotpoints 1 sub {
- a b \psk@Simpson % a b M on Styack
+ a b \psk@Simpson\space \ifPst@algebraic true \else false \fi % a b M useX on Stack
tx@FuncDict begin Simpson I end % y value on stack
scy b scx exch lineto
/b b dx add def
@@ -498,12 +500,12 @@
/scx { \pst@number\psxunit mul } def
/scy { \pst@number\psyunit mul } def
tx@FuncDict begin /SFunc { t #5 } def end
- a b \psk@Simpson % a b M on Stack
+ a b \psk@Simpson false % a b M useX on Stack
tx@FuncDict begin Simpson I end % y value on stack
scy t scx exch moveto
/t t dd add def
\psk@plotpoints 1 sub {
- a b \psk@Simpson % a b M on Stack
+ a b \psk@Simpson false % a b M useXon Stack
tx@FuncDict begin Simpson I end % y value on stack
scy t scx exch lineto
/t t dd add def
@@ -517,7 +519,7 @@
%
\def\psConv{\@ifnextchar[{\psConv@i}{\psConv@i[]}}
\def\psConv@i[#1]#2#3(#4,#5)#6#7{%
- \psIntegral[#1]{#2}{#3}(#4,#5){pop pop x #6\space x t neg add #7\space mul}%
+ \psIntegral[#1]{#2}{#3}(#4,#5){pop pop xVal #6\space xVal t neg add #7\space mul}%
}%
%
\define@key[psset]{pst-func}{PrintVLimit}[1e-6]{\def\psFunc@PrintVLimit{#1 }}