diff options
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf | bin | 51563 -> 60668 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/pstricks/pst-news17.tex | 39 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks/pstricks.tex | 28 |
3 files changed, 58 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf Binary files differindex cf0e3d600cf..597b6372a03 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.pdf diff --git a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex index 41ea4a686f4..aa7991c65ff 100644 --- a/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex +++ b/Master/texmf-dist/doc/generic/pstricks/pst-news17.tex @@ -52,7 +52,7 @@ Internally \Lprog{lualatex} starts \Lprog{xelatex} for creating the environments \fi %-------------------------------------------------------------------------------------- -\section{\texttt{pstricks.tex} (v. 2.73 -- 2017/05/18)} +\section{\texttt{pstricks.tex} (v. 2.74 -- 2017/06/15)} %-------------------------------------------------------------------------------------- \subsection{Error message} @@ -81,7 +81,44 @@ This changes now to _Not_Configured_For_This_Format \end{verbatim} +\subsection{Random colors} +There are now four predefined random ''colors``: +\begin{verbatim} + \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}% +\end{verbatim} + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomgray,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomrgb,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomcmyk,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + + +\begin{LTXexample}[pos=t] +\begin{pspicture}(10,5) +\multido{\rA=0.0+0.1}{50}{\psline[linecolor=randomhsb,linewidth=1mm](0,\rA)(10,\rA)} +\end{pspicture} +\end{LTXexample} + + +The random counter can be initialized with \verb|\pstVerb{rrand srand}|. \subsection{refangle} 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 |