pst-circ 1.49 (22dec08)

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

5 files changed, 401 insertions, 423 deletions

diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index d8beb170c38..66b7fc5a5f9 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,4 +1,11 @@
-1.47 2008-08-06 (hv) - fix bug with \newcommand insread of \def 
+1.49 2008-11-18 (hv) - fix bug with edge, renamed to circedge
+                     - fixed bug with the current arrows of transsistor type
+                     - renamed \next to \circnext
+1.48 2008-09-26 (hv) - new option memory for a FET, suggested by 
+                       Christoph Friederich (doesn't really work)
+                     - fix bug with TRot for FET type 
+                     - added dipolestyle twoCircles for Icc
+1.47 2008-08-06 (hv) - fix bug with \newcommand instead of \def 
 1.46 2008-07-15 (hv) - optional dot for the (new)ground symbol (rw) 
 		     - added dipolstyle crystal for the capacitor 
 1.45 2008-03-16 (hv) - fix bug with a switch as multidipole 
diff --git a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
index 716e220fb1e..85aea905da3 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
+++ b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib
@@ -112,9 +112,9 @@
 @Book{PSTricks2,
   author	= {Herbert Vo\ss},
   title		= {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
-  edition	= {4.},
+  edition	= {5.},
   publisher	= {DANTE -- Lehmanns},
-  year		= {2007},
+  year		= {2008},
   address	= {Heidelberg/Hamburg}
 }
 
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 4ebcd8c1ae4..0b5a1e676aa 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 5b2bbbaea37..332d2a17772 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,70 +1,37 @@
-%% $Id: pst-circ-doc.tex 18 2008-03-22 20:20:39Z herbert $
-\listfiles
-\documentclass{article}
-\usepackage[a4paper]{geometry}
-\usepackage[T1]{fontenc}
-\usepackage{arev}%  use this if you do not have the palatino math font
-%\usepackage{mathpazo}
-\usepackage{fancyhdr}
-\usepackage{url,array,longtable}
-%
-\usepackage[dvipsnames]{pstricks}
+%% $Id: pst-circ-doc.tex 70 2008-12-22 13:03:24Z herbert $
+\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
+    headexclude,footexclude,oneside]{pst-doc}
+\usepackage[utf8]{inputenc}
 \usepackage{pst-circ}
-\let\verPstCirc\fileversion
-\usepackage{multicol}
-\usepackage{showexpl,lscape}
-\lstset{language=PSTricks,
-    morekeywords={psGammaDist,psChiIIDist,psTDist,psFDist,psBetaDist,psPlotImpl}}
-\lstdefinestyle{syntax}{backgroundcolor=\color{blue!20},numbers=none,xleftmargin=0pt,xrightmargin=0pt,
-    frame=single}
-%
+\let\pstCircFV\fileversion
+\lstset{pos=l,wide=false,language=PSTricks,
+    morekeywords={multidipole,parallel},basicstyle=\footnotesize\ttfamily}
 %
+\newcommand{\CircPackage}{\textsf{`pst-circ'}}
 \makeatletter
-\def\@UrlFont{\small\ttfamily}
 \renewenvironment{description}
   {\list{}{\labelwidth\z@ \itemindent-\leftmargin
     \itemsep0pt \parsep0pt
     \let\makelabel\descriptionlabel}}
   {\endlist}
-
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-\def\PS{PostScript}
-\newcommand{\CircPackage}{\textsf{`pst-circ'}}
-
-\lhead{\CircPackage}\rhead{A PSTricks package for drawing electric circuits}
-\pagestyle{fancy}
-
-\psset{subgriddiv=0,griddots=10,gridlabels=7pt}%
-%\showgrid
-\usepackage[colorlinks,linktocpage]{hyperref}
+\makeatother
 
 \begin{document}
 
-\title{\texttt{pst-circ}\\[10pt] 
-    {\Large A PSTricks package for drawing electric circuits}\\\normalsize ver. \verPstCirc}
-\author{Christophe Jorssen\thanks{\url{<CJ@PSTricks.de>}} \and  
-Herbert Vo\ss\thanks{\url{<voss@PSTricks.de>}}}
+\title{\texttt{pst-circ}}
+\subtitle{A PSTricks package for drawing electric circuits; v.\pstCircFV}
+\author{Christoph Jorssen \\Herbert Vo\ss}
+\docauthor{}
 \date{\today}
 \maketitle
 
-\begin{abstract}
-\CircPackage{} is a PSTricks package to draw easily electric circuits. Most
-dipoles, tripoles and quadrupoles used in classical electrotechnical
-circuits are provided as graphical units which can readily be
-interconnectedd to produce circuit diagrams of a reasonable level of complexity.
-\end{abstract}
-
-\clearpage
-
-\setlength{\columnseprule}{0.6pt}
-\begin{multicols}{2}
-{\parskip 0pt \tableofcontents}
-\end{multicols}
+\tableofcontents
 
 \clearpage
-\section{Introduction}
 
-The package \CircPackage{} is a collection of graphical elements based
+\begin{abstract}
+\noindent
+The package \LPack{pst-circ} is a collection of graphical elements based
 on PStricks that can be used to facilitate display of electronic
 circuit elements. For example, an equivalent circuit of a voltage
 source, its source impedance, and a connected load can easily be
@@ -74,6 +41,25 @@ details of the exact placement are hidden as much as possible so the
 author can focus on the circuitry without the distraction of sorting
 out the underlying vector graphics.
 
+\LPack{pst-circ} loads by default the following packages: \LPack{pst-node}, 
+\LPack{multido}, \LPack{pst-xkey}, and, of course \LPack{pstricks}.
+All should be already part of your local \TeX\ installation. If not, or in case
+of having older versions, go to \url{http://www.CTAN.org/} and load the newest version.
+
+\vfill\noindent
+Thanks to: \\
+Rafal Bartczuk,
+Fran\c{c}ois Boone, 
+    Jean-C\^ome Charpentier,
+    Patrick Drechsler,
+    Manuel Luque, 
+    Ted Pavlic,
+    Alan Ristow,
+Douglas Waud, and
+Richard Weissnar.
+\end{abstract}
+
+
 \section{The basic system}
 
 \subsection{Parameters}
@@ -84,66 +70,68 @@ objects you are drawing.
 \begin{longtable}{@{}>{\ttfamily}l l l@{}}
 \textrm{\emph{name}} & \emph{type} & \emph{default}\\\hline
 \endhead
-intensity 	& boolean &  \emph{false} \\
-intensitylabel  & string &  \emph{ } \\
-intensitylabeloffset & dimension &  \emph{ 0.5} \\
-intensitycolor & PSTricks color &  \emph{ black} \\
-intensitylabelcolor & PSTricks color &  \emph{ black} \\
-intensitywidth & dimension &  \emph{ \texttt{\cs{pslinewidth}}} \\
-tension & boolean &  \emph{ false} \\
-tensionlabel & string &  \emph{ } \\
-tensionoffset & dimension &  \emph{ 1} \\
-tensionlabeloffset & dimension &  \emph{ 1.2} \\
-tensioncolor & PSTricks color &  \emph{ black} \\
-tensionlabelcolor & PSTricks color &  \emph{ black} \\
-tensionwidth & dimension &  \emph{ \texttt{\cs{pslinewidth}}} \\
-labeloffset & dimension &  \emph{ 0.7} \\
-labelangle & PSTricks label angle &  \emph{ 0} \\
-labelInside & integer &  \emph{ 0} \\
-dipoleconvention & & \emph{ receptor} \\
-directconvetion & boolean &  \emph{ true} \\
-dipolestyle & string &  \emph{ normal} \\
-variable & boolean &  \emph{ false} \\
-parallel & boolean &  \emph{ false} \\
-parallelarm & dimension &  \emph{ 1.5} \\
-parallelsep & real &  \emph{ 0} \\
-parallelnode & boolean &  \emph{ false} \\
-intersect & boolean &  \emph{ false} \\
-intersectA & node & \\
-intersectB & node & \\
-OAinvert & boolean &  \emph{ true} \\
-OAperfect & boolean &  \emph{ true} \\
-OAiplus & boolean &  \emph{ false} \\
-OAiminus & boolean &  \emph{ false} \\
-OAiout & boolean &  \emph{ false} \\
-OAipluslabel & string &  \emph{ } \\
-OAiminuslabel & string &  \emph{ } \\
-OAioutlabel & string &  \emph{ } \\
-transistorcircle & boolean &  \emph{ true} \\
-transistorinvert & boolean &  \emph{ false} \\
-transistoribase & boolean &  \emph{ false} \\
-transistoricollector & boolean &  \emph{ false} \\
-transistoriemitter & boolean &  \emph{ false} \\
-transistoribaselabel & string &  \emph{ } \\
-transistoricollectorlabel & string &  \emph{ } \\
-transistoriemitterlabel & string &  \emph{ } \\
-TRot & angle &  \emph{ 0} \\
-edge & macro &  \emph{ \texttt{\textbackslash ncangles}} \\
-transistortype & string &  \emph{ PNP} \\
-FETchanneltype & string &  \emph{ N} \\
-primarylabel & string &  \emph{ } \\
-secondarylabel & string &  \emph{ } \\
-transformeriprimary & boolean &  \emph{ false} \\
-transformerisecondary & boolean &  \emph{ false} \\
-transformeriprimarylabel & string &  \emph{ } \\
-transformerisecondarylabel & string &  \emph{ } \\
-tripolestyle & string &  \emph{ normal}
+\Lkeyword{intensity} & boolean &  \emph{false} \\
+\Lkeyword{intensitylabel} & string &  \emph{ } \\
+\Lkeyword{intensitylabeloffset} & dimension &  \emph{ 0.5} \\
+\Lkeyword{intensitycolor} & color &  \emph{ black} \\
+\Lkeyword{intensitylabelcolor} & color &  \emph{ black} \\
+\Lkeyword{intensitywidth} & dimension &  \emph{ \texttt{\Lcs{pslinewidth}}} \\
+\Lkeyword{tension} & boolean &  \emph{ false} \\
+\Lkeyword{tensionlabel} & string &  \emph{ } \\
+\Lkeyword{tensionoffset} & dimension &  \emph{ 1} \\
+\Lkeyword{tensionlabeloffset} & dimension &  \emph{ 1.2} \\
+\Lkeyword{tensioncolor} & color &  \emph{ black} \\
+\Lkeyword{tensionlabelcolor} & color &  \emph{ black} \\
+\Lkeyword{tensionwidth} & dimension &  \emph{ \texttt{\Lcs{pslinewidth}}} \\
+\Lkeyword{labeloffset} & dimension &  \emph{ 0.7} \\
+\Lkeyword{labelangle} & label angle &  \emph{ 0} \\
+\Lkeyword{labelInside} & integer &  \emph{ 0} \\
+\Lkeyword{dipoleconvention} & & \emph{ receptor} \\
+\Lkeyword{directconvetion} & boolean &  \emph{ true} \\
+\Lkeyword{dipolestyle} & string &  \emph{ normal} \\
+\Lkeyword{variable} & boolean &  \emph{ false} \\
+\Lkeyword{parallel} & boolean &  \emph{ false} \\
+\Lkeyword{parallelarm} & dimension &  \emph{ 1.5} \\
+\Lkeyword{parallelsep} & real &  \emph{ 0} \\
+\Lkeyword{parallelnode} & boolean &  \emph{ false} \\
+\Lkeyword{intersect} & boolean &  \emph{ false} \\
+\Lkeyword{intersectA} & node & \\
+\Lkeyword{intersectB} & node & \\
+\Lkeyword{OAinvert} & boolean &  \emph{ true} \\
+\Lkeyword{OAperfect} & boolean &  \emph{ true} \\
+\Lkeyword{OAiplus} & boolean &  \emph{ false} \\
+\Lkeyword{OAiminus} & boolean &  \emph{ false} \\
+\Lkeyword{OAiout} & boolean &  \emph{ false} \\
+\Lkeyword{OAipluslabel} & string &  \emph{ } \\
+\Lkeyword{OAiminuslabel} & string &  \emph{ } \\
+\Lkeyword{OAioutlabel} & string &  \emph{ } \\
+\Lkeyword{transistorcircle} & boolean &  \emph{ true} \\
+\Lkeyword{transistorinvert} & boolean &  \emph{ false} \\
+\Lkeyword{transistoribase} & boolean &  \emph{ false} \\
+\Lkeyword{transistoricollector} & boolean &  \emph{ false} \\
+\Lkeyword{transistoriemitter} & boolean &  \emph{ false} \\
+\Lkeyword{transistoribaselabel} & string &  \emph{ } \\
+\Lkeyword{transistoricollectorlabel} & string &  \emph{ } \\
+\Lkeyword{transistoriemitterlabel} & string &  \emph{ } \\
+\Lkeyword{TRot} & angle &  \emph{ 0} \\
+\Lkeyword{edge} & macro &  \emph{ \texttt{\textbackslash ncangles}} \\
+\Lkeyword{transistortype} & string &  \emph{ NPN} \\
+\Lkeyword{FETchanneltype} & string &  \emph{ N} \\
+\Lkeyword{FETmemory} & boolean &  \emph{ false} \\
+\Lkeyword{primarylabel} & string &  \emph{ } \\
+\Lkeyword{secondarylabel} & string &  \emph{ } \\
+\Lkeyword{transformeriprimary} & boolean &  \emph{ false} \\
+\Lkeyword{transformerisecondary} & boolean &  \emph{ false} \\
+\Lkeyword{transformeriprimarylabel} & string &  \emph{ } \\
+\Lkeyword{transformerisecondarylabel} & string &  \emph{ } \\
+\Lkeyword{tripolestyle} & string &  \emph{ normal}
 \end{longtable}
 
 \subsection{Macros}
 
 \subsubsection{Dipole macros}
 
+\psset{griddots=10,subgriddiv=0}
 \begin{LTXexample}[width=3.5cm]
 \begin{pspicture}(3,2)\psgrid
   \pnode(0,1){A}
@@ -251,9 +239,9 @@ tripolestyle & string &  \emph{ normal}
 \bigskip
 \subsubsection{Tripole macros}
 
-Obviously, tripoles are not node connections. So \CircPackage{} tries its best to adjust the
+Obviously, tripoles are not node connections. So \LPack{pst-circ} tries its best to adjust the
 position of the tripole regarding the three nodes. Internally, the connections are done by the
-\cs{ncangle} pst-node macro. However, the auto-positionning and the auto-connections are not always
+\Lcs{ncangle} pst-node macro. However, the auto-positionning and the auto-connections are not always
 well chosen\footnote{This is something we are working on. I think that auto-positionning and
 auto-connections should be done at PostScript level and not at PSTricks level. If someone has any
 ideas, please mail us.}, so don't try to use tripole macros in strange situations!
@@ -290,7 +278,8 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
 \begin{LTXexample}[width=5.5cm]
 \begin{pspicture}(5,3)\psgrid
   \pnode(0,1.5){A}\psset{linewidth=1pt}
-  \transistor[basesep=2cm,arrows=o-o](A){Emitter}{Collector}
+  \transistor[transistortype=PNP,basesep=2cm,
+     arrows=o-o](A){Emitter}{Collector}
   \psline{o-}(5,3)(3,3)(3,3|Collector)(Collector)
   \psline{o-}(5,0)(3,0)(3,3|Emitter)(Emitter)
   \psline{o-}(A)([nodesep=2]A)
@@ -342,8 +331,8 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
 \subsubsection{Multidipole}
 
 
-\cs{multidipole} is a macro that allows multiple dipoles to be drawn between two specified nodes.
-\cs{multidipole} takes as many arguments as you want. \textbf{Note the \rnode{Dot}{dot} that is
+\Lcs{multidipole} is a macro that allows multiple dipoles to be drawn between two specified nodes.
+\Lcs{multidipole} takes as many arguments as you want. \textbf{Note the \rnode{Dot}{dot} that is
 after the last dipole.}
 
 \bigskip
@@ -368,7 +357,7 @@ after the last dipole.}
 
 \bigskip
 \ncangles[linestyle=dashed,linecolor=gray,nodesep=3pt,armA=.5cm,angleA=-90,armB=4cm,angleB=0]{->}{Dot}{Dot2} 
-Important: for the time being, \cs{multidipole} takes optional arguments but does not 
+Important: for the time being, \Lcs{multidipole} takes optional arguments but does not 
 restore original values. We recommand not using it.
 
 
@@ -465,13 +454,13 @@ restore original values. We recommand not using it.
 \bigskip
 \subsubsection{Current intensity and electrical potential parameters}
 
-If the \texttt{intensity} parameter is set to \texttt{true}, an arrow is drawn on the wire
-connecting one of the nodes to the dipole. If the \texttt{tension} parameter is set to \texttt{true},
+If the \Lkeyword{intensity} parameter is set to \true, an arrow is drawn on the wire
+connecting one of the nodes to the dipole. If the \Lkeyword{tension} parameter is set to \true,
 an arrow is drawn parallel to the dipole.
 
-The way those arrows are drawn is set by \texttt{dipoleconvention} and \texttt{directconvention}
-parameters. \texttt{dipoleconvention} can take two values~: \texttt{generator} or \texttt{receptor}.
-\texttt{directconvention} is a boolean.
+The way those arrows are drawn is set by \Lkeyword{dipoleconvention} and \Lkeyword{directconvention}
+parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator} or \Lkeyval{receptor}.
+\Lkeyword{directconvention} is a boolean.
 
 
 \begin{LTXexample}[width=3.5cm]
@@ -509,8 +498,8 @@ parameters. \texttt{dipoleconvention} can take two values~: \texttt{generator} o
 \end{pspicture}
 \end{LTXexample}
 
-If \texttt{intensitylabel} is set to an non empty argument, then \texttt{intensity} is automatically
-set to true. If \texttt{tensionlabel} is set to an non empty argument, then \texttt{tension} is
+If \Lkeyword{intensitylabel} is set to an non empty argument, then \Lkeyword{intensity} is automatically
+set to true. If \Lkeyword{tensionlabel} is set to an non empty argument, then \Lkeyword{tension} is
 automatically set to true.
 
 \begin{LTXexample}[width=3.5cm]
@@ -542,7 +531,7 @@ automatically set to true.
 \end{pspicture}
 \end{LTXexample}
 
-Some specific intensity parameters are available for tripoles and quadrupoles.
+Some specific intensity parameters are available for \Index{tripole}s and \Index{quadrupole}s.
 
 \begin{LTXexample}[width=5.5cm]
 \begin{pspicture}(5,3)\psgrid
@@ -581,7 +570,7 @@ Some specific intensity parameters are available for tripoles and quadrupoles.
 
 \subsubsection{Parallel parameters}
 
-If the \texttt{parallel} parameter is set to \texttt{true}, the dipole is drawn parallel to the line
+If the \Lkeyword{parallel} parameter is set to \true, the dipole is drawn parallel to the line
 connecting the nodes.
 
 \begin{LTXexample}[width=3.5cm]
@@ -633,7 +622,7 @@ connecting the nodes.
 \end{pspicture}
 \end{LTXexample}
 
-Note: When used with \cs{multidipole}, the  parallel \texttt{parameter}
+Note: When used with \Lcs{multidipole}, the  \Lkeyword{parallel} parameter
 must not be set for the first dipole.
 
 
@@ -651,7 +640,7 @@ must not be set for the first dipole.
 \end{pspicture}
 \end{LTXexample}
 
-Wire intersect parameters work also with \cs{multidipole}.
+Wire intersect parameters work also with \Lcs{multidipole}.
 
 \begin{LTXexample}[width=6.5cm]
 \begin{pspicture}(7,7)\psgrid
@@ -674,6 +663,14 @@ Wire intersect parameters work also with \cs{multidipole}.
 \begin{pspicture}[showgrid=true](3,2)
   \pnode(0,1){A}
   \pnode(3,1){B}
+  \Icc[dipolestyle=twoCircles](A)(B){$I$}
+\end{pspicture}
+\end{LTXexample}
+
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}[showgrid=true](3,2)
+  \pnode(0,1){A}
+  \pnode(3,1){B}
   \resistor[dipolestyle=zigzag](A)(B){$R$}
 \end{pspicture}
 \end{LTXexample}
@@ -999,10 +996,17 @@ the coils are drawn as rectangles and the resistor as a zigzag.
 \end{pspicture}
 \end{LTXexample}
 
+\begin{LTXexample}[width=5.5cm]
+\begin{pspicture}(5,3)
+\transistor[basesep=2cm,transistortype=FET,
+  FETmemory=true](0,1.5)(5,0)(5,3)
+\end{pspicture}
+\end{LTXexample}
+
 \clearpage
 \subsection{Special objects}
 
-\subsubsection{\texttt{\textbackslash dashpot}}
+\subsubsection{\nxLcs{dashpot}}
 
 
 \begin{LTXexample}[pos=t]
@@ -1039,7 +1043,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
 
 \subsection{Examples}
 
-\begin{LTXexample}[width=8cm]
+\begin{LTXexample}[pos=t]
   \begin{pspicture}(-1.5,-1)(6,5)
 %  \psgrid[subgriddiv=1,griddots=10]
   % Node definitions
@@ -1062,7 +1066,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
   \end{pspicture}
 \end{LTXexample}
 
-\begin{LTXexample}[width=8cm]
+\begin{LTXexample}[pos=t]
   \begin{pspicture}(-0.5,0)(7,8)
 %  \psgrid[subgriddiv=1,griddots=10]
   % Node definitions
@@ -1095,7 +1099,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
   \end{pspicture}
 \end{LTXexample}
 
-\begin{LTXexample}[width=8.5cm]
+\begin{LTXexample}[pos=t]
   \begin{pspicture}(-1,0)(7,8)
 %  \psgrid[subgriddiv=1,griddots=10]
   % Node definitions
@@ -1128,7 +1132,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
   \end{pspicture}
 \end{LTXexample}
 
-\begin{LTXexample}[width=8.5cm]
+\begin{LTXexample}[pos=t]
   \begin{pspicture}(6,6)
 %  \psgrid[subgriddiv=1,griddots=10]
   % Node definitions
@@ -1354,8 +1358,8 @@ Since for microwave signal, the direction in which the signal spreads is very im
 There are  dipoleinput or tripoleinput or quadripoleinput and arrowinput parameters. 
 The value of theses parameters are left or right for the first one and true or false for second one. 
 %
-\begin{verbatim}
-%%%%%
+\xLcs{ifPst@inputarrow}\xLcs{pcline}
+\begin{lstlisting}[style=code]
 \ifPst@inputarrow
    \ifx\psk@Dinput\pst@Dinput@right
        \pcline[arrows=-C](#2)(dipole@1)
@@ -1369,8 +1373,7 @@ The value of theses parameters are left or right for the first one and true or f
    \pcline[arrows=C-](dipole@2)(#3)
 \fi
 \pcline[fillstyle=none,linestyle=none](#2)(#3)
-%%%%%
-\end{verbatim}
+\end{lstlisting}
 The last line is to correct somme problems when I use colors (see example2)
 
 To add color in components (Monopole, tripole and Quadripole) I add a new 
@@ -1388,23 +1391,22 @@ Finally, something doesn't work with multidipole: this following example works:
 \end{pspicture}
 \end{LTXexample}
 
+\bigskip
 However, this following one doesn't work:
 \begin{lstlisting}
-\begin{LTXexample}[width=3.5cm,rframe={}]
 \begin{pspicture}(4,2)\psgrid
   \pnode(0.5,1){A}
   \pnode(3.5,1){B}
   \multidipole(A)(B)\amplifier{LNA}%
     \resistor{$R$}.
 \end{pspicture}
-\end{LTXexample}
 \end{lstlisting}
 
 
 \subsection{New monopole components}
 \subsubsection{New ground}
 \begin{description}
-  \item[groundstyle:]  ads | old | triangle
+  \item[\Lkeyword{groundstyle}:]  \Lkeyval{ads} | \Lkeyval{old} | \Lkeyval{triangle}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1421,7 +1423,7 @@ However, this following one doesn't work:
 
 \subsubsection{Antenna}
 \begin{description}
-  \item[antennastyle:]  two | three | triangle
+  \item[\Lkeyword{antennastyle}:]  \Lkeyval{two} | \Lkeyval{three} | \Lkeyval{triangle}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1449,9 +1451,9 @@ However, this following one doesn't work:
 \subsection{New monopole macro-components}
 \subsubsection{Oscillator}
 \begin{description}
-  \item[output:]  top | right | bottom | left
-  \item[inputarrow:] false | true
-  \item[LOstyle:] -- | crystal
+  \item[\Lkeyword{output}:]  \Lkeyval{top} | \Lkeyval{right} | \Lkeyval{bottom} | \Lkeyval{left}
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{LOstyle}:] -- | \Lkeyval{crystal}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1489,9 +1491,9 @@ However, this following one doesn't work:
 \subsection{New dipole macro-components}
 \subsubsection{Filters}
 \begin{description}
-  \item[dipolestyle:]  bandpass | lowpass | highpass
-  \item[inputarrow:] false | true
-  \item[dipoleinput:] left | right
+  \item[\Lkeyword{dipolestyle}:]  \Lkeyval{bandpass} | \Lkeyval{lowpass} | \Lkeyval{highpass}
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1530,8 +1532,8 @@ However, this following one doesn't work:
 
 \subsubsection{Isolator}
 \begin{description}
-  \item[inputarrow:] false | true
-  \item[dipoleinput:] left | right
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1561,11 +1563,11 @@ However, this following one doesn't work:
 
 \subsubsection{Frequency multiplier/divider}
 \begin{description}
-  \item[dipolestyle:] multiplier | divider
-  \item[value:] N | $n\in N$
-  \item[programmable:] false | true
-  \item[inputarrow:] false | true
-  \item[dipoleinput:] left | right
+  \item[\Lkeyword{dipolestyle}:] \Lkeyval{multiplier} | \Lkeyval{divider}
+  \item[\Lkeyword{value}:] \Lkeyval{N} | $n\in N$
+  \item[\Lkeyword{programmable}:] \false | \true
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1599,8 +1601,8 @@ However, this following one doesn't work:
 
 \subsubsection{Phase shifter}
 \begin{description}
-  \item[inputarrow:] false | true
-  \item[dipoleinput:] left | right
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1623,8 +1625,8 @@ However, this following one doesn't work:
 
 \subsubsection{VCO}
 \begin{description}
-  \item[inputarrow:] false | true
-  \item[dipoleinput:] left | right
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1645,8 +1647,8 @@ However, this following one doesn't work:
 
 \subsubsection{Amplifier}
 \begin{description}
-  \item[inputarrow:] false | true
-  \item[dipoleinput:] left | right
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1675,8 +1677,8 @@ However, this following one doesn't work:
 
 \subsubsection{Detector}
 \begin{description}
-  \item[inputarrow:] false | true
-  \item[dipoleinput:] left | right
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1706,9 +1708,9 @@ However, this following one doesn't work:
 \subsection{New tripole macro-components}
 \subsubsection{Mixer}
 \begin{description}
-  \item[tripolestyle:] bottom | top
-  \item[tripoleconfig:] left | right
-  \item[inputarrow:] false | true
+  \item[\Lkeyword{tripolestyle}:] \Lkeyval{bottom} | \Lkeyval{top}
+  \item[\Lkeyword{tripoleconfig}:] \Lkeyval{left} | \Lkeyval{right}
+  \item[\Lkeyword{inputarrow}:] \false | \true
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1733,9 +1735,9 @@ However, this following one doesn't work:
 
 \subsubsection{Circulator}
 \begin{description}
-  \item[tripolestyle:] circulator | isolator
-  \item[inputarrow:] false | true
-  \item[tripoleinput:] left | right
+  \item[\Lkeyword{tripolestyle}:] \Lkeyval{circulator} | \Lkeyval{isolator}
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{tripoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1780,8 +1782,8 @@ However, this following one doesn't work:
 
 \subsubsection{Agc}
 \begin{description}
-  \item[inputarrow:] false | true
-  \item[tripoleinput:] left | right
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{tripoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -1806,9 +1808,9 @@ However, this following one doesn't work:
 \subsection{New quadripole macro-components}
 \subsubsection{Coupler}
 \begin{description}
-  \item[couplerstyle:] hybrid | directional
-  \item[inputarrow:] false | true
-  \item[quadripoleinput:] left | right
+  \item[\Lkeyword{couplerstyle}:] \Lkeyval{hybrid} | \Lkeyval{directional}
+  \item[\Lkeyword{inputarrow}:] \false | \true
+  \item[\Lkeyword{quadripoleinput}:] \Lkeyval{left} | \Lkeyval{right}
 \end{description}
 
 \begin{LTXexample}[width=3.5cm,rframe={}]
@@ -2105,23 +2107,24 @@ From Chang, K., RF and Microwave Wireless Systems, Wiley InterScience, page 319,
 \section{Flip Flops -- logical elements}
 
 The syntax for all logical base circuits is
-\begin{lstlisting}[style=syntax]
-logic[<options>](<originX,originY>){Label}
-\end{lstlisting}
+\begin{BDef}
+\Lcs{logic}\OptArgs\OptArg*{\coord0}\Largb{label}
+\end{BDef}
 
 \noindent where the options and the origin are optional. If they are missing,
 then the default options, described in the next section and the default
 origin $(0,0)$ is used. The origin specifies the lower left corner
 of the logical circuit.
 
-\begin{lstlisting}[style=syntax]
-logic{Demo}
-logic[logicType=and]{Demo}
-logic(0,0){Demo}
-logic[logicType=and](0,0){Demo}
+\xLcs{logic}xLkeyword{logicType}
+\begin{lstlisting}[style=code]
+\logic{Demo}
+\logic[logicType=and]{Demo}
+\logic(0,0){Demo}
+\logic[logicType=and](0,0){Demo}
 \end{lstlisting}
 
-The above four ,,different`` calls of the \verb|logic| macro give the
+The above four ,,different`` calls of the \Lcs{logic} macro give the
 same output, because they are equivalent. 
 
 \subsection{The Options}
@@ -2129,20 +2132,20 @@ same output, because they are equivalent.
 \begin{longtable}{@{}>{\ttfamily}l l l@{}}
 \textrm{\emph{name}} & \emph{type} & \emph{default}\\\hline
 \endhead
-logicShowNode & boolean & \emph{ false} \\
-logicShowDot & boolean & \emph{ false} \\
-logicNodestyle & command & \emph{ \textbackslash footnotesize} \\
-logicSymbolstyle & command & \emph{ \textbackslash large} \\
-logicSymbolpos & value & \emph{ 0.5} \\
-logicLabelstyle & command & \emph{ \textbackslash small} \\
-logicType & string & \emph{ and} \\
-logicChangeLR & boolean & \emph{ false} \\
-logicWidth & length & \emph{ 1.5} \\
-logicHeight & length & \emph{ 2.5} \\
-logicWireLength & length & \emph{ 0.5} \\
-logicNInput & number & \emph{ 2} \\
-logicJInput & number & \emph{ 2} \\
-logicKInput & number &\emph{ 2}
+\Lkeyword{logicShowNode} & boolean & \false \\
+\Lkeyword{logicShowDot} & boolean & \false \\
+\Lkeyword{logicNodestyle} & command & \emph{\textbackslash footnotesize} \\
+\Lkeyword{logicSymbolstyle} & command & \emph{\textbackslash large} \\
+\Lkeyword{logicSymbolpos} & value & \emph{0.5} \\
+\Lkeyword{logicLabelstyle} & command & \emph{\textbackslash small} \\
+\Lkeyword{logicType} & string & \Lkeyval{and} \\
+\Lkeyword{logicChangeLR} & boolean & \false \\
+\Lkeyword{logicWidth} & length & \emph{1.5} \\
+\Lkeyword{logicHeight} & length & \emph{2.5} \\
+\Lkeyword{logicWireLength} & length & \emph{0.5} \\
+\Lkeyword{logicNInput} & number & \emph{2} \\
+\Lkeyword{logicJInput} & number & \emph{2} \\
+\Lkeyword{logicKInput} & number &\emph{2}
 \end{longtable}
 
 \subsection{Basic Logical Circuits}
@@ -2158,11 +2161,9 @@ a123
 NOT123a
 \end{verbatim}
 
-\verb|A_1| is not a good choice, the underscore may causes some
-problems.
+\verb|A_1| is not a good choice, the underscore may cause some problems.
 
 \subsubsection{And}
-
 \psset{subgriddiv=0,griddots=5,gridlabels=7pt}
 \begin{LTXexample}[width=4.5cm](3,3)
   \begin{pspicture}(-1,0)(3,3)
@@ -2437,12 +2438,12 @@ problems.
 \end{LTXexample}
 
 \bigskip
-The unit of \verb|logicWireLength| is the same than the actual one for pstricks, set by
-the \verb|unit| option.
+The unit of \Lkeyword{logicWireLength} is the same than the actual one for pstricks, set by
+the \Lkeyword{unit} option.
 
 \subsection{The Node Names}
 Every logic circuit is defined with its name, which should be a unique one.
-If we have the following NAND circuit, then \verb|pst-circ| defines the nodes
+If we have the following NAND circuit, then \LPack{pst-circ} defines the nodes
 \begin{verbatim}
 NAND11, NAND12, NAND13, NAND14, NAND1Q
 \end{verbatim}
@@ -2550,7 +2551,7 @@ all is finished.
 \section{Adding new components}
 
 Adding new components is not simple. As a matter of fact, because of the complex
-mechanism of \cs{multidipole}, there are multiple steps. Nevertheless, it can take some time\ldots
+mechanism of \Lcs{multidipole}, there are multiple steps. Nevertheless, it can take some time\ldots
 
 If you want to modify the code, you need to know the following
 things. For a dipole, you first
@@ -2591,8 +2592,8 @@ need to define the following items:
     \pnode(component_right_end,0){dipole@2}}
 \end{lstlisting}
 
-Then, you have to make some changes in the \cs{multidipole} core code\dots In the definition
-of \verb+\pst@multidipole+, look for the last \verb+\ifx+ test
+Then, you have to make some changes in the \Lcs{multidipole} core code\dots In the definition
+of \Lcs{pst@multidipole}, look for the last \Lcs{ifx} test
 \begin{lstlisting}[language=TeX]
   % ...
   % Extract from \pst@multidipole
@@ -2656,31 +2657,32 @@ Do the same in \verb+\pst@multidipole@+
   % Extract form \pst@multidipole@
   % ...
 \end{lstlisting}
-and that's it! All you have to do then is send your modified \texttt{pst-circ.tex} to 
-me and  it will become part of the official release of \CircPackage.
+and that's it! All you have to do then is send your modified \LFile{pst-circ.tex} to 
+me and  it will become part of the official release of \LPack{pst-circ}.
 
 \textbf{Important:} Pay attention to the comment character \verb+%+
 at the end of lines. They are \emph{very} important in order to avoid spurious blanks.
 
 
 
-\section{Acknowledgements}
 
-We thank of course Manuel Luque for his original work on pst-circ and for his circuit
-drawings: this wouldn't have been possible without him. As usual, Denis Girou gave us a 
-precious hand with some dark tricks of \TeX{} and PSTricks. Jean-C\^ome Charpentier
-wrote the outline of \cs{multidipole} (a story about riri, fifi and loulou\dots).
 
-Thanks also to Fran\c{c}ois Boone (\url{francois.boone@usherbrooke.ca} -- microwave symbols), 
-Douglas Waud, Patrick Drechsler (dashpot), Alan Ristow, Ted Pavlic,
-and Richard Weissnar.
+\clearpage
+\section{List of all optional arguments for \texttt{pst-circ}}
+
+\xkvview{family=pst-circ,columns={key,type,default}}
 
 
+\bgroup
+\raggedright
 \nocite{*}
-
-{\raggedright
 \bibliographystyle{plain}
 \bibliography{pst-circ-doc}
-}
+\egroup
+
+\printindex
+
+
+
 
 \end{document}
diff --git a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
index 22aec4edd25..f4e41324609 100644
--- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
+++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
@@ -24,20 +24,22 @@
 %
 % Require PSTricks and pst-node packages
 %
-\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
 \ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
 \ifx\PSTnodeLoaded\endinput\else\input pst-node.tex\fi
 \ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
+\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
 %
-\def\fileversion{1.47}
-\def\filedate{2008/08/06}
+\def\fileversion{1.49}
+\def\filedate{2008/11/08}
 \message{`pst-circ' v\fileversion (CJ,hv,pd)}
 %
-\edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax
+\edef\PstAtCode{\the\catcode`\@}
+\catcode`\@=11\relax
 \pst@addfams{pst-circ}
 %
 \pstheader{pst-circ.pro}
 \SpecialCoor
+
 %
 \newdimen\Pst@position
 %
@@ -66,6 +68,7 @@
 \newif\ifPst@T@changeLR
 \newif\ifPst@Ttype
 \newif\ifPst@FETchanneltype% Ted
+\newif\ifPst@T@memory% atosch
 \newif\ifPst@Trafo@iprimary
 \newif\ifPst@Trafo@isecondary
 \newif\ifPst@variable
@@ -82,6 +85,7 @@
 \def\pst@FETchanneltype@P{P}% Ted
 \def\pst@FETchanneltype@N{N}% Ted
 % start  Herbert 2003-07-17
+\def\pst@Dstyle@twoCircles{twoCircles}
 \def\pst@Dstyle@varistor{varistor}
 \def\pst@Dstyle@thyristor{thyristor}
 \def\pst@Dstyle@GTO{GTO}
@@ -149,15 +153,17 @@
 \define@key[psset]{pst-circ}{transistoricollectorlabel}{\def\psk@labelT@iC{#1}}
 \define@key[psset]{pst-circ}{transistoriemitterlabel}{\def\psk@labelT@iE{#1}}
 \define@key[psset]{pst-circ}{FETchanneltype}{\def\psk@FETchanneltype{#1}}% Ted 2007-10-15
+\define@key[psset]{pst-circ}{FETmemory}[true]{\@nameuse{Pst@T@memory#1}}% atosch
 \define@key[psset]{pst-circ}{transistortype}{%
   \def\psk@Ttype{#1}%
   \ifx\psk@Ttype\pst@Ttype@FET\relax\@nameuse{Pst@T@circlefalse}\fi}
 \newdimen\Pst@basesep
 \define@key[psset]{pst-circ}{basesep}{\pst@getlength{#1}\Pst@basesep}
 \define@key[psset]{pst-circ}{TRot}{\pst@checknum{#1}\Pst@TRot}
-\define@key[psset]{pst-circ}{edge}{%
-    \def\psedge{#1}%
-    \ifx\psedge\@none\def\psedge##1##2{}\fi%
+\define@key[psset]{pst-circ}{circedge}{%
+  \let\pscirc@edge#1%
+  \ifx\pscirc@edge\@none\def\pscirc@edge(##1)(##2){}\fi%
+  \ifx\pscirc@edge\pcangles\def\pscirc@edge@sector{2.5}\else\def\pscirc@edge@sector{1.5}\fi%
 }
 %
 \define@key[psset]{pst-circ}{primarylabel}{\def\psk@Trafo@primary@label{#1}}
@@ -197,8 +203,8 @@
 \def\pst@logic@type@D{D}
 \def\pst@logic@type@JK{JK}
 %
-\psset{%
-  labelInside=0,%
+\psset[pst-circ]{%
+  labelInside=0,circedge=\pcangle,
   intensity=false,intensitylabel={},intensitylabeloffset=0.5,
   intensitycolor=black,intensitylabelcolor=black,intensitywidth=\pslinewidth,
   tension=false,tensionlabel={},tensionoffset=1,tensionlabeloffset=1.2,
@@ -210,19 +216,22 @@
   OAiminuslabel={},OAioutlabel={},OApower=false,%
   transistorcircle=true, transistorinvert=false, % hv 2003-07-23
   transistoribase=false,transistoricollector=false,transistoriemitter=false,%
-  transistoribaselabel={},basesep=0pt,edge=\pcangle,%
+  transistoribaselabel={},basesep=0pt,
   transistoricollectorlabel={},transistoriemitterlabel={},
   transistortype=NPN,TRot=0,%
+  FETmemory=false,						% atosch
   primarylabel={},secondarylabel={},transformeriprimary=false,transformerisecondary=false,
   transformeriprimarylabel={},transformerisecondarylabel={},
-  tripolestyle=normal,variable=false,%
-  logicShowDot=false, logicShowNode=false, logicChangeLR=false,% hv
-  logicWireLength=0.5, logicWidth=1.5, logicHeight=2.5, % hv
-  logicNInput=2, logicJInput=2, logicKInput=2, logicType=and,% hv
+  tripolestyle=normal,variable=false,
+  logicShowDot=false, logicShowNode=false, logicChangeLR=false, % hv
+  logicWireLength=0.5, logicWidth=1.5, logicHeight=2.5,       	% hv
+  logicNInput=2, logicJInput=2, logicKInput=2, logicType=and, 	% hv
   logicLabelstyle=\small, logicSymbolstyle=\large,
-  logicSymbolpos=0.5,logicNodestyle=\footnotesize}% hv
+  logicSymbolpos=0.5,logicNodestyle=\footnotesize
+}% hv
+
 %
-\newpsstyle{baseOpt}{edge=\pcline,arrows=-,arm=.5,angleA=0,angleB=180}
+\newpsstyle{baseOpt}{circedge=\pcline,arrows=-,arm=.5,angleA=0,angleB=180}
 \newpsstyle{emitterOpt}{arrows=-,arm=.5,angleA=180,angleB=-90}%
 \newpsstyle{collectorOpt}{arrows=-,arm=.5,angleA=180,angleB=90}
 %
@@ -232,8 +241,7 @@
 %
 \def\resistor{\@ifnextchar[{\pst@resistor}{\pst@resistor[]}}
 \def\pst@resistor[#1](#2)(#3)#4{{%
-  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@resistor%
-  }\ignorespaces}
+  \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@resistor}\ignorespaces}
 %
 \def\capacitor{\@ifnextchar[{\pst@capacitor}{\pst@capacitor[]}}
 \def\pst@capacitor[#1](#2)(#3)#4{{%
@@ -370,82 +378,92 @@
 }
 %
 \newif\ifPst@temp
-\def\transistor{\@ifnextchar[{\transistor@i}{\transistor@i[]}}
-\def\transistor@i[#1](#2){%
+\def\transistor{\def\pst@par{}\pst@object{transistor}}
+\def\transistor@i(#1){%
+%  \addbefore@par{circedge=\pcangle}
+  \pst@killglue
   \begingroup
-  \psset{#1}
-  \@ifnextchar({\transistor@iii(#2)}{\Pst@tempfalse\transistor@ii(#2)}}
+  \use@par%
+  \@ifnextchar({\transistor@iii(#1)}{\Pst@tempfalse\transistor@ii(#1)}}
 %
 \def\transistor@ii(#1)#2#3{% with one node, the base
   \pst@killglue%
   \ifPst@temp\pnode(#1){TBaseNode}%
   \else%
-    \pst@getcoor{#1}\pst@tempa%
+    \pst@getcoor{#1}\pst@tempA%
     \pnode(!
-      \pst@tempa /YB exch \pst@number\psyunit div def
+      \pst@tempA /YB exch \pst@number\psyunit div def
       /XB exch \pst@number\psxunit div def
       /basesep \Pst@basesep\space \pst@number\psxunit div def
       XB basesep \Pst@TRot\space cos mul add
       YB basesep \Pst@TRot\space sin mul add){TBaseNode}% base node
   \fi%
-  \rput{\Pst@TRot}(TBaseNode){%
-    \ifPst@T@circle\pscircle(0.3,0){0.7}\fi
+  \psdot(#1)%
+  \rput[c]{\Pst@TRot}(TBaseNode){%(#1){%
+    \ifPst@T@circle\pscircle(0.3,0){0.7}\fi%
     \ifx\psk@Ttype\pst@Ttype@FET\relax%
-      \psline[arrows=-,linewidth=\psk@I@width](0,0.5)(0,-0.5)
-    \else
-      \psline[arrows=-,linewidth=4\pslinewidth](0,0.4)(0,-0.4)
-    \fi
+      \ifPst@T@memory% atosch
+        \psline[arrows=-,linewidth=\psk@I@width](-0.15,0.5)(-0.15,-0.5)%
+      \fi%
+      \psline[arrows=-,linewidth=\psk@I@width](TBaseNode|0,0.5)(TBaseNode|0,-0.5)%
+    \else%
+      \psline[arrows=-,linewidth=4\pslinewidth](TBaseNode|0,0.4)(TBaseNode|0,-0.4)%
+    \fi%
     \ifnum180=\Pst@TRot\relax%
       \ifx\psk@Ttype\pst@Ttype@FET\relax%
-        \ifPst@T@invert\pnode(0.65,-0.5){#2}\else\pnode(0.65,-0.5){#3}\fi%
-        \ifPst@T@invert\pnode(0.65,0.5){#3}\else\pnode(0.65,0.5){#2}\fi%
-      \else
+        \ifPst@T@invert\pnode(0.75,-0.5){#2}\else\pnode(0.75,-0.5){#3}\fi%
+        \ifPst@T@invert\pnode(0.75,0.5){#3}\else\pnode(0.75,0.5){#2}\fi%
+      \else%
         \ifPst@T@invert\pnode(0.5,-0.5){#2}\else\pnode(0.5,-0.5){#3}\fi%
         \ifPst@T@invert\pnode(0.5,0.5){#3}\else\pnode(0.5,0.5){#2}\fi%
-      \fi
+      \fi%
     \else%
       \ifx\psk@Ttype\pst@Ttype@FET\relax%
         \ifPst@T@invert\pnode(0.65,0.5){#2}\else\pnode(0.65,0.5){#3}\fi%
         \ifPst@T@invert\pnode(0.65,-0.5){#3}\else\pnode(0.65,-0.5){#2}\fi%
-      \else
+      \else%
         \ifPst@T@invert\pnode(0.5,0.5){#2}\else\pnode(0.5,0.5){#3}\fi%
         \ifPst@T@invert\pnode(0.5,-0.5){#3}\else\pnode(0.5,-0.5){#2}\fi%
-      \fi
+      \fi%
     \fi%
     \ifx\psk@Ttype\pst@Ttype@FET\relax%
-      \psline[arrows=-](0.65,0.5)(0.15,0.5)(0.15,-0.5)(0.65,-0.5)
-    \else
-      \psline[arrows=-](0.5,0.5)(0,0)(0.5,-0.5)
-    \fi
-  }%
-  \ifx\psk@Ttype\pst@Ttype@FET\relax%
-%    \ifx\psk@Ttype\pst@Ttype@PNP\relax%
-    \ifx\psk@FETchanneltype\pst@FETchanneltype@P\relax% Ted 2007-10-15
-      \psline[origin={#3},arrowinset=0,arrowsize=8\pslinewidth]{->}(-0.5,0)
+      \ifnum180=\Pst@TRot\relax
+        \psline[arrows=-](0.6,0.5)(0.05,0.5)(0.05,-0.5)(0.6,-0.5)%
+      \else 
+        \psline[arrows=-](0.65,0.5)(0.15,0.5)(0.15,-0.5)(0.65,-0.5)%
+      \fi%
     \else%
-      \psline[origin={#2},arrowinset=0,arrowsize=8\pslinewidth]{<-}(-0.5,0)
+      \psline[arrows=-](0.5,0.5)(TBaseNode)(0.5,-0.5)%
     \fi%
-  \else
-    \ifx\psk@Ttype\pst@Ttype@PNP\relax%
-      \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(#3)(TBaseNode)
+    \ifx\psk@Ttype\pst@Ttype@FET\relax%
+%      \ifx\psk@Ttype\pst@Ttype@PNP\relax%
+      \ifx\psk@FETchanneltype\pst@FETchanneltype@P\relax% Ted 2007-10-15
+        \psline[origin={#3},arrowinset=0,arrowsize=8\pslinewidth]{->}(-0.5,0)%
+      \else%
+        \psline[origin={#2},arrowinset=0,arrowsize=8\pslinewidth]{<-}(-0.5,0)%
+      \fi%
     \else%
-       \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(TBaseNode)(#2)
+      \ifx\psk@Ttype\pst@Ttype@PNP\relax%
+        \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(#3)(TBaseNode)%
+      \else%
+         \psline[arrowinset=0,arrowsize=8\pslinewidth]{->}(TBaseNode)(#2)%
+      \fi%
     \fi%
-  \fi
+  }%
   \ifPst@temp\else\endgroup\fi%
   \ignorespaces%
 }
 %
 \def\transistor@iii(#1)(#2)(#3){% with three nodes
-  \pst@getcoor{#1}\pst@tempa%
-  \pst@getcoor{#2}\pst@tempb%
-  \pst@getcoor{#3}\pst@tempc%
+  \pst@getcoor{#1}\pst@tempA%
+  \pst@getcoor{#2}\pst@tempB%
+  \pst@getcoor{#3}\pst@tempC%
   \pnode(!%
-    \pst@tempa /Y1 exch \pst@number\psyunit div def
+    \pst@tempA /Y1 exch \pst@number\psyunit div def
     /X1 exch \pst@number\psxunit div def
-    \pst@tempb /Y2 exch \pst@number\psyunit div def
+    \pst@tempB /Y2 exch \pst@number\psyunit div def
     /X2 exch \pst@number\psxunit div def
-    \pst@tempc /Y3 exch \pst@number\psyunit div def
+    \pst@tempC /Y3 exch \pst@number\psyunit div def
     /X3 exch \pst@number\psxunit div def
     /LR X1 X2 lt { false }{ true } ifelse def % change left-right
     /basesep \Pst@basesep\space \pst@number\psxunit div def
@@ -461,7 +479,7 @@
   \if\psk@labelT@iC\@empty\else\psset{transistoricollector=true}\fi%
   \ifPst@intensity\psset{transistoribase=true,transistoriemitter=true,transistoricollector=true}\fi%
 %
-  \bgroup\psset{style=baseOpt}\psedge(#1)(TBaseNode)\egroup%
+  \bgroup\psset{style=baseOpt}\pscirc@edge(#1)(TBaseNode)\egroup%
   \ifPst@T@iB% base current?
     \ncput[npos=0.5,nrot=\Pst@TRot]{%
       \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,%
@@ -470,41 +488,41 @@
   \fi%
   \bgroup%
     \psset{style=collectorOpt}%
-  \ifPst@T@invert\psedge(#3)(@@emitter)\else\psedge(#3)(@@collector)\fi%
+    \ifPst@T@invert\pscirc@edge(#3)(@@emitter)\else\pscirc@edge(#3)(@@collector)\fi%
   \egroup%
   \ncput[npos=2]{\pnode{\ifPst@T@invert @@emitter\else @@collector\fi}}%
   \ifPst@T@iE% emitter current?
     \ifPst@T@invert% emitter/collector changed?
-      \ncput[npos=1.5,nrot=:U]{%
+      \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,%
     arrowsize=6\pslinewidth,arrowinset=0]{->}(-0.1,0)(0.1,0)}
-      \nbput[npos=1.5]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iE}
+      \nbput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iE}
     \fi\fi%
   \ifPst@T@iC% collector current?
     \ifPst@T@invert\else% emitter/collector changed?
-      \ncput[npos=1.5,nrot=:U]{%
+      \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,%
     arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \nbput[npos=1.5]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iC}
+      \nbput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iC}
     \fi\fi%
   \bgroup
   \psset{style=emitterOpt}
-  \ifPst@T@invert\psedge(#2)(@@collector)\else\psedge(#2)(@@emitter)\fi
+  \ifPst@T@invert\pscirc@edge(#2)(@@collector)\else\pscirc@edge(#2)(@@emitter)\fi
   \egroup
   \ncput[npos=2]{\pnode{\ifPst@T@invert @@collector\else @@emitter\fi}}
   \ifPst@T@iE
     \ifPst@T@invert\else
-      \ncput[npos=1.5,nrot=:U]{%
+      \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
-      \naput[npos=1.5]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iE}
+      \naput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iE}
     \fi\fi%
   \ifPst@T@iC% collector current?
     \ifPst@T@invert% emitter/collector changed?
-      \ncput[npos=1.5,nrot=:U]{%
+      \ncput[npos=\pscirc@edge@sector,nrot=:U]{%
         \psline[linecolor=\psk@I@color,linewidth=\psk@I@width,
     arrowsize=6\pslinewidth,arrowinset=0]{<-}(-.1,0)(.1,0)}
-      \naput[npos=1.5]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iC}
+      \naput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iC}
     \fi\fi
   \psline[linestyle=none](#1)(#2)% for the end arrows
   \psline[linestyle=none](#1)(#3)% for the end arrows
@@ -728,54 +746,54 @@
   \pst@count@i=\z@
   \let\pst@multidipole@output\@empty
   \ifx\resistor #4%
-    \let\next\pst@multidipole@resistor
+    \let\pscirc@next\pst@multidipole@resistor
   \else
     \ifx\capacitor #4%
-      \let\next\pst@multidipole@capacitor
+      \let\pscirc@next\pst@multidipole@capacitor
     \else
       \ifx\battery #4%
-        \let\next\pst@multidipole@battery
+        \let\pscirc@next\pst@multidipole@battery
       \else
         \ifx\coil #4%
-          \let\next\pst@multidipole@coil
+          \let\pscirc@next\pst@multidipole@coil
         \else
           \ifx\Ucc #4%
-            \let\next\pst@multidipole@Ucc
+            \let\pscirc@next\pst@multidipole@Ucc
           \else
             \ifx\Icc #4%
-              \let\next\pst@multidipole@Icc
+              \let\pscirc@next\pst@multidipole@Icc
             \else
               \ifx\switch #4%
-                \let\next\pst@multidipole@switch
+                \let\pscirc@next\pst@multidipole@switch
               \else
                 \ifx\diode #4%
-                  \let\next\pst@multidipole@diode
+                  \let\pscirc@next\pst@multidipole@diode
                 \else
                   \ifx\Zener #4%
-                    \let\next\pst@multidipole@Zener
+                    \let\pscirc@next\pst@multidipole@Zener
                   \else
                     \ifx\wire #4%
-                      \let\next\pst@multidipole@wire
+                      \let\pscirc@next\pst@multidipole@wire
                     \else
                       \ifx\lamp #4%
-                        \let\next\pst@multidipole@lamp
+                        \let\pscirc@next\pst@multidipole@lamp
                       \else
                         \ifx\circledipole #4%
-                          \let\next\pst@multidipole@circledipole
+                          \let\pscirc@next\pst@multidipole@circledipole
                         \else
                           \ifx\LED #4%
-                            \let\next\pst@multidipole@LED
+                            \let\pscirc@next\pst@multidipole@LED
                           \else%%% pd change
                             \ifx\dashpot #4%%% pd change
-                              \let\next\pst@multidipole@dashpot
+                              \let\pscirc@next\pst@multidipole@dashpot
                             \else%%% pd change
                               \ifx\filter #4%
-                                \let\next\pst@multidipole@filter
+                                \let\pscirc@next\pst@multidipole@filter
                               \else
                                 \ifx\isolator #4%
-                                  \let\next\pst@multidipole@filter
+                                  \let\pscirc@next\pst@multidipole@filter
                                 \else
-                                  \let\next\ignorespaces
+                                  \let\pscirc@next\ignorespaces
                                 \fi
                               \fi
                             \fi%%% pd change
@@ -794,59 +812,59 @@
   \fi
   \advance\pst@count@i\@ne
   \advance\pst@count@iii\@ne
-  \next
+  \pscirc@next
 }
 %
 \def\pst@multidipole@#1{%
   \ifx\resistor #1%
-      \let\next\pst@multidipole@resistor
+      \let\pscirc@next\pst@multidipole@resistor
   \else
     \ifx\capacitor #1%
-      \let\next\pst@multidipole@capacitor
+      \let\pscirc@next\pst@multidipole@capacitor
     \else
       \ifx\battery #1%
-        \let\next\pst@multidipole@battery
+        \let\pscirc@next\pst@multidipole@battery
       \else
         \ifx\coil #1%
-          \let\next\pst@multidipole@coil
+          \let\pscirc@next\pst@multidipole@coil
         \else
           \ifx\Ucc #1%
-            \let\next\pst@multidipole@Ucc
+            \let\pscirc@next\pst@multidipole@Ucc
           \else
             \ifx\Icc #1%
-              \let\next\pst@multidipole@Icc
+              \let\pscirc@next\pst@multidipole@Icc
             \else
               \ifx\switch #1%
-                \let\next\pst@multidipole@switch %off
+                \let\pscirc@next\pst@multidipole@switch %off
               \else
                 \ifx\diode #1%
-                  \let\next\pst@multidipole@diode
+                  \let\pscirc@next\pst@multidipole@diode
                 \else
                   \ifx\Zener #1%
-                    \let\next\pst@multidipole@Zener
+                    \let\pscirc@next\pst@multidipole@Zener
                   \else
                     \ifx\wire #1%
-                      \let\next\pst@multidipole@wire
+                      \let\pscirc@next\pst@multidipole@wire
                     \else
                       \ifx\lamp #1%
-                        \let\next\pst@multidipole@lamp
+                        \let\pscirc@next\pst@multidipole@lamp
                       \else
                         \ifx\circledipole #1%
-                          \let\next\pst@multidipole@circledipole
+                          \let\pscirc@next\pst@multidipole@circledipole
                         \else
                           \ifx\LED #1%
-                            \let\next\pst@multidipole@LED
+                            \let\pscirc@next\pst@multidipole@LED
                           \else%%% pd change
                             \ifx\dashpot #1%%% pd change
-                              \let\next\pst@multidipole@dashpot
+                              \let\pscirc@next\pst@multidipole@dashpot
                             \else%%% pd change
                               \ifx\filter #1%
-                                \let\next\pst@multidipole@filter
+                                \let\pscirc@next\pst@multidipole@filter
                               \else
                                 \ifx\isolator #1%
-                                  \let\next\pst@multidipole@isolator
+                                  \let\pscirc@next\pst@multidipole@isolator
                                 \else
-                                  \let\next\ignorespaces
+                                  \let\pscirc@next\ignorespaces
                                   \pst@multidipole@output
                                 \fi
                               \fi
@@ -866,7 +884,7 @@
   \fi
   \advance\pst@count@i\@ne
   \advance\pst@count@iii\@ne
-  \next
+  \pscirc@next
 }
 %
 \def\pst@multidipole@resistor{\@ifnextchar[{\pst@multidipole@resistor@}{\pst@multidipole@resistor@[]}}
@@ -1157,10 +1175,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%
 %
 \def\pst@draw@dipole#1#2#3#4#5{%   suggestion by Alain Ristow
-  \psset{dimen=middle}%
-  \psset{#1}%
-  \if\psk@I@label\@empty\else\psset{intensity=true}\fi
-  \if\psk@tension@label\@empty\else\psset{tension=true}\fi
+  \psset{dimen=middle,#1}%
+  \if\psk@I@label\@empty\else\psset[pst-circ]{intensity=true}\fi
+  \if\psk@tension@label\@empty\else\psset[pst-circ]{tension=true}\fi
   \ifx\psk@Dconvention\pst@Dconvention@generator
      \Pst@Dconventiontrue
   \else
@@ -1180,7 +1197,7 @@
          \ncput[npos=1]{\pnode{dipole@@@2}}
          \ncput[nrot=:U]{#5}
          \pcline[arrows=-](dipole@@1)(dipole@@@1)
-         \pcline[arrows=-](dipole@@@1)(dipole@1)
+         \pcline[arrows=-](dipole@@@1)(dipole@i)
          \pcline[arrows=-](dipole@2)(dipole@@@2)
          \pcline[arrows=-](dipole@@@2)(dipole@@2)
          \ifPst@parallel@node
@@ -1198,20 +1215,17 @@
      \pcline[arrows=-,linestyle=none,
         fillstyle=none,offset=\psk@label@offset](#2)(#3)
          \ncput[nrot=\psk@label@angle]{#4}
-         %%%
-         % CHANGES HERE!!!
-         %%%
 %%%%%
          \ifPst@inputarrow
             \ifx\psk@Dinput\pst@Dinput@right
-                \pcline[fillstyle=none,arrows=-C](#2)(dipole@1)
+                \pcline[fillstyle=none,arrows=-C](#2)(dipole@i)
                 \pcline[fillstyle=none,arrows=->,arrowinset=0](#3)(dipole@2)
              \else
-                \pcline[fillstyle=none,arrows=->,arrowinset=0](#2)(dipole@1)
+                \pcline[fillstyle=none,arrows=->,arrowinset=0](#2)(dipole@i)
                 \pcline[fillstyle=none,arrows=C-](dipole@2)(#3)
             \fi
          \else
-            \pcline[fillstyle=none,arrows=-C](#2)(dipole@1)
+            \pcline[fillstyle=none,arrows=-C](#2)(dipole@i)
             \pcline[fillstyle=none,arrows=C-](dipole@2)(#3)
          \fi
          \pcline[fillstyle=none,linestyle=none](#2)(#3)
@@ -1219,65 +1233,16 @@
          \pst@intensity{#2}{#3}
          \pst@tension{#2}{#3}
        \fi%
-     }%
-%
-\iffalse  % the original stuff
-\def\pst@draw@dipole#1#2#3#4#5{%
-  \psset{dimen=middle}%
-  \psset{#1}%
-  \if\psk@I@label\@empty\else\psset{intensity=true}\fi
-  \if\psk@tension@label\@empty\else\psset{tension=true}\fi
-  \ifx\psk@Dconvention\pst@Dconvention@generator
-    \Pst@Dconventiontrue
-  \else
-    \ifx\psk@Dconvention\pst@Dconvention@receptor
-      \Pst@Dconventionfalse
-    \fi
-  \fi
-  \pcline[arrows=-,linestyle=none,fillstyle=none](#2)(#3)
-  \ncput[nrot=:U]{\pnode{dipole@M}}
-  \ifPst@parallel
-    \pcline[arrows=-,linestyle=none,fillstyle=none](#2)(dipole@M)
-    \ncput[npos=\psk@parallel@sep]{\pnode{dipole@@1}}
-    \pcline[arrows=-,linestyle=none,fillstyle=none](#3)(dipole@M)
-    \ncput[npos=\psk@parallel@sep]{\pnode{dipole@@2}}
-    \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@parallel@arm](dipole@@1)(dipole@@2)
-    \ncput[npos=0]{\pnode{dipole@@@1}}
-    \ncput[npos=1]{\pnode{dipole@@@2}}
-    \ncput[nrot=:U]{#5}
-    \pcline[arrows=-](dipole@@1)(dipole@@@1)
-    \pcline[arrows=-](dipole@@@1)(dipole@1)
-    \pcline[arrows=-](dipole@2)(dipole@@@2)
-    \pcline[arrows=-](dipole@@@2)(dipole@@2)
-    \ifPst@parallel@node
-      \pscircle*(dipole@@1){2\pslinewidth}
-      \pscircle*(dipole@@2){2\pslinewidth}
-    \fi
-    \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](dipole@@@1)(dipole@@@2)
-    \ncput[nrot=\psk@label@angle]{#4}
-    \pst@intensity{dipole@@@1}{dipole@@@2}
-    \pst@tension{dipole@@@1}{dipole@@@2}
-  \else
-    \ncput[nrot=:U]{#5}
-    \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](#2)(#3)
-    \ncput[nrot=\psk@label@angle]{#4}
-    \pcline[arrows=-](#2)(dipole@1)
-    \pcline[arrows=-](dipole@2)(#3)
-    \pcline[linestyle=none](#2)(#3)
-    \pst@intensity{#2}{#3}
-    \pst@tension{#2}{#3}
-  \fi
-  }
-\fi
+}%
 %
 \def\pst@intensity#1#2{%
   \ifPst@intensity
     \ifPst@direct@convention
-      \pcline[arrows=-,linestyle=none,fillstyle=none](#1)(dipole@1)
+      \pcline[arrows=-,linestyle=none,fillstyle=none](#1)(dipole@i)
       \ncput[nrot=:U]{%
         \psline[linecolor=\psk@I@color,
           linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
-      \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@I@label@offset](#1)(dipole@1)
+      \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@I@label@offset](#1)(dipole@i)
       \ncput[nrot=\psk@label@angle]{\csname\psk@I@labelcolor\endcsname\psk@I@label}
     \else
       \pcline[arrows=-,linestyle=none,fillstyle=none](dipole@2)(#2)
@@ -1292,7 +1257,7 @@
 \def\pst@tension#1#2{%
   \ifPst@tension
     \pcline[arrows=-,linestyle=none,fillstyle=none,%
-      offset=\psk@tension@offset](#1)(dipole@1)
+      offset=\psk@tension@offset](#1)(dipole@i)
     \ncput[npos=.5]{\pnode{tension@1}}
     \pcline[arrows=-,linestyle=none,fillstyle=none,
       offset=-\psk@tension@offset](#2)(dipole@2)
@@ -1315,7 +1280,7 @@
       \fi
     \fi
     \pcline[arrows=-,linestyle=none,fillstyle=none,%
-      offset=\psk@tension@label@offset](dipole@1)(dipole@2)
+      offset=\psk@tension@label@offset](dipole@i)(dipole@2)
     \ncput[nrot=\psk@label@angle]{%
   \csname\psk@tension@labelcolor\endcsname\psk@tension@label}
   \fi
@@ -1323,19 +1288,16 @@
 %
 \def\pst@draw@resistor{%
   \ifx\psk@Dstyle\pst@Dstyle@zigzag
-    \pnode(-0.75,0){dipole@1}
+    \pnode(-0.75,0){dipole@i}
     \pnode(0.75,0){dipole@2}
-    \multips(-0.75,0)(0.5,0){3}%
-      {\psline[arrows=-,linewidth=1.5\pslinewidth]%
+    \multips(-0.75,0)(0.5,0){3}{%
+      \psline[arrows=-,linewidth=1.5\pslinewidth]%
           (0,0)(0.125,0.25)(0.375,-0.25)(0.5,0)}%
   \else
-    \pnode(-0.5,0){dipole@1}
-    \pnode(0.5,0){dipole@2}
+    \pnode(-0.5,0){dipole@i}\pnode(0.5,0){dipole@2}
     \psframe[linewidth=1.5\pslinewidth](-0.5,-0.25)(0.5,0.25)
   \fi
-  \ifPst@variable%
-    \psline{->}(-0.5,-0.55)(0.5,0.55)%
-  \fi
+  \ifPst@variable\psline{->}(-0.5,-0.55)(0.5,0.55)\fi
   \ifx\psk@Dstyle\pst@Dstyle@varistor
     \psline[linewidth=0.8pt](-0.75,-0.55)(-0.5,-0.55)(0.5,0.55)%
   \fi
@@ -1343,7 +1305,7 @@
 %
 % pd start ====================================================
 \def\pst@draw@dashpot{%
-  \pnode(0,0){dipole@1}%
+  \pnode(0,0){dipole@i}%
   \pnode(0.5,0){dipole@2}%
   \psline[linewidth=1.5\pslinewidth]%
   (-0.5,-0.5)(0.5,-0.5)(0.5,0.5)(-0.5,0.5)%
@@ -1356,31 +1318,31 @@
   \ifx\psk@Dstyle\pst@Dstyle@chemical
     \psline[arrows=-](-0.2,-0.5)(-0.2,0.5)
     \psarc[arrows=-](1.1875,0){1.0625}{154.8}{205.2}
-    \pnode(-0.2,0){dipole@1}
+    \pnode(-0.2,0){dipole@i}
     \pnode(0.125,0){dipole@2}
   \else
     \ifx\psk@Dstyle\pst@Dstyle@elektorchemical
       \psframe[framearc=0.01,dimen=outer](-0.2284123,0.2743733)(-0.0557103,-0.2743733)
       \psframe[framearc=0.01,dimen=outer,fillstyle=solid,fillcolor=black](0.0557103,0.2743733)(0.2284123,-0.2743733)
-      \pnode(-0.2284123,0){dipole@1}
+      \pnode(-0.2284123,0){dipole@i}
       \pnode(0.2284123,0){dipole@2}
     \else
       \ifx\psk@Dstyle\pst@Dstyle@elektor
         \psframe[framearc=0.01,dimen=outer,fillstyle=solid,fillcolor=black](-0.2284123,0.2743733)(-0.0557103,-0.2743733)
         \psframe[framearc=0.01,dimen=outer,fillstyle=solid,fillcolor=black](0.0557103,0.2743733)(0.2284123,-0.2743733)
-        \pnode(-0.2284123,0){dipole@1}
+        \pnode(-0.2284123,0){dipole@i}
         \pnode(0.2284123,0){dipole@2}
       \else
         \ifx\psk@Dstyle\pst@Dstyle@crystal
           \psline[arrows=-](-0.3,-0.4)(-0.3,0.4)
           \psline[arrows=-](0.3,-0.4)(0.3,0.4)
 	  \psframe(-0.2,-0.5)(0.2,0.5)
-          \pnode(-0.3,0){dipole@1}
+          \pnode(-0.3,0){dipole@i}
           \pnode(0.3,0){dipole@2}
 	\else
           \psline[arrows=-](-0.2,-0.5)(-0.2,0.5)
           \psline[arrows=-](0.2,-0.5)(0.2,0.5)
-          \pnode(-0.2,0){dipole@1}
+          \pnode(-0.2,0){dipole@i}
           \pnode(0.2,0){dipole@2}
 	\fi
       \fi
@@ -1414,7 +1376,7 @@
 \def\pst@draw@battery{%
   \psline[arrows=-,linewidth=1.5\pslinewidth](-0.10,-0.5)(-0.10,0.5)
   \psline[arrows=-,linewidth=3\pslinewidth](0.10,-0.25)(0.10,0.25)
-  \pnode(-0.1,0){dipole@1}
+  \pnode(-0.1,0){dipole@i}
   \pnode(0.1,0){dipole@2}
   \ifPst@variable%
     \psline{->}(-0.75,-0.5)(0.75,0.5)%
@@ -1429,7 +1391,7 @@
       (0,0.3)(0.25,0)(0.2,-0.2)(0.1,0)
       (0.2,0.3)(0.45,0)(0.4,-0.2)(0.3,0)
       (0.4,0.3)(0.65,0)(0.6,-0.2)(0.5,0)
-    \pnode(-0.7,0){dipole@1}
+    \pnode(-0.7,0){dipole@i}
     \pnode(0.5,0){dipole@2}
   \else
     \ifx\psk@Dstyle\pst@Dstyle@elektor
@@ -1437,7 +1399,7 @@
       \psarcn(-0.1295265,0){0.1295265}{-180}{0}
       \psarcn(0.1295265,0){0.1295265}{-180}{0}
       \psarcn[arrows=-c](0.3885794,0){0.1295265}{-180}{0}
-      \pnode(-0.5181058,0){dipole@1}
+      \pnode(-0.5181058,0){dipole@i}
       \pnode(0.5181058,0){dipole@2}
     \else
       \ifx\psk@Dstyle\pst@Dstyle@elektorcurved
@@ -1445,11 +1407,11 @@
         \psarcn[arrows=-c](-0.136056,0.089453){0.211665}{-130}{-410}
         \psarcn[arrows=-c](0.136055,0.089453){0.211665}{-130}{-410}
         \psarcn[arrows=-c](0.408167,0.089453){0.211665}{-130}{-385}
-        \pnode(-0.6,0){dipole@1}
+        \pnode(-0.6,0){dipole@i}
         \pnode(0.6,0){dipole@2}
     \else
       \ifx\psk@Dstyle\pst@Dstyle@rectangle
-        \pnode(-0.5,0){dipole@1}
+        \pnode(-0.5,0){dipole@i}
         \pnode(0.5,0){dipole@2}
         \psframe[linewidth=1.5\pslinewidth,fillstyle=solid,fillcolor=black](-0.5,-0.25)(0.5,0.25)
     \else
@@ -1457,14 +1419,14 @@
       \pscurve[arrows=-,linewidth=1.5\pslinewidth](-0.5,0)(-0.25,0.5)(0,0)
       \pscurve[arrows=-,linewidth=1.5\pslinewidth](0,0)(0.25,0.5)(0.5,0)
       \pscurve[arrows=-,linewidth=1.5\pslinewidth](0.5,0)(0.75,0.5)(1,0)
-      \pnode(-1,0){dipole@1}
+      \pnode(-1,0){dipole@i}
       \pnode(1,0){dipole@2}
     \fi\fi\fi\fi%
   \ifPst@variable\psline{->}(-0.75,-0.5)(0.75,0.5)\fi%
   }
 %
 \def\pst@draw@Ucc{%
-  \pnode(-0.5,0){dipole@1}
+  \pnode(-0.5,0){dipole@i}
   \pnode(0.5,0){dipole@2}
   \ifx\psk@Dstyle\pst@Dstyle@diamond
     \pspolygon[linewidth=1.5\pslinewidth](-0.5,0)(0,0.5)(0.5,0)(0,-0.5)
@@ -1480,21 +1442,28 @@
 }
 %
 \def\pst@draw@Icc{%
-  \pnode(-0.5,0){dipole@1}
-  \pnode(0.5,0){dipole@2}
-  \pscircle[linewidth=1.5\pslinewidth](0,0){0.5}
-  \psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.5)(0,0.5)
-  }
+  \ifx\psk@Dstyle\pst@Dstyle@twoCircles
+    \pnode(-0.7,0){dipole@i}
+    \pnode(0.7,0){dipole@2}
+    \pscircle[linewidth=1.5\pslinewidth](-0.175,0){0.5}
+    \pscircle[linewidth=1.5\pslinewidth](0.175,0){0.5}
+  \else
+    \pnode(-0.5,0){dipole@i}
+    \pnode(0.5,0){dipole@2}
+    \pscircle[linewidth=1.5\pslinewidth](0,0){0.5}
+    \psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.5)(0,0.5)
+  \fi%
+}
 %
 \def\pst@draw@switch{%
   \ifx\psk@Dstyle\pst@Dstyle@close
-    \pnode(-0.5,0){dipole@1}
+    \pnode(-0.5,0){dipole@i}
     \pnode(0.5,0){dipole@2}
     \qdisk(-0.5,0){1.5pt}
     \qdisk(0.5,0){1.5pt}
     \psline[arrows=-,linewidth=2\pslinewidth](-0.5,0.05)(0.5,0.05)
   \else
-    \pnode(-0.55,0){dipole@1}
+    \pnode(-0.55,0){dipole@i}
     \pnode(0.5,0){dipole@2}
     \psline[arrows=-,linewidth=2\pslinewidth](-0.5,0)(0.5,0.5)
     \psarcn[arrowinset=0]{->}(-0.5,0){0.75}{45}{-45}
@@ -1521,7 +1490,7 @@
       \psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.1)(0,-0.35)
     \fi
   \fi
-  \pnode(-0.25,0){dipole@1}
+  \pnode(-0.25,0){dipole@i}
   \pnode(0.25,0){dipole@2}
   }
 %
@@ -1532,7 +1501,7 @@
   \else
     \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.25)(0.25,-0.25)(0,-0.25)
   \fi
-  \pnode(-0.25,0){dipole@1}
+  \pnode(-0.25,0){dipole@i}
   \pnode(0.25,0){dipole@2}
 }
 %
@@ -1540,20 +1509,20 @@
   \pscircle[linewidth=1.5\pslinewidth]{0.5}
   \psline[arrows=-,linewidth=1.5\pslinewidth](0.5;45)(0.5;225)
   \psline[arrows=-,linewidth=1.5\pslinewidth](0.5;135)(0.5;315)
-  \pnode(-0.5,0){dipole@1}
+  \pnode(-0.5,0){dipole@i}
   \pnode(0.5,0){dipole@2}
 }
 %
 \def\pst@draw@circledipole{%
   \pscircle[linewidth=1.5\pslinewidth]{0.5}
-  \pnode(-0.5,0){dipole@1}
+  \pnode(-0.5,0){dipole@i}
   \pnode(0.5,0){dipole@2}
 }
 %
 \def\pst@draw@LED{%
   \pspolygon[arrows=-,linewidth=1.5\pslinewidth](-0.25,-0.2)(-0.25,0.2)(0.25,0)
   \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.2)(0.25,-0.2)
-  \pnode(-0.25,0){dipole@1}
+  \pnode(-0.25,0){dipole@i}
   \pnode(0.25,0){dipole@2}
   \multips(-0.25,0.3)(0.25,0){3}{\psline[arrows=->](0.25,0.22)}%
 }
@@ -2177,7 +2146,7 @@
 }
 %
 \def\pst@draw@filter{%
-    \pnode(-0.5,0){dipole@1}
+    \pnode(-0.5,0){dipole@i}
     \pnode(0.5,0){dipole@2}
     \psframe[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
     \pscurve[linewidth=1.5\pslinewidth]{c-c}(-0.4,0.250)(-0.2,0.3750)(0,0.250)(0.2,0.1250)(0.4,0.250)
@@ -2228,7 +2197,7 @@
 }
 %
 \def\pst@draw@isolator{%
-    \pnode(-0.5,0){dipole@1}
+    \pnode(-0.5,0){dipole@i}
     \pnode(0.5,0){dipole@2}
     \psframe[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
     \ifx\psk@Dinput\pst@Dinput@right
@@ -2267,7 +2236,7 @@
 }
 %
 \def\pst@draw@freqmult{%
-    \pnode(-0.5,0){dipole@1}
+    \pnode(-0.5,0){dipole@i}
     \pnode(0.5,0){dipole@2}
     \psframe[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
     \ifPst@programmable%
@@ -2327,7 +2296,7 @@
 }
 %
 \def\pst@draw@phaseshifter{%
-    \pnode(-0.4,0){dipole@1}
+    \pnode(-0.4,0){dipole@i}
     \pnode(0.4,0){dipole@2}
     \pscircle[linewidth=1.5\pslinewidth](0,0){0.4}
     \psline[fillstyle=none,linewidth=1.5\pslinewidth,arrowinset=0]{->}(-0.5,-0.5)(0.5,0.5)
@@ -2362,7 +2331,7 @@
 }
 %
 \def\pst@draw@vco{%
-    \pnode(-0.5,0){dipole@1}
+    \pnode(-0.5,0){dipole@i}
     \pnode(0.5,0){dipole@2}
     \pscircle[linewidth=1.5\pslinewidth](0,0){0.5}
     \pscurve[linewidth=1.5\pslinewidth]{c-c}(-0.3,0.000)(-0.225,0.088375)(-0.15,0.1250)(-0.075,0.088375)%
@@ -2399,7 +2368,7 @@
 }
 %
 \def\pst@draw@amplifier{%
-    \pnode(-0.433,0){dipole@1}
+    \pnode(-0.433,0){dipole@i}
     \pnode(0.433,0){dipole@2}
     \ifx\psk@Dinput\pst@Dinput@right
         \pstriangle[gangle=90,linewidth=1.5\pslinewidth](0.433,0)(1,0.866)
@@ -2438,7 +2407,7 @@
 }
 %
 \def\pst@draw@detector{%
-    \pnode(-0.5,0){dipole@1}
+    \pnode(-0.5,0){dipole@i}
     \psline[fillstyle=none](-0.5,0)(-0.2165,0)
     \pnode(0.5,0){dipole@2}
     \psline[fillstyle=none](0.5,0)(0.2165,0)