From 0a643319cbe02210a8bc148efaa0c7f59c8ee400 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Jul 2018 21:06:49 +0000 Subject: pstricks (23jul18) git-svn-id: svn://tug.org/texlive/trunk@48256 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/pstricks/pstricks.tex | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 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 2471de42665..825559264df 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 726 2018-02-05 13:52:25Z herbert $ +%% $Id: pstricks.tex 761 2018-05-01 19:11:51Z 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.84} -\def\filedate{2018/05/01} +\def\fileversion{2.85} +\def\filedate{2018/07/22} \pst@addfams{pstricks} % %\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{} @@ -795,7 +795,7 @@ \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}% \ignorespaces} % -\def\radians{\def\pst@angleunit{57.2956 mul } +\def\radians{\def\pst@angleunit{57.2956 mul }% \pstVerb{tx@Dict begin startGlobal /pst@angleunit {\pst@angleunit} def endGlobal end}}% \def\pst@angleunit{}% @@ -4325,7 +4325,6 @@ pop % ----------- hv 20120219 ------------------- \newpsstyle{gridstyle}{subgriddiv=0,gridcolor=lightgray,griddots=10,gridlabels=8pt} \newpsstyle{gridstyleA}{subgriddiv=5,gridcolor=red!30,subgridcolor=green!20!black!10,gridlabels=0pt} -%\define@boolkey[psset]{pstricks}[]{showgrid}[true]{} \newif\ifshowgrid \newdimen\sh@wgridXunit \newdimen\sh@wgridYunit @@ -4333,18 +4332,19 @@ 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#1t% - \ifx#2r\showgridtrue\else% true->bottom + \ifx#1b \showgridtrue\else% bottom + \ifx#1f \showgridfalse\else + \ifx#1t + \ifx#2r \showgridtrue\else% true->bottom \showgridtrue\def\showgridp@s{1}\fi% top - \fi\fi\fi% - \ifnum\showgridp@s>0 - \sh@wgridXunit=\psxunit% - \sh@wgridYunit=\psyunit% - \fi% + \fi\fi\fi + \ifnum\showgridp@s>0\relax + \sh@wgridXunit=\psxunit + \sh@wgridYunit=\psyunit + \fi + } -\psset[pstricks]{showgrid=false} +\psset[pstricks]{showgrid=f} \define@boolkey[psset]{pstricks}[Pst@]{pgffunctions}[true]{} \psset[pstricks]{pgffunctions=false} % @@ -4393,17 +4393,17 @@ pop \psset{showgrid=false}% % for nested pspicture environemnets \def\pst@tempA{#1}% \ifx\pst@tempA\@empty\else\psset{#1}\fi% sets the shift and grid option - \ifx\pst@bgcolor\@empty \else\psframe*[linecolor=\pst@bgcolor](#2,#3)(#4,#5)\fi - \ifshowgrid\ifnum\showgridp@s=0\psgrid[style=gridstyle]\fi\fi% + \ifx\pst@bgcolor\@empty\else\psframe*[linecolor=\pst@bgcolor](#2,#3)(#4,#5)\fi + \ifshowgrid\ifnum\showgridp@s=0\psgrid[style=gridstyle]\fi\fi % ----------- 1.10/12 end hv ------------------- \ignorespaces% % 2008-12-07 - \ifPst@pgffunctions\pstVerb{ pgffunctions } \fi % hv 2013-04-17 + \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% + \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 @@ -4437,7 +4437,7 @@ pop \ifPst@draft \expandafter\ifx\csname @latexerr\endcsname\relax \box\pst@hbox - \else % do we have LaTeX? + \else% do we have LaTeX? \fboxsep=0pt \fbox{\rule[-\pst@shift]{0pt}{\ht\pst@hbox}\rule{\wd\pst@hbox}{0pt}}% \fi -- cgit v1.2.3