diff options
Diffstat (limited to 'graphics/pstricks/base/generic')
-rw-r--r-- | graphics/pstricks/base/generic/pstricks-color.tex | 2 | ||||
-rw-r--r-- | graphics/pstricks/base/generic/pstricks-tex.def | 4 | ||||
-rw-r--r-- | graphics/pstricks/base/generic/pstricks-xetex.def | 5 | ||||
-rw-r--r-- | graphics/pstricks/base/generic/pstricks.tex | 46 |
4 files changed, 32 insertions, 25 deletions
diff --git a/graphics/pstricks/base/generic/pstricks-color.tex b/graphics/pstricks/base/generic/pstricks-color.tex index e2d9085937..7a7b5622d5 100644 --- a/graphics/pstricks/base/generic/pstricks-color.tex +++ b/graphics/pstricks/base/generic/pstricks-color.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-color.tex 455 2022-03-01 10:42:02Z herbert $ +%% $Id: pstricks-color.tex 260 2021-09-23 19:22:36Z herbert $ %% %% This is file `pstricks-color.tex', %% diff --git a/graphics/pstricks/base/generic/pstricks-tex.def b/graphics/pstricks/base/generic/pstricks-tex.def index 191e289be9..49529f84c9 100644 --- a/graphics/pstricks/base/generic/pstricks-tex.def +++ b/graphics/pstricks/base/generic/pstricks-tex.def @@ -1,4 +1,4 @@ -%% $Id: pstricks-tex.def 592 2022-08-27 07:00:30Z herbert $ +%% $Id: pstricks-tex.def 711 2023-04-29 18:59:10Z herbert $ %% pstricks-tex.def % %% fileversion and filedate see main file pstricks.tex @@ -89,4 +89,4 @@ \message{defining color #1: \expandafter\meaning\csname\string\color@#1\endcsname}% } %% -%% END: pstricks-tex.def +%% END: pstricks-tex.def
\ No newline at end of file diff --git a/graphics/pstricks/base/generic/pstricks-xetex.def b/graphics/pstricks/base/generic/pstricks-xetex.def index 61495720b2..68049094a2 100644 --- a/graphics/pstricks/base/generic/pstricks-xetex.def +++ b/graphics/pstricks/base/generic/pstricks-xetex.def @@ -1,5 +1,7 @@ -%% $Id: pstricks-xetex.def 276 2021-09-27 11:28:22Z herbert $ +%% $Id: pstricks-xetex.def 4 2020-06-09 08:32:19Z herbert $ %% +%% Copyright 2019- Herbert Voss +% % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 % of this license or (at your option) any later version. @@ -11,7 +13,6 @@ % The xdvipdfmx driver does not support all node macros. In the following % there are alternatives defined: % -%% fileversion and filedate see main file pstricks.tex %% \ncput -> \NCput % \def\NCput{\pst@object{NCput}} 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 |