texlive[70686] Master/texmf-dist: pst-fit (18mar24)
commits+karl at tug.org
commits+karl at tug.org
Mon Mar 18 20:59:01 CET 2024
Revision: 70686
https://tug.org/svn/texlive?view=revision&revision=70686
Author: karl
Date: 2024-03-18 20:59:01 +0100 (Mon, 18 Mar 2024)
Log Message:
-----------
pst-fit (18mar24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-fit/Changes
trunk/Master/texmf-dist/doc/generic/pst-fit/README
trunk/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex
trunk/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex
trunk/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty
Modified: trunk/Master/texmf-dist/doc/generic/pst-fit/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-fit/Changes 2024-03-18 19:58:52 UTC (rev 70685)
+++ trunk/Master/texmf-dist/doc/generic/pst-fit/Changes 2024-03-18 19:59:01 UTC (rev 70686)
@@ -1,4 +1,4 @@
-%% $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
@@ -5,6 +5,7 @@
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
Modified: trunk/Master/texmf-dist/doc/generic/pst-fit/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-fit/README 2024-03-18 19:58:52 UTC (rev 70685)
+++ trunk/Master/texmf-dist/doc/generic/pst-fit/README 2024-03-18 19:59:01 UTC (rev 70686)
@@ -9,4 +9,4 @@
- Gaussian; and
- 4th order Polynomial
-
+hvoss at tug.org
Modified: trunk/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex 2024-03-18 19:58:52 UTC (rev 70685)
+++ trunk/Master/texmf-dist/doc/generic/pst-fit/pst-fit-doc.tex 2024-03-18 19:59:01 UTC (rev 70686)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex 2024-03-18 19:58:52 UTC (rev 70685)
+++ trunk/Master/texmf-dist/tex/generic/pst-fit/pst-fit.tex 2024-03-18 19:59:01 UTC (rev 70686)
@@ -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 at addfams{pst-fit}
%
\define at key[psset]{pst-fit}{symbolFont}{\def\psk at symbolFont{/#1 }}%
-\psset[pst-fit]{symbolFont=StandardSymL}
+\psset[pst-fit]{symbolFont=StandardSymbolsPS}
%
\def\beginplot at ErrorLine{\begin at OpenObj}
\def\endplot at ErrorLine{\psErrorLine at ii}
@@ -328,7 +328,7 @@
\ifPst at science
mfont (x) show
mfont (10) show
- 0 ttxspc rmoveto mfontexp xcoorexp show
+ 0 ttxspc rmoveto mfontexp xcoorexp \ifPst at comma\space dot2comma \fi show
\fi
\psk at relxerr\space 0 ne
{ \ifPst at science
@@ -353,7 +353,7 @@
\ifPst at science
mfont (x) show
mfont (10) show
- 0 ttxspc rmoveto mfontexp ycoorexp show
+ 0 ttxspc rmoveto mfontexp ycoorexp \ifPst at comma\space dot2comma \fi show
\fi
\psk at relyerr\space 0 ne
{ \ifPst at science
@@ -361,11 +361,11 @@
mfont dely show
mfont (x) show
mfont (10) show
- 0 ttxspc rmoveto mfontexp delyexp show
+ 0 ttxspc rmoveto mfontexp delyexp \ifPst at comma\space dot2comma \fi show
0 ttxspc neg rmoveto s1 (\string\051) show
\else
s1 (\string\261) show
- mfont dely show
+ mfont dely \ifPst at comma\space dot2comma \fi show
s1 (\string\051) show
\fi }
{ s1 (\string\051) show } ifelse } ifelse
@@ -514,7 +514,7 @@
/praXstart praTemp 2 get \pst at 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 at valuewidth string cvs show
+ praARY prak get \psk at valuewidth string cvs \ifPst at 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 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% START PRINT EQUATIONS %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %% http://www-k12.atmos.washington.edu/~ovens/gmt/doc/html/GMT_Docs/node153.html
\ifPst at ShowEq
% Setup Cursor
(\psk at EqPos) length 0 gt
@@ -739,33 +740,37 @@
{ 10 \psk at decimals exp dup 3 1 roll mul round exch div } if
\psk at decimals\space 0 eq { cvi } if /tmpB exch def
(y = ) show
- tmpA \psk at valuewidth string cvs show
+ tmpA \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show
(x) show
0 \psk at fontscale 4 div rmoveto
- mfontexp tmpB \psk at valuewidth string cvs show mfont
+ mfontexp tmpB \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show mfont
0 \psk at fontscale 4 div neg rmoveto
- setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint \psk at valuewidth string cvs show } if } if
+ setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint
+ \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show } if } if
% Exponential Fit Equation %
\psk at ExpFit\space {
Euler ai 0 get exp
\psk at decimals\space -1 gt
{ 10 \psk at decimals exp dup 3 1 roll mul round exch div } if
- \psk at decimals\space 0 eq { cvi } if /tmpA exch def
+ \psk at decimals\space 0 eq { cvi } if /tmpA exch def
Euler ai 1 get exp
\psk at decimals\space -1 gt
{ 10 \psk at decimals exp dup 3 1 roll mul round exch div } if
\psk at decimals\space 0 eq { cvi } if /tmpB exch def
(y = ) show
- (\string\050) show tmpA \psk at valuewidth string cvs show (\string\051) show
+ (\string\050) show tmpA \psk at valuewidth string \ifPst at comma\space dot2comma \fi cvs
+ \ifPst at comma\space dot2comma \fi show (\string\051) show
%(e) show
- (\string\264) show
+ (\string\264) show % centered dot
%0 \psk at fontscale 4 div rmoveto
%mfontexp tmpB \psk at valuewidth string cvs show
- (\string\050) show tmpB \psk at valuewidth string cvs show (\string\051) show
+ (\string\050) show tmpB \psk at valuewidth string \ifPst at comma\space dot2comma \fi cvs
+ \ifPst at comma\space dot2comma \fi show (\string\051) show %( )
0 \psk at fontscale 2 div rmoveto
mfontexp (x) show mfont
0 \psk at fontscale 2 div neg rmoveto
- setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint \psk at valuewidth string cvs show } if} if
+ setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint
+ \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show } if} if
% Gaussian Fit Equation %
\psk at 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 @@
{ 10 \psk at decimals exp dup 3 1 roll mul round exch div } if
\psk at decimals\space 0 eq { cvi } if /tmpC exch def
(y = ) show
- tmpA 30 string cvs show
+ tmpA 30 string cvs \ifPst at comma\space dot2comma \fi show
(e) show
0 \psk at fontscale 4 div rmoveto
- mfontexp tmpC \psk at valuewidth string cvs show
+ mfontexp tmpC \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show
(\string\(x) show
- tmpB 0 ne { tmpB 0 ge { (+) show } if tmpB \psk at valuewidth string cvs show } if
+ tmpB 0 ne { tmpB 0 ge { (+) show } if tmpB
+ \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show } if
(\string\)) show
0 \psk at fontscale 4 div rmoveto (2) show mfont
0 \psk at fontscale 2 div neg rmoveto
- setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint \psk at valuewidth string cvs show } if } if
+ setYint Yint 0 ne and { Yint 0 gt { (+) show } if Yint
+ \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show } if } if
%%%%%%%%%%%%%%%
% Round Coeff %
%%%%%%%%%%%%%%%
@@ -808,10 +815,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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 at comma\space dot2comma \fi show
ci 1 sub 0 gt { xPr } if
ci 1 sub 1 gt {%
- 0 \psk at fontscale 4 div rmoveto ci 1 sub 30 string cvs show
+ 0 \psk at fontscale 4 div rmoveto ci 1 sub 30 string cvs
+ \ifPst at comma\space dot2comma \fi show
0 \psk at fontscale 4 div neg rmoveto } if
ci m eq not { ai ci get 0 lt {}{ (+) show } ifelse } if
} for } if
@@ -822,12 +830,14 @@
\psk at decimals\space 0 eq { cvi } if /rsquared exch def
\psk at EqPos\space PLU moveto
0 \psk at fontscale 1.5 mul neg rmoveto
+% \define at boolkey[psset]{pst-tools}[Pst@]{comma}[true]{%
+% \ifPst at comma\def\psk at decimalSeparator{,}\else\def\psk at decimalSeparator{.}\fi}
(R) show
0 \psk at fontscale 2 div rmoveto
mfontexp (2) show mfont
0 \psk at fontscale 2 div neg rmoveto
( = ) show
- rsquared \psk at valuewidth string cvs show
+ rsquared \psk at valuewidth string cvs \ifPst at comma\space dot2comma \fi show
\fi
}
%
Modified: trunk/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty 2024-03-18 19:58:52 UTC (rev 70685)
+++ trunk/Master/texmf-dist/tex/latex/pst-fit/pst-fit.sty 2024-03-18 19:59:01 UTC (rev 70686)
@@ -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}
More information about the tex-live-commits
mailing list.