CTAN sync 202403180301

6 files changed, 41 insertions, 29 deletions

diff --git a/graphics/pstricks/contrib/pst-fit/Changes b/graphics/pstricks/contrib/pst-fit/Changes
index 28f6efcacd..6b4fd06254 100644
--- a/graphics/pstricks/contrib/pst-fit/Changes
+++ b/graphics/pstricks/contrib/pst-fit/Changes
@@ -1,10 +1,11 @@
-%% $Id: Changes 673 2012-04-01 09:50:48Z herbert $
+%% $Id: Changes 881 2024-03-17 20:32:53Z herbert $
 %%
 pst-fit.sty ----------- (hv)
 0.01 2012-04-01  first CTAN version
 
 
 pst-fit.tex ----------- (bl/hv)
+0.03  2024-03-17  - added option comma for decimals instead of dot 
 0.02  2017-08-24  - use always URW fonts instead of PostScript, 
                     eg Helvetica->NimbusSanL
 0.01  2012-04-01  - first CTAN version
diff --git a/graphics/pstricks/contrib/pst-fit/README b/graphics/pstricks/contrib/pst-fit/README
index 1b1c2baa84..d437d7262a 100644
--- a/graphics/pstricks/contrib/pst-fit/README
+++ b/graphics/pstricks/contrib/pst-fit/README
@@ -9,4 +9,4 @@
 -    Gaussian; and
 -    4th order Polynomial
 
-
+hvoss@tug.org
diff --git a/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.pdf b/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.pdf
index 9d1c6fed0b..ca08195565 100644
--- a/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.pdf
+++ b/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.pdf
diff --git a/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.tex b/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.tex
index a61092a524..959d76fc8d 100644
--- a/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.tex
+++ b/graphics/pstricks/contrib/pst-fit/doc/pst-fit-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-fit-doc.tex 673 2012-04-01 09:50:48Z herbert $
+%% $Id: pst-fit-doc.tex 881 2024-03-17 20:32:53Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,
    smallheadings, headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
diff --git a/graphics/pstricks/contrib/pst-fit/latex/pst-fit.sty b/graphics/pstricks/contrib/pst-fit/latex/pst-fit.sty
index 89ab3527fb..b299c01abc 100644
--- a/graphics/pstricks/contrib/pst-fit/latex/pst-fit.sty
+++ b/graphics/pstricks/contrib/pst-fit/latex/pst-fit.sty
@@ -1,7 +1,8 @@
-%% $Id: pst-fit.sty 673 2012-04-01 09:50:48Z herbert $
+%% $Id: pst-fit.sty 881 2024-03-17 20:32:53Z herbert $
 \RequirePackage{pstricks}
+\RequirePackage{pst-tools}
 \RequirePackage{pstricks-add}
