tikzpeople (28nov16)

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

1 files changed, 24 insertions, 34 deletions

diff --git a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty
index 0500ae86c87..d90baca43a0 100644
--- a/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty
+++ b/Master/texmf-dist/tex/latex/tikzpeople/tikzpeople.shape.guard.sty
@@ -13,23 +13,7 @@
 %% This work has the LPPL maintenance status `maintained'.
 %% 
 %% The Current Maintainer of this work is Nils Fleischhacker.
-%%
-%% This work consists of the files tikzpeople.tex, tikzpeople.sty,
-%% tikzpeople.shape.alice.sty, tikzpeople.shape.bob.sty, 
-%% tikzpeople.shape.bride.sty, tikzpeople.shape.builder.sty,
-%% tikzpeople.shape.businessman.sty, tikzpeople.shape.charlie.sty,
-%% tikzpeople.shape.chef.sty, tikzpeople.shape.conductor.sty,
-%% tikzpeople.shape.cowboy.sty, tikzpeople.shape.criminal.sty,
-%% tikzpeople.shape.dave.sty, tikzpeople.shape.graduate.sty, 
-%% tikzpeople.shape.groom.sty, tikzpeople.shape.guard.sty, 
-%% tikzpeople.shape.jester.sty, tikzpeople.shape.judge.sty,
-%% tikzpeople.shape.mexican.sty, tikzpeople.shape.nun.sty, 
-%% tikzpeople.shape.nurse.sty, tikzpeople.shape.physician.sty,
-%% tikzpeople.shape.pilot.sty, tikzpeople.shape.police.sty,
-%% tikzpeople.shape.priest.sty, tikzpeople.shape.sailor.sty,
-%% tikzpeople.shape.santa.sty and tikzpeople.shape.surgeon.sty
 \tikzpeople@addcolorkey{details}
-\tikzpeople@addcolorkey{hat}
 \tikzpeople@addcolorkey{collar}
 \tikzpeople@addcolorkey{lining}
 
@@ -50,18 +34,18 @@
 		\draw[lining,postaction={
 				    decoration={
 				        markings,
-				        mark=at position 0.1  with {\coordinate (A) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.23 with {\coordinate (B) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.50 with {\coordinate (C) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.62 with {\coordinate (D) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
-				        mark=at position 0.75 with {\coordinate (E) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);};
+				        mark=at position 0.1  with {\coordinate (tikzpeople@tmp1) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.23 with {\coordinate (tikzpeople@tmp2) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.50 with {\coordinate (tikzpeople@tmp3) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.62 with {\coordinate (tikzpeople@tmp4) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);},
+				        mark=at position 0.75 with {\coordinate (tikzpeople@tmp5) at (0,\if@tikzpeople@mirrored\else-\fi.4pt*\scalingfactor);};
 				    },decorate
 				}] (2pt,-8.7pt) to[out=90,in=290] (290:3.6pt) -- (300:3.4pt) -- ++(102:0.6pt);
-    \draw[details] (A) circle (0.2pt);
-    \draw[details] (B) circle (0.2pt);
-    \draw[details] (C) circle (0.2pt);
-    \draw[details] (D) circle (0.2pt);
-    \draw[details] (E) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp1) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp2) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp3) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp4) circle (0.2pt);
+    \draw[details] (tikzpeople@tmp5) circle (0.2pt);
 	\end{scope}
 }
 
@@ -87,21 +71,27 @@
 \newcommand{\tikzpeople@guard@definecolors}{
 	\definecolor{shirt}{rgb}{0.62,0.1,0}
 	\definecolor{hat}{rgb}{0,0,0}
-	\definecolor{skin}{rgb}{0.84,0.58,0.24}
 	\definecolor{collar}{rgb}{0.29,0.29,0.29}
 	\definecolor{details}{rgb}{1,0.82,0}
 	\definecolor{lining}{rgb}{0.9,0.9,0.9}
 }
 \newcommand{\tikzpeople@guard@definestyles}{
-	\tikzstyle{shirt}=[color=\tikzpeople@shirt!80,top color=\tikzpeople@shirt!40, bottom color=\tikzpeople@shirt!80,shading angle=45];
-	\tikzstyle{collar}=[color=\tikzpeople@collar!80,top color=\tikzpeople@collar!40, bottom color=\tikzpeople@collar!80,shading angle=45];
-	\tikzstyle{hat}=[color=\tikzpeople@hat!80,top color=\tikzpeople@hat!40, bottom color=\tikzpeople@hat!80,shading angle=45];
-	\tikzstyle{skin}=[color=\tikzpeople@skin!80,top color=\tikzpeople@skin!40, bottom color=\tikzpeople@skin!80,shading angle=45];
-	\tikzstyle{details}=[color=\tikzpeople@details!80, top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80, shading angle=45];
-	\tikzstyle{lining}=[color=\tikzpeople@lining];
+	\if@tikzpeople@saturated
+		\tikzset{
+			collar/.style ={color=\tikzpeople@collar,top color=\tikzpeople@collar!70, bottom color=\tikzpeople@collar,shading angle=45},
+			details/.style={color=\tikzpeople@details, top color=\tikzpeople@details!70, bottom color=\tikzpeople@details, shading angle=45},
+			lining/.style ={color=\tikzpeople@lining}
+		}
+	\else
+		\tikzset{
+			collar/.style ={color=\tikzpeople@collar!80,top color=\tikzpeople@collar!40, bottom color=\tikzpeople@collar!80,shading angle=45},
+			details/.style={color=\tikzpeople@details!80, top color=\tikzpeople@details!40, bottom color=\tikzpeople@details!80, shading angle=45},
+			lining/.style ={color=\tikzpeople@lining}
+		}
+	\fi
 }
 
 \newcommand{\tikzpeople@guard@colors}{
 	shirt/200/{-.75/-1}, hat/160/{-.75/1.3}, skin/20/{.5/.7}, collar/0/{.2/.1}, 
-	details/180/{.49/-.32,-.5/.35}, lining/340/{.44/-.8}%
+	details/180/{.45/-.4,-.5/.3}, lining/340/{.4/-.8}%
 }