From fcb05e5badc5ccfca4b1539572f63e487ed4fce5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Dec 2018 22:20:19 +0000 Subject: pstricks (11dec18) git-svn-id: svn://tug.org/texlive/trunk@49385 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 38 +++++++++++++++------- 1 file changed, 27 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/tex/generic/pstricks') 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{% -- cgit v1.2.3