texlive[41822] Master/texmf-dist: pstricks-add (8aug16)
commits+karl at tug.org
commits+karl at tug.org
Mon Aug 8 23:09:44 CEST 2016
Revision: 41822
http://tug.org/svn/texlive?view=revision&revision=41822
Author: karl
Date: 2016-08-08 23:09:43 +0200 (Mon, 08 Aug 2016)
Log Message:
-----------
pstricks-add (8aug16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes
trunk/Master/texmf-dist/doc/generic/pstricks-add/README
trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
Added Paths:
-----------
trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps
trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf
trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes 2016-08-08 01:16:09 UTC (rev 41821)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/Changes 2016-08-08 21:09:43 UTC (rev 41822)
@@ -1,4 +1,4 @@
-%% $Id: Changes 287 2016-04-25 07:43:53Z herbert $
+%% $Id: Changes 315 2016-08-08 15:20:00Z herbert $
%%
pstricks-add.pro -----------
0.23 2009-12-17 - add RGBtoGRAY and WavelengthToGRAY
@@ -39,6 +39,7 @@
pstricks-add.tex ----------- (hv)
+ v 3.81 2016-08-08 - added \psOlympicRings
v 3.80 2016-04-25 - moved node definitions into pst-node
v 3.79 2016-02-09 - added optional argument randInit to intialize
the random generator
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/README 2016-08-08 01:16:09 UTC (rev 41821)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/README 2016-08-08 21:09:43 UTC (rev 41822)
@@ -35,7 +35,7 @@
which is part of your local TeX tree. The pro file should go
into $TEXMF/dvips/pstricks/
Then do not forget to run texhash to update this tree.
-For more information see the documentation of your LATEX distribution
+For more information see the documentation of your LaTeX distribution
on installing packages into your local TeX system or read the
TeX Frequently Asked Questions:
(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages).
Added: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps 2016-08-08 01:16:09 UTC (rev 41821)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps 2016-08-08 21:09:43 UTC (rev 41822)
Property changes on: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.eps
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/postscript
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf 2016-08-08 01:16:09 UTC (rev 41821)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf 2016-08-08 21:09:43 UTC (rev 41822)
Property changes on: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex 2016-08-08 21:09:43 UTC (rev 41822)
@@ -0,0 +1,10 @@
+\documentclass[pstricks]{standalone}
+\usepackage{pstricks-add}
+\begin{document}
+\begin{pspicture}(-4.5,-3)(4.5,1.5)
+\psOlympicRings(0,0)
+\psOlympicRings[psscale=0.2](1.5,-1.5)
+\psOlympicRings[psscale=0.2](-1.5,-1.5)
+\psOlympicRings[psscale=0.2](0,0.5)
+\end{pspicture}
+\end{document}
Property changes on: trunk/Master/texmf-dist/doc/generic/pstricks-add/data/olympic.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib 2016-08-08 01:16:09 UTC (rev 41821)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.bib 2016-08-08 21:09:43 UTC (rev 41822)
@@ -17,9 +17,9 @@
@Book{PSTricks2,
author = {Herbert Vo\ss},
title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX},
- edition = {6.},
+ edition = {7},
publisher = {DANTE -- Lehmanns},
- year = {2010},
+ year = {2016},
address = {Heidelberg/Berlin}
}
@@ -104,7 +104,7 @@
author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}},
title = {The {\LaTeX} {G}raphics {C}ompanion},
publisher = {{Addison-Wesley Publishing Company}},
- edition = second,
+ edition = 2,
year = {2007},
address = {Reading, Mass.}
}
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex 2016-08-08 01:16:09 UTC (rev 41821)
+++ trunk/Master/texmf-dist/doc/generic/pstricks-add/pstricks-add-doc.tex 2016-08-08 21:09:43 UTC (rev 41822)
@@ -1,4 +1,4 @@
-%% $Id: pstricks-add-doc.tex 287 2016-04-25 07:43:53Z herbert $
+%% $Id: pstricks-add-doc.tex 318 2016-08-08 16:54:19Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings,
headexclude,footexclude,oneside]{pst-doc}
\listfiles
@@ -30,7 +30,10 @@
\lstset{explpreset={pos=l,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},
escapechar=§}
-\def\bgImage{\psset{unit=1.5}
+\def\bgImage{\includegraphics{data/olympic}}
+
+\iffalse
+\psset{unit=1.5}
\begin{pspicture}(-3,-3)(3,3)
\psChart[userColor={red!30,green!30,blue!40,gray,cyan!50,
magenta!60,cyan},chartSep=30pt,shadow=true,shadowsize=5pt]{34.5,17.2,20.7,15.5,5.2,6.9}{6}{2}
@@ -45,7 +48,9 @@
\rput(psChartI1){Taxes}\rput(psChartI2){Rent}\rput(psChartI3){Bills}
\rput(psChartI4){Car}\rput(psChartI5){Gas}\rput(psChartI6){Food}
\end{pspicture}}
+\fi
+
\begin{document}
\title{\texttt{pstricks-add}\\additionals Macros for \texttt{pstricks}\\
\small v.\pstricksaddFV}
@@ -135,6 +140,8 @@
%\psGetDistance(-2111,-12)(3,1)\DVal ==> Overflow!
\end{LTXexample}
+
+
\clearpage
%--------------------------------------------------------------------------------------
@@ -1121,7 +1128,34 @@
\end{pspicture}
\end{lstlisting}
+
\clearpage
+\section{Olympic Rings}
+The colors for the Rings are defined as \LColor{OlympicBlue}, \LColor{OlympicRed}, \LColor{OlympicGreen},
+and \LColor{OlympicYellow} and can be overwritten by the user. The only valid optional argument
+is \Lkeyword{psscale} for scaling.
+
+\begin{BDef}
+\Lcs{psOlympicRings}\OptArgs\coord1
+\end{BDef}
+
+\resetOptions
+\psset{unit=1cm,doubleline=false,linearc=0,psscale=1}
+
+\includegraphics{data/olympic}
+
+\begin{lstlisting}
+\begin{pspicture}(-4.5,-3)(4.5,1.5)
+\psOlympicRings(0,0)
+\psOlympicRings[psscale=0.2](1.5,-1.5)
+\psOlympicRings[psscale=0.2](-1.5,-1.5)
+\psOlympicRings[psscale=0.2](0,0.5)
+\end{pspicture}
+\end{lstlisting}
+
+
+
+\clearpage
%--------------------------------------------------------------------------------------
\section{\nxLcs{psFormatInt}}
%--------------------------------------------------------------------------------------
Modified: trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex 2016-08-08 01:16:09 UTC (rev 41821)
+++ trunk/Master/texmf-dist/tex/generic/pstricks-add/pstricks-add.tex 2016-08-08 21:09:43 UTC (rev 41822)
@@ -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,7 +2540,49 @@
}%
\end at 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 at 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 at 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 at object{psOlympicRings}}
+\def\psOlympicRings at i(#1){%
+ \pst at killglue
+ \begingroup
+ \addbefore at par{psscale=1}%
+% \begin at SpecialObj
+ \use at par
+ \rput(#1){%
+ \psscalebox{\psk@@psscale}{%
+ %\begin{pspicture}(-4.5,-3)(4.5,1.5)
+ \ps at lympicRing(-3,0){OlympicBlue}%
+ \ps at lympicRing(-1.5,-1.375){OlympicYellow}%
+ \ps at lympicArc(-3,0){OlympicBlue}{330}{30}%
+ \ps at lympicRing(0,0){black}%
+ \ps at lympicArc(-1.5,-1.375){OlympicYellow}{30}{90}%
+ \ps at lympicRing(1.5,-1.375){OlympicGreen}%
+ \ps at lympicArc(0,0){black}{330}{30}%
+ \ps at lympicRing(3,0){OlympicRed}%
+ \ps at lympicArc(1.5,-1.375){OlympicGreen}{30}{90}}}%
+ %\end{pspicture}
+% \end at SpecialObj
+ \endgroup
+}
+
\def\resetOptions{%
\def\pst at linetype{0}%
% \pstScalePoints(1,1){}{}%
More information about the tex-live-commits
mailing list