From 0eca414d24b2ef276840906d8b58eafb63bd573f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 17 Dec 2018 21:30:22 +0000 Subject: pstricks (17dec18) git-svn-id: svn://tug.org/texlive/trunk@49437 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 37 +++++++++++++--------- 1 file changed, 22 insertions(+), 15 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 923352d4402..3934d1b1111 100644 --- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex +++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks.tex 857 2018-12-13 11:20:40Z herbert $ +%% $Id: pstricks.tex 869 2018-12-16 12:19:43Z herbert $ %% pstricks.tex %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu. %% COPYRIGHT 2000-2003 by Denis Girou. @@ -22,7 +22,7 @@ %% !! loading additional TeX packages see line 38,39 and 72ff %% !! loading config file pstricks.con line 439 %% !! loading pro files line 452ff -%% !! fileversion and date see line 78 +%% !! fileversion and date see line 83 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % \edef\PstAtCode{\the\catcode`\@} @@ -80,8 +80,8 @@ \fi \let\pgfforeach\foreach % -\def\fileversion{2.88} -\def\filedate{2018/12/13} +\def\fileversion{2.90} +\def\filedate{2018/12/17} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -650,15 +650,15 @@ \newrgbcolor{magenta}{1 0 1} \@ifundefined{xglobal}% do we have xcolor loaded? - {\@newcolor{randomgray}{Rand setgray}% - \@newcolor{randomrgb}{Rand Rand Rand setrgbcolor}% - \@newcolor{randomcmyk}{Rand Rand Rand Rand setcmykcolor}% - \@newcolor{randomhsb}{Rand Rand Rand sethsbcolor}% + {\@newcolor{randomgray}{tx@Dict begin Rand setgray end}% + \@newcolor{randomrgb}{tx@Dict begin Rand Rand Rand setrgbcolor end}% + \@newcolor{randomcmyk}{tx@Dict begin Rand Rand Rand Rand setcmykcolor end}% + \@newcolor{randomhsb}{tx@Dict begin Rand Rand Rand sethsbcolor end}% }{% - \definecolor[ps]{randomgray}{gray}{Rand}% - \definecolor[ps]{randomrgb}{rgb}{Rand Rand Rand}% - \definecolor[ps]{randomcmyk}{cmyk}{Rand Rand Rand Rand}% - \definecolor[ps]{randomhsb}{hsb}{Rand Rand Rand}% + \definecolor[ps]{randomgray}{gray}{tx@Dict begin Rand end}% + \definecolor[ps]{randomrgb}{rgb}{tx@Dict begin Rand Rand Rand end}% + \definecolor[ps]{randomcmyk}{cmyk}{tx@Dict begin Rand Rand Rand Rand end}% + \definecolor[ps]{randomhsb}{hsb}{tx@Dict begin Rand Rand Rand end}% } % \define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{} @@ -2826,6 +2826,9 @@ \psset[pstricks]{gridlabels=10pt} \define@key[psset]{pstricks}{gridlabelcolor}[black]{\pst@getcolor{#1}\psgridlabelcolor} \psset[pstricks]{gridlabelcolor=black} +\define@key[psset]{pstricks}{xgridoffset}[0]{\pst@getlength{#1}\psk@xgridoffset} +\define@key[psset]{pstricks}{ygridoffset}[0]{\pst@getlength{#1}\psk@ygridoffset} +\psset[pstricks]{xgridoffset=0,ygridoffset=0} \def\tx@Grid{Grid } @@ -2840,6 +2843,8 @@ \pst@@getcoor{#3}% \ifnum\psk@subgriddiv>1\relax \addto@pscode{ + /xGridOffset \psk@xgridoffset\space def + /yGridOffset \psk@ygridoffset\space def gsave \tx@setStrokeTransparency \psk@subgridwidth SLW @@ -2856,6 +2861,8 @@ \fi% \addto@pscode{ gsave + /xGridOffset \psk@xgridoffset def + /yGridOffset \psk@ygridoffset def \tx@setStrokeTransparency \psk@gridwidth SLW \pst@usecolor\psgridcolor @@ -4101,14 +4108,13 @@ pop \def\tx@PutCoor{PutCoor } \def\tx@PutBegin{PutBegin } \def\tx@PutEnd{PutEnd } -\def\rput{\pst@ifstar{\@ifnextchar[{\rput@i}{\begingroup\rput@ii}}} +\def\rput{\def\pst@par{}\pst@ifstar{\@ifnextchar[{\rput@i}{\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}% + \expandafter\addto@par\expandafter{#1}% \fi \rput@ii } @@ -4124,6 +4130,7 @@ pop \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 -- cgit v1.2.3