From 0b311348359e1406b173d9c0de4974af3e90f836 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 18 Oct 2022 03:01:49 +0000 Subject: CTAN sync 202210180301 --- graphics/pstricks/contrib/pst-math/Changes | 1 + .../pstricks/contrib/pst-math/doc/pst-math-doc.pdf | Bin 231813 -> 228170 bytes .../pstricks/contrib/pst-math/doc/pst-math-doc.tex | 2 +- .../pstricks/contrib/pst-math/dvips/pst-math.pro | 2 +- .../pstricks/contrib/pst-math/latex/pst-math.sty | 30 +++++++++++++-------- .../pstricks/contrib/pst-math/tex/pst-math.tex | 4 +-- 6 files changed, 24 insertions(+), 15 deletions(-) (limited to 'graphics') diff --git a/graphics/pstricks/contrib/pst-math/Changes b/graphics/pstricks/contrib/pst-math/Changes index 6a228ba897..fe248f97a8 100644 --- a/graphics/pstricks/contrib/pst-math/Changes +++ b/graphics/pstricks/contrib/pst-math/Changes @@ -1,4 +1,5 @@ ..... pst-math.sty/pro +0.66 2022-10-17 - fix bug with random list (doubled first entry) 0.65 2018-12-16 - allow lists with more than 100 numbers 0.64 2018-12-13 - added macros for creating lists of randoms 0.63 2014-07-30 - added the arc secans functions diff --git a/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.pdf b/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.pdf index 97b00889d7..a9fee0d9d3 100644 Binary files a/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.pdf and b/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.pdf differ diff --git a/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.tex b/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.tex index d40e7eb2f8..c3c2a80746 100644 --- a/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.tex +++ b/graphics/pstricks/contrib/pst-math/doc/pst-math-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pst-math-doc.tex 864 2018-12-15 21:15:11Z herbert $ +%% $Id: pst-math-doc.tex 887 2018-12-29 13:17:59Z herbert $ \documentclass[fontsize=11pt,english,BCOR=10mm,DIV=12,bibliography=totoc,parskip=false, headings=small, headinclude=false,footinclude=false,oneside,abstract=on]{pst-doc} \usepackage{pst-math} diff --git a/graphics/pstricks/contrib/pst-math/dvips/pst-math.pro b/graphics/pstricks/contrib/pst-math/dvips/pst-math.pro index 1d4f70369a..d68b2e17d6 100644 --- a/graphics/pstricks/contrib/pst-math/dvips/pst-math.pro +++ b/graphics/pstricks/contrib/pst-math/dvips/pst-math.pro @@ -53,7 +53,7 @@ add % build the sum } for Pi 2 mul sqrt z div mul - z 5.5 add z 0.5 add exp mul ENeperian z 5.5 add neg exp mul + z 5.5 add z 0.5 add Power mul ENeperian z 5.5 add neg Power mul % Power is controlled exp end } bind def % /GAMMALN {dup dup dup 5.5 add dup ln 3 -1 roll .5 add mul sub neg 1.000000000190015 diff --git a/graphics/pstricks/contrib/pst-math/latex/pst-math.sty b/graphics/pstricks/contrib/pst-math/latex/pst-math.sty index 0c0f1aef40..ce7a536d8b 100644 --- a/graphics/pstricks/contrib/pst-math/latex/pst-math.sty +++ b/graphics/pstricks/contrib/pst-math/latex/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 diff --git a/graphics/pstricks/contrib/pst-math/tex/pst-math.tex b/graphics/pstricks/contrib/pst-math/tex/pst-math.tex index 5816202457..b3c0e69f00 100644 --- a/graphics/pstricks/contrib/pst-math/tex/pst-math.tex +++ b/graphics/pstricks/contrib/pst-math/tex/pst-math.tex @@ -20,8 +20,8 @@ \csname PSTmathLoaded\endcsname \let\PSTmathLoaded\endinput \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi -\def\fileversion{0.64} -\def\filedate{2018/12/13} +\def\fileversion{0.66} +\def\filedate{2022/10/17} \message{`pst-math' v\fileversion\space, (CJ,hv)} \pstheader{pst-math.pro} -- cgit v1.2.3