texlive[71752] Master/texmf-dist: pstricks (9jul24)

[commits+karl at tug.org]

Revision: 71752
          https://tug.org/svn/texlive?view=revision&revision=71752
Author:   karl
Date:     2024-07-09 22:04:31 +0200 (Tue, 09 Jul 2024)
Log Message:
-----------
pstricks (9jul24)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf
    trunk/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
    trunk/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
    trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex

Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex	2024-07-09 20:04:21 UTC (rev 71751)
+++ trunk/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex	2024-07-09 20:04:31 UTC (rev 71752)
@@ -41,6 +41,12 @@
 Added a test for \verb|lualatex| before the default linewidth and color are set.
 See last line in \verb|pstricks.tex|
 
+Moved macro \Lcs{clipbox} to \Lcs{psclipbox} to prevent a clash with package
+\LPack{adjustbox}
+from Martin Scharrer.
+
+
+
 \section{\LuaLaTeX}\label{lua}
 This version has a stable basic support for the lua package
 \LPack{luapstricks.lua}, available from \url{https://github.com/zauguin/luapstricks}.

Modified: trunk/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex	2024-07-09 20:04:21 UTC (rev 71751)
+++ trunk/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex	2024-07-09 20:04:31 UTC (rev 71752)
@@ -97,7 +97,7 @@
 % 15. When lines are very short, linestyle=dash may cause an error.
 %     PATCH: Input this file.
 %
-% 16. \clipbox does not work.
+% 16. \psclipbox does not work.
 %     PATCH: Input this file.
 %
 % 17. Various nodes are missing \leavevmode, which can cause irregularities
@@ -509,8 +509,8 @@
   stroke>
 
 % 16.
-\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
-\def\clipbox@[#1]{\pst at makebox\clipbox@@{#1}}
+\def\psclipbox{\@ifnextchar[{\psclipbox@}{\psclipbox@[\z@]}}
+\def\psclipbox@[#1]{\pst at makebox\psclipbox@@{#1}}
 
 % 20.
 \def\mixed at coor#1#2{%

Modified: trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex	2024-07-09 20:04:21 UTC (rev 71751)
+++ trunk/Master/texmf-dist/tex/generic/pstricks/pstricks.tex	2024-07-09 20:04:31 UTC (rev 71752)
@@ -88,8 +88,8 @@
 
 \let\pgfforeach\foreach
 %
-\def\fileversion{3.19c}
-\def\filedate{2024/02/02}
+\def\fileversion{3.20}
+\def\filedate{2024/07/09}
 \pst at addfams{pstricks}
 %
 %\define at boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -2609,13 +2609,13 @@
   \AltClipMode
 \fi
 
-\def\clipbox{\@ifnextchar[{\clipbox@}{\clipbox@[\z@]}}
+\def\psclipbox{\@ifnextchar[{\psclipbox@}{\psclipbox@[\z@]}}
 % DG modification begin - Apr. 3, 1997
 % From paulus at immd5.informatik.uni-erlangen.de (Dietrich Paulus)
 %\def\clipbox@[#1]{\pst at makebox\clipbox@@{#1}}
-\def\clipbox@[#1]{\pst at makebox{\clipbox@@{#1}}}
+\def\psclipbox@[#1]{\pst at makebox{\psclipbox@@{#1}}}
 % DG modification end
-\def\clipbox@@#1{%
+\def\psclipbox@@#1{%
   \pssetlength\pst at dimg{#1}%
   \leavevmode\hbox{%
   \begin at psclip%
@@ -4119,10 +4119,19 @@
 \def\pst at picture{\@ifnextchar[{\pst@@picture}{\pst@@picture[]}}
 \def\pst@@picture[#1]{\@ifnextchar({\pst@@picture at i[#1]}{\pst@@picture@@i[#1]}}%
 \def\pst@@picture@@i[#1]{%
-  \gdef\pscoor{(10,10)}%
+  \def\pic at coor{(0,0)(0,0)}%
+%  \gdef\pscoor{(10,10)}%
   \ifPst at calcframe
     \typeout{>>>Check for file \jobname-\the\numexpr\ps at imagectr+1.psaux}%
-    \IfFileExists{\jobname-\the\numexpr\ps at imagectr+1.psaux}{\input{\jobname-\the\numexpr\ps at imagectr+1.psaux}}{}%
+    \IfFileExists{\jobname-\the\numexpr\ps at imagectr+1.psaux}
+      {\input{\jobname-\the\numexpr\ps at imagectr+1.psaux}%
+       \xdef\pic at coor{(0,0)\pscoor}%
+       \typeout{----->>\pic at coor}%
+       \typeout{----->>\pscoor}%
+      }
+      {%\gdef\pscoor{(10,10)}
+       %\def\pic at coor{(0,0)(0,0)(10,10)}
+       }%
     %  \typeout{>>>\pscoor}%
   \fi
   \edef\@temp{[\noexpand#1]\pscoor}%
@@ -4168,7 +4177,7 @@
   \ifPst at pgffunctions\pstVerb{ pgffunctions }\fi% hv 2013-04-17
 }
 
-\def\pic at coor{(0,0)(0,0)(10,10)}
+%\def\pic at coor{(0,0)(0,0)(10,10)}
 \def\endpspicture{%
   \ifPst at calcframe
     \ifPSTlualatex   
@@ -4236,7 +4245,7 @@
     \advance\pst at dimd\pst at dimb
     \lower\pst at dimd\box\pst at hbox
     \kern\pst at dimc}%
-  \if at star\setbox\pst at hbox=\hbox{\clipbox@@\z@}\fi
+  \if at star\setbox\pst at hbox=\hbox{\psclipbox@@\z@}\fi
   \leavevmode
   \ifPst at draft
     \expandafter\ifx\csname @latexerr\endcsname\relax