summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/pstricks
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-27 22:37:04 +0000
committerKarl Berry <karl@freefriends.org>2017-11-27 22:37:04 +0000
commitfbca3b3af2b5a08fa978fbc12382b92a0f2f978f (patch)
tree16b6e264f4020c8d95c9e503f508f0935b595145 /Master/texmf-dist/tex/generic/pstricks
parentb1ec982b71420074d4bdf8d0c997229dd91a5b01 (diff)
pstricks (27nov17)
git-svn-id: svn://tug.org/texlive/trunk@45924 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/pstricks')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex43
1 files changed, 26 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index e2d1405feda..3c8c5edd124 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -76,8 +76,8 @@
\fi
\let\pgfforeach\foreach
%
-\def\fileversion{2.77}
-\def\filedate{2017/10/04}
+\def\fileversion{2.78}
+\def\filedate{2017/11/26}
\pst@addfams{pstricks}
%
%\define@boolkey[psset]{pstricks}[Pst@]{useURWfonts}[true]{}
@@ -489,11 +489,13 @@
%-----------------------% hv 20100413
\def\pst@checknum#1#2{%
\edef\ps@next{#1}%
- \ifx\ps@next\@empty\let\pst@num\z@%
- \else\expandafter\pst@@checknum\ps@next..\@nil%
- \fi%
- \ifcase\pst@num% 0
- \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa%
+ \ifx\ps@next\@empty
+ \let\pst@num\z@
+ \else
+ \expandafter\pst@@checknum\ps@next..\@nil
+ \fi
+ \ifcase\pst@num\relax
+ \@pstrickserr{Bad number: `#1'. 0 substituted.}\@ehpa
\def#2{0 }%
\or% 1
\edef#2{\ifnum\pst@num=\tw@-\fi\the\pst@cntg.%
@@ -1266,7 +1268,7 @@
\def\psfs@none{}
\def\psfs@solid{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency fill }}
\def\psfs@eofill{\pst@fill{\pst@usecolor\psfillcolor \tx@setTransparency eofill}}
-\def\psfs@oefill{\pst@fill{\pst@usecolor\psk@oefillcolor \tx@setTransparency fill } \psfs@eofill }
+\def\psfs@oefill{\pst@fill{\pst@usecolor\psk@oefillcolor \tx@setTransparency fill }\psfs@eofill }
\def\psfs@shape{\pst@fill{\pst@usecolor\psfillcolor \tx@setBlendmode fill }}
\def\psfs@spiral{\pst@fill{\pst@fsOrigin \pst@usecolor\psfillcolor clip newpath
0 .1 500 { dup dup sqrt 4 div 0 360 arc fill \pst@fsAngle rotate } for }}
@@ -1664,10 +1666,11 @@
\fi%
}
\def\use@par{%
- \ifx\pst@par\@empty\else%
- \expandafter\@psset\pst@par,\@nil%
+ \ifx\pst@par\@empty\else
+ \expandafter\@psset\pst@par,\@nil
\def\pst@par{}%
- \fi}
+ \fi
+}
\def\use@keep@par{% same as \use@par, but keeps the values
\ifx\pst@par\@empty\else
\expandafter\@psset\pst@par,\@nil
@@ -1695,7 +1698,13 @@
%\def\pst@@getarrows#1#2{\addto@par{arrows=#2}#1}
\def\pst@@getarrows#1#2{%
\def\pst@tempa{#2}% prevent empty arrow arguments, to allow \psline{}(...)(...)
- \ifx\pst@tempa\@empty\addto@par{arrows=-}\else\addto@par{arrows=#2}\fi#1}
+ \ifx\pst@tempa\@empty
+ \addto@par{arrows=-}%
+ \else
+ \addto@par{arrows=#2}%
+ \fi
+ #1%
+}
% ------------------------- hv 1.10 end ------------------------
%
\def\begin@ClosedObj{%
@@ -2477,14 +2486,14 @@
}
\def\psline@ii{%
\ifx\pslinestyle\psls@@symbol\addto@pscode{ \psls@symbol SymbolLine }%
- \else%
+ \else
\addto@pscode{
\ifPst@noCurrentPoint\else\pst@cp\fi % current point?
\psline@iii % arc and lineto type
\tx@Line % .pro function
}%
- \fi%
- \end@OpenObj%
+ \fi
+ \end@OpenObj
}
\def\psline@iii{%
\ifdim\pslinearc>\z@
@@ -4071,11 +4080,11 @@ pop
\fi%
}
\def\psput@cartesian#1{%
- \hbox to \z@{\kern\pst@dimg{\vbox to \z@{\vss\box#1\vskip\pst@dimh}\hss}}%
+\hbox to \z@{\kern\pst@dimg{\vbox to \z@{\vss\box#1\vskip\pst@dimh}\hss}}%
}
\def\psput@special#1{%
\hbox{%
- \pst@Verb{ { \pst@coor \pstnodescale } \tx@PutCoor \tx@PutBegin }% 20150911 hv
+ \pst@Verb{{ \pst@coor \pstnodescale } \tx@PutCoor \tx@PutBegin }% 20150911 hv
\box#1%
\pst@Verb{ \tx@PutEnd }%
}%