summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-05-02 20:47:43 +0000
committerKarl Berry <karl@freefriends.org>2018-05-02 20:47:43 +0000
commitc6a8412d1611093105c992e30cf39c01cc00ad77 (patch)
tree7994ae46e8e740d127490696813513bc5e33df21 /Master/texmf-dist/tex/generic/pstricks
parentf314b723bd18f824c0d4ce525b9c1b8700d79169 (diff)
pstricks (2may18)
git-svn-id: svn://tug.org/texlive/trunk@47572 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def4
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex24
2 files changed, 15 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
index f711b7589f8..db8528d0317 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks-tex.def
@@ -1,6 +1,6 @@
-%% $Id: pstricks-tex.def 617 2017-10-04 16:16:21Z herbert $
+%% $Id: pstricks-tex.def 704 2018-01-06 09:50:33Z herbert $
%% pstricks-tex.def
-%% Copyright 2017 Herbert Voss
+%% Copyright 2017- Herbert Voss
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 8232b1a2872..2471de42665 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 702 2018-01-06 08:43:54Z herbert $
+%% $Id: pstricks.tex 726 2018-02-05 13:52:25Z herbert $
%% pstricks.tex
%% COPYRIGHT 1993, 1994, 1999 by Timothy Van Zandt, tvz@nwu.edu.
%% COPYRIGHT 2000-2003 by Denis Girou.
@@ -36,7 +36,9 @@
\expandafter\ifx\csname @latexerr\endcsname\relax % do we have TeX? then @latexerr isn't defined
\input pstricks-tex.def
\fi
-%
+
+\let\ifpstUndefined\@ifundefined
+
%\catcode`\@=\PstAtCode\relax
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey.tex \fi
\ifx\PSTFPloaded\endinput\else\input pst-fp.tex\fi
@@ -78,8 +80,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.82}
-\def\filedate{2018/01/06}
+\def\fileversion{2.84}
+\def\filedate{2018/05/01}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -87,7 +89,7 @@
%
% stolen from latex.ltx to make it TeX compatible
\newcount\psLoopIndex
-\def\@fornoop#1\@@#2#3{}
+\long\def\@fornoop#1\@@#2#3{}
\long\def\@for#1:=#2\do#3{%
\pst@cntm=0
\expandafter\def\expandafter\@fortmp\expandafter{#2}%
@@ -3810,10 +3812,10 @@ pop
\def\pswedge{\def\pst@par{}\pst@object{pswedge}}
\def\pswedge@i{\@ifnextchar({\pswedge@ii}{\pswedge@ii(0,0)}}
\def\pswedge@ii(#1)#2#3#4{%
- \begin@ClosedObj%
+ \begin@ClosedObj
\pssetlength\pst@dimc{#2}%
- \pst@getangle{#3}\pst@tempa%
- \pst@getangle{#4}\pst@tempb%
+ \pst@getangle{#3}\pst@tempa
+ \pst@getangle{#4}\pst@tempb
\pst@@getcoor{#1}%
\def\pst@linetype{1}%
\addto@pscode{
@@ -3822,13 +3824,12 @@ pop
2 copy
moveto
\ifPst@SpecialLength \pst@SpecialLength \else \pst@number\pst@dimc \fi
-% \pst@number\pst@dimc
\psk@dimen CLW mul sub % Adjusted radius
\pst@tempa \pst@tempb
arc
closepath}%
- \showpointsfalse%
- \end@ClosedObj%
+ \showpointsfalse
+ \end@ClosedObj
}
\def\tx@ellipse#1{ \ifx\psk@rot\@empty 0 \else \psk@rot \fi #1 Ellipse }
\def\tx@Ellipse{ \ifx\psk@rot\@empty 0 \else \psk@rot \fi Ellipse }
@@ -4328,6 +4329,7 @@ pop
\newif\ifshowgrid
\newdimen\sh@wgridXunit
\newdimen\sh@wgridYunit
+
\define@key[psset]{pstricks}{showgrid}[b]{\expandafter\pst@@showgrid#1!!\@nil}
\def\pst@@showgrid#1#2#3\@nil{% hv 20130403
\def\showgridp@s{0}%