diff options
author | Karl Berry <karl@freefriends.org> | 2023-04-18 19:41:35 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-04-18 19:41:35 +0000 |
commit | f60813ebc3d6007c61d26e2558acd597dce4ff7a (patch) | |
tree | 736704f70175804a35b1691a07601aa6139b3cff | |
parent | 38d898cde9c146a8d17bdbc6fbf3bcbf3c3ab75d (diff) |
pstricks-add (18apr23)
git-svn-id: svn://tug.org/texlive/trunk@66887 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks-add/Changes | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf | bin | 12448916 -> 12459825 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex | 10 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex | 37 |
4 files changed, 37 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks-add/Changes b/Master/texmf-dist/doc/generic/pstricks-add/Changes index aab0b20fe35..12da3933fb0 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/Changes +++ b/Master/texmf-dist/doc/generic/pstricks-add/Changes @@ -1,4 +1,4 @@ -%% $Id: Changes 656 2022-11-21 08:41:43Z herbert $ +%% $Id: Changes 705 2023-04-17 18:32:58Z herbert $ %% pstricks-add.pro ----------- 0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY @@ -14,6 +14,7 @@ pstricks-add.sty ----------- (hv) pstricks-add.tex ----------- (hv) + v 3.94 2023-04-17 - use L3 for floating point on LaTeX level v 3.93 2022-11-21 - modifies documentation fix for \psOlypicRings v 3.92 2021-12-25 - added \psColorLine diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf Binary files differindex 17450fd892a..aa6a853289e 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex index e36c8d3b20d..b12623a7ac0 100644 --- a/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex +++ b/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add-doc.tex 656 2022-11-21 08:41:43Z herbert $ +%% $Id: pstricks-add-doc.tex 705 2023-04-17 18:32:58Z herbert $ %\RequirePackage{pdfmanagement-testphase} %\DeclareDocumentMetadata{} % @@ -145,7 +145,7 @@ Timothy Van Zandt \begin{BDef} \Lcs{psGetSlope}\coord1\coord2\Lcs{\Larga{macro}}\\ -\Lcs{psGetDistance}\coord1\coord2\Lcs{\Larga{macro}} +\Lcs{psGetDistance}\OptArg{\Larga{decimals}}\coord1\coord2\Lcs{\Larga{macro}} \end{BDef} \begin{LTXexample}[width=4cm] @@ -159,6 +159,12 @@ Timothy Van Zandt %\psGetDistance(-2111,-12)(3,1)\DVal ==> Overflow! \end{LTXexample} +\begin{LTXexample}[width=4cm] +\psGetDistance(-2,1)(3,-1.5)\DVal \DVal\\ +\psGetDistance[5](-2,1)(3,-1.5)\DVal \DVal\\ +\psGetDistance[3](-2,1)(3,-1.5)\DVal \DVal\\ +\psGetDistance[1](-2,1)(3,-1.5)\DVal \DVal +\end{LTXexample} \clearpage diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index 2b0344422d8..e0f79965744 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.tex 656 2022-11-21 08:41:43Z herbert $ +%% $Id: pstricks-add.tex 705 2023-04-17 18:32:58Z herbert $ %% %% This is file `pstricks-add.tex', %% @@ -31,8 +31,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.93} -\def\filedate{2022/11/21} +\def\fileversion{3.94} +\def\filedate{2023/04/17} \let\pstricksaddFV\fileversion \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % @@ -50,13 +50,30 @@ \advance\pst@dimn by -#4pt \pst@divide{\pst@dimn}{\pst@dimm}#5} % -\def\psGetDistance(#1,#2)(#3,#4)#5{% 4 values without a dimen! #5 is a macro - \pst@dimm=#1pt% - \advance\pst@dimm by -#3pt% - \pst@dimn=#2pt% - \advance\pst@dimn by -#4pt - \pst@pyth\pst@dimm\pst@dimn\pst@dimo - \edef#5{\strip@pt\pst@dimo} +\def\psGetDistance{\@ifnextchar[\psGetDistance@i{\psGetDistance@ii}} +\def\psGetDistance@i[#1](#2,#3)(#4,#5)#6{% 4 values without a dimen! #6 is a macro + \if@pstLaTeX + \edef#6{\pscalculate{round(sqrt((#4-#2)^2+(#5-#3)^2),#1)}}% + \else + \pst@dimm=#1pt + \advance\pst@dimm by -#3pt + \pst@dimn=#2pt + \advance\pst@dimn by -#4pt + \pst@pyth\pst@dimm\pst@dimn\pst@dimo + \edef#5{\strip@pt\pst@dimo}% + \fi +}% +\def\psGetDistance@ii(#1,#2)(#3,#4)#5{% 4 values without a dimen! #6 is a macro + \if@pstLaTeX + \edef#5{\pscalculate{sqrt((#3-#1)^2+(#4-#2)^2)}}% + \else + \pst@dimm=#1pt + \advance\pst@dimm by -#3pt + \pst@dimn=#2pt + \advance\pst@dimn by -#4pt + \pst@pyth\pst@dimm\pst@dimn\pst@dimo + \edef#5{\strip@pt\pst@dimo}% + \fi }% %--------------------------------------- small stuff ------------------------------- \define@boolkey[psset]{pstricks-add}[Pst@]{CMYK}[true]{} |