-\ProvidesPackage{pst-fit}[2012/04/01 package wrapper for 
+\ProvidesPackage{pst-fit}[2024/03/17 package wrapper for 
   pst-fit.tex (hv)]
 \input{pst-fit.tex}
 \ProvidesFile{pst-fit.tex}
diff --git a/graphics/pstricks/contrib/pst-fit/tex/pst-fit.tex b/graphics/pstricks/contrib/pst-fit/tex/pst-fit.tex
index 3f174660ac..ea7c0ef753 100644
--- a/graphics/pstricks/contrib/pst-fit/tex/pst-fit.tex
+++ b/graphics/pstricks/contrib/pst-fit/tex/pst-fit.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-fit.tex 673 2012-04-01 09:50:48Z herbert $
+%% $Id: pst-fit.tex 881 2024-03-17 20:32:53Z herbert $
 %%
 %% This is file `pst-fit.tex',
 %%
@@ -23,8 +23,8 @@
 \ifx\PSTricksAddLoaded\endinput\else\input pstricks-add.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else    \input pst-xkey \fi
 %
-\def\fileversion{0.02}
-\def\filedate{2017/08/24}
+\def\fileversion{0.03}
+\def\filedate{2024/03/17}
 \message{`PST-fit' v\fileversion, \filedate\space (BL,HV)}
 %
 \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
@@ -32,7 +32,7 @@
 \pst@addfams{pst-fit}
 %
 \define@key[psset]{pst-fit}{symbolFont}{\def\psk@symbolFont{/#1 }}%
-\psset[pst-fit]{symbolFont=StandardSymL}
+\psset[pst-fit]{symbolFont=StandardSymbolsPS}
 %
 \def\beginplot@ErrorLine{\begin@OpenObj}
 \def\endplot@ErrorLine{\psErrorLine@ii}
@@ -328,7 +328,7 @@ n 0 eq not
        \ifPst@science
        mfont (x) show
        mfont (10) show
-       0 ttxspc rmoveto mfontexp xcoorexp show
+       0 ttxspc rmoveto mfontexp xcoorexp \ifPst@comma\space dot2comma \fi show
        \fi
      \psk@relxerr\space 0 ne
      { \ifPst@science
@@ -353,7 +353,7 @@ n 0 eq not
        \ifPst@science
        mfont (x) show
        mfont (10) show
-       0 ttxspc rmoveto mfontexp ycoorexp show
+       0 ttxspc rmoveto mfontexp ycoorexp \ifPst@comma\space dot2comma \fi show
        \fi
      \psk@relyerr\space 0 ne
      { \ifPst@science
@@ -361,11 +361,11 @@ n 0 eq not
        mfont dely show
        mfont (x) show
        mfont (10) show
-       0 ttxspc rmoveto mfontexp delyexp show
+       0 ttxspc rmoveto mfontexp delyexp \ifPst@comma\space dot2comma \fi show
        0 ttxspc neg rmoveto s1 (\string\051) show
        \else
        s1 (\string\261) show
-       mfont dely show
+       mfont dely \ifPst@comma\space dot2comma \fi show
        s1 (\string\051) show
        \fi }
        { s1 (\string\051) show } ifelse } ifelse
@@ -514,7 +514,7 @@ n 0 eq not
          /praXstart praTemp 2 get \pst@number\psxunit\space mul def
          0 1 praTemp 1 get 1 sub {/praj ED
          0 1 praTemp 0 get 1 sub {/prai ED /prak praj praTemp 1 get prai mul add def
-         praARY prak get \psk@valuewidth string cvs show
+         praARY prak get \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show
          currentpoint pop dup praXmax gt { /praXmax ED }{ pop } ifelse
          currentpoint pop praXstart sub neg tempfontscale 1.5 mul neg rmoveto
          } for
@@ -723,6 +723,7 @@ n 0 eq not
   %%%%%%%%%%%%%%%%%%%%%%%%%%%
   %% START PRINT EQUATIONS %%
   %%%%%%%%%%%%%%%%%%%%%%%%%%%
+  %% http://www-k12.atmos.washington.edu/~ovens/gmt/doc/html/GMT_Docs/node153.html
   \ifPst@ShowEq
   % Setup Cursor
   (\psk@EqPos) length 0 gt
@@ -739,33 +740,37 @@ n 0 eq not
     { 10 \psk@decimals exp dup 3 1 roll mul round exch div } if
     \psk@decimals\space 0 eq { cvi } if  /tmpB exch def
   (y = ) show
-  tmpA  \psk@valuewidth string cvs show
+  tmpA  \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show
   (x) show
   0 \psk@fontscale 4 div rmoveto
-  mfontexp tmpB \psk@valuewidth string cvs show mfont
+  mfontexp tmpB \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show mfont
   0 \psk@fontscale 4 div neg rmoveto
-  setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint \psk@valuewidth string cvs show } if } if
+  setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint 
+    \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show } if } if
  % Exponential Fit Equation %
   \psk@ExpFit\space {
   Euler ai 0 get exp
   \psk@decimals\space -1 gt
     { 10 \psk@decimals exp dup 3 1 roll mul round exch div } if
-    \psk@decimals\space 0 eq { cvi } if  /tmpA exch def
+    \psk@decimals\space 0 eq { cvi } if  /tmpA exch def 
   Euler ai 1 get exp
   \psk@decimals\space -1 gt
     { 10 \psk@decimals exp dup 3 1 roll mul round exch div } if
     \psk@decimals\space 0 eq { cvi } if  /tmpB exch def
   (y = ) show
-  (\string\050) show tmpA \psk@valuewidth string cvs show (\string\051) show
+  (\string\050) show tmpA \psk@valuewidth string \ifPst@comma\space dot2comma \fi cvs 
+    \ifPst@comma\space dot2comma \fi show (\string\051) show
   %(e) show
-  (\string\264) show
+  (\string\264) show  % centered dot
   %0 \psk@fontscale 4 div rmoveto
   %mfontexp tmpB \psk@valuewidth string cvs show
-  (\string\050) show tmpB \psk@valuewidth string cvs show (\string\051) show
+  (\string\050) show tmpB \psk@valuewidth string \ifPst@comma\space dot2comma \fi cvs 
+    \ifPst@comma\space dot2comma \fi show (\string\051) show   %( )
   0 \psk@fontscale 2 div rmoveto
   mfontexp (x) show mfont
   0 \psk@fontscale 2 div neg rmoveto
-  setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint \psk@valuewidth string cvs show } if} if
+  setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint 
+    \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show } if} if
   % Gaussian Fit Equation %
   \psk@GaussFit\space {
   /tmpA Euler ai 0 get ai 1 get dup mul 4 div ai 2 get div sub exp def
@@ -784,16 +789,18 @@ n 0 eq not
     { 10 \psk@decimals exp dup 3 1 roll mul round exch div } if
     \psk@decimals\space 0 eq { cvi } if  /tmpC exch def
   (y = ) show
-  tmpA 30 string cvs show
+  tmpA 30 string cvs \ifPst@comma\space dot2comma \fi show
   (e) show
   0 \psk@fontscale 4 div rmoveto
-  mfontexp tmpC \psk@valuewidth string cvs show
+  mfontexp tmpC \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show
   (\string\(x) show
-  tmpB 0 ne { tmpB 0 ge { (+) show } if tmpB \psk@valuewidth string cvs show } if
+  tmpB 0 ne { tmpB 0 ge { (+) show } if tmpB 
+    \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show } if
   (\string\)) show
   0 \psk@fontscale 4 div rmoveto (2) show mfont
   0 \psk@fontscale 2 div neg rmoveto
-  setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint \psk@valuewidth string cvs show } if } if
+  setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint 
+    \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show } if } if
   %%%%%%%%%%%%%%%
   % Round Coeff %
   %%%%%%%%%%%%%%%
