pst-circ (19jun14)

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

4 files changed, 95 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index ba3d6c3cc00..696f09e324e 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,5 @@
+2.10 2014-06-19 . Added more alternative styles (Patrice Mégret)
+                  fixed bug for quadrupoles
 2.09 2014-05-18 - allow empty arguments for logicSymbolstyle and
                   logicLabelstyle
 2.08 2014-04-19 - added  labeloffset for \mixer
diff --git a/Master/texmf-dist/doc/generic/pst-circ/README b/Master/texmf-dist/doc/generic/pst-circ/README
index 2fba8cd37a9..6f92315d8e4 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/README
+++ b/Master/texmf-dist/doc/generic/pst-circ/README
@@ -19,7 +19,7 @@ package the first time.
 pst-circ uses the extended version of the keyval package. So
 be sure that you 
 - have installed xkeyval with the special pst-xkey
-  (CTAN: tex-archive/macros/latex/contrib/xkeyval/)
+  (CTAN: macros/latex/contrib/xkeyval/)
 - do not load another package after pst-circ, which loads
   the old keyval.sty or pst-key.tex
 
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
index ec76d8dff47..52da535f508 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
index 2af7d6aacdf..1b0af8e7f55 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex
@@ -1,4 +1,4 @@
-%% $Id: pst-circ-doc.tex 917 2014-05-18 17:37:17Z herbert $
+%% $Id: pst-circ-doc.tex 927 2014-06-18 11:01:59Z herbert $
 \documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
     headexclude,footexclude,oneside]{pst-doc}
 \usepackage[utf8]{inputenc}
@@ -115,6 +115,7 @@ Thanks to: \\
     \mbox{Michael Lauterbach},
     \mbox{Manuel Luque}, 
     \mbox{Steven P. McPherson}, 
+    \mbox{Patrice Mégret},
     \mbox{Ted Pavlic}, 
     \mbox{Alan Ristow},
     \mbox{Uwe Siart},
@@ -243,19 +244,61 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
 \xLcs{Ucc}
 \begin{LTXexample}[width=3.5cm]
 \begin{pspicture}(3,2)
-  \pnodes(0,1){A}(3,1){B}
-  \Ucc(A)(B){$E$}
+ \pnodes(0,1){A}(3,1){B}
+ \Ucc[dipolestyle=normal](A)(B){$E$}
 \end{pspicture}
 \end{LTXexample}
 
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+ \pnodes(0,1){A}(3,1){B}
+ \Ucc[dipolestyle=diamond](A)(B){$E$}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+ \pnodes(0,1){A}(3,1){B}
+ \Ucc[dipolestyle=normalCei](A)(B){$E$}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+ \pnodes(0,1){A}(3,1){B}
+ \Ucc[dipolestyle=diamondCei](A)(B){$E$}
+\end{pspicture}
+\end{LTXexample}
+
+
 \xLcs{Icc}
 \begin{LTXexample}[width=3.5cm]
 \begin{pspicture}(3,2)
-  \pnodes(0,1){A}(3,1){B}
-  \Icc(A)(B){$\eta$}
+ \pnodes(0,1){A}(3,1){B}
+ \Icc[dipolestyle=normal](A)(B){$\eta$}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+ \pnodes(0,1){A}(3,1){B}
+ \Icc[dipolestyle=twoCircles](A)(B){$\eta$}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+ \pnodes(0,1){A}(3,1){B}
+\Icc[dipolestyle=diamond](A)(B){$\eta$}
 \end{pspicture}
 \end{LTXexample}
 
+
+
+
+
+
+
 \xLcs{switch}
 \begin{LTXexample}[width=3.5cm]
 \begin{pspicture}(3,2)
@@ -264,6 +307,30 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
 \end{pspicture}
 \end{LTXexample}
 
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+  \pnodes(0,1){A}(3,1){B}
+  \switch[dipolestyle=close](A)(B){$K$}
+\end{pspicture}
+\end{LTXexample}
+
+\xLcs{arrowswitch}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+  \pnodes(0,1){A}(3,1){B}
+  \arrowswitch(A)(B){$K$}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+  \pnodes(0,1){A}(3,1){B}
+  \arrowswitch[dipolestyle=close](A)(B){$K$}
+\end{pspicture}
+\end{LTXexample}
+
+
+
 \xLcs{diode}
 \begin{LTXexample}[width=3.5cm]
 \begin{pspicture}(3,2)
@@ -519,6 +586,26 @@ well chosen, so don't try to use tripole macros in strange situations!
 \end{pspicture}
 \end{LTXexample}
 
+
+\xLcs{newtransformer}
+\begin{LTXexample}[width=5.5cm]
+\begin{pspicture}(3,2)
+ \pnodes(0,1){A}(3,1){B}
+ \newtransformer(A)(B){$\mathcal T$}
+\end{pspicture}
+\end{LTXexample}
+
+
+\xLcs{newtransformerquad}
+\begin{LTXexample}[width=5.5cm]
+\begin{pspicture}(5,3)
+ \pnodes(0,3){A}(0,0){B}%
+        (5,3){C}(5,0){D}
+ \newtransformerquad(A)(B)(C)(D)%
+   {$\mathcal T$}
+\end{pspicture}
+\end{LTXexample}
+
 \xLcs{optoCoupler}
 \begin{LTXexample}[width=5.5cm]
 \begin{pspicture}(5,3)