summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-06-16 22:08:39 +0000
committerKarl Berry <karl@freefriends.org>2017-06-16 22:08:39 +0000
commitd76ab792119d600283d06a1b9e6a2b39b9e24928 (patch)
treee7a63c2a6d491950fcf0b5d913721b8c47675c92 /Master/texmf-dist/tex/generic
parentee00fa8394da17aa90bd4a4d211ba6e923f8be92 (diff)
pstricks (16jun17)
git-svn-id: svn://tug.org/texlive/trunk@44617 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/pstricks/pstricks.tex28
1 files changed, 20 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
index 1cbf1f61967..14af68d5e9c 100644
--- a/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
+++ b/Master/texmf-dist/tex/generic/pstricks/pstricks.tex
@@ -135,14 +135,14 @@
\catcode`\@=\PstAtCode\relax
\ifx\PSTFPloaded\endinput\else \input pst-fp.tex\fi
%
+\catcode`\@=11\relax
\@ifundefined{pgfutil@empty}{\input pgfutil-common.tex}{}
\@ifundefined{pgkeys@empty}{\input pgfkeys.code.tex}{}
\@ifundefined{pgffor@emptyvalues}{\input pgffor.code.tex}{}
\let\pgfforeach\foreach
%
-\def\fileversion{2.73a}
-\def\filedate{2017/05/22}
-\catcode`\@=11\relax
+\def\fileversion{2.74}
+\def\filedate{2017/06/15}
\pst@addfams{pstricks}
%
% stolen from latex.ltx to make it TeX compatible
@@ -627,7 +627,7 @@
\gdef\pslbrace[{ ]
\gdef\psrbrace[} ]
\endgroup
-
+%
\pstVerb{
/pssetRGBcolor /setrgbcolor load def
/pssetCMYKcolor /setcmykcolor load def
@@ -638,8 +638,8 @@
%\expandafter\edef\csname color@#1\endcsname{#2}%
\expandafter\edef\csname\string\color@#1\endcsname{#2}% hv 1.14 2005-12-17
\ignorespaces}
-\def\pst@color#1{%
- \def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}%
+%
+\def\pst@color#1{\def\pst@currentcolor{#1}\pstVerb{#1}\aftergroup\pst@endcolor}%
\def\pst@endcolor{\pstVerb{\pst@currentcolor}}
\def\pst@currentcolor{0 setgray}
\def\altcolormode{%
@@ -681,8 +681,8 @@
\def\pst@usecolor#1{\csname\string\color@#1\endcsname\space}
%
\def\newgray#1#2{%
- \pst@checknum{#2}\pst@tempg
- \@newcolor{#1}{\pst@tempg setgray}}
+ \pst@checknum{#2}\pst@tempg
+ \@newcolor{#1}{\pst@tempg setgray}}%
\def\newrgbcolor#1#2{%
\pst@expandafter\pst@getnumiii{#2} {} {} {} {}\@nil
\@newcolor{#1}{\pst@tempg \pst@temph \pst@tempi setrgbcolor}}
@@ -703,6 +703,18 @@
\newrgbcolor{yellow}{1 1 0}
\newrgbcolor{cyan}{0 1 1}
\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}%
+ }{%
+ \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}%
+ }
%
\define@boolkey[psset]{pstricks}[Pst@]{draft}[true]{}
\define@key[psset]{pstricks}{bgcolor}{\def\pst@bgcolor{#1}}% background for pspicture