@@ -808,10 +815,11 @@ n 0 eq not
   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   PolyEq { (y =) show
   1 1 m { /ci exch def
-          ai ci 1 sub get 30 string cvs show
+          ai ci 1 sub get 30 string cvs \ifPst@comma\space dot2comma \fi show
           ci 1 sub 0 gt { xPr } if
           ci 1 sub 1 gt {%
-             0 \psk@fontscale 4 div rmoveto ci 1 sub 30 string cvs show
+             0 \psk@fontscale 4 div rmoveto ci 1 sub 30 string cvs 
+             \ifPst@comma\space dot2comma \fi show
              0 \psk@fontscale 4 div neg rmoveto } if 
           ci m eq not { ai ci get 0 lt {}{ (+) show } ifelse } if
   } for } if
@@ -822,12 +830,14 @@ n 0 eq not
   \psk@decimals\space 0 eq { cvi } if  /rsquared exch def
   \psk@EqPos\space PLU moveto
   0 \psk@fontscale 1.5 mul neg rmoveto
+%  \define@boolkey[psset]{pst-tools}[Pst@]{comma}[true]{%
+%  \ifPst@comma\def\psk@decimalSeparator{,}\else\def\psk@decimalSeparator{.}\fi}
   (R) show
   0 \psk@fontscale 2 div rmoveto
   mfontexp (2) show mfont
   0 \psk@fontscale 2 div neg rmoveto
   ( = ) show
-  rsquared \psk@valuewidth string cvs show
+  rsquared \psk@valuewidth string cvs \ifPst@comma\space dot2comma \fi show
   \fi 
 }
 %