diff options
author | Norbert Preining <norbert@preining.info> | 2023-05-01 03:03:35 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-05-01 03:03:35 +0000 |
commit | 5164dcdfce521e72debadb619624c4ee37b03ccc (patch) | |
tree | c1d8f6031b3af0521ebd8a6fe8363439aeb3e021 /graphics/pstricks/base/generic/pstricks.tex | |
parent | 7932c8102a8f5298d7d36caa6df233c356f96e56 (diff) |
CTAN sync 202305010303
Diffstat (limited to 'graphics/pstricks/base/generic/pstricks.tex')
-rw-r--r-- | graphics/pstricks/base/generic/pstricks.tex | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/graphics/pstricks/base/generic/pstricks.tex b/graphics/pstricks/base/generic/pstricks.tex index 264fb01e1a..2252c6bb12 100644 --- a/graphics/pstricks/base/generic/pstricks.tex +++ b/graphics/pstricks/base/generic/pstricks.tex @@ -88,8 +88,8 @@ \let\pgfforeach\foreach % -\def\fileversion{3.18} -\def\filedate{2022/11/28} +\def\fileversion{3.19} +\def\filedate{2023/04/30} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -344,11 +344,11 @@ } % \def\pst@pyth#1#2#3{% from pst-3d - \begingroup% - \pst@dima=#1\relax% - \ifnum\pst@dima<\z@\pst@dima=-\pst@dima\fi% dima=abs(x) - \pst@dimb=#2\relax% - \ifnum\pst@dimb<\z@\pst@dimb=-\pst@dimb\fi% dimb=abs(y) + \begingroup + \pst@dima=#1\relax + \ifnum\pst@dima<\z@ \pst@dima=-\pst@dima\fi% dima=abs(x) + \pst@dimb=#2\relax + \ifnum\pst@dimb<\z@ \pst@dimb=-\pst@dimb\fi% dimb=abs(y) \advance\pst@dimb\pst@dima % dimb=s=abs(x)+abs(y) \ifnum\pst@dimb=\z@ \global\pst@dimg=\z@ % dimg=z=sqrt(x^2+y^2) @@ -364,7 +364,7 @@ \pst@dimd=7pt % initial guess at sqrt(u) \pst@@pyth\pst@@pyth\pst@@pyth % dimd=sqrt(u) \pst@dimtonum\pst@dimd\pst@tempa - \pst@dimg=\pst@tempa\pst@dimb + \global\pst@dimg=\pst@tempa\pst@dimb \global\divide\pst@dimg 8 % dimg=z=(8f)*s/8 \fi \endgroup @@ -4137,16 +4137,21 @@ pop \pssetylength\pst@dimb{#3}% \pssetxlength\pst@dimc{#4}% \pssetylength\pst@dimd{#5}% - \ifdim\pst@dima>\pst@dimc% - \pst@dimg=\pst@dima% - \pst@dima=\pst@dimc% - \pst@dimc=\pst@dimg% - \fi% - \ifdim\pst@dimb>\pst@dimd% - \pst@dimg=\pst@dimb% - \pst@dimb=\pst@dimd% - \pst@dimd=\pst@dimg% - \fi% + \pstVerb{/xCanvasLeft \pst@number\pst@dima def + /yCanvasLeft \pst@number\pst@dimb def + /xCanvasRight \pst@number\pst@dimc def + /yCanvasRight \pst@number\pst@dimd def + }% + \ifdim\pst@dima>\pst@dimc + \pst@dimg=\pst@dima + \pst@dima=\pst@dimc + \pst@dimc=\pst@dimg + \fi + \ifdim\pst@dimb>\pst@dimd + \pst@dimg=\pst@dimb + \pst@dimb=\pst@dimd + \pst@dimd=\pst@dimg + \fi \setbox\pst@hbox=\hbox\bgroup \begingroup\KillGlue \@ifundefined{@latexerr}{}{\let\unitlength\psunit}% @@ -4246,8 +4251,9 @@ pop \@namedef{endpspicture*}{\endpspicture} % \ifx\pstcustomize\relax \input pstricks.con \fi -\pstVerb{0.8 setlinewidth 0 setgray}% default setting (needed for lualatex) - +%%% changed 20230430 by hv, confuses otherwise the dvi color handling +\ifluatex\pstVerb{0.8 setlinewidth 0 setgray}\fi% default setting (needed for lualatex) +%%% \catcode`\@=\PstAtCode\relax % \endinput |