pst-fun update (18apr10)

git-svn-id: svn://tug.org/texlive/trunk@17909 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 97 insertions, 50 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-fun/Changes b/Master/texmf-dist/doc/generic/pst-fun/Changes
index 6add4a7c90e..5412debf261 100644
--- a/Master/texmf-dist/doc/generic/pst-fun/Changes
+++ b/Master/texmf-dist/doc/generic/pst-fun/Changes
@@ -1,4 +1,5 @@
 ..... pst-fun.tex
+0.04  2010-04-18  added \psPig
 0.03  2008-06-22  added \psKangaroo
 0.02  2007-09-09  added \psAnt
 0.01  2007-07-23  initial version
diff --git a/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.pdf b/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.pdf
index 3d1ecc91191..e597a31f70f 100644
--- a/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.tex b/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.tex
index d84ce7a000c..86c5bd2a083 100644
--- a/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-fun/pst-fun-doc.tex
@@ -1,46 +1,39 @@
-\documentclass[a4paper,11pt]{article}
-\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
-%\usepackage{pamathx}
-\usepackage{mathpazo}
-\usepackage{url}
-\usepackage{amsmath}
-\usepackage{tabularx}
-\usepackage{longtable}
-\usepackage{pstricks}
-\usepackage{pst-fun}
-\let\pstFunFV\fileversion
-\usepackage{pstricks-add}% for the alg parser
-\usepackage{showexpl}
-\lstset{pos=t,wide=true}
-%
-\usepackage{xspace}
-\def\PS{PostScript\xspace}
-\def\CMD#1{{\ttfamily\textbackslash #1}}
-%
-\def\pshlabel#1{\footnotesize#1}
-\def\psvlabel#1{\footnotesize#1}
-\usepackage[colorlinks,linktocpage]{hyperref}
-%
+%% $Id: pst-thick-doc.tex 170 2009-12-08 21:30:53Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+    headexclude,footexclude,oneside]{pst-doc}
+\usepackage[utf8]{inputenc}
+\usepackage{pstricks-add,pst-fun}
+\let\pstFV\fileversion
+
+\def\bgImage{{%\psset{unit=0.5}
+\begin{pspicture}(0,-1.3)(10,3)
+  \psBird[Branch] \rput{-20}(4,1.8){\psBird}
+\end{pspicture}
+}}
+
+\lstset{explpreset={pos=t,width=-99pt,overhang=0pt,hsep=\columnsep,vsep=\bigskipamount,rframe={}},style=code}
 \begin{document}
+
 \title{\texttt{pst-fun}\\funny macros\\
-		  \small v.\pstFunFV}
-\author{%
-    \tabular[t]{c}Manuel Luque\\[3pt]
-    \url{ml@PSTricks.de}
-    \endtabular   \and 
-    \tabular[t]{c}Herbert Vo\ss\\[3pt]
-    \url{hv@PSTricks.de}\endtabular%
-} 
+		  \small v.\pstFV}
+\subtitle{A PSTricks package for drawing funny objects}
+\author{Manuel Luque\\Herbert Vo\ss} 
+\docauthor{Herbert Vo\ss}
 \date{\today}
-
 \maketitle
 
-%\tableofcontents
+\clearpage
+
+%\begin{abstract}
+%\end{abstract}
 
+\tableofcontents
 
+\clearpage
+
+\section{The macros}
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-4)(4,8) % needs pstricks-add
+\begin{pspicture}[showgrid](-5,-4)(4,8) % needs pstricks-add
   \psBill
   \psHomothetie[linecolor=blue](4,-3){2}{\psBill}
   \psdots[dotsize=3pt,linecolor=red](4,-3)
@@ -50,53 +43,60 @@
   \psHomothetie[linecolor=magenta](4,-3){-0.25}{\psBill}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psBill}
 %$
 
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](0,-0.5)(12,4)
+\begin{pspicture}[showgrid](0,-0.5)(12,4)
  \psFish
  \rput(6,0){\psFish[fillstyle=slope]}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psFish}
 
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](-2,-2.4)(6,2)
+\begin{pspicture}[showgrid](-2,-2.4)(6,2)
   \psLouisXIII
   \rput(4,0){\psLouisXIII[linecolor=red]}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psLouisXIII}
 
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](0,-0.4)(11,6)
+\begin{pspicture}[showgrid](0,-0.4)(11,6)
   \psPulpo \rput(10,0.5){\psscalebox{0.15}{\psPulpo[fillcolor=yellow,fillstyle=solid]}}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psPulpo}
 
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](0,-1.2)(12,3)
+\begin{pspicture}[showgrid](0,-1.2)(12,3)
   \psBird \rput(4,0){\psBird} \rput{-60}(8,2){\psBird}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psBird}\xLkeyword{Branch}
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](0,-1.3)(10,3)
+\begin{pspicture}[showgrid](0,-1.3)(10,3)
   \psBird[Branch] \rput{-20}(4,1.8){\psBird}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psBird}\xLkeyword{Branch}
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](0,-0.3)(8,10)
+\begin{pspicture}[showgrid](0,-0.3)(8,10)
   \psLuke
   \rput(6.5,1){\psscalebox{0.15}{\psLuke}}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psLuke}
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](-5,-5)(5,5)
+\begin{pspicture}[showgrid](-5,-5)(5,5)
   \psAnt
   \rput(-3,3){\psAnt[fillcolor=red!50]}
   \rput{30}(3,-3){\psAnt[fillcolor=blue!50]}
@@ -104,28 +104,39 @@
   \rput(2.5,3){\psscalebox{0.15}{\psAnt}}
 \end{pspicture}
 \end{LTXexample}
-
+\xLcs{psAnt}
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](6,7)
+\begin{pspicture}[showgrid](6,7)
   \psParrot{1}
   \psParrot{0.2}\rput(4,5){\psParrot{0.2}}
 \end{pspicture}
 \end{LTXexample}
-
+\xLcs{psParrot}
 
 \begin{LTXexample}
-\begin{pspicture}[showgrid=true](8,7)
+\begin{pspicture}[showgrid](8,7)
   \psKangaroo{1}
   \multido{\iA=2+1}{5}{\rput[lb](1,\iA){\psKangaroo[fillcolor=red]{1}}}
   \rput(4,0){\psKangaroo[fillcolor=red!30]{5}}
   \rput(5,1){\psKangaroo[fillcolor=blue!30,opacity=0.5]{5}}
 \end{pspicture}
 \end{LTXexample}
+\xLcs{psKangaroo}
+
+\begin{LTXexample}
+\begin{pspicture}(-1,-4)(8,4)
+  \psPig(0,0)\psPig[fillcolor=blue!40,noseColor=purple,
+    eyeColor=red,linewidth=4pt,unit=2](4,0)
+\end{pspicture}
+\end{LTXexample}
+\xLcs{psPig}\xLkeyword{eyeColor}\xLkeyword{noseColor}
+
+\clearpage
+\section{List of all optional arguments for \texttt{pst-fun}}
 
+\xkvview{family=pst-fun,columns={key,type,default}}
 
-%\section{Credits}
-%Manuel Luque 
 
 \bgroup
 \raggedright
@@ -133,6 +144,9 @@
 \bibliographystyle{plain}
 \bibliography{pst-fun-doc}
 \egroup
+
+
+\printindex
 \end{document}
 
 
diff --git a/Master/texmf-dist/tex/generic/pst-fun/pst-fun.tex b/Master/texmf-dist/tex/generic/pst-fun/pst-fun.tex
index aee4c4e3043..c58db748d6a 100644
--- a/Master/texmf-dist/tex/generic/pst-fun/pst-fun.tex
+++ b/Master/texmf-dist/tex/generic/pst-fun/pst-fun.tex
@@ -31,8 +31,8 @@
 % interface to the `xkeyval' package
 \pst@addfams{pst-fun}
 
-\def\fileversion{0.03}
-\def\filedate{2008/06/22}
+\def\fileversion{0.04}
+\def\filedate{2010/04/18}
 \message{`PST-fun' v\fileversion, \filedate\space (hv)}
 %
 \SpecialCoor
@@ -731,6 +731,38 @@
   \ignorespaces%
 }
 %
+\define@key[psset]{pst-fun}{noseColor}[purple!50!gray]{\def\psk@noseColor{#1}}
+\define@key[psset]{pst-fun}{eyeColor}[black]{\def\psk@eyeColor{#1}}
+\psset{noseColor=purple!50!gray,eyeColor=black}
+
+\def\psPig{\pst@object{psPig}}
+\def\psPig@i(#1){%
+  \pst@getcoor{#1}\pst@origin
+  \addbefore@par{linewidth=0.1,fillcolor=pink,fillstyle=solid}
+  \begin@ClosedObj
+     \rput(!\pst@origin\space \tx@UserCoor){%
+       \pspolygon(-0.6,0)(-0.4,-1.7)(-0.3,-1.5)(-0.2,-1.7)(-0.1,0)
+       \pspolygon(0.6,0)(0.4,-1.7)(0.3,-1.5)(0.2,-1.7)(0.1,0)
+       \psellipse(0,0)(1.3,1.2)%
+       \pscurve(0.15,0.05)(0.2,0.4)(0.4,0.75)(0.55,0.8)
+       \pscurve(0.15,-0.05)(0.3,-0.1)(0.6,0.7)(0.55,0.85)
+       \pscurve(-0.15,0.05)(-0.2,0.4)(-0.4,0.75)(-0.55,0.8)
+       \pscurve(-0.15,-0.05)(-0.3,-0.1)(-0.6,0.7)(-0.55,0.85)
+       \psellipse(0,0)(0.45,0.41)%
+       \psellipse(0,-0.65)(0.75,0.55)%
+       \psellipse[fillcolor=\psk@noseColor](-0.24,-0.65)(0.2,0.3)%
+       \psellipse[fillcolor=\psk@noseColor](0.24,-0.65)(0.2,0.3)%
+       \psellipse[linewidth=0.4\pslinewidth,fillcolor=white](-0.15,0.05)(0.13,0.18)
+       \psellipse[linewidth=0.4\pslinewidth,fillcolor=white](0.15,0.05)(0.13,0.18)
+       \psellipse*[linecolor=\psk@eyeColor](-0.15,0.05)(0.06,0.085)
+       \psellipse*[linecolor=\psk@eyeColor](0.15,0.05)(0.06,0.085)
+       \psline[fillstyle=none,linejoin=1](0,1.2)(0,1.3)(-0.1,1.32)(0.125,1.4)%
+          (-0.1,1.5)(0.175,1.6)(-0.2,1.7)
+     }
+  \end@ClosedObj%
+  \ignorespaces%
+}
+%
 \catcode`\@=\PstAtCode\relax
 %
 %% END: pst-fun.tex