pstricks (11dec18)

git-svn-id: svn://tug.org/texlive/trunk@49385 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 42 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/generic/pstricks/README b/Master/texmf-dist/doc/generic/pstricks/README
index 1ab7a0ef1e6..626295ad82c 100644
--- a/Master/texmf-dist/doc/generic/pstricks/README
+++ b/Master/texmf-dist/doc/generic/pstricks/README
@@ -1,4 +1,4 @@
-PSTricks 2018
+PSTricks 2019
 
 This package may be distributed under the terms of the LaTeX Project 
 Public License, as described in lppl.txt in the base LaTeX distribution.
@@ -103,19 +103,15 @@ base    : main PSTricks files
 
 
 5 - Running pdflatex or lualatex
-     Load package pstricks-pdf instead of pstricks and run your example with
+     Load package auto-pst-pdf or auto-pst-pdf-lua and run your example with
 the optional argument --shell-escape (MikTeX allows also -enable-write18)
 
 lualatex --shell-escape <file>
 pdflatex --shell-escape <file>
 
-pstricks-pdf creates in the background all pspicture environment as single
-pdf graphic files. In difference to auto-pst-pdf the package pstricks-pdf allows running
-lualatex.
-All optional arguments of package auto-pst-pdf are possible.
-See documentation for more informations. The package pst-platform is
-loaded by default and similiar to ifplatform.sty, it fixes a problem with
-lualatex.
+auto-pst-pdf(-lua) creates in the background all pspicture environment as single
+pdf graphic files.
+See documentation for more informations.
 
 
 
@@ -127,4 +123,4 @@ be found on the Web page.
 
 
 --
-Denis Girou, Sebastian Rahtz and Herbert Voss (updated November 2017)
+Denis Girou, Sebastian Rahtz and Herbert Voss (updated December 2018)
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
index 6904025bbb2..d12fcc533f6 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.pdf
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
index 1cf91b97cd0..949fcab9e0c 100644
--- a/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
+++ b/Master/texmf-dist/doc/generic/pstricks/pst-news18.tex
@@ -51,12 +51,18 @@ this new file.
 
 
 %--------------------------------------------------------------------------------------
-\section{\texttt{pstricks.tex} (v. 2.84 -- 2018/05/01)}
+\section{\texttt{pstricks.tex} (v. 2.87 -- 2018/12/11)}
 %--------------------------------------------------------------------------------------
 
 Use the \Lcs{long} definition for \Lcs{@fornoop} to be compatible to the latest
-chanegs in \LaTeX.
-
+changes in \LaTeX.
+
+In old versions the macro \Lcs{rput} can't be used with the key-value setting. The latest version
+of \Lfile{pstricks.tex} defines a modified \Lcs{rput} which ckecks first if a following
+optional argument has the old behaviour, eg \Lcs{rput}\texttt{[lb]\{...\}} or 
+a key/value setting like \Lcs{rput}\texttt{[ref=lb,rot=...,](...)}. However, there should be no
+change in the output and, of course, it makes no sense to mix the old and new setting in \emph{one}
+\Lcs{rput} macro.
 
 
 \subsection{PostScript Fonts}
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 7b9e2ba95db..b6d8128f047 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -1,8 +1,8 @@
-%% $Id: pstricks.tex 838 2018-11-14 19:00:45Z herbert $
+%% $Id: pstricks.tex 856 2018-12-11 11:20:46Z herbert $
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
-%% Copyright 2004-2018 Herbert Voss
+%% Copyright 2004-2019 Herbert Voss
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -80,8 +80,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.86a}
-\def\filedate{2018/11/14}
+\def\fileversion{2.87}
+\def\filedate{2018/12/11}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -4101,20 +4101,36 @@ pop
 \def\tx@PutCoor{PutCoor }
 \def\tx@PutBegin{PutBegin }
 \def\tx@PutEnd{PutEnd }
-\def\rput{\def\pst@par{}\pst@ifstar{\@ifnextchar[{\rput@i}{\rput@ii}}}
-\def\rput@i[#1]{\addto@par{ref={#1}}\rput@ii}
+\def\rput{\pst@ifstar{\@ifnextchar[{\rput@i}{\begingroup\rput@ii}}}
+\def\rput@i[#1]{%
+  \begingroup
+  \test@for@options#1=\@nil
+  \ifnum\the\pst@cntm=\z@ 
+    \addto@par{ref={#1}}%
+  \else
+    \expandafter\psset\expandafter{#1}%
+  \fi
+  \rput@ii
+}
+\def\test@for@options#1=#2\@nil{%
+  \if$#2$  % #2 is empty -> old syntax
+    \pst@cntm=\z@
+  \else    % something like foo=bar
+    \pst@cntm=\@ne
+  \fi
+}
+
 \def\rput@ii{\@ifnextchar({\rput@iv}{\rput@iii}}
 \def\rput@iii#1{\addto@par{rot={#1}}\@ifnextchar({\rput@iv}{\rput@iv(\z@,\z@)}}
 \def\rput@iv(#1){\pst@killglue\pst@makebox{\rput@v{#1}}}
 \def\rput@v#1{%
-  \begingroup%
-    \use@par%
-    \if@star\pst@starbox\fi%
-    \pst@makesmall\pst@hbox%
+    \use@par
+    \if@star\pst@starbox\fi
+    \pst@makesmall\pst@hbox
     \ifx\psk@rot\@empty\else\pst@rotate{ps@rot }\pst@hbox\fi% (MJS)
 %    \pst@rotate\psk@rot\pst@hbox%
     \psput@{#1}\pst@hbox%
-  \endgroup%
+  \endgroup
   \ignorespaces}
 %
 \def\multirput{%