summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-05-14 03:00:57 +0000
committerNorbert Preining <norbert@preining.info>2022-05-14 03:00:57 +0000
commit2afee5e322fb0dfc2764c270803bc6381b65636e (patch)
tree6c5fe92847403c0b3238f66b593a36ec55e08414 /graphics
parent4e2ad1a6e6a7ed1dc60b36eaaaa70701ba3d5e75 (diff)
CTAN sync 202205140300
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pstricks/contrib/pst-ode/ChangeLog5
-rw-r--r--graphics/pstricks/contrib/pst-ode/README.md8
-rw-r--r--graphics/pstricks/contrib/pst-ode/pst-ode-doc.pdfbin131897 -> 134155 bytes
-rw-r--r--graphics/pstricks/contrib/pst-ode/pst-ode-doc.tex4
-rw-r--r--graphics/pstricks/contrib/pst-ode/pst-ode.pro2
-rw-r--r--graphics/pstricks/contrib/pst-ode/pst-ode.tex10
6 files changed, 17 insertions, 12 deletions
diff --git a/graphics/pstricks/contrib/pst-ode/ChangeLog b/graphics/pstricks/contrib/pst-ode/ChangeLog
index 4a98bce72f..1ac17161d5 100644
--- a/graphics/pstricks/contrib/pst-ode/ChangeLog
+++ b/graphics/pstricks/contrib/pst-ode/ChangeLog
@@ -1,3 +1,8 @@
+2022-05-13
+ * version 0.16
+ * fix: scoping issue with x, y, t in formatoutput and ODESET procedures,
+ analysed and fixed by Marcel Krüger (https://gitlab.com/zauguin)
+
2021-03-12
* version 0.15
* new: option `algebraicN` (infix notation for number of output points)
diff --git a/graphics/pstricks/contrib/pst-ode/README.md b/graphics/pstricks/contrib/pst-ode/README.md
index c6e6b9a858..d5316bdda2 100644
--- a/graphics/pstricks/contrib/pst-ode/README.md
+++ b/graphics/pstricks/contrib/pst-ode/README.md
@@ -1,16 +1,16 @@
# The `pst-ode` PSTricks package
-© 2012--`\today` Alexander Grahn
-
https://gitlab.com/agrahn/pst-ode
+© 2012--`\today` Alexander Grahn
+
This package defines `\pstODEsolve` for solving initial value problems for sets of Ordinary Differential Equations (ODE) using the Runge-Kutta-Fehlberg (**`RKF45`**) method with automatic step size adjustment.
-`\pstODEsolve[<options>]{<result>}{<output format>}{`*t*<sub>0</sub>`}{`*t*<sub>e</sub>`}{`*N*`}{`**x**<sub>0</sub>`}{`**f**`(`*t*`, `**x**`)}`
+`\pstODEsolve[<options>]{<result>}{<output format>}{`*t*<sub>0</sub>`}{`*t*<sub>e</sub>`}{`*N*`}{`**x**<sub>0</sub>`}{`**f**`(`*t*`,`**x**`)}`
The state vectors **x** found at *N* equally spaced output points between *t*<sub>0</sub> and *t*<sub>e</sub> are stored in the PostScript object `<result>`, formatted according to the second argument `<output format>`, as a long list of values. `<output format>` lists the quantities to be stored in `<result>`. The user can select from the elements of **x** and the integration parameter *t*.
-The initial condition vector **x**<sub>0</sub> and the right-hand side **f**`(`*t*`, `**x**`)` of the ODE system can be input in algebraic notation, if desired. RPN (Postfix) notation of PostScript can as well be used.
+The initial condition vector **x**<sub>0</sub> and the right-hand side **f**`(`*t*`,`**x**`)` of the ODE system can be input in algebraic notation, if desired. RPN (Postfix) notation of PostScript can as well be used.
`<result>` can be directly used as the `<data>` argument of `\listplot{<data>}` (package `pst-plot`) or `\listplotThreeD{<data>}` (package `pst-3dplot`).
diff --git a/graphics/pstricks/contrib/pst-ode/pst-ode-doc.pdf b/graphics/pstricks/contrib/pst-ode/pst-ode-doc.pdf
index 3244717e84..f80e6bcfa2 100644
--- a/graphics/pstricks/contrib/pst-ode/pst-ode-doc.pdf
+++ b/graphics/pstricks/contrib/pst-ode/pst-ode-doc.pdf
Binary files differ
diff --git a/graphics/pstricks/contrib/pst-ode/pst-ode-doc.tex b/graphics/pstricks/contrib/pst-ode/pst-ode-doc.tex
index 6c67293611..74b1e5ab11 100644
--- a/graphics/pstricks/contrib/pst-ode/pst-ode-doc.tex
+++ b/graphics/pstricks/contrib/pst-ode/pst-ode-doc.tex
@@ -167,7 +167,7 @@ With \Lkeyword{algebraicIC}, the initial condition vector $\mathbf{x}_0$ can be
With \Lkeyword{algebraic}, the right-hand side of differential equations $\mathbf{f}(t,\mathbf{x})$ can be given in infix notation. Algebraic infix expressions are to be separated by `\Lkeyword{|}'. Default is \PS{} notation.\\
\noindent\OptArg*{algebraicAll}\\
-Option \Lkeyword{algebraicAll} is equivalent to setting all of \Lkeyword{algebraicOutputFormat}, \Lkeyword{algebraicT}, \Lkeyword{algebraicIC}, \Lkeyword{algebraic}.\\
+Option \Lkeyword{algebraicAll} is equivalent to setting all of \Lkeyword{algebraicOutputFormat}, \Lkeyword{algebraicT}, \Lkeyword{algebraicN}, \Lkeyword{algebraicIC}, \Lkeyword{algebraic}.\\
\noindent\OptArg*{silent}\\
Option \Lkeyword{silent} suppresses the terminal output of stepping information.\\
@@ -335,7 +335,7 @@ I'd like to thank Manuel Luque for the inspiring examples on his site \url{http:
\section{License}
This package can be redistributed and/or modified under the terms
-of the \LaTeX Project Public License Distributed from CTAN archives:
+of the \LaTeX Project Public License distributed from CTAN archives:
\url{http://mirrors.ctan.org/macros/latex/base/lppl.txt}
\end{document}
diff --git a/graphics/pstricks/contrib/pst-ode/pst-ode.pro b/graphics/pstricks/contrib/pst-ode/pst-ode.pro
index 6967071032..0018fedc47 100644
--- a/graphics/pstricks/contrib/pst-ode/pst-ode.pro
+++ b/graphics/pstricks/contrib/pst-ode/pst-ode.pro
@@ -1,7 +1,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% PostScript prologue for pst-ode.tex.
-% Version 0.15, 2021/03/12
+% Version 0.16, 2022/05/13
%
% Alexander Grahn (C) 2012--today
%
diff --git a/graphics/pstricks/contrib/pst-ode/pst-ode.tex b/graphics/pstricks/contrib/pst-ode/pst-ode.tex
index d57ff94273..b4b43b1cd2 100644
--- a/graphics/pstricks/contrib/pst-ode/pst-ode.tex
+++ b/graphics/pstricks/contrib/pst-ode/pst-ode.tex
@@ -11,8 +11,8 @@
%% ODEs using the Runge-Kutta-Fehlberg (RKF45) method with automatic
%% step size adjustment
%%
-\def\fileversion{0.15}
-\def\filedate{2021/03/12}
+\def\fileversion{0.16}
+\def\filedate{2022/05/13}
\csname PSTODELoaded\endcsname
\let\PSTODELoaded\endinput
@@ -159,7 +159,7 @@
\ifPst@algebraic
/ode@rpn tx@Dict begin (\expandafter\ode@zapspace\ode@arg\@nil) AlgParser end cvx bind def
/ODESET {%system of ODEs
- /x exch def /y x def tx@Dict begin ode@rpn end ode@dict xlength end array astore
+ ode@dict /x exch def /y x def end tx@Dict begin ode@dict ode@rpn end end ode@dict xlength end array astore
} bind def
\else
/ODESET {
@@ -171,8 +171,8 @@
\ifPstODE@algebraicOutputFormat
/ode@fmtrpn tx@Dict begin (\expandafter\ode@zapspace\ode@fmt\@nil) AlgParser end cvx bind def
/formatoutput {%
- ode@laststate /x exch def /y x def /t ode@dict tcur end def
- tx@Dict begin ode@fmtrpn end
+ ode@dict ode@laststate /x exch def /y x def /t tcur def end
+ tx@Dict begin ode@dict ode@fmtrpn end end
} bind def
\else /formatoutput {[#2] assembleresult} def \fi%
%perform ode integration