diff options
author | Karl Berry <karl@freefriends.org> | 2018-12-09 22:37:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-12-09 22:37:09 +0000 |
commit | a5b95c30b4007ce056780ddc7a862789c4402aec (patch) | |
tree | 73a2c112dff4062347cf26d1fa9c0d66419cdb86 /Master/texmf-dist/tex/latex/pstricks-add | |
parent | 5f2879c55bb928db4d672eae3b4c1843d61f9009 (diff) |
pstricks-add (9dec18)
git-svn-id: svn://tug.org/texlive/trunk@49360 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/pstricks-add')
-rw-r--r-- | Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty index 97fdcfab764..4e021d197e0 100644 --- a/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty +++ b/Master/texmf-dist/tex/latex/pstricks-add/pstricks-add.sty @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.sty 721 2018-02-03 20:37:57Z herbert $ +%% $Id: pstricks-add.sty 726 2018-02-05 13:52:25Z herbert $ % \RequirePackage{pstricks} \RequirePackage{pst-plot} @@ -7,7 +7,7 @@ \RequirePackage{pst-math} \RequirePackage{multido} -\ProvidesPackage{pstricks-add}[2018/02/03 v. 0.15 package wrapper for +\ProvidesPackage{pstricks-add}[2018/02/04 v. 0.16 package wrapper for pstricks-add.tex (hv)] \input{pstricks-add.tex} \ProvidesFile{pstricks-add.tex} @@ -17,30 +17,26 @@ [2009/12/17 v. 0.23, PostScript prologue file (hv)] \@addtofilelist{pstricks-add.pro}}{}% -\RequirePackage{xparse} - -\ExplSyntaxOn -\DeclareExpandableDocumentCommand\psCalc{m}{\fp_to_decimal:n{#1}}% -\ExplSyntaxOff +\RequirePackage{pst-calculate} \def\psRiemannSum(#1,#2)#3#4{% (x0,x1) n f(#1) \def\psFunction@##1{#4}% - \edef\ps@@dx{\psCalc{(#2-#1)/#3}}% - \edef\ps@@dxHalf{\psCalc{\ps@@dx/2}}% + \edef\ps@@dx{\pscalculate{(#2-#1)/#3}}% + \edef\ps@@dxHalf{\pscalculate{\ps@@dx/2}}% % \typeout{dx=\ps@dx}% \def\psRightSumValue{0}% \def\psLeftSumValue{0}% \def\psMiddleSumValue{0}% \def\psDiffSumValue{0}% \Multido{\rA=#1+\ps@@dx,\rB=\ps@@dx+\ps@@dx,\rC=\ps@@dxHalf+\ps@@dx}{#3}{% - \def\ps@rightY{\psCalc{\psFunction@{\rB}}}% - \def\ps@leftY{\psCalc{\psFunction@{\rA}}}% - \def\ps@middleY{\psCalc{\psFunction@{\rC}}}% + \def\ps@rightY{\pscalculate{\psFunction@{\rB}}}% + \def\ps@leftY{\pscalculate{\psFunction@{\rA}}}% + \def\ps@middleY{\pscalculate{\psFunction@{\rC}}}% % \typeout{\ps@leftY, \ps@rightY }% - \edef\psLeftSumValue{\psCalc{\psLeftSumValue+\ps@@dx*\ps@leftY}}% - \edef\psRightSumValue{\psCalc{\psRightSumValue+\ps@@dx*\ps@rightY}}% - \edef\psMiddleSumValue{\psCalc{\psMiddleSumValue+\ps@@dx*\ps@middleY}}% - \edef\psDiffSumValue{\psCalc{\psDiffSumValue+abs(\ps@@dx*(\ps@rightY-\ps@leftY))}}% + \edef\psLeftSumValue{\pscalculate{\psLeftSumValue+\ps@@dx*\ps@leftY}}% + \edef\psRightSumValue{\pscalculate{\psRightSumValue+\ps@@dx*\ps@rightY}}% + \edef\psMiddleSumValue{\pscalculate{\psMiddleSumValue+\ps@@dx*\ps@middleY}}% + \edef\psDiffSumValue{\pscalculate{\psDiffSumValue+abs(\ps@@dx*(\ps@rightY-\ps@leftY))}}% % \typeout{\psLeftSumValue , \psRightSumValue }% }% end \Multido } |