From 8992fd4a79ab8f6cf711d89d67275ef3cde5b516 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Tue, 9 Jul 2024 20:04:31 +0000
Subject: pstricks (9jul24)

git-svn-id: svn://tug.org/texlive/trunk@71752 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/doc/generic/pstricks/pst-news24.pdf | Bin 98554 -> 99744 bytes
 .../texmf-dist/doc/generic/pstricks/pst-news24.tex |   6 +++++
 .../doc/generic/pstricks/pstricks-bug.tex          |   6 ++---
 .../texmf-dist/tex/generic/pstricks/pstricks.tex   |  27 ++++++++++++++-------
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf
index bbc7bf404d2..e102b8a602a 100644
Binary files a/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf and b/Master/texmf-dist/doc/generic/pstricks/pst-news24.pdf differ
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
index 3fb53580ab3..bf357b88d48 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news24.tex
@@ -41,6 +41,12 @@ broken.
 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}.
diff --git a/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex b/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
index b5f9ba2c32c..d4e0329dd39 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pstricks-bug.tex
@@ -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@makebox\clipbox@@{#1}}
+\def\psclipbox{\@ifnextchar[{\psclipbox@}{\psclipbox@[\z@]}}
+\def\psclipbox@[#1]{\pst@makebox\psclipbox@@{#1}}
 
 % 20.
 \def\mixed@coor#1#2{%
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 2f87e9895e8..66b00657b99 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -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@addfams{pstricks}
 %
 %\define@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@immd5.informatik.uni-erlangen.de (Dietrich Paulus)
 %\def\clipbox@[#1]{\pst@makebox\clipbox@@{#1}}
-\def\clipbox@[#1]{\pst@makebox{\clipbox@@{#1}}}
+\def\psclipbox@[#1]{\pst@makebox{\psclipbox@@{#1}}}
 % DG modification end
-\def\clipbox@@#1{%
+\def\psclipbox@@#1{%
   \pssetlength\pst@dimg{#1}%
   \leavevmode\hbox{%
   \begin@psclip%
@@ -4119,10 +4119,19 @@ pop
 \def\pst@picture{\@ifnextchar[{\pst@@picture}{\pst@@picture[]}}
 \def\pst@@picture[#1]{\@ifnextchar({\pst@@picture@i[#1]}{\pst@@picture@@i[#1]}}%
 \def\pst@@picture@@i[#1]{%
-  \gdef\pscoor{(10,10)}%
+  \def\pic@coor{(0,0)(0,0)}%
+%  \gdef\pscoor{(10,10)}%
   \ifPst@calcframe
     \typeout{>>>Check for file \jobname-\the\numexpr\ps@imagectr+1.psaux}%
-    \IfFileExists{\jobname-\the\numexpr\ps@imagectr+1.psaux}{\input{\jobname-\the\numexpr\ps@imagectr+1.psaux}}{}%
+    \IfFileExists{\jobname-\the\numexpr\ps@imagectr+1.psaux}
+      {\input{\jobname-\the\numexpr\ps@imagectr+1.psaux}%
+       \xdef\pic@coor{(0,0)\pscoor}%
+       \typeout{----->>\pic@coor}%
+       \typeout{----->>\pscoor}%
+      }
+      {%\gdef\pscoor{(10,10)}
+       %\def\pic@coor{(0,0)(0,0)(10,10)}
+       }%
     %  \typeout{>>>\pscoor}%
   \fi
   \edef\@temp{[\noexpand#1]\pscoor}%
@@ -4168,7 +4177,7 @@ pop
   \ifPst@pgffunctions\pstVerb{ pgffunctions }\fi% hv 2013-04-17
 }
 
-\def\pic@coor{(0,0)(0,0)(10,10)}
+%\def\pic@coor{(0,0)(0,0)(10,10)}
 \def\endpspicture{%
   \ifPst@calcframe
     \ifPSTlualatex   
@@ -4236,7 +4245,7 @@ pop
     \advance\pst@dimd\pst@dimb
     \lower\pst@dimd\box\pst@hbox
     \kern\pst@dimc}%
-  \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi
+  \if@star\setbox\pst@hbox=\hbox{\psclipbox@@\z@}\fi
   \leavevmode
   \ifPst@draft
     \expandafter\ifx\csname @latexerr\endcsname\relax
-- 
cgit v1.2.3