diff options
author | Norbert Preining <norbert@preining.info> | 2024-04-01 03:01:08 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2024-04-01 03:01:08 +0000 |
commit | 424c878a0d7e7768235612afefcc53605797eabf (patch) | |
tree | 105207c52625aec5616a90f4b003593325c71d79 /graphics/pstricks/contrib/pst-func/tex/pst-func.tex | |
parent | d1109269e156ddc67b67f942a2e5aad3b37a40a6 (diff) |
CTAN sync 202404010301
Diffstat (limited to 'graphics/pstricks/contrib/pst-func/tex/pst-func.tex')
-rw-r--r-- | graphics/pstricks/contrib/pst-func/tex/pst-func.tex | 91 |
1 files changed, 48 insertions, 43 deletions
diff --git a/graphics/pstricks/contrib/pst-func/tex/pst-func.tex b/graphics/pstricks/contrib/pst-func/tex/pst-func.tex index 786942a07a..ca546b7df6 100644 --- a/graphics/pstricks/contrib/pst-func/tex/pst-func.tex +++ b/graphics/pstricks/contrib/pst-func/tex/pst-func.tex @@ -1,4 +1,4 @@ -%% $Id: pst-func.tex 697 2023-04-14 10:17:32Z herbert $ +%% $Id: pst-func.tex 885 2024-03-31 07:25:14Z herbert $ %% %% This is file `pst-func.tex', %% @@ -31,8 +31,8 @@ % interface to the `xkeyval' package \pst@addfams{pst-func} % -\def\fileversion{1.02} -\def\filedate{2023/04/14} +\def\fileversion{1.02a} +\def\filedate{2024/03/31} \message{`PST-func' v\fileversion, \filedate\space (hv)} % \pstheader{pst-func.pro} @@ -737,7 +737,7 @@ grestore \addto@pscode{ % thanks to Buddy Ledger /mfont { \psk@PSfont\space findfont \psk@fontscale scalefont setfont } bind def /mfontexp { \psk@PSfont\space findfont \psk@fontscale 1.2 div scalefont setfont } bind def - /s1 { /StandardSymL findfont \psk@fontscale scalefont setfont } bind def + /s1 { /StandardSymbolsPS findfont \psk@fontscale scalefont setfont } bind def \ifPst@algebraic /x #1 def /Func (#2) tx@AlgToPs begin AlgToPs end cvx def @@ -1580,45 +1580,50 @@ grestore \leavevmode \pst@killglue \begingroup - \addbefore@par{plotpoints=500,nue=1,mue=1,lambda=0}% + \addbefore@par{plotpoints=500,nue=1,mue=1,lambda=0,saveData=false}% \use@par - \iffalse %\ifluatex for later use - \luaexec{ require("pst-func") - printDataPlotFileFDist(#1,#2,\psk@plotpoints,\psk@mue,\psk@nue,\psk@lambda,"\jobname-lua","true") }% - \fileplot{\jobname-lua.data}% + \ifluatex + \ifPst@saveData + \luaexec{ require("pst-func") + printDataPlotFileFDist(#1,#2,\psk@plotpoints,\psk@mue,\psk@nue,\psk@lambda,"\jobname-lua","true","true") }% + \else + \luaexec{ require("pst-func") + printDataPlotFileFDist(#1,#2,\psk@plotpoints,\psk@mue,\psk@nue,\psk@lambda,"\jobname-lua","true","false") }% + \fi +% \typeout{\stringData} + \pslistplot{\stringData}% \else - \psplot[algebraic=false]{#1}{#2}[/F_BETA \psk@mue 2 div \psk@nue 2 div tx@FuncDict begin BETA end def]{ - /constA Euler \psk@lambda -2 div exp def - /Sum - constA F_BETA -% \psk@nue 2 div \psk@mue 2 div tx@FuncDict begin BETA end - div % first fraction - \psk@mue \psk@nue div \psk@mue 2 div exp - mul - \psk@nue dup \psk@mue x mul add div \psk@mue \psk@nue add 2 div exp - mul - x \psk@mue 2 div 1 sub exp - mul - def - /K 1 def - { - constA \psk@lambda 2 div K exp mul % nominator - \psk@nue 2 div \psk@mue 2 div K add tx@FuncDict begin BETA end K factorial mul % denominator - div % first fraction - \psk@mue \psk@nue div \psk@mue 2 div K add exp - mul - \psk@nue dup \psk@mue x mul add div \psk@mue \psk@nue add 2 div K add exp - mul - x \psk@mue 2 div 1 sub K add exp - mul - dup abs 1e-5 lt - { pop exit } - { Sum add /Sum ED - K 1 add /K ED } ifelse - K 100 ge { (Error ConfHyperFunc: K=100) == exit } if - } loop - Sum - }% + \psplot[algebraic=false]{#1}{#2}[/F_BETA \psk@mue 2 div \psk@nue 2 div tx@FuncDict begin BETA end def]{ + /constA Euler \psk@lambda -2 div exp def + /Sum + constA F_BETA + div % first fraction + \psk@mue \psk@nue div \psk@mue 2 div exp + mul + \psk@nue dup \psk@mue x mul add div \psk@mue \psk@nue add 2 div exp + mul + x \psk@mue 2 div 1 sub exp + mul + def + /K 1 def + { + constA \psk@lambda 2 div K exp mul % nominator + \psk@nue 2 div \psk@mue 2 div K add tx@FuncDict begin BETA end K factorial mul % denominator + div % first fraction + \psk@mue \psk@nue div \psk@mue 2 div K add exp + mul + \psk@nue dup \psk@mue x mul add div \psk@mue \psk@nue add 2 div K add exp + mul + x \psk@mue 2 div 1 sub K add exp + mul + dup abs 1e-5 lt + { pop exit } + { Sum add /Sum ED + K 1 add /K ED } ifelse + K 100 ge { (Error ConfHyperFunc: K=100) == exit } if + } loop + Sum + }% \fi \endgroup \fi @@ -2143,9 +2148,9 @@ grestore \ifPst@onlyNode\else /dec \psk@decimals\space def % Anzahl der Dezimahlen f\"{u}r x /ydec \psk@ydecimals\space def % Anzahl der Dezimalen f\"{u}r y - /symb { /StandardSymL findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift f\"{u}r Klammer und senkrechten Strich + /symb { /StandardSymbolsPS findfont \psk@fontscale\space scalefont setfont } bind def % Symbolschrift f\"{u}r Klammer und senkrechten Strich /schrift { \psk@PSfont\space findfont \psk@fontscale scalefont setfont } bind def % Schrift f\"{u}r die Ergebnisse - /TiefSchrift { /StandardSymL findfont \psk@fontscale 1.8 div scalefont setfont } bind def % Schrift f\"{u}r tiefergestellte Buchstaben + /TiefSchrift { /StandardSymbolsPS findfont \psk@fontscale 1.8 div scalefont setfont } bind def % Schrift f\"{u}r tiefergestellte Buchstaben /spdx \psk@fontscale 4 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist /spdy \psk@fontscale 15 div def % Abstand, der mit der Schriftg\"{o}{\ss}e skaliert ist /Wert { dec -1 le { /dec 15 def } if 10 dec exp mul round 10 dec exp div dec 0 eq { cvi 15 string cvs } { 15 string cvs } ifelse % x-Wert runden und als string ablegen |