pst-math (17oct22)

git-svn-id: svn://tug.org/texlive/trunk@64732 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 19 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/pst-math/pst-math.sty b/Master/texmf-dist/tex/latex/pst-math/pst-math.sty
index 0c0f1aef407..ce7a536d8bb 100644
--- a/Master/texmf-dist/tex/latex/pst-math/pst-math.sty
+++ b/Master/texmf-dist/tex/latex/pst-math/pst-math.sty
@@ -1,4 +1,4 @@
-% $Id: pst-math.sty 864 2018-12-15 21:15:11Z herbert $
+% $Id: pst-math.sty 867 2018-12-16 12:07:22Z herbert $
 %%
 %% This is file `pst-math.sty'.
 %%
@@ -12,7 +12,7 @@
 %%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pst-math}[2018/12/16 v 0.65 package wrapper for PSTricks pst-math.tex]
+\ProvidesPackage{pst-math}[2022/10/17 v 0.66 package wrapper for PSTricks pst-math.tex]
 \RequirePackage{pst-calculate}
 \RequirePackage{ifluatex}
 \RequirePackage{xstring}
@@ -31,12 +31,12 @@
   \setcounter{Random@Right}{#2}%
   \setcounter{Random@No@max}{#3}%
   \setcounter{Rand@No}{0}%
-  \def\RandomNumbers{}%
+  \gdef\RandomNumbers{}%
   \def\R@Control{}%
   \multido{\iA=1+1}{\theRandom@No@max}{\xdef\R@Control{0\R@Control}}%
 }
 
-\def\RandomNumbers{}%\pscalculate{randint(\theRandom@Left,\theRandom@Right)}}
+\def\RandomNumbers{}
 
 \def\makeSimpleRandomNumberList{%
   \def\RandomNumbers{}%
@@ -52,18 +52,26 @@
 %
 \def\makeRandomNumberList{%
   \edef\@Number{\pscalculate{randint(\theRandom@Left,\theRandom@Right)}}% Zufallszahl
-  \add@Number{\@Number}}
+    \add@Number{\@Number}}
+
+\def\R@Left{}\def\R@Right{}\def\R@Value{}%
 
 \def\add@Number#1{%
-  \def\R@Left{}\def\R@Right{}\def\R@Value{}%
   \StrChar{\R@Control}{#1}[\R@Value]
   \ifnum\R@Value=0 
     \stepcounter{Rand@No}%
-    \ifnum\theRand@No=1\relax
-      \gdef\RandomNumbers{#1}%
+    \ifx\RandomNumbers\@empty %  the first number ??
+      \xdef\RandomNumbers{#1}%
     \else
       \xdef\RandomNumbers{\RandomNumbers,#1}%
     \fi
+%    \ifnum\theRand@No=1\relax
+%      \gdef\RandomNumbers{#1}%
+%      \RandomNumbers\\
+%    \else
+%      \xdef\RandomNumbers{\RandomNumbers,#1}%
+%      \RandomNumbers\\
+%    \fi
     \StrLeft{\R@Control}{\the\numexpr#1-1}[\R@Left]%
     \StrRight{\R@Control}{\the\numexpr\theRandom@No@max-#1}[\R@Right]%
     \xdef\R@Control{\R@Left1\R@Right}%
@@ -76,13 +84,13 @@
   \next
 }
 \def\getNumberFromList#1{%
-  \global\count0 = 1
+  \setcounter{Rand@No}{1}%
   \edef\x{\noexpand\get@Index#1;\RandomNumbers}\x,,\relax}
 \def\get@Index#1;#2,#3,#4\relax{%
-  \ifnum\the\count0=#1 
+  \ifnum\theRand@No = #1 
     \def\next{#2}%
   \else
-    \global\advance\count0 by 1
+    \stepcounter{Rand@No}%
     \def\next{\get@Index#1;#3,#4\relax}%
   \fi
   \next