diff options
author | Karl Berry <karl@freefriends.org> | 2016-08-08 21:09:43 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-08-08 21:09:43 +0000 |
commit | 4b2f94e6f9f4425195657c2efbff5667c0399b5d (patch) | |
tree | 7a62c25ad4ecd3501e0bf417f99749a40ae897fd /Master/texmf-dist/tex/generic | |
parent | 0adf66fc426457e6bccec989503b6e2f2aafc630 (diff) |
pstricks-add (8aug16)
git-svn-id: svn://tug.org/texlive/trunk@41822 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r-- | Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex | 48 |
1 files changed, 45 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex index 16c810160f7..74b10ece20b 100644 --- a/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex +++ b/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex @@ -1,4 +1,4 @@ -%% $Id: pstricks-add.tex 287 2016-04-25 07:43:53Z herbert $ +%% $Id: pstricks-add.tex 317 2016-08-08 16:49:34Z herbert $ %% %% This is file `pstricks-add.tex', %% @@ -30,8 +30,8 @@ \ifx\PSTXKeyLoaded\endinput\else \input pst-xkey \fi \ifx\PSTmathLoaded\endinput\else \input pst-math \fi % -\def\fileversion{3.80} -\def\filedate{2016/04/25} +\def\fileversion{3.81} +\def\filedate{2016/08/08} \message{`pstricks-add' v\fileversion, \filedate\space (dr,hv)} % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax @@ -2540,6 +2540,48 @@ a add }% \end@SpecialObj% } +\newrgbcolor{OlympicRed}{0.87 0 0.14} +\newrgbcolor{OlympicGreen}{0 0.62 0.24} +\newrgbcolor{OlympicBlue}{0 0.52 0.78} +\newrgbcolor{OlympicYellow}{0.96 0.78 0} +%\definecolor{oblue}{rgb}{0,.52,.78} +%\definecolor{oyellow}{rgb}{.96,.76,0} +%\definecolor{ogreen}{rgb}{0,.62,.24} +%\definecolor{ored}{rgb}{.87,0,.14} + +\def\ps@lympicRing(#1)#2{% + \rput(#1){% + \pscircle[linewidth=0.25,linecolor=#2](0,0){1.375}% + \pscircle[linewidth=0.05,linecolor=white](0,0){1.425}% + \pscircle[linewidth=0.05,linecolor=white](0,0){1.125}}} +\def\ps@lympicArc(#1)#2#3#4{% + \rput(#1){% + \psarc[linewidth=0.25,linecolor=#2](0,0){1.25}{#3}{#4}% + \psarc[linewidth=0.05,linecolor=white](0,0){1.4}{#3}{#4}% + \psarc[linewidth=0.05,linecolor=white](0,0){1.1}{#3}{#4}}} +\def\psOlympicRings{\pst@object{psOlympicRings}} +\def\psOlympicRings@i(#1){% + \pst@killglue + \begingroup + \addbefore@par{psscale=1}% +% \begin@SpecialObj + \use@par + \rput(#1){% + \psscalebox{\psk@@psscale}{% + %\begin{pspicture}(-4.5,-3)(4.5,1.5) + \ps@lympicRing(-3,0){OlympicBlue}% + \ps@lympicRing(-1.5,-1.375){OlympicYellow}% + \ps@lympicArc(-3,0){OlympicBlue}{330}{30}% + \ps@lympicRing(0,0){black}% + \ps@lympicArc(-1.5,-1.375){OlympicYellow}{30}{90}% + \ps@lympicRing(1.5,-1.375){OlympicGreen}% + \ps@lympicArc(0,0){black}{330}{30}% + \ps@lympicRing(3,0){OlympicRed}% + \ps@lympicArc(1.5,-1.375){OlympicGreen}{30}{90}}}% + %\end{pspicture} +% \end@SpecialObj + \endgroup +} \def\resetOptions{% \def\pst@linetype{0}% |