pstricks (24aug18)

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

1 files changed, 7 insertions, 22 deletions

diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 825559264df..e0540b78aa2 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 761 2018-05-01 19:11:51Z herbert $
+%% $Id: pstricks.tex 797 2018-08-23 18:33:16Z herbert $
 %% pstricks.tex
 %% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
 %% COPYRIGHT 2000-2003 by Denis Girou.
@@ -80,8 +80,8 @@
 \fi
 \let\pgfforeach\foreach
 %
-\def\fileversion{2.85}
-\def\filedate{2018/07/22}
+\def\fileversion{2.86}
+\def\filedate{2018/08/23}
 \pst@addfams{pstricks}
 %
 %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -4332,11 +4332,11 @@ pop
 \define@key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil}
 \def\pst@@showgrid#1#2#3\@nil{%                            hv 20130403
   \def\showgridp@s{0}%
-  \ifx#1b \showgridtrue\else%                               bottom
-    \ifx#1f \showgridfalse\else
+  \ifx#1b\showgridtrue\else%                               bottom
+    \ifx#1f\showgridfalse\else
       \ifx#1t
         \ifx#2r \showgridtrue\else%  			   true->bottom
-               \showgridtrue\def\showgridp@s{1}\fi%        top
+                \showgridtrue\def\showgridp@s{1}\fi%        top
   \fi\fi\fi
   \ifnum\showgridp@s>0\relax
     \sh@wgridXunit=\psxunit
@@ -4400,37 +4400,22 @@ pop
   \ifPst@pgffunctions\pstVerb{ pgffunctions }\fi% hv 2013-04-17
 }
 \def\pic@coor{(0,0)(0,0)(10,10)}
-%\newdimen\pst@shift
 \def\endpspicture{%
   \ifshowgrid\ifnum\showgridp@s>0
     \psgrid[xunit=\sh@wgridXunit,yunit=\sh@wgridYunit,style=gridstyle]\fi\fi
   \pst@killglue
-%  \global\pst@shift=\pst@shift% in fact of the following endgroup
   \endgroup
   \egroup
-  \ifdim\wd\pst@hbox=\z@\else
-    %\@pstrickserr{Extraneous space in the pspicture environment}%
-    %{Type \space <return> \space to proceed.}%
-  \fi
   \ht\pst@hbox=\pst@dimd
   \dp\pst@hbox=-\pst@dimb
   \setbox\pst@hbox=\hbox{%
     \kern-\pst@dima
-% Orig version ----------
-%\ifx\pst@tempa\@empty\else
-%\advance\pst@dimd-\pst@dimb
-%\pst@dimd=\pst@tempa\pst@dimd
-%\advance\pst@dimd\pst@dimb
-%\lower\pst@dimd
-%\fi
-%----- end Orig
     \ifPst@shift@star%\typeout{==pstricks== old behaviour of the shift option}%     shift=*
       \advance\pst@dimd-\pst@dimb
       \pst@dimd=0.5\pst@dimd
     \else\pst@dimd-\pst@shift\fi
     \advance\pst@dimd\pst@dimb
-    \lower\pst@dimd
-    \box\pst@hbox
+    \lower\pst@dimd\box\pst@hbox
     \kern\pst@dimc}%
   \if@star\setbox\pst@hbox=\hbox{\clipbox@@\z@}\fi
   \leavevmode