summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-02-03 01:26:19 +0000
committerKarl Berry <karl@freefriends.org>2009-02-03 01:26:19 +0000
commitb396e9795f300708e4296019397ba084a1a37ace (patch)
tree7a37c83a72338c984c2c30d299f5803d428a2d25 /Master
parent8f110ef84fb7ea64a55198b28dd444c222e4aef7 (diff)
pst-circ 1.50 (2feb09)
git-svn-id: svn://tug.org/texlive/trunk@12055 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/Changes5
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.bib30
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdfbin526482 -> 525727 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex829
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex849
5 files changed, 782 insertions, 931 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index 66b7fc5a5f9..9761c52a5f2 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,8 @@
+1.50 2009-02-01 - add RFLine symbol
+ - internal changes to the code
+ - make all microwave symbols work with
+ multinode
+ - fix several bugs in the documentation
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
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 85aea905da3..d4c75592e2a 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
@@ -38,24 +38,6 @@
}
-@Manual{pstlens:2001,
- Title = {PST-lens - {\PS} macros for Generic TeX},
- Author = {Denis Girou and Manuel Luque},
- Organization = {},
- Address = {\url{ftp://ftp.dante.de/tex-archive/graphics/pstricks/contrib/pst-lens/}},
- Note = {},
- year = 2001,
-}
-
-@Manual{vue3d:2002,
- Title = {Vue en 3D},
- Author = {Manuel Luque},
- Organization = {},
- Address = {\url{http://members.aol.com/Mluque5130/vue3d16112002.zip}},
- Note = {},
- year = 2002,
-}
-
@Article{dtk02.2:jackson.voss:plot-funktionen,
author = {Laura E. Jackson and Herbert Vo{\ss}},
title = {Die {P}lot-{F}unktionen von {\texttt{pst-plot}}},
@@ -113,16 +95,16 @@
author = {Herbert Vo\ss},
title = {\texttt{PSTricks} -- {G}rafik f\"ur \TeX{} und \LaTeX},
edition = {5.},
- publisher = {DANTE -- Lehmanns},
+ publisher = {DANTE/Lehmanns Media},
year = {2008},
- address = {Heidelberg/Hamburg}
+ address = {Heidelberg/Berlin}
}
@Book{voss:math,
author = {Herbert Vo\ss},
- title = {\LaTeX\ in {M}athematik und {N}aturwissenschaften},
- publisher = {{Franzis-Verlag}},
- year = {2006},
- address = {Poing}
+ title = {Mathematik mit \LaTeX},
+ publisher = {{DANTE/Lehmanns Media}},
+ year = {2009},
+ address = {Heidelberg/Berlin}
}
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 dd8513821bc..16a79365bc4 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
Binary files differ
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 d78873d2139..680995da294 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 76 2009-01-18 21:21:52Z herbert $
+%% $Id: pst-circ-doc.tex 91 2009-02-01 15:51:45Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
@@ -68,8 +68,9 @@ Thanks to: \\
\subsection{Parameters}
There are specific paramaters defined to change easily the behaviour of the pst-circ
-objects you are drawing.
+objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pageref{sec:para}.
+\iffalse
\begin{longtable}{@{}>{\ttfamily}l l l@{}}
\textrm{\emph{name}} & \emph{type} & \emph{default}\\\hline
\endhead
@@ -129,122 +130,131 @@ objects you are drawing.
\Lkeyword{transformerisecondarylabel} & string & \emph{ } \\
\Lkeyword{tripolestyle} & string & \emph{ normal}
\end{longtable}
+\fi
\subsection{Macros}
\subsubsection{Dipole macros}
-
-\psset{griddots=10,subgriddiv=0}
+\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}[showgrid=true](3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\resistor(A)(B){$R$}
\end{pspicture}
\end{LTXexample}
-
-
-\psset{griddots=10,subgriddiv=0}
+\xLcs{RFLine}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}[showgrid=true](3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\RFLine(A)(B){R}
\end{pspicture}
\end{LTXexample}
-
+\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}[showgrid=true](3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\capacitor(A)(B){$C$}
\end{pspicture}
\end{LTXexample}
+\xLcs{battery}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\battery(A)(B){$E$}
\end{pspicture}
\end{LTXexample}
+\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\coil(A)(B){$L$}
\end{pspicture}
\end{LTXexample}
+\xLcs{Ucc}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\Ucc(A)(B){$E$}
\end{pspicture}
\end{LTXexample}
+\xLcs{Icc}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\Icc(A)(B){$\eta$}
\end{pspicture}
\end{LTXexample}
+\xLcs{switch}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\switch(A)(B){$K$}
\end{pspicture}
\end{LTXexample}
+\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\diode(A)(B){$D$}
\end{pspicture}
\end{LTXexample}
+\xLcs{Zener}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\Zener(A)(B){$D$}
\end{pspicture}
\end{LTXexample}
+\xLcs{lamp}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\lamp(A)(B){$\mathcal L$}
\end{pspicture}
\end{LTXexample}
+\xLcs{circledipole}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\circledipole(A)(B){$\mathcal G$}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{labeloffset}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}[showgrid=true](3,2)
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\circledipole[labeloffset=0](A)(B){\Large\textbf{A}}
\end{pspicture}
\end{LTXexample}
+\xLcs{LED}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\LED(A)(B){$\mathcal D$}
@@ -254,16 +264,15 @@ objects you are drawing.
\bigskip
\subsubsection{Tripole macros}
-Obviously, tripoles are not node connections. So \LPack{pst-circ} tries its best to adjust the
+Obviously, \Index{tripole}s 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
\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!
+well chosen, so don't try to use tripole macros in strange situations!
+\xLcs{OA}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](5,3)
+\begin{pspicture}(5,3)
\pnode(0,0){A}
\pnode(0,3){B}
\pnode(5,1.5){C}
@@ -271,8 +280,9 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
+\xLkeyword{OApower}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](5,3)
+\begin{pspicture}(5,3)
\pnode(0,0){A}
\pnode(0,3){B}
\pnode(5,1.5){C}
@@ -280,24 +290,27 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
+\xLcs{transistor}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](3,4)
+\begin{pspicture}(3,4)
\pnode(0,2){A}\pnode(3,1){B}
\pnode(3,3){C}
\transistor(A)(B)(C)
\end{pspicture}
\end{LTXexample}
+\xLkeyset{transistortype=PNP}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](3,4)
+\begin{pspicture}(3,4)
\pnode(0,2){A}\pnode(3,1){B}
\pnode(3,3){C}
\transistor[transistortype=PNP](A)(B)(C)
\end{pspicture}
\end{LTXexample}
+\xLkeyword{basesep}\xLkeyword{arrows}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](5,3)
+\begin{pspicture}(5,3)
\pnode(0,1.5){A}
\pnode(5,0){B}
\pnode(5,3){C}
@@ -305,8 +318,9 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
+\xLkeyword{basesep}\xLkeyword{transistoriemitter}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](3,4)
+\begin{pspicture}(3,4)
\pnode(0,2){A}\pnode(3,0.5){B}
\pnode(3,3.5){C}
\transistor[transistoriemitter=true,
@@ -314,8 +328,9 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
+\xLkeyword{basesep}\xLkeyword{transistorinvert}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](3,4)
+\begin{pspicture}(3,4)
\pnode(0,2){A}\pnode(3,1){B}
\pnode(3,3){C}
\transistor[transistorinvert,
@@ -323,8 +338,10 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
+\xLkeyset{transistortype=PNP}
+\xLkeyword{basesep}\xLnotation{Emitter}\xLkeyword{nodesep}\xLnotation{Collector}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](5,3)
+\begin{pspicture}(5,3)
\pnode(0,1.5){A}\psset{linewidth=1pt}
\transistor[transistortype=PNP,basesep=2cm,
arrows=o-o](A){Emitter}{Collector}
@@ -334,9 +351,9 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
-
+\xLcs{Tswitch}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](5,2)
+\begin{pspicture}(5,2)
\pnode(0,2){A}
\pnode(5,2){B}
\pnode(0,0){C}
@@ -344,8 +361,9 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
+\xLcs{potentiometer}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}[showgrid=true](3,3)
+\begin{pspicture}(3,3)
\pnode(0,1){A}
\pnode(3,1){B}
\pnode(3,2.25){C}
@@ -356,8 +374,9 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\bigskip
\subsubsection{Quadrupole macros}
+\xLcs{transformer}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](5,5)
+\begin{pspicture}(5,5)
\pnode(0,5){A}
\pnode(0,0){B}
\pnode(5,5){C}
@@ -366,8 +385,9 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{pspicture}
\end{LTXexample}
+\xLcs{optoCoupler}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}[showgrid=true](5,3)
+\begin{pspicture}(5,3)
\pnode(0,2.5){A}
\pnode(0,0.5){B}
\pnode(4,2.5){C}
@@ -377,16 +397,16 @@ ideas, please mail us.}, so don't try to use tripole macros in strange situation
\end{LTXexample}
-\clearpage
\subsubsection{Multidipole}
\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.}
+\Lcs{multidipole} takes as many arguments as you want. Note the \rnode{Dot}{dot} that is
+after the last dipole.
\bigskip
+\xLcs{diode}\xLcs{resistor}\xLcs{caoacitor}
\begin{minipage}{7cm}
-\begin{pspicture}[showgrid=true](7,7)
+\begin{pspicture}(7,7)
\pnode(0,0){A} \pnode(7,7){B}
\multidipole(A)(B)\resistor{$R$}%
\capacitor[linecolor=red]{$C$}%
@@ -394,7 +414,7 @@ after the last dipole.}
\end{pspicture}
\end{minipage}\hfill
\begin{minipage}{6cm}
-\verb+\begin{pspicture}[showgrid=true](7,7)+\\
+\verb+\begin{pspicture}(7,7)+\\
\verb+ \pnode(0,0){A}+\\
\verb+ \pnode(7,7){B}+\\
\verb+ \multidipole(A)(B)\resistor{$R$}%+\\
@@ -413,8 +433,9 @@ restore original values. We recommand not using it.
\bigskip
\subsubsection{Wire}
+\xLcs{wire}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\wire(A)(B)
@@ -424,8 +445,9 @@ restore original values. We recommand not using it.
\bigskip
\subsubsection{Potential}
+\xLcs{tension}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\tension(A)(B){$u$}
@@ -435,8 +457,9 @@ restore original values. We recommand not using it.
\bigskip
\subsubsection{ground}
+\xLcs{ground}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0.5,1){A}
\pnode(1,1){B}
\pnode(2.5,1){C}
@@ -452,17 +475,18 @@ restore original values. We recommand not using it.
\subsubsection{Label parameters}
-
+\xLcs{resitor}\xLkeyword{labeloffset}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,1)\psgrid
+\begin{pspicture}(3,1)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor[labeloffset=0](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
+\xLcs{resitor}\xLkeyset{labelangle=:U}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,0){A}
\pnode(3,2){B}
\resistor[labelangle=:U](A)(B){$R$}
@@ -470,15 +494,16 @@ restore original values. We recommand not using it.
\end{LTXexample}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,0){A}
\pnode(3,2){B}
\resistor[labelangle=0](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
+\xLcs{transformer}\xLkeyword{primarylabel}\xLkeyword{secondarylabel}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}(5,5)\psgrid
+\begin{pspicture}(5,5)
\pnode(0,5){A}
\pnode(0,0){B}
\pnode(5,5){C}
@@ -488,8 +513,9 @@ restore original values. We recommand not using it.
\end{pspicture}
\end{LTXexample}
+\xLkeyword{labelInside}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,4.5)\psgrid
+\begin{pspicture}(3,4.5)
\pnode(0,.5){A}
\pnode(3,.5){B}
\Ucc[labelInside=1](A)(B){$V$}
@@ -509,21 +535,23 @@ If the \Lkeyword{intensity} parameter is set to \true, an arrow is drawn on the
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 \Lkeyword{dipoleconvention} and \Lkeyword{directconvention}
+The way those \Index{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.
+\xLkeyword{intensity}\xLkeyword{tension}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor[intensity,tension](A)(B){}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{intensity}\xLkeyword{tension}\xLkeyset{dipoleconvention=generator}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor[intensity,tension,
@@ -531,8 +559,9 @@ parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator
\end{pspicture}
\end{LTXexample}
+\xLkeyword{intensity}\xLkeyword{tension}\xLkeyword{directconvention}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor[intensity,tension,
@@ -540,8 +569,9 @@ parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator
\end{pspicture}
\end{LTXexample}
+\xLkeyword{intensity}\xLkeyword{tension}\xLkeyset{dipoleconvention=generator}\xLkeyword{directconvention}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor[intensity,tension,
@@ -554,15 +584,17 @@ set to true. If \Lkeyword{tensionlabel} is set to an non empty argument, then \L
automatically set to true.
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor[intensitylabel=$i$,tensionlabel=$u$](A)(B){}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{intensitylabel}\xLkeyword{intensitylabeloffset}
+\xLkeyword{tensionlabel}\xLkeyword{tensionoffset}\xLkeyword{tensionlabeloffset}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1.5){A}
\pnode(3,1.5){B}
\resistor[intensitylabel=$i$,intensitylabeloffset=-0.5,
@@ -571,8 +603,10 @@ automatically set to true.
\end{pspicture}
\end{LTXexample}
+\xLkeyword{intensitycolor}\xLkeyword{intensitywidth}\xLkeyword{intensitylabel}\xLkeyword{intensitylabelcolor}
+\xLkeyword{tensionwidth}\xLkeyword{tensionlabel}\xLkeyword{tensioncolor}\xLkeyword{tensionlabelcolor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor[intensitylabel=$i$,intensitywidth=3\pslinewidth,
@@ -584,8 +618,9 @@ automatically set to true.
Some specific intensity parameters are available for \Index{tripole}s and \Index{quadrupole}s.
+\xLkeyword{OAiminuslabel}\xLkeyword{OAipluslabel}\xLkeyword{OAioutlabel}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}(5,3)\psgrid
+\begin{pspicture}(5,3)
\pnode(0,0){A}
\pnode(0,3){B}
\pnode(5,1.5){C}
@@ -595,8 +630,9 @@ Some specific intensity parameters are available for \Index{tripole}s and \Index
\end{pspicture}
\end{LTXexample}
+\xLkeyword{basesep}\xLkeyword{transistoribaselabel}\xLkeyword{transistoricollectorlabel}\xLkeyword{transistoriemitterlabel}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}(5,3)\psgrid
+\begin{pspicture}(5,3)
\pnode(0,1.5){A}
\pnode(5,0){B}
\pnode(5,3){C}
@@ -606,8 +642,10 @@ Some specific intensity parameters are available for \Index{tripole}s and \Index
\end{pspicture}
\end{LTXexample}
+\xLkeyword{transformerisecondarylabel}
+\xLkeyword{transformeriprimarylabel}
\begin{LTXexample}[width=5.5cm]
-\begin{pspicture}(5,5)\psgrid
+\begin{pspicture}(5,5)
\pnode(0,5){A}
\pnode(0,0){B}
\pnode(5,5){C}
@@ -625,7 +663,7 @@ If the \Lkeyword{parallel} parameter is set to \true, the dipole is drawn parall
connecting the nodes.
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,3)\psgrid
+\begin{pspicture}(3,3)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor(A)(B){}
@@ -634,7 +672,7 @@ connecting the nodes.
\end{LTXexample}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,3)\psgrid
+\begin{pspicture}(3,3)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor(A)(B){}
@@ -643,7 +681,7 @@ connecting the nodes.
\end{LTXexample}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,3)\psgrid
+\begin{pspicture}(3,3)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor(A)(B){}
@@ -653,7 +691,7 @@ connecting the nodes.
\end{LTXexample}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,3)\psgrid
+\begin{pspicture}(3,3)
\pnode(0,.5){A}
\pnode(3,.5){B}
\resistor(A)(B){}
@@ -663,7 +701,7 @@ connecting the nodes.
\end{LTXexample}
\begin{LTXexample}[width=8.5cm]
-\begin{pspicture}(8,8)\psgrid
+\begin{pspicture}(8,8)
\pnode(0,0){A}
\pnode(8,8){B}
\multidipole(A)(B)\resistor{$R$}%
@@ -681,7 +719,7 @@ must not be set for the first dipole.
\subsubsection{Wire intersections}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,3)\psgrid
+\begin{pspicture}(3,3)
\pnode(0,0){A}
\pnode(3,3){B}
\pnode(0,3){C}
@@ -694,7 +732,7 @@ must not be set for the first dipole.
Wire intersect parameters work also with \Lcs{multidipole}.
\begin{LTXexample}[width=6.5cm]
-\begin{pspicture}(7,7)\psgrid
+\begin{pspicture}(7,7)
\pnode(0,0){A}
\pnode(6,6){B}
\pnode(0,6){C}
@@ -710,163 +748,183 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\bigskip
\subsubsection{Dipole style parameters}
+\xLkeyset{dipolestyle=twoCircles}\xLcs{ICC}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}[showgrid=true](3,2)
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\Icc[dipolestyle=twoCircles](A)(B){$I$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=zigzag}\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}[showgrid=true](3,2)
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\resistor[dipolestyle=zigzag](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=varistor}\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}[showgrid=true](3,2)
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\resistor[dipolestyle=varistor](A)(B){U}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=chemical}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}[showgrid=true](3,2)
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\capacitor[dipolestyle=chemical](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=elektor}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\capacitor[dipolestyle=elektor](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=elektorchemical}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\capacitor[dipolestyle=elektorchemical](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=crystal}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\capacitor[dipolestyle=crystal](A)(B){$Q$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=rectangle}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\coil[dipolestyle=rectangle](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=curved}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\coil[dipolestyle=curved](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=elektor}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\coil[dipolestyle=elektor](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=elektorcurved}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\coil[dipolestyle=elektorcurved](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=thyristor}\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\diode[dipolestyle=thyristor](A)(B){$T$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=GTO}\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\diode[dipolestyle=GTO](A)(B){$T$}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{dipolestyle=triac}\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\diode[dipolestyle=triac](A)(B){$T$}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{variable}\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\resistor[variable](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{variable}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\capacitor[variable](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{variable}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\coil[variable](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{variable}\xLcs{battery}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\battery[variable](A)(B){$U$}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{variable}\xLcs{coil}\xLkeyset{dipolestyle=elektor}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0,1){A}
\pnode(3,1){B}
\coil[dipolestyle=elektor,variable](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
-In the following example the parameter \verb|dipolestyle| is used for a tripole and quadrupole, because
-the coils are drawn as rectangles and the resistor as a zigzag.
+In the following example the parameter \Lkeyword{dipolestyle} is used for a tripole and quadrupole, because
+the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
+\xLkeyset{labelangle=:U}\xLcs{potentiometer}\xLkeyset{dipolestyle=zigzag}
\begin{LTXexample}[width=3.5cm]
-\begin{pspicture}(3,3)\psgrid
+\begin{pspicture}(3,3)
\pnode(0,0){A}
\pnode(3,3){B}
\pnode(3,1.5){C}
@@ -875,8 +933,9 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\end{LTXexample}
+\xLcs{transformer}\xLkeyset{dipolestyle=rectangle}
\begin{LTXexample}[width=4.5cm]
-\begin{pspicture}(4,4)\psgrid
+\begin{pspicture}(4,4)
\pnode(0,4){A}
\pnode(0,0){B}
\pnode(4,4){C}
@@ -888,6 +947,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\subsubsection{Tripole style parameters}
+\xLcs{Tswitch}\xLkeyset{tripolestyle=left}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\pnode(0,2){A}
@@ -897,6 +957,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\end{LTXexample}
+\xLcs{Tswitch}\xLkeyset{tripolestyle=right}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\pnode(0,2){A}
@@ -906,6 +967,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\end{LTXexample}
+\xLcs{OA}\xLkeyset{tripolestyle=french}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\pnode(0,3){A}
@@ -917,8 +979,8 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\subsubsection{Potentiometer tripole}
+\xLcs{potentiometer}\xLkeyword{labeloffset}
\begin{pspicture}(3,3)
- \psgrid
\pnode(0,1){A}
\pnode(3,1){B}
\pnode(3,2){C}
@@ -926,15 +988,14 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \psgrid
\pnode(0,2.5){A}
\pnode(3,2.5){B}
\pnode(0,1){C}
\potentiometer[labeloffset=0pt](A)(B)(C){P}
\end{pspicture}
\hfill
+\xLcs{potentiometer}\xLkeyword{labeloffset}\xLkeyset{labelangle=:U}
\begin{pspicture}(3,3)
- \psgrid
\pnode(0,0){A}
\pnode(3,2){B}
\pnode(2.5,3){C}
@@ -943,8 +1004,8 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\vspace{1cm}
\noindent
+\xLcs{potentiometer}\xLkeyword{labeloffset}
\begin{pspicture}(3,3)
- \psgrid
\pnode(1,0){A}
\pnode(1,3){B}
\pnode(2.5,0){C}
@@ -952,7 +1013,6 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \psgrid
\pnode(0,3){A}
\pnode(3,0){B}
\pnode(2,0){C}
@@ -960,7 +1020,6 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \psgrid
\pnode(0,2){A}
\pnode(3,2){B}
\pnode(1.5,0){C}
@@ -971,7 +1030,6 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\vspace{1cm}
\noindent
\begin{pspicture}(3,3)
- \psgrid
\pnode(1,0){A}
\pnode(1,3){B}
\pnode(2.5,0){C}
@@ -979,7 +1037,6 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \psgrid
\pnode(0,3){A}
\pnode(3,0){B}
\pnode(2,0){C}
@@ -987,7 +1044,6 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \psgrid
\pnode(0,2){A}
\pnode(3,2){B}
\pnode(1.5,0){C}
@@ -996,6 +1052,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\subsubsection{Other Parameters}
+\xLkeyword{OAinvert}\xLcs{OA}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\pnode(0,0){A}
@@ -1005,6 +1062,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\end{LTXexample}
+\xLkeyword{OAperfect}\xLcs{OA}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\pnode(0,0){A}
@@ -1024,6 +1082,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\end{LTXexample}
+\xLkeyset{transistortype=FET}\xLcs{transistor}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\pnode(0,1.5){A}\psset{linewidth=1pt}
@@ -1035,6 +1094,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\end{LTXexample}
+\xLkeyset{transistortype=FET}\xLcs{transistor}\xLkeyset{FETchannel=P}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\pnode(0,1.5){A}\psset{linewidth=1pt}
@@ -1047,6 +1107,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\end{pspicture}
\end{LTXexample}
+\xLkeyset{transistortype=FET}\xLcs{transistor}\xLkeyword{FETmemory}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
\transistor[basesep=2cm,transistortype=FET,
@@ -1064,7 +1125,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\newcommand*\pswall[3]{% ll ur lr
\psframe[linecolor=white,fillstyle=hlines,hatchcolor=black](#1)(#2)% (ll)(ur)
\psline[linecolor=black](#1)(#3)}
-\begin{pspicture}[showgrid=true](0.5,1)(8,10)
+\begin{pspicture}(0.5,1)(8,10)
\rput(3,9.5){\sffamily \textbf{Viscoelasticity}}
% Kelvin-Voigt model (spring and dashpot parallel): ===========
\rput[c](1.75,8.85){\sffamily Kelvin-Voigt}
@@ -1096,7 +1157,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1.5,-1)(6,5)
-% \psgrid[subgriddiv=1,griddots=10]
+% [subgriddiv=1,griddots=10]
% Node definitions
\pnode(0,0){A}
\pnode(0,3){B}
@@ -1119,7 +1180,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\begin{LTXexample}[pos=t]
\begin{pspicture}(-0.5,0)(7,8)
-% \psgrid[subgriddiv=1,griddots=10]
+% [subgriddiv=1,griddots=10]
% Node definitions
\pnode(0.5,1){A}
\pnode(3.5,1){B}
@@ -1152,7 +1213,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,0)(7,8)
-% \psgrid[subgriddiv=1,griddots=10]
+% [subgriddiv=1,griddots=10]
% Node definitions
\pnode(1,1){A}
\pnode(1,7){B}
@@ -1170,7 +1231,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\begin{LTXexample}[width=8.5cm]
\begin{pspicture}(-0.25,-0.25)(6,6)
-% \psgrid[subgriddiv=1,griddots=10]
+% [subgriddiv=1,griddots=10]
% Node definitions
\pnode(0,3){A}
\pnode(3,3){B}
@@ -1185,7 +1246,7 @@ the coils are drawn as rectangles and the resistor as a zigzag.
\begin{LTXexample}[pos=t]
\begin{pspicture}(6,6)
-% \psgrid[subgriddiv=1,griddots=10]
+% [subgriddiv=1,griddots=10]
% Node definitions
\pnode(0,0){A}\pnode(6,0){B}
\pnode(0.3,4){Cprime}\pnode(5.7,4){Dprime}
@@ -1321,7 +1382,7 @@ The following example was written by Manuel Luque.
\begin{LTXexample}[pos=t]
\begin{pspicture}(0,-0.5)(14,4)
-% \psgrid[subgriddiv=1,griddots=10]
+% [subgriddiv=1,griddots=10]
\pnode(0,0){B}\pnode(0,3){A}
\pnode(2.5,3.5){C}\pnode(2.5,-0.5){D}\pnode(5,3){E}\pnode(6.5,1.5){F}
\pnode(5,0){G}\pnode(3.5,1.5){H} \pnode(8,2.5){I}\pnode(8,1){J}
@@ -1377,7 +1438,7 @@ The following example was written by Christian Hoffmann.
\begin{LTXexample}[pos=t]
\SpecialCoor
- \begin{pspicture}(0,-1)(7,6.5)%\psgrid
+ \begin{pspicture}(0,-1)(7,6.5)%
\pnode(0,6){plus}
\pnode(3,3){basis}
\pnode([nodesep=-2] basis){schalter}
@@ -1426,19 +1487,13 @@ The value of theses parameters are left or right for the first one and true or f
\pcline[fillstyle=none,linestyle=none](#2)(#3)
\end{lstlisting}
+The last line is to correct some problems when I use colors (see example2)
+To add color in components (Monopole, tripole and Quadripole), there is a new
+argument.
+ \Lcs{multidipole} also works:
-
-
-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
-argument since I don't know how to do this by another way. However,
-I think it is not the optimal solution. For dipole, to put commands for
-color in the first optionnal argument is ok.
-
-Finally, something doesn't work with multidipole: this following example works:
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(4,2)\psgrid
+\begin{pspicture}(4,2)
\pnode(0.5,1){A}
\pnode(3.5,1){B}
\multidipole(A)(B)\filter{BPF}%
@@ -1447,15 +1502,14 @@ Finally, something doesn't work with multidipole: this following example works:
\end{LTXexample}
\bigskip
-However, this following one doesn't work:
-\begin{lstlisting}
-\begin{pspicture}(4,2)\psgrid
+\begin{LTXexample}[width=3.5cm,rframe={}]
+\begin{pspicture}(4,2)
\pnode(0.5,1){A}
\pnode(3.5,1){B}
\multidipole(A)(B)\amplifier{LNA}%
\resistor{$R$}.
\end{pspicture}
-\end{lstlisting}
+\end{LTXexample}
\subsection{New monopole components}
@@ -1465,7 +1519,7 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(0.5,1){A}
\pnode(1,1){B}
\pnode(2.5,1){C}
@@ -1482,21 +1536,21 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(1,0.5){A}
\antenna[antennastyle=three](A)
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(1,0.5){A}
\antenna(A)
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(1,0.5){A}
\antenna[antennastyle=triangle](A)
\end{pspicture}
@@ -1512,7 +1566,7 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(1,1){A}
\oscillator[output=left,inputarrow=false](A)%
{$f_{LO}$}{}
@@ -1520,7 +1574,7 @@ However, this following one doesn't work:
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(1,1){A}
\oscillator[output=top,inputarrow=true,LOstyle=crystal](A)%
{f$_{\textrm{LO}}$}{}
@@ -1528,7 +1582,7 @@ However, this following one doesn't work:
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(1,1){A}
\oscillator[output=right,inputarrow=false](A)%
{$f_{LO}$}{fillstyle=solid,fillcolor=blue}
@@ -1536,7 +1590,7 @@ However, this following one doesn't work:
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
+\begin{pspicture}(3,2)
\pnode(1,1){A}
\oscillator[output=bottom,inputarrow=false](A)%
{$f_{LO}$}{}
@@ -1551,36 +1605,35 @@ However, this following one doesn't work:
\item[\Lkeyword{dipoleinput}:] \Lkeyval{left} | \Lkeyval{right}
\end{description}
+\xLcs{filter}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\filter(A)(B){BPF}
\end{pspicture}
\end{LTXexample}
+\xLcs{filter}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\filter[dipolestyle=lowpass,fillstyle=solid,%
fillcolor=red](A)(B){LPF}
\end{pspicture}
\end{LTXexample}
+\xLcs{filter}\xLkeyset{dipolestyle=highpass}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
- \filter[dipolestyle=highpass,dipoleinput=right,%
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
+ \filter[dipolestyle=highpass,dipoleinput=right,
inputarrow=true](A)(B){HPF}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\filter[dipolestyle=highpass,inputarrow=true](A)(B){BPF}
\end{pspicture}
\end{LTXexample}
@@ -1592,26 +1645,23 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\isolator[inputarrow=true](A)(B){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
- \isolator[dipoleinput=right,inputarrow=true,fillstyle=solid,%
- fillcolor=yellow](A)(B){Isolator}
+\begin{pspicture}(3,2)
+\pnode(0,1){A} \pnode(3,1){B}
+\isolator[dipoleinput=right,inputarrow=true,
+ fillstyle=solid,fillcolor=yellow](A)(B){Isolator}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A}\pnode(3,1){B}
\isolator[dipoleinput=left](A)(B){}
\end{pspicture}
\end{LTXexample}
@@ -1626,31 +1676,25 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A}\pnode(3,1){B}
\freqmult[dipolestyle=divider,inputarrow=true](A)(B){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A}\pnode(3,1){B}
\freqmult[dipolestyle=multiplier,value=10](A)(B){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,3)\psgrid
- \pnode(0,1.5){A}
- \pnode(3,1.5){B}
- \freqmult[dipolestyle=multiplier,programmable=true,%
- labeloffset=-1,%
- dipoleinput=right,%
- inputarrow=true,
- fillstyle=solid,
- fillcolor=green](A)(B){10<N<35}
+\begin{pspicture}(3,3)
+\pnode(0,1.5){A}\pnode(3,1.5){B}
+\freqmult[dipolestyle=multiplier,programmable=true,
+ labeloffset=-1,dipoleinput=right,inputarrow=true,
+ fillstyle=solid,fillcolor=green](A)(B){10<N<35}
\end{pspicture}
\end{LTXexample}
@@ -1661,20 +1705,17 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A1}
- \pnode(3,1){A2}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A1} \pnode(3,1){A2}
\phaseshifter(A1)(A2){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){B1}
- \pnode(3,1){B2}
- \phaseshifter[inputarrow=true,%
- dipoleinput=right,fillstyle=solid,fillcolor=red]%
- (B1)(B2){90\ensuremath{^\circ}}
+\begin{pspicture}(3,2)
+\pnode(0,1){B1} \pnode(3,1){B2}
+\phaseshifter[inputarrow=true,dipoleinput=right,
+ fillstyle=solid,fillcolor=red](B1)(B2){90$^\circ$}
\end{pspicture}
\end{LTXexample}
@@ -1685,17 +1726,15 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A1}
- \pnode(3,1){A2}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A1} \pnode(3,1){A2}
\vco[fillstyle=solid,fillcolor=yellow](A1)(A2){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){B1}
- \pnode(3,1){B2}
+\begin{pspicture}(3,2)
+ \pnode(0,1){B1} \pnode(3,1){B2}
\vco[dipoleinput=right,inputarrow=true](B1)(B2){VCO}
\end{pspicture}
\end{LTXexample}
@@ -1707,25 +1746,22 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\amplifier[inputarrow=true](A)(B){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\amplifier[dipoleinput=right,inputarrow=true](A)(B){PA}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\amplifier[dipoleinput=left](A)(B){LNA}
\end{pspicture}
\end{LTXexample}
@@ -1737,25 +1773,22 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\detector[inputarrow=true](A)(B){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\detector[dipoleinput=right,inputarrow=true](A)(B){}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1){A}
- \pnode(3,1){B}
+\begin{pspicture}(3,2)
+ \pnode(0,1){A} \pnode(3,1){B}
\detector[dipoleinput=left](A)(B){}
\end{pspicture}
\end{LTXexample}
@@ -1769,21 +1802,17 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0.5,1){A}
- \pnode(2.5,1){B}
- \pnode(1.5,2){C}
+\begin{pspicture}(3,2)
+ \pnode(0.5,1){A}\pnode(2.5,1){B}\pnode(1.5,2){C}
\mixer[tripolestyle=top,inputarrow=true](A)(B)(C)%
{Mixer}{}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0.5,1){A}
- \pnode(2.5,1){B}
- \pnode(1.5,0){C}
- \mixer[inputarrow=true,tripoleinput=right](A)(B)(C)%
+\begin{pspicture}(3,2)
+ \pnode(0.5,1){A}\pnode(2.5,1){B}\pnode(1.5,0){C}
+ \mixer[inputarrow=true,tripoleinput=right](A)(B)(C)
{Mixer}{fillstyle=solid,fillcolor=yellow}
\end{pspicture}
\end{LTXexample}
@@ -1796,42 +1825,35 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0.5,1){A}
- \pnode(2.5,1){B}
- \pnode(1.5,0){C}
+\begin{pspicture}(3,2)
+ \pnode(0.5,1){A}\pnode(2.5,1){B}\pnode(1.5,0){C}
\circulator{0}(A)(B)(C){Circulator}{}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,3)\psgrid
- \pnode(1.5,0.5){A}
- \pnode(1.5,2.5){B}
- \pnode(0.5,1.5){C}
+\begin{pspicture}(3,3)
+ \pnode(1.5,0.5){A}\pnode(1.5,2.5){B}\pnode(0.5,1.5){C}
\circulator[tripolestyle=isolator,inputarrow=true]{90}%
(A)(B)(C){Isolator}{}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0.5,1){A}
- \pnode(2.5,1){B}
- \pnode(1.5,0){C}
- \circulator[tripoleconfig=right,tripolestyle=isolator,%
+\begin{pspicture}(3,2)
+\pnode(0.5,1){A}\pnode(2.5,1){B}\pnode(1.5,0){C}
+\circulator[tripoleconfig=right,tripolestyle=isolator,
inputarrow=true,tripoleinput=right]{0}%
(B)(A)(C){Isolator}{}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0.5,1){A}
- \pnode(2.5,1){B}
- \pnode(1.5,2){C}
- \circulator[tripoleconfig=right,inputarrow=true]{180}%
- (A)(B)(C){Isolator}{fillstyle=solid,fillcolor=red}
+\begin{pspicture}(3,2)
+\pnode(0.5,1){A}\pnode(2.5,1){B}\pnode(1.5,2){C}
+\circulator[tripoleconfig=right,
+ inputarrow=true]{180}(A)(B)(C){Isolator}%
+ {fillstyle=solid,fillcolor=red}
\end{pspicture}
\end{LTXexample}
@@ -1842,19 +1864,15 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0.5,1){A}
- \pnode(2.5,1){B}
- \pnode(1.5,0){C}
+\begin{pspicture}(3,2)
+ \pnode(0.5,1){A}\pnode(2.5,1){B}\pnode(1.5,0){C}
\agc(A)(B)(C){AGC}{fillstyle=solid,fillcolor=yellow}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0.5,1){A}
- \pnode(2.5,1){B}
- \pnode(1.5,0){C}
+\begin{pspicture}(3,2)
+ \pnode(0.5,1){A}\pnode(2.5,1){B}\pnode(1.5,0){C}
\agc[tripoleinput=right,inputarrow=true](A)(B)(C)%
{AGC}{fillstyle=solid,fillcolor=blue}
\end{pspicture}
@@ -1869,11 +1887,9 @@ However, this following one doesn't work:
\end{description}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1.4){A}
- \pnode(0,0.6){B}
- \pnode(3,1.4){C}
- \pnode(3,0.6){D}
+\begin{pspicture}(3,2)
+ \pnode(0,1.4){A} \pnode(0,0.6){B}
+ \pnode(3,1.4){C} \pnode(3,0.6){D}
\coupler[couplerstyle=hybrid,inputarrow=true](A)(B)(C)(D)%
{Hyb. $180$\ensuremath{^\circ}}%
{fillstyle=solid,fillcolor=yellow}
@@ -1881,21 +1897,17 @@ However, this following one doesn't work:
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1.4){A}
- \pnode(0,0.6){B}
- \pnode(3,1.4){C}
- \pnode(3,0.6){D}
+\begin{pspicture}(3,2)
+ \pnode(0,1.4){A} \pnode(0,0.6){B}
+ \pnode(3,1.4){C} \pnode(3,0.6){D}
\coupler[couplerstyle=directional](A)(B)(C)(D){10~dB}{}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1.4){A}
- \pnode(0,0.6){B}
- \pnode(3,1.4){C}
- \pnode(3,0.6){D}
+\begin{pspicture}(3,2)
+ \pnode(0,1.4){A} \pnode(0,0.6){B}
+ \pnode(3,1.4){C} \pnode(3,0.6){D}
\coupler[couplerstyle=hybrid,inputarrow=true,%
quadripoleinput=right](A)(B)(C)(D)%
{Hyb. $180$\ensuremath{^\circ}}{}
@@ -1903,11 +1915,9 @@ However, this following one doesn't work:
\end{LTXexample}
\begin{LTXexample}[width=3.5cm,rframe={}]
-\begin{pspicture}(3,2)\psgrid
- \pnode(0,1.4){A}
- \pnode(0,0.6){B}
- \pnode(3,1.4){C}
- \pnode(3,0.6){D}
+\begin{pspicture}(3,2)
+ \pnode(0,1.4){A} \pnode(0,0.6){B}
+ \pnode(3,1.4){C} \pnode(3,0.6){D}
\coupler[couplerstyle=directional,quadripoleinput=right,%
inputarrow=true](A)(B)(C)(D){10~dB}{}
\end{pspicture}
@@ -1941,7 +1951,7 @@ From Chang, K., RF and Microwave Wireless Systems, Wiley InterScience, page 319,
Hot and Cold\\
loads for calibration
\end{tabular}}
- %%% Branche réception
+ %%% Branche reception
\pnode(6,8){R1}
\pnode(8,8){R2}
\pnode(7,7){X1}
@@ -2222,82 +2232,84 @@ NOT123a
\psset{subgriddiv=0,griddots=5,gridlabels=7pt}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-1,0)(3,3)
- \psgrid
\logic{AND1}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicChangeLR=true]{AND2}
+ \logic[logicChangeLR]{AND2}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=and}\xLkeyword{logicChangeLR}\xLkeyword{logicNInput}
+\xLkeyword{logicWidth}\xLkeyword{logicHeight}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](4,6)
\begin{pspicture}(-0.5,0)(4,5)
- \psgrid
- \logic[logicShowNode=true,%
- logicWidth=2,%
- logicHeight=4,%
- logicNInput=6,%
- logicChangeLR=true](1,1){AND3}
+ \logic[logicShowNode,%
+ logicWidth=2,
+ logicHeight=4,
+ logicNInput=6,
+ logicChangeLR](1,1){AND3}
\end{pspicture}
\end{LTXexample}
\subsubsection{NotAnd}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=nand",%
- logicShowNode=true]{NAND1}
+ \logic[logicType=nand,
+ logicShowNode]{NAND1}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=nand,%
- logicChangeLR=true]{NAND2}
+ \logic[logicType=nand,
+ logicChangeLR]{NAND2}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=nand}\xLkeyword{logicChangeLR}\xLkeyword{logicNInput}
+\xLkeyword{logicWidth}\xLkeyword{logicHeight}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](4,6)
\begin{pspicture}(4,5)
- \psgrid
- \logic[logicType=nand,%
- logicShowNode=true,%
- logicWidth=2,%
- logicHeight=4,%
- logicNInput=6,%
- logicChangeLR=true](1,1){NAND3}
+ \logic[logicType=nand,
+ logicShowNode,
+ logicWidth=2,
+ logicHeight=4,
+ logicNInput=6,
+ logicChangeLR](1,1){NAND3}
\end{pspicture}
\end{LTXexample}
\subsubsection{Or}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=or",%
- logicShowNode=true]{OR1}
+ \logic[logicType=or,
+ logicShowNode]{OR1}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=or,%
- logicChangeLR=true]{OR2}
+ \logic[logicType=or,
+ logicChangeLR]{OR2}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=or}\xLkeyword{logicChangeLR}\xLkeyword{logicNInput}
+\xLkeyword{logicWidth}\xLkeyword{logicHeight}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](4,6)
\begin{pspicture}(4,5)
- \psgrid
- \logic[logicType=or,%
- logicShowNode=true,%
- logicWidth=2,%
- logicHeight=4,%
- logicNInput=6,%
- logicChangeLR=true](1,1){OR3}
+ \logic[logicType=or,
+ logicShowNode,
+ logicWidth=2,
+ logicHeight=4,
+ logicNInput=6,
+ logicChangeLR](1,1){OR3}
\end{pspicture}
\end{LTXexample}
@@ -2306,28 +2318,29 @@ NOT123a
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=nor",%
- logicShowNode=true]{NOR1}
+ \logic[logicType=nor,
+ logicShowNode]{NOR1}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=nor,%
- logicChangeLR=true]{NOR2}
+ \logic[logicType=nor,
+ logicChangeLR]{NOR2}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=nor}\xLkeyword{logicChangeLR}\xLkeyword{logicNInput}
+\xLkeyword{logicWidth}\xLkeyword{logicHeight}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](4,6)
\begin{pspicture}(4,5)
- \psgrid
- \logic[logicType=nor,%
- logicShowNode=true,%
- logicWidth=2,%
- logicHeight=4,%
- logicNInput=6,%
- logicChangeLR=true](1,1){NOR3}
+ \logic[logicType=nor,
+ logicShowNode,
+ logicWidth=2,
+ logicHeight=4,
+ logicNInput=6,
+ logicChangeLR](1,1){NOR3}
\end{pspicture}
\end{LTXexample}
@@ -2336,27 +2349,28 @@ NOT123a
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=not",%
- logicShowNode=true]{NOT1}
+ \logic[logicType=not,
+ logicShowNode]{NOT1}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=not,%
- logicChangeLR=true]{NOT2}
+ \logic[logicType=not,
+ logicChangeLR]{NOT2}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=not}\xLkeyword{logicChangeLR}
+\xLkeyword{logicWidth}\xLkeyword{logicHeight}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](4,6)
\begin{pspicture}(4,5)
- \psgrid
- \logic[logicType=not,%
- logicShowNode=true,%
- logicWidth=2,%
- logicHeight=4,%
- logicChangeLR=true](1,1){NOT3}
+ \logic[logicType=not,
+ logicShowNode,
+ logicWidth=2,
+ logicHeight=4,
+ logicChangeLR](1,1){NOT3}
\end{pspicture}
\end{LTXexample}
@@ -2364,28 +2378,29 @@ NOT123a
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=exor",%
- logicShowNode=true]{ExOR1}
+ \logic[logicType=exor,
+ logicShowNode]{ExOR1}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=exor,%
- logicChangeLR=true]{ExOR2}
+ \logic[logicType=exor,
+ logicChangeLR]{ExOR2}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=exor}\xLkeyword{logicChangeLR}\xLkeyword{logicNInput}
+\xLkeyword{logicWidth}\xLkeyword{logicHeight}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](4,6)
\begin{pspicture}(4,5)
- \psgrid
- \logic[logicType=exor,%
- logicShowNode=true,%
- logicNInput=6,%
- logicWidth=2,%
- logicHeight=4,%
- logicChangeLR=true](1,1){ExOR3}
+ \logic[logicType=exor,
+ logicShowNode,
+ logicNInput=6,
+ logicWidth=2,
+ logicHeight=4,
+ logicChangeLR](1,1){ExOR3}
\end{pspicture}
\end{LTXexample}
@@ -2393,49 +2408,54 @@ NOT123a
\clearpage
\subsubsection{Exclusive NOR}
+\xLkeyset{logicType=exnor}\xLkeyword{logicShowNode}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=exnor",%
- logicShowNode=true]{ExNOR1}
+ \logic[logicType=exnor,
+ logicShowNode]{ExNOR1}
\end{pspicture}
\end{LTXexample}
+\xLkeyset{logicType=exor}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,3)
- \logic[logicType=exnor,%
- logicChangeLR=true]{ExNOR2}
+ \logic[logicType=exnor,
+ logicChangeLR]{ExNOR2}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=exor}\xLkeyword{logicChangeLR}\xLkeyword{logicNInput}
+\xLkeyword{logicWidth}\xLkeyword{logicHeight}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](4,6)
\begin{pspicture}(4,5)
- \psgrid
- \logic[logicType=exnor,%
- logicShowNode=true,%
- logicNInput=6,%
- logicWidth=2,%
- logicHeight=4,%
- logicChangeLR=true](1,1){ExNOR3}
+ \logic[logicType=exnor,
+ logicShowNode,
+ logicNInput=6,
+ logicWidth=2,
+ logicHeight=4,
+ logicChangeLR](1,1){ExNOR3}
\end{pspicture}
\end{LTXexample}
\subsection{RS Flip Flop}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=RS}
\begin{LTXexample}[width=4.5cm](3,4.5)
\begin{pspicture}(-1,-1)(3,3)
- \logic[logicShowNode=true,%
- logicType=RS"]{RS1}
+ \logic[logicShowNode,
+ logicType=RS]{RS1}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=RS}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](3,4.5)
\begin{pspicture}(-1,-1)(3,3)
- \logic[logicShowNode=true,%
- logicType=RS,%
- logicChangeLR=true]{RS2}
+ \logic[logicShowNode,
+ logicType=RS,
+ logicChangeLR]{RS2}
\end{pspicture}
\end{LTXexample}
@@ -2444,51 +2464,55 @@ NOT123a
\begin{LTXexample}[width=4.5cm](3,4.5)
\begin{pspicture}(-1,-1)(3,3)
- \logic[logicShowNode=true,%
- logicType=D"]{D1}
+ \logic[logicShowNode,
+ logicType=D]{D1}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=D}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](3,4.5)
\begin{pspicture}(-1,-1)(3,3)
- \logic[logicShowNode=true,%
- logicType=D,%
- logicChangeLR=true]{D2}
+ \logic[logicShowNode=true,
+ logicType=D,
+ logicChangeLR]{D2}
\end{pspicture}
\end{LTXexample}
\subsection{JK Flip Flop}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=JK}\xLkeyword{logicJInput}\xLkeyword{logicKInput}
\begin{LTXexample}[width=4.5cm](3,4.5)
- \begin{pspicture}(-1,-1)(3,3)
- \logic[logicShowNode=true,%
- logicType=JK",%
- logicKInput=2,%
+\begin{pspicture}(-1,-1)(3,3)
+ \logic[logicShowNode,
+ logicType=JK,
+ logicKInput=2,
logicJInput=2]{JK1}
- \end{pspicture}
+\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicShowNode}\xLkeyset{logicType=JK}\xLkeyword{logicJInput}\xLkeyword{logicKInput}\xLkeyword{logicChangeLR}
\begin{LTXexample}[width=4.5cm](3,4.5)
\begin{pspicture}(-1,-1)(3,3)
- \logic[logicShowNode=true,%
- logicType=JK,%
- logicKInput=2, logicJInput=4,%
- logicChangeLR=true]{JK2}
+ \logic[logicShowNode,logicType=JK,
+ logicKInput=2, logicJInput=4,
+ logicChangeLR]{JK2}
\end{pspicture}
\end{LTXexample}
\subsection{Other Options}
+\xLkeyword{logicShowDot}
\begin{LTXexample}[width=3.5cm](3,3)
\begin{pspicture}(-0.5,0)(3,2.5)
- \logic[logicShowDot=true]{A0}
+ \logic[logicShowDot]{A0}
\end{pspicture}
\end{LTXexample}
+\xLkeyword{logicWireLength}
\begin{LTXexample}[width=4.5cm](4,3)
\begin{pspicture}(-1,0)(3,2.5)
- \logic[logicWireLength=1,%
- logicShowDot=true]{A1}
+ \logic[logicWireLength=1,
+ logicShowDot]{A1}
\end{pspicture}
\end{LTXexample}
@@ -2499,16 +2523,16 @@ 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 \LPack{pst-circ} defines the nodes
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
NAND11, NAND12, NAND13, NAND14, NAND1Q
-\end{verbatim}
+\end{lstlisting}
\noindent If there exists an inverted output, like for alle Flip Flops,
then the negated one gets the appendix \verb|neg| to the node name. For
example:
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
NAND1Q, NAND1Qneg
-\end{verbatim}
+\end{lstlisting}
\begin{LTXexample}[width=3cm](3,3.5)
\begin{pspicture}(-0.5,0)(2.5,3)
@@ -2526,9 +2550,9 @@ NAND1Q, NAND1Qneg
\vspace{0.5cm}
Now it is possible to draw a line from the output to the input
-\begin{verbatim}
+\begin{lstlisting}[style=syntax]
\ncbar[angleA=0,angleB=180]{<Node A>}{<Node B>}
-\end{verbatim}
+\end{lstlisting}
It may be easier to print a grid since the drawing phase and then comment it out if
all is finished.
@@ -2552,7 +2576,6 @@ all is finished.
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,0)(5,5)
- \psgrid
\psset{logicType=nor, logicLabelstyle=\normalsize,%
logicWidth=1, logicHeight=1.5, dotsize=0.15}
\logic(1.5,0){nor1}
@@ -2573,7 +2596,6 @@ all is finished.
\bigskip
\begin{LTXexample}[pos=t]
\begin{pspicture}(-4,0)(5,7)
- \psgrid
\psset{logicWidth=1, logicHeight=2, dotsize=0.15}
\logic[logicWireLength=0](-2,0){A0}
\logic[logicWireLength=0](-2,5){A1}
@@ -2598,11 +2620,6 @@ all is finished.
-
-
-
-
-
\section{Adding new components}
Adding new components is not simple. As a matter of fact, because of the complex
@@ -2652,18 +2669,11 @@ of \Lcs{pst@multidipole}, look for the last \Lcs{ifx} test
\begin{lstlisting}[language=TeX]
% ...
% Extract from \pst@multidipole
- \else
- \ifx\circledipole #4%
- \let\next\pst@multidipole@circledipole
- \else
- \ifx\LED #4%
- \let\next\pst@multidipole@LED
- \else
- % Put your modification here
- \let\next\ignorespaces
- \fi
- \fi
- \fi
+ \else\ifx\circledipole#4\let\next\pst@multidipole@circledipole
+ \else\ifx\LED #4\let\next\pst@multidipole@LED
+ \else % Put your modification here
+ \let\next\ignorespaces
+ \fi\fi\fi
% Extract form \pst@multidipole
% ...
\end{lstlisting}
@@ -2671,21 +2681,11 @@ and add (marked with \verb+%%%+)
\begin{lstlisting}[language=TeX]
% ...
% Extract from \pst@multidipole
- \else
- \ifx\circledipole #4%
- \let\next\pst@multidipole@circledipole
- \else
- \ifx\LED #4%
- \let\next\pst@multidipole@LED
- \else
- \ifx\component_name #4%%%
- \let\next\pst@multidipole@component_name%%%
- \else%%%
- \let\next\ignorespaces
- \fi%%%
- \fi
- \fi
- \fi
+ \else\ifx\circledipole #4\let\next\pst@multidipole@circledipole
+ \else\ifx\LED #4\let\next\pst@multidipole@LED
+ \else\ifx\component_name#4\let\next\pst@multidipole@component_name%%%
+ \else\let\next\ignorespaces
+ \fi\fi\fi\fi
% Extract form \pst@multidipole
% ...
\end{lstlisting}
@@ -2693,41 +2693,25 @@ Do the same in \verb+\pst@multidipole@+
\begin{lstlisting}[language=TeX]
% ...
% Extract from \pst@multidipole@
- \else
- \ifx\circledipole #1%
- \let\next\pst@multidipole@circledipole
- \else
- \ifx\LED #1%
- \let\next\pst@multidipole@LED
- \else
- \ifx\component_name #1%%%
- \let\next\pst@multidipole@component_name%%%
- \else%%%
- \let\next\ignorespaces
- \pst@multidipole@output
- \fi%%%
- \fi
- \fi
- \fi
+ \else\ifx\circledipole#1\let\next\pst@multidipole@circledipole
+ \else\ifx\LED #1\let\next\pst@multidipole@LED
+ \else\ifx\component_name#1\let\next\pst@multidipole@component_name%%%
+ \else\let\next\ignorespaces\pst@multidipole@output
+ \fi\fi\fi\fi
% Extract form \pst@multidipole@
% ...
\end{lstlisting}
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.
-
-
-
\clearpage
-\section{List of all optional arguments for \texttt{pst-circ}}
+\section{List of all optional arguments for \texttt{pst-circ}}\label{sec:para}
+Note: the default for booleans is always false.
\xkvview{family=pst-circ,columns={key,type,default}}
-
\bgroup
\raggedright
\nocite{*}
@@ -2737,7 +2721,4 @@ at the end of lines. They are \emph{very} important in order to avoid spurious b
\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 f4e41324609..aef09754ac7 100644
--- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
+++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
@@ -1,4 +1,4 @@
-%%
+
%% This is file `pst-circ.tex',
%%
%% IMPORTANT NOTICE:
@@ -29,8 +29,8 @@
\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{1.49}
-\def\filedate{2008/11/08}
+\def\fileversion{1.50}
+\def\filedate{2009/01/18}
\message{`pst-circ' v\fileversion (CJ,hv,pd)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -47,35 +47,14 @@
\newcount\pst@count@ii
\newcount\pst@count@iii
%
-\newif\ifPst@intensity
-\newif\ifPst@tension
\newif\ifPst@Dconvention
-\newif\ifPst@direct@convention
\newif\ifPst@parallel
\newif\ifPst@parallel@node
-\newif\ifPst@wire@intersect
-\newif\ifPst@OA@perfect
-\newif\ifPst@OA@power
-\newif\ifPst@OA@invert
-\newif\ifPst@OA@iplus
-\newif\ifPst@OA@iminus
-\newif\ifPst@OA@iout
-\newif\ifPst@T@circle% hv 2003-07-23
-\newif\ifPst@T@invert
-\newif\ifPst@T@iB
-\newif\ifPst@T@iC
-\newif\ifPst@T@iE
\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
-%
-\newif\ifPst@logic@showDot % hv
-\newif\ifPst@logic@showNode % hv
-\newif\ifPst@logic@changeLR % hv
%
\def\pst@Dconvention@receptor{receptor}
\def\pst@Dconvention@generator{generator}
@@ -109,87 +88,87 @@
\def\pst@tripole@style@center{center}
\def\pst@tripole@style@french{french}
%
-\define@key[psset]{pst-circ}{intensity}[true]{\@nameuse{Pst@intensity#1}}
-\define@key[psset]{pst-circ}{intensitylabel}{\def\psk@I@label{#1}}
-\define@key[psset]{pst-circ}{intensitylabelcolor}{\def\psk@I@labelcolor{#1}}
-\define@key[psset]{pst-circ}{intensitylabeloffset}{\def\psk@I@label@offset{#1}}
-\define@key[psset]{pst-circ}{intensitycolor}{\def\psk@I@color{#1}}
-\define@key[psset]{pst-circ}{intensitywidth}{\def\psk@I@width{#1}}
-\define@key[psset]{pst-circ}{tension}[true]{\@nameuse{Pst@tension#1}}
-\define@key[psset]{pst-circ}{tensionlabel}{\def\psk@tension@label{#1}}
-\define@key[psset]{pst-circ}{tensionlabelcolor}{\def\psk@tension@labelcolor{#1}}
-\define@key[psset]{pst-circ}{tensionoffset}{\def\psk@tension@offset{#1}}
-\define@key[psset]{pst-circ}{tensionlabeloffset}{\def\psk@tension@label@offset{#1}}
-\define@key[psset]{pst-circ}{tensioncolor}{\def\psk@tension@color{#1}}
-\define@key[psset]{pst-circ}{tensionwidth}{\def\psk@tension@width{#1}}
-\define@key[psset]{pst-circ}{labeloffset}{\def\psk@label@offset{#1}}
-\define@key[psset]{pst-circ}{labelangle}{\def\psk@label@angle{#1}}
-\define@key[psset]{pst-circ}{labelInside}{\def\psk@labelInside{#1}}
-\define@key[psset]{pst-circ}{dipoleconvention}{\def\psk@Dconvention{#1}}
-\define@key[psset]{pst-circ}{directconvention}[true]{\@nameuse{Pst@direct@convention#1}}
-\define@key[psset]{pst-circ}{dipolestyle}{\def\psk@Dstyle{#1}}
+\define@boolkey[psset]{pst-circ}[Pst@]{intensity}[true]{}
+\define@key[psset]{pst-circ}{intensitylabel}[]{\def\psk@I@label{#1}}
+\define@key[psset]{pst-circ}{intensitylabelcolor}[black]{\def\psk@I@labelcolor{#1}}
+\define@key[psset]{pst-circ}{intensitylabeloffset}[0.5]{\def\psk@I@label@offset{#1}}
+\define@key[psset]{pst-circ}{intensitycolor}[black]{\def\psk@I@color{#1}}
+\define@key[psset]{pst-circ}{intensitywidth}[\pslinewidth]{\def\psk@I@width{#1}}
+\define@boolkey[psset]{pst-circ}[Pst@]{tension}[true]{}
+\define@key[psset]{pst-circ}{tensionlabel}[]{\def\psk@tension@label{#1}}
+\define@key[psset]{pst-circ}{tensionlabelcolor}[black]{\def\psk@tension@labelcolor{#1}}
+\define@key[psset]{pst-circ}{tensionoffset}[1]{\def\psk@tension@offset{#1}}
+\define@key[psset]{pst-circ}{tensionlabeloffset}[1.2]{\def\psk@tension@label@offset{#1}}
+\define@key[psset]{pst-circ}{tensioncolor}[black]{\def\psk@tension@color{#1}}
+\define@key[psset]{pst-circ}{tensionwidth}[\pslinewidth]{\def\psk@tension@width{#1}}
+\define@key[psset]{pst-circ}{labeloffset}[0.7]{\def\psk@label@offset{#1}}
+\define@key[psset]{pst-circ}{labelangle}[0]{\def\psk@label@angle{#1}}
+\define@key[psset]{pst-circ}{labelInside}[0]{\def\psk@labelInside{#1}}
+\define@key[psset]{pst-circ}{dipoleconvention}[receptor]{\def\psk@Dconvention{#1}}
+\define@boolkey[psset]{pst-circ}[Pst@]{directconvention}[true]{}
+\define@key[psset]{pst-circ}{dipolestyle}[normal]{\def\psk@Dstyle{#1}}
\define@key[psset]{pst-circ}{parallel}[true]{\@nameuse{Pst@parallel#1}}
-\define@key[psset]{pst-circ}{parallelarm}{\def\psk@parallel@arm{#1}}
-\define@key[psset]{pst-circ}{parallelsep}{\def\psk@parallel@sep{#1}}
+\define@key[psset]{pst-circ}{parallelarm}[1.5]{\def\psk@parallel@arm{#1}}
+\define@key[psset]{pst-circ}{parallelsep}[0]{\def\psk@parallel@sep{#1}}
\define@key[psset]{pst-circ}{parallelnode}[true]{\@nameuse{Pst@parallel@node#1}}
-\define@key[psset]{pst-circ}{intersect}[true]{\@nameuse{Pst@wire@intersect#1}}
+\define@boolkey[psset]{pst-circ}[Pst@wire@]{intersect}[true]{}
\define@key[psset]{pst-circ}{intersectA}{\def\psk@wire@intersectA{#1}}
\define@key[psset]{pst-circ}{intersectB}{\def\psk@wire@intersectB{#1}}
-\define@key[psset]{pst-circ}{OAperfect}[true]{\@nameuse{Pst@OA@perfect#1}}
-\define@key[psset]{pst-circ}{OApower}[true]{\@nameuse{Pst@OA@power#1}}
-\define@key[psset]{pst-circ}{OAinvert}[true]{\@nameuse{Pst@OA@invert#1}}
-\define@key[psset]{pst-circ}{OAiplus}[true]{\@nameuse{Pst@OA@iplus#1}}
-\define@key[psset]{pst-circ}{OAiminus}[true]{\@nameuse{Pst@OA@iminus#1}}
-\define@key[psset]{pst-circ}{OAiout}[true]{\@nameuse{Pst@OA@iout#1}}
-\define@key[psset]{pst-circ}{OAipluslabel}{\def\psk@label@OA@iplus{#1}}
-\define@key[psset]{pst-circ}{OAiminuslabel}{\def\psk@label@OA@iminus{#1}}
-\define@key[psset]{pst-circ}{OAioutlabel}{\def\psk@label@OA@iout{#1}}
-\define@key[psset]{pst-circ}{transistorcircle}[true]{\@nameuse{Pst@T@circle#1}}% hv 2003-07-23
-\define@key[psset]{pst-circ}{transistorinvert}[true]{\@nameuse{Pst@T@invert#1}}
-\define@key[psset]{pst-circ}{transistoribase}[true]{\@nameuse{Pst@T@iB#1}}
-\define@key[psset]{pst-circ}{transistoricollector}[true]{\@nameuse{Pst@T@iC#1}}
-\define@key[psset]{pst-circ}{transistoriemitter}[true]{\@nameuse{Pst@T@iE#1}}
-\define@key[psset]{pst-circ}{transistoribaselabel}{\def\psk@labelT@iB{#1}}
-\define@key[psset]{pst-circ}{transistoricollectorlabel}{\def\psk@labelT@iC{#1}}
-\define@key[psset]{pst-circ}{transistoriemitterlabel}{\def\psk@labelT@iE{#1}}
+\define@boolkey[psset]{pst-circ}[Pst@]{OAperfect}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{OApower}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{OAinvert}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{OAiplus}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{OAiminus}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{OAiout}[true]{}
+\define@key[psset]{pst-circ}{OAipluslabel}[]{\def\psk@label@OAiplus{#1}}
+\define@key[psset]{pst-circ}{OAiminuslabel}[]{\def\psk@label@OAiminus{#1}}
+\define@key[psset]{pst-circ}{OAioutlabel}[]{\def\psk@label@OAiout{#1}}
+\define@boolkey[psset]{pst-circ}[Pst@]{transistorcircle}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{transistorinvert}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{transistoribase}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{transistoricollector}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{transistoriemitter}[true]{}
+\define@key[psset]{pst-circ}{transistoribaselabel}[]{\def\psk@labeltransistoribase{#1}}
+\define@key[psset]{pst-circ}{transistoricollectorlabel}[]{\def\psk@labeltransistoricollector{#1}}
+\define@key[psset]{pst-circ}{transistoriemitterlabel}[]{\def\psk@labeltransistoriemitter{#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}{%
+\define@boolkey[psset]{pst-circ}[Pst@]{FETmemory}[true]{}
+\define@key[psset]{pst-circ}{transistortype}[NPN]{%
\def\psk@Ttype{#1}%
- \ifx\psk@Ttype\pst@Ttype@FET\relax\@nameuse{Pst@T@circlefalse}\fi}
+ \ifx\psk@Ttype\pst@Ttype@FET \Pst@transistorcirclefalse\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}{circedge}{%
+\define@key[psset]{pst-circ}{basesep}[0]{\pst@getlength{#1}\Pst@basesep}
+\define@key[psset]{pst-circ}{TRot}[0]{\pst@checknum{#1}\Pst@TRot}
+\define@key[psset]{pst-circ}{circedge}[\pcangle]{%
\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}}
-\define@key[psset]{pst-circ}{secondarylabel}{\def\psk@Trafo@secondary@label{#1}}
+\define@key[psset]{pst-circ}{primarylabel}[]{\def\psk@Trafo@primary@label{#1}}
+\define@key[psset]{pst-circ}{secondarylabel}[]{\def\psk@Trafo@secondary@label{#1}}
\define@key[psset]{pst-circ}{transformeriprimary}[true]{\@nameuse{Pst@Trafo@iprimary#1}}
\define@key[psset]{pst-circ}{transformerisecondary}[true]{\@nameuse{Pst@Trafo@isecondary#1}}
-\define@key[psset]{pst-circ}{transformeriprimarylabel}{\def\psk@Trafo@iprimary@label{#1}}
-\define@key[psset]{pst-circ}{transformerisecondarylabel}{\def\psk@Trafo@isecondary@label{#1}}
-\define@key[psset]{pst-circ}{tripolestyle}{\def\psk@tripole@style{#1}}
-\define@key[psset]{pst-circ}{variable}[true]{\@nameuse{Pst@variable#1}}
-%
-\define@key[psset]{pst-circ}{logicChangeLR}[false]{\@nameuse{Pst@logic@changeLR#1}}% hv
-\define@key[psset]{pst-circ}{logicShowDot}[false]{\@nameuse{Pst@logic@showDot#1}}% hv
-\define@key[psset]{pst-circ}{logicShowNode}[false]{\@nameuse{Pst@logic@showNode#1}}% hv
-%\define@key[psset]{pst-circ}{logicOrigin}{\def\psk@logic@origin{#1}}% hv
-\define@key[psset]{pst-circ}{logicWidth}{\def\psk@logic@width{#1}}% hv
-\define@key[psset]{pst-circ}{logicHeight}{\def\psk@logic@height{#1}}% hv
-\define@key[psset]{pst-circ}{logicType}{\def\psk@logic@type{#1}}% hv
-\define@key[psset]{pst-circ}{logicNInput}{\def\psk@logic@nInput{#1}}% hv
-\define@key[psset]{pst-circ}{logicJInput}{\def\psk@logic@JInput{#1}}% hv
-\define@key[psset]{pst-circ}{logicKInput}{\def\psk@logic@KInput{#1}}% hv
-\define@key[psset]{pst-circ}{logicWireLength}{\def\psk@logic@wireLength{#1}}% hv
-\define@key[psset]{pst-circ}{logicLabelstyle}{\def\psk@logic@labelstyle{#1}}% hv
-\define@key[psset]{pst-circ}{logicSymbolstyle}{\def\psk@logic@symbolstyle{#1}}% hv
-\define@key[psset]{pst-circ}{logicSymbolpos}{\def\psk@logic@symbolpos{#1}}% hv
-\define@key[psset]{pst-circ}{logicNodestyle}{\def\psk@logic@nodestyle{#1}}% hv
+\define@key[psset]{pst-circ}{transformeriprimarylabel}[]{\def\psk@Trafo@iprimary@label{#1}}
+\define@key[psset]{pst-circ}{transformerisecondarylabel}[]{\def\psk@Trafo@isecondary@label{#1}}
+\define@key[psset]{pst-circ}{tripolestyle}[normal]{\def\psk@tripole@style{#1}}
+\define@boolkey[psset]{pst-circ}[Pst@]{variable}[true]{}
+%
+\define@boolkey[psset]{pst-circ}[Pst@]{logicChangeLR}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{logicShowDot}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{logicShowNode}[true]{}
+\define@key[psset]{pst-circ}{logicWidth}[1.5]{\def\psk@logic@width{#1}}% hv
+\define@key[psset]{pst-circ}{logicHeight}[2.5]{\def\psk@logic@height{#1}}% hv
+\define@key[psset]{pst-circ}{logicType}[and]{\def\psk@logic@type{#1}}% hv
+\define@key[psset]{pst-circ}{logicNInput}[2]{\def\psk@logic@nInput{#1}}% hv
+\define@key[psset]{pst-circ}{logicJInput}[2]{\def\psk@logic@JInput{#1}}% hv
+\define@key[psset]{pst-circ}{logicKInput}[2]{\def\psk@logic@KInput{#1}}% hv
+\define@key[psset]{pst-circ}{logicWireLength}[0.5]{\def\psk@logic@wireLength{#1}}% hv
+\define@key[psset]{pst-circ}{logicLabelstyle}[\small]{\def\psk@logic@labelstyle{#1}}% hv
+\define@key[psset]{pst-circ}{logicSymbolstyle}[\large]{\def\psk@logic@symbolstyle{#1}}% hv
+\define@key[psset]{pst-circ}{logicSymbolpos}[0.5]{\def\psk@logic@symbolpos{#1}}% hv
+\define@key[psset]{pst-circ}{logicNodestyle}[\footnotesize]{\def\psk@logic@nodestyle{#1}}% hv
+
%
\def\pst@logic@type@and{and}
\def\pst@logic@type@or{or}
@@ -205,7 +184,8 @@
%
\psset[pst-circ]{%
labelInside=0,circedge=\pcangle,
- intensity=false,intensitylabel={},intensitylabeloffset=0.5,
+ intensity=false,intensitylabel={},
+ intensitylabeloffset=0.5,
intensitycolor=black,intensitylabelcolor=black,intensitywidth=\pslinewidth,
tension=false,tensionlabel={},tensionoffset=1,tensionlabeloffset=1.2,
tensioncolor=black,tensionlabelcolor=black,tensionwidth=\pslinewidth,
@@ -236,82 +216,73 @@
\newpsstyle{collectorOpt}{arrows=-,arm=.5,angleA=180,angleB=90}
%
\def\wire{\@ifnextchar[{\pst@draw@wire}{\pst@draw@wire[]}}
-%
\def\tension{\@ifnextchar[{\pst@draw@tension@}{\pst@draw@tension@[]}}
%
+\def\RFLine{\@ifnextchar[{\pst@RFLine}{\pst@RFLine[]}}
+\def\pst@RFLine[#1](#2)(#3)#4{{%
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@RFLine}\ignorespaces}
+%
\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}
%
\def\capacitor{\@ifnextchar[{\pst@capacitor}{\pst@capacitor[]}}
\def\pst@capacitor[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@capacitor%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@capacitor}\ignorespaces}
%
\def\battery{\@ifnextchar[{\pst@battery}{\pst@battery[]}}
\def\pst@battery[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@battery%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@battery}\ignorespaces}
%
\def\coil{\@ifnextchar[{\pst@coil}{\pst@coil[]}}
\def\pst@coil[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@coil%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@coil}\ignorespaces}
%
\def\Ucc{\@ifnextchar[{\pst@Ucc}{\pst@Ucc[]}}
\def\pst@Ucc[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Ucc%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Ucc}\ignorespaces}
%
\def\Icc{\@ifnextchar[{\pst@Icc}{\pst@Icc[]}}
\def\pst@Icc[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Icc%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Icc}\ignorespaces}
%
\def\switch{\@ifnextchar[{\pst@switch}{\pst@switch[]}}
\def\pst@switch[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@switch%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@switch}\ignorespaces}
%
\def\diode{\@ifnextchar[{\pst@diode}{\pst@diode[]}}
\def\pst@diode[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@diode%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@diode}\ignorespaces}
%
\def\Zener{\@ifnextchar[{\pst@Zener}{\pst@Zener[]}}
\def\pst@Zener[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Zener%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Zener}\ignorespaces}
%
\def\lamp{\@ifnextchar[{\pst@lamp}{\pst@lamp[]}}
\def\pst@lamp[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@lamp%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@lamp}\ignorespaces}
%
\def\circledipole{\@ifnextchar[{\pst@circledipole}{\pst@circledipole[]}}
\def\pst@circledipole[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@circledipole%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@circledipole}\ignorespaces}
%
\def\LED{\@ifnextchar[{\pst@LED}{\pst@LED[]}}
\def\pst@LED[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@LED%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@LED}\ignorespaces}
%
% pd start ====================================================
\def\dashpot{\@ifnextchar[{\pst@dashpot}{\pst@dashpot[]}}
\def\pst@dashpot[#1](#2)(#3)#4{{%
- \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@dashpot%
- }\ignorespaces}
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@dashpot}\ignorespaces}
% pd end ======================================================
%
\def\OA{\pst@object{OA}}
\def\OA@i(#1)(#2)(#3){%
\addbefore@par{dimen=middle}%
\begin@ClosedObj%
- \if\psk@label@OA@iplus\@empty\else\psset{OAiplus=true}\fi%
- \if\psk@label@OA@iminus\@empty\else\psset{OAiminus=true}\fi%
- \if\psk@label@OA@iout\@empty\else\psset{OAiout=true}\fi%
+ \if\psk@label@OAiplus\@empty\else\psset{OAiplus=true}\fi%
+ \if\psk@label@OAiminus\@empty\else\psset{OAiminus=true}\fi%
+ \if\psk@label@OAiout\@empty\else\psset{OAiout=true}\fi%
\ifPst@intensity\psset{OAiplus=true,OAiminus=true,OAiout=true}\fi%
\pst@getcoor{#1}\pst@tempa
\pst@getcoor{#2}\pst@tempb
@@ -327,49 +298,49 @@
/YC Y1 Y2 add 2 div def
XC YC){C@}
\rput(C@){\pst@draw@OA}
- \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#1}{\ifPst@OA@invert Minus@\else Plus@\fi}
- \ncput[npos=2]{\pnode{\ifPst@OA@invert Minus@@\else Plus@@\fi}}
- \ifPst@OA@iplus
- \ifPst@OA@invert\else
+ \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#1}{\ifPst@OAinvert Minus@\else Plus@\fi}
+ \ncput[npos=2]{\pnode{\ifPst@OAinvert Minus@@\else Plus@@\fi}}
+ \ifPst@OAiplus
+ \ifPst@OAinvert\else
\ncput[npos=2.5]{%
\psline[linecolor=\psk@I@color,
linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
- \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OA@iplus}
+ \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiplus}
\fi
\fi
- \ifPst@OA@iminus
- \ifPst@OA@invert
+ \ifPst@OAiminus
+ \ifPst@OAinvert
\ncput[npos=2.5]{%
\psline[linecolor=\psk@I@color,
linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
- \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OA@iminus}
+ \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiminus}
\fi
\fi
- \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#2}{\ifPst@OA@invert Plus@\else Minus@\fi}
- \ncput[npos=2]{\pnode{\ifPst@OA@invert Plus@@\else Minus@@\fi}}
- \ifPst@OA@iplus
- \ifPst@OA@invert
+ \ncangle[arrows=-,arm=.5,angleA=0,angleB=180]{#2}{\ifPst@OAinvert Plus@\else Minus@\fi}
+ \ncput[npos=2]{\pnode{\ifPst@OAinvert Plus@@\else Minus@@\fi}}
+ \ifPst@OAiplus
+ \ifPst@OAinvert
\ncput[npos=2.5]{%
\psline[linecolor=\psk@I@color,
linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
- \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OA@iplus}
+ \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiplus}
\fi
\fi
- \ifPst@OA@iminus
- \ifPst@OA@invert\else
+ \ifPst@OAiminus
+ \ifPst@OAinvert\else
\ncput[npos=2.5]{%
\psline[linecolor=\psk@I@color,
linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
- \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OA@iminus}
+ \nbput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiminus}
\fi
\fi
\ncangle[arrows=-,arm=.5,angleA=180,angleB=0]{#3}{S@}
\ncput[npos=2]{\pnode{S@@}}
- \ifPst@OA@iout
+ \ifPst@OAiout
\ncput[npos=2.5]{%
\psline[linecolor=\psk@I@color,
linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
- \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OA@iout}
+ \naput[npos=2.5]{\csname\psk@I@labelcolor\endcsname\psk@label@OAiout}
\fi
\psline[linestyle=none](#1)(#2)% for the end arrows
\psline[linestyle=none](#1)(#3)% for the end arrows
@@ -400,9 +371,9 @@
\fi%
\psdot(#1)%
\rput[c]{\Pst@TRot}(TBaseNode){%(#1){%
- \ifPst@T@circle\pscircle(0.3,0){0.7}\fi%
+ \ifPst@transistorcircle\pscircle(0.3,0){0.7}\fi%
\ifx\psk@Ttype\pst@Ttype@FET\relax%
- \ifPst@T@memory% atosch
+ \ifPst@FETmemory% 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)%
@@ -411,19 +382,19 @@
\fi%
\ifnum180=\Pst@TRot\relax%
\ifx\psk@Ttype\pst@Ttype@FET\relax%
- \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%
+ \ifPst@transistorinvert\pnode(0.75,-0.5){#2}\else\pnode(0.75,-0.5){#3}\fi%
+ \ifPst@transistorinvert\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%
+ \ifPst@transistorinvert\pnode(0.5,-0.5){#2}\else\pnode(0.5,-0.5){#3}\fi%
+ \ifPst@transistorinvert\pnode(0.5,0.5){#3}\else\pnode(0.5,0.5){#2}\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%
+ \ifPst@transistorinvert\pnode(0.65,0.5){#2}\else\pnode(0.65,0.5){#3}\fi%
+ \ifPst@transistorinvert\pnode(0.65,-0.5){#3}\else\pnode(0.65,-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%
+ \ifPst@transistorinvert\pnode(0.5,0.5){#2}\else\pnode(0.5,0.5){#3}\fi%
+ \ifPst@transistorinvert\pnode(0.5,-0.5){#3}\else\pnode(0.5,-0.5){#2}\fi%
\fi%
\fi%
\ifx\psk@Ttype\pst@Ttype@FET\relax%
@@ -474,55 +445,55 @@
\Pst@temptrue%
\transistor@ii(@@base){@@emitter}{@@collector}%
%
- \if\psk@labelT@iB\@empty\else\psset{transistoribase=true}\fi%
- \if\psk@labelT@iE\@empty\else\psset{transistoriemitter=true}\fi%
- \if\psk@labelT@iC\@empty\else\psset{transistoricollector=true}\fi%
+ \if\psk@labeltransistoribase\@empty\else\psset{transistoribase=true}\fi%
+ \if\psk@labeltransistoriemitter\@empty\else\psset{transistoriemitter=true}\fi%
+ \if\psk@labeltransistoricollector\@empty\else\psset{transistoricollector=true}\fi%
\ifPst@intensity\psset{transistoribase=true,transistoriemitter=true,transistoricollector=true}\fi%
%
\bgroup\psset{style=baseOpt}\pscirc@edge(#1)(TBaseNode)\egroup%
- \ifPst@T@iB% base current?
+ \ifPst@transistoribase% base current?
\ncput[npos=0.5,nrot=\Pst@TRot]{%
\psline[linecolor=\psk@I@color,linewidth=\psk@I@width,%
arrowsize=6\pslinewidth,arrowinset=0]{->}(-.1,0)(.1,0)}%
- \naput[npos=0.5]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iB}%
+ \naput[npos=0.5]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoribase}%
\fi%
\bgroup%
\psset{style=collectorOpt}%
- \ifPst@T@invert\pscirc@edge(#3)(@@emitter)\else\pscirc@edge(#3)(@@collector)\fi%
+ \ifPst@transistorinvert\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=2]{\pnode{\ifPst@transistorinvert @@emitter\else @@collector\fi}}%
+ \ifPst@transistoriemitter% emitter current?
+ \ifPst@transistorinvert% emitter/collector changed?
\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=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iE}
+ \nbput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoriemitter}
\fi\fi%
- \ifPst@T@iC% collector current?
- \ifPst@T@invert\else% emitter/collector changed?
+ \ifPst@transistoricollector% collector current?
+ \ifPst@transistorinvert\else% emitter/collector changed?
\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=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iC}
+ \nbput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoricollector}
\fi\fi%
\bgroup
\psset{style=emitterOpt}
- \ifPst@T@invert\pscirc@edge(#2)(@@collector)\else\pscirc@edge(#2)(@@emitter)\fi
+ \ifPst@transistorinvert\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=2]{\pnode{\ifPst@transistorinvert @@collector\else @@emitter\fi}}
+ \ifPst@transistoriemitter
+ \ifPst@transistorinvert\else
\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=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iE}
+ \naput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoriemitter}
\fi\fi%
- \ifPst@T@iC% collector current?
- \ifPst@T@invert% emitter/collector changed?
+ \ifPst@transistoricollector% collector current?
+ \ifPst@transistorinvert% emitter/collector changed?
\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=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labelT@iC}
+ \naput[npos=\pscirc@edge@sector]{\csname\psk@I@labelcolor\endcsname\psk@labeltransistoricollector}
\fi\fi
\psline[linestyle=none](#1)(#2)% for the end arrows
\psline[linestyle=none](#1)(#3)% for the end arrows
@@ -723,17 +694,16 @@
%
%%%%%%%%%%%%%
\def\multidipole{\@ifnextchar[{\pst@multidipole}{\pst@multidipole[]}}
-%
\def\pst@multidipole[#1](#2)(#3)#4{%
\psset{#1}%
- \pst@getcoor{#2}\pst@tempa
- \pst@getcoor{#3}\pst@tempb
+ \pst@getcoor{#2}\pst@tempA
+ \pst@getcoor{#3}\pst@tempB
\pst@Verb{%
gsave
STV CP T
- \pst@tempa /Ybegin@ exch \pst@number\psyunit div def
+ \pst@tempA /Ybegin@ exch \pst@number\psyunit div def
/Xbegin@ exch \pst@number\psxunit div def
- \pst@tempb /Yend@ exch \pst@number\psyunit div def
+ \pst@tempB /Yend@ exch \pst@number\psyunit div def
/Xend@ exch \pst@number\psxunit div def
/Xbegin Xbegin@ Xend@ lt {Xbegin@} {Xend@} ifelse def
/Xend Xbegin@ Xend@ lt {Xend@} {Xbegin@} ifelse def
@@ -745,143 +715,63 @@
grestore}%
\pst@count@i=\z@
\let\pst@multidipole@output\@empty
- \ifx\resistor #4%
- \let\pscirc@next\pst@multidipole@resistor
- \else
- \ifx\capacitor #4%
- \let\pscirc@next\pst@multidipole@capacitor
- \else
- \ifx\battery #4%
- \let\pscirc@next\pst@multidipole@battery
- \else
- \ifx\coil #4%
- \let\pscirc@next\pst@multidipole@coil
- \else
- \ifx\Ucc #4%
- \let\pscirc@next\pst@multidipole@Ucc
- \else
- \ifx\Icc #4%
- \let\pscirc@next\pst@multidipole@Icc
- \else
- \ifx\switch #4%
- \let\pscirc@next\pst@multidipole@switch
- \else
- \ifx\diode #4%
- \let\pscirc@next\pst@multidipole@diode
- \else
- \ifx\Zener #4%
- \let\pscirc@next\pst@multidipole@Zener
- \else
- \ifx\wire #4%
- \let\pscirc@next\pst@multidipole@wire
- \else
- \ifx\lamp #4%
- \let\pscirc@next\pst@multidipole@lamp
- \else
- \ifx\circledipole #4%
- \let\pscirc@next\pst@multidipole@circledipole
- \else
- \ifx\LED #4%
- \let\pscirc@next\pst@multidipole@LED
- \else%%% pd change
- \ifx\dashpot #4%%% pd change
- \let\pscirc@next\pst@multidipole@dashpot
- \else%%% pd change
- \ifx\filter #4%
- \let\pscirc@next\pst@multidipole@filter
- \else
- \ifx\isolator #4%
- \let\pscirc@next\pst@multidipole@filter
- \else
- \let\pscirc@next\ignorespaces
- \fi
- \fi
- \fi%%% pd change
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
+ \ifx\resistor #4\let\pscirc@next\pst@multidipole@resistor% 1
+ \else\ifx\RFLine #4\let\pscirc@next\pst@multidipole@RFLine
+ \else\ifx\capacitor #4\let\pscirc@next\pst@multidipole@capacitor
+ \else\ifx\battery #4\let\pscirc@next\pst@multidipole@battery
+ \else\ifx\coil #4\let\pscirc@next\pst@multidipole@coil
+ \else\ifx\Ucc #4\let\pscirc@next\pst@multidipole@Ucc
+ \else\ifx\Icc #4\let\pscirc@next\pst@multidipole@Icc
+ \else\ifx\switch #4\let\pscirc@next\pst@multidipole@switch
+ \else\ifx\diode #4\let\pscirc@next\pst@multidipole@diode
+ \else\ifx\Zener #4\let\pscirc@next\pst@multidipole@Zener% 10
+ \else\ifx\wire #4\let\pscirc@next\pst@multidipole@wire
+ \else\ifx\lamp #4\let\pscirc@next\pst@multidipole@lamp
+ \else\ifx\circledipole#4\let\pscirc@next\pst@multidipole@circledipole
+ \else\ifx\LED #4\let\pscirc@next\pst@multidipole@LED
+ \else\ifx\dashpot #4\let\pscirc@next\pst@multidipole@dashpot %15
+ \else\ifx\filter #4\let\pscirc@next\pst@multidipole@filter
+ \else\ifx\isolator #4\let\pscirc@next\pst@multidipole@isolator%
+ \else\ifx\freqmult #4\let\pscirc@next\pst@multidipole@freqmult%
+ \else\ifx\phaseshifter#4\let\pscirc@next\pst@multidipole@phaseshifter%
+ \else\ifx\vco #4\let\pscirc@next\pst@multidipole@vco % 20
+ \else\ifx\amplifier #4\let\pscirc@next\pst@multidipole@amplifier%
+ \else\ifx\detector #4\let\pscirc@next\pst@multidipole@detector% 22
+ \else\let\pscirc@next\ignorespaces
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi% 1..10
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi%11..20
+ \fi\fi% 21..22
\advance\pst@count@i\@ne
\advance\pst@count@iii\@ne
- \pscirc@next
-}
+ \pscirc@next}
%
\def\pst@multidipole@#1{%
- \ifx\resistor #1%
- \let\pscirc@next\pst@multidipole@resistor
- \else
- \ifx\capacitor #1%
- \let\pscirc@next\pst@multidipole@capacitor
- \else
- \ifx\battery #1%
- \let\pscirc@next\pst@multidipole@battery
- \else
- \ifx\coil #1%
- \let\pscirc@next\pst@multidipole@coil
- \else
- \ifx\Ucc #1%
- \let\pscirc@next\pst@multidipole@Ucc
- \else
- \ifx\Icc #1%
- \let\pscirc@next\pst@multidipole@Icc
- \else
- \ifx\switch #1%
- \let\pscirc@next\pst@multidipole@switch %off
- \else
- \ifx\diode #1%
- \let\pscirc@next\pst@multidipole@diode
- \else
- \ifx\Zener #1%
- \let\pscirc@next\pst@multidipole@Zener
- \else
- \ifx\wire #1%
- \let\pscirc@next\pst@multidipole@wire
- \else
- \ifx\lamp #1%
- \let\pscirc@next\pst@multidipole@lamp
- \else
- \ifx\circledipole #1%
- \let\pscirc@next\pst@multidipole@circledipole
- \else
- \ifx\LED #1%
- \let\pscirc@next\pst@multidipole@LED
- \else%%% pd change
- \ifx\dashpot #1%%% pd change
- \let\pscirc@next\pst@multidipole@dashpot
- \else%%% pd change
- \ifx\filter #1%
- \let\pscirc@next\pst@multidipole@filter
- \else
- \ifx\isolator #1%
- \let\pscirc@next\pst@multidipole@isolator
- \else
- \let\pscirc@next\ignorespaces
- \pst@multidipole@output
- \fi
- \fi
- \fi%%% pd change
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
- \fi
+ \ifx\resistor#1\let\pscirc@next\pst@multidipole@resistor %1
+ \else\ifx\RFLine#1\let\pscirc@next\pst@multidipole@RFLine
+ \else\ifx\capacitor#1\let\pscirc@next\pst@multidipole@capacitor
+ \else\ifx\battery#1\let\pscirc@next\pst@multidipole@battery
+ \else\ifx\coil#1\let\pscirc@next\pst@multidipole@coil %5
+ \else\ifx\Ucc #1\let\pscirc@next\pst@multidipole@Ucc
+ \else\ifx\Icc #1\let\pscirc@next\pst@multidipole@Icc
+ \else\ifx\switch #1\let\pscirc@next\pst@multidipole@switch %off
+ \else\ifx\diode#1\let\pscirc@next\pst@multidipole@diode
+ \else\ifx\Zener #1\let\pscirc@next\pst@multidipole@Zener %10
+ \else\ifx\wire #1\let\pscirc@next\pst@multidipole@wire
+ \else\ifx\lamp #1\let\pscirc@next\pst@multidipole@lamp
+ \else\ifx\circledipole#1\let\pscirc@next\pst@multidipole@circledipole
+ \else\ifx\LED #1\let\pscirc@next\pst@multidipole@LED
+ \else\ifx\dashpot #1\let\pscirc@next\pst@multidipole@dashpot %15
+ \else\ifx\filter #1\let\pscirc@next\pst@multidipole@filter
+ \else\ifx\isolator #1\let\pscirc@next\pst@multidipole@isolator
+ \else\ifx\freqmult #1\let\pscirc@next\pst@multidipole@freqmult%
+ \else\ifx\phaseshifter#1\let\pscirc@next\pst@multidipole@phaseshifter%
+ \else\ifx\vco #1\let\pscirc@next\pst@multidipole@vco % 20
+ \else\ifx\amplifier#1\let\pscirc@next\pst@multidipole@amplifier%
+ \else\ifx\detector #1\let\pscirc@next\pst@multidipole@detector% 22
+ \else\let\pscirc@next\ignorespaces\pst@multidipole@output
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi
\advance\pst@count@i\@ne
\advance\pst@count@iii\@ne
\pscirc@next
@@ -907,6 +797,25 @@
\pst@multidipole@
}
%
+\def\pst@multidipole@RFLine{\@ifnextchar[{\pst@multidipole@RFLine@}{\pst@multidipole@RFLine@[]}}
+\def\pst@multidipole@RFLine@[#1]#2{%
+ \expandafter\def\csname pst@tmp@\number\pst@count@iii\endcsname{#2}%
+ {\psset{#1}%
+ \ifPst@parallel\aftergroup\advance\aftergroup\pst@count@i\aftergroup\m@ne\fi}%
+ \pst@count@ii=\pst@count@i%
+ \advance\pst@count@ii\@ne%
+ \toks0\expandafter{\pst@multidipole@output}%
+ \edef\pst@multidipole@output{%
+ \the\toks0%
+ \pst@multidipole@def@coor%
+ \noexpand\RFLine[#1]%
+ (! X@\the\pst@count@i\space Y@\the\pst@count@i)%
+ (! X@\the\pst@count@ii\space Y@\the\pst@count@ii)%
+ {\noexpand\csname pst@tmp@\number\pst@count@iii\endcsname}%
+ }%
+ \pst@multidipole@
+}
+%
% pd start ====================================================
\def\pst@multidipole@dashpot{\@ifnextchar[{\pst@multidipole@dashpot@}{\pst@multidipole@dashpot@[]}}
%
@@ -1158,7 +1067,8 @@
\edef\pst@multidipole@output{%
\the\toks0
\pst@multidipole@def@coor
- \noexpand\wire[#1](! X@\the\pst@count@i\space Y@\the\pst@count@i)(! X@\the\pst@count@ii\space Y@\the\pst@count@ii)
+ \noexpand\wire[#1]%
+ (! X@\the\pst@count@i\space Y@\the\pst@count@i)(! X@\the\pst@count@ii\space Y@\the\pst@count@ii)
}%
\pst@multidipole@
}
@@ -1183,66 +1093,61 @@
\else
\ifx\psk@Dconvention\pst@Dconvention@receptor\Pst@Dconventionfalse\fi
\fi
- \pcline[arrows=-,linestyle=none,fillstyle=none](#2)(#3)
+ \pcline[arrowscale=1,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@i)
- \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=-,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[arrowscale=1,arrows=-,linestyle=none,fillstyle=none,offset=\psk@label@offset](#2)(#3)
+ \ncput[nrot=\psk@label@angle]{#4}
%%%%%
- \ifPst@inputarrow
- \ifx\psk@Dinput\pst@Dinput@right
- \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@i)
- \pcline[fillstyle=none,arrows=C-](dipole@2)(#3)
- \fi
+ \ifPst@inputarrow
+ \ifx\psk@Dinput\pst@Dinput@right
+ \pcline[fillstyle=none,arrows=-C](#2)(dipole@1)
+ \pcline[fillstyle=none,arrows=->,arrowinset=0](#3)(dipole@2)
\else
- \pcline[fillstyle=none,arrows=-C](#2)(dipole@i)
+ \pcline[fillstyle=none,arrows=->,arrowinset=0](#2)(dipole@1)
\pcline[fillstyle=none,arrows=C-](dipole@2)(#3)
- \fi
- \pcline[fillstyle=none,linestyle=none](#2)(#3)
+ \fi
+ \else
+ \pcline[arrowscale=1,fillstyle=none,arrows=-C](#2)(dipole@1)
+ \pcline[arrowscale=1,fillstyle=none,arrows=C-](dipole@2)(#3)
+ \fi
+ \pcline[fillstyle=none,linestyle=none](#2)(#3)
%%%%%
- \pst@intensity{#2}{#3}
- \pst@tension{#2}{#3}
- \fi%
+ \pst@intensity{#2}{#3}
+ \pst@tension{#2}{#3}
+ \fi%
}%
%
\def\pst@intensity#1#2{%
\ifPst@intensity
- \ifPst@direct@convention
- \pcline[arrows=-,linestyle=none,fillstyle=none](#1)(dipole@i)
+ \ifPst@directconvention
+ \pcline[arrows=-,linestyle=none,fillstyle=none](#1)(dipole@1)
\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@i)
+ \pcline[arrows=-,linestyle=none,fillstyle=none,offset=\psk@I@label@offset](#1)(dipole@1)
\ncput[nrot=\psk@label@angle]{\csname\psk@I@labelcolor\endcsname\psk@I@label}
\else
\pcline[arrows=-,linestyle=none,fillstyle=none](dipole@2)(#2)
@@ -1257,12 +1162,12 @@
\def\pst@tension#1#2{%
\ifPst@tension
\pcline[arrows=-,linestyle=none,fillstyle=none,%
- offset=\psk@tension@offset](#1)(dipole@i)
+ offset=\psk@tension@offset](#1)(dipole@1)
\ncput[npos=.5]{\pnode{tension@1}}
\pcline[arrows=-,linestyle=none,fillstyle=none,
offset=-\psk@tension@offset](#2)(dipole@2)
\ncput[npos=.5]{\pnode{tension@2}}
- \ifPst@direct@convention
+ \ifPst@directconvention
\ifPst@Dconvention
\pcline[linecolor=\psk@tension@color,
linewidth=\psk@tension@width,arrowinset=0]{<-}(tension@1)(tension@2)
@@ -1280,7 +1185,7 @@
\fi
\fi
\pcline[arrows=-,linestyle=none,fillstyle=none,%
- offset=\psk@tension@label@offset](dipole@i)(dipole@2)
+ offset=\psk@tension@label@offset](dipole@1)(dipole@2)
\ncput[nrot=\psk@label@angle]{%
\csname\psk@tension@labelcolor\endcsname\psk@tension@label}
\fi
@@ -1288,13 +1193,13 @@
%
\def\pst@draw@resistor{%
\ifx\psk@Dstyle\pst@Dstyle@zigzag
- \pnode(-0.75,0){dipole@i}
+ \pnode(-0.75,0){dipole@1}
\pnode(0.75,0){dipole@2}
\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@i}\pnode(0.5,0){dipole@2}
+ \pnode(-0.5,0){dipole@1}\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
@@ -1303,9 +1208,19 @@
\fi
}
%
+\def\pst@draw@RFLine{%
+ \pnode(-1.5,0){dipole@1} \pnode(1.5,0){dipole@2}
+ \pscustom[arrows=-]{%
+ \psellipticarcn(-0.8,0)(0.2,0.3){90}{-90}
+ \psline(-0.8,-.3)(0.8,-.3)
+ \psellipticarc(0.8,0)(0.2,0.3){-90}{90}
+ \psline(-0.8,.3)(0.8,.3)}
+ \psellipse(-0.8,0)(0.2,0.3)
+ \pcline[arrows=-](dipole@1)(-0.8,0)\pcline[arrows=-](dipole@2)(1,0)}
+%
% pd start ====================================================
\def\pst@draw@dashpot{%
- \pnode(0,0){dipole@i}%
+ \pnode(0,0){dipole@1}%
\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)%
@@ -1318,31 +1233,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@i}
+ \pnode(-0.2,0){dipole@1}
\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@i}
+ \pnode(-0.2284123,0){dipole@1}
\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@i}
+ \pnode(-0.2284123,0){dipole@1}
\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@i}
+ \pnode(-0.3,0){dipole@1}
\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@i}
+ \pnode(-0.2,0){dipole@1}
\pnode(0.2,0){dipole@2}
\fi
\fi
@@ -1360,23 +1275,23 @@
\pspolygon(-0.4,-0.2)(-0.4,0.2)(-0.05,0)
\else
\pspolygon[arrows=-](-1,-0.75)(-1,0.75)(1,0)(-1,-0.75)
- \ifPst@OA@power
+ \ifPst@OApower
\psline{-o}(0,0.375)(0,0.75)\uput[90](0,0.75){$+$}
\psline{-o}(0,-0.375)(0,-0.75)\uput[-90](0,-0.75){$-$}
\fi
\fi
- \pnode(-1,0.25){\ifPst@OA@invert Minus@\else Plus@\fi}
- \pnode(-1,-0.25){\ifPst@OA@invert Plus@\else Minus@\fi}
+ \pnode(-1,0.25){\ifPst@OAinvert Minus@\else Plus@\fi}
+ \pnode(-1,-0.25){\ifPst@OAinvert Plus@\else Minus@\fi}
\pnode(1,0){S@}
- \uput{0.1}[0](-1,0.25){\ifPst@OA@invert$-$\else$+$\fi}
- \uput{0.1}[0](-1,-0.25){\ifPst@OA@invert$+$\else$-$\fi}
- \ifPst@OA@perfect\rput(0.25,0){$\infty$}\fi%
+ \uput{0.1}[0](-1,0.25){\ifPst@OAinvert$-$\else$+$\fi}
+ \uput{0.1}[0](-1,-0.25){\ifPst@OAinvert$+$\else$-$\fi}
+ \ifPst@OAperfect\rput(0.25,0){$\infty$}\fi%
}
%
\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@i}
+ \pnode(-0.1,0){dipole@1}
\pnode(0.1,0){dipole@2}
\ifPst@variable%
\psline{->}(-0.75,-0.5)(0.75,0.5)%
@@ -1391,7 +1306,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@i}
+ \pnode(-0.7,0){dipole@1}
\pnode(0.5,0){dipole@2}
\else
\ifx\psk@Dstyle\pst@Dstyle@elektor
@@ -1399,7 +1314,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@i}
+ \pnode(-0.5181058,0){dipole@1}
\pnode(0.5181058,0){dipole@2}
\else
\ifx\psk@Dstyle\pst@Dstyle@elektorcurved
@@ -1407,11 +1322,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@i}
+ \pnode(-0.6,0){dipole@1}
\pnode(0.6,0){dipole@2}
\else
\ifx\psk@Dstyle\pst@Dstyle@rectangle
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\pnode(0.5,0){dipole@2}
\psframe[linewidth=1.5\pslinewidth,fillstyle=solid,fillcolor=black](-0.5,-0.25)(0.5,0.25)
\else
@@ -1419,14 +1334,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@i}
+ \pnode(-1,0){dipole@1}
\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@i}
+ \pnode(-0.5,0){dipole@1}
\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)
@@ -1443,12 +1358,12 @@
%
\def\pst@draw@Icc{%
\ifx\psk@Dstyle\pst@Dstyle@twoCircles
- \pnode(-0.7,0){dipole@i}
+ \pnode(-0.7,0){dipole@1}
\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@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)
@@ -1457,13 +1372,13 @@
%
\def\pst@draw@switch{%
\ifx\psk@Dstyle\pst@Dstyle@close
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\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@i}
+ \pnode(-0.55,0){dipole@1}
\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}
@@ -1490,7 +1405,7 @@
\psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.1)(0,-0.35)
\fi
\fi
- \pnode(-0.25,0){dipole@i}
+ \pnode(-0.25,0){dipole@1}
\pnode(0.25,0){dipole@2}
}
%
@@ -1501,7 +1416,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@i}
+ \pnode(-0.25,0){dipole@1}
\pnode(0.25,0){dipole@2}
}
%
@@ -1509,20 +1424,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@i}
+ \pnode(-0.5,0){dipole@1}
\pnode(0.5,0){dipole@2}
}
%
\def\pst@draw@circledipole{%
\pscircle[linewidth=1.5\pslinewidth]{0.5}
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\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@i}
+ \pnode(-0.25,0){dipole@1}
\pnode(0.25,0){dipole@2}
\multips(-0.25,0.3)(0.25,0){3}{\psline[arrows=->](0.25,0.22)}%
}
@@ -1613,7 +1528,7 @@
\psframe[linewidth=2\pslinewidth](0,0)(\psk@logic@width,\psk@logic@height)%
}
\pst@getcoor{#2}\pst@tempa
- \ifPst@logic@changeLR\def\logic@LR{true}\else\def\logic@LR{false}\fi%
+ \ifPst@logicChangeLR\def\logic@LR{true}\else\def\logic@LR{false}\fi%
\pstVerb{
/YA \pst@tempa exch pop \pst@number\psyunit div def
/YB YA \psk@logic@height\space add def
@@ -1631,16 +1546,16 @@
\pnode(! XA YA dy 4 div 3 mul add){#3R}
\psline(#3R)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 4 div 3 mul add)
\psline(#3S)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 4 div add)
- \uput[\ifPst@logic@changeLR 180\else 0\fi](#3R){\psk@logic@nodestyle R}
- \uput[\ifPst@logic@changeLR 180\else 0\fi](#3S){\psk@logic@nodestyle S}
+ \uput[\ifPst@logicChangeLR 180\else 0\fi](#3R){\psk@logic@nodestyle R}
+ \uput[\ifPst@logicChangeLR 180\else 0\fi](#3S){\psk@logic@nodestyle S}
\pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 4 div add){#3Qneg}
\pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 4 div add){0.1}
\pnode(! XB YA dy 4 div 3 mul add){#3Q}
\psline(#3Q)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add)
\psline(#3Qneg)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 4 div add)
- \uput[\ifPst@logic@changeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
- \uput{0.4}[\ifPst@logic@changeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$}
- \ifPst@logic@showDot
+ \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
+ \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$}
+ \ifPst@logicShowDot
\qdisk(! XA \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YA dy 4 div 3 mul add){3pt}
\qdisk(! XA \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YA dy 4 div add){3pt}
\qdisk(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt}
@@ -1657,16 +1572,16 @@
\psline(#3C)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add)
\psline[linewidth=0.5pt](! XA YA dy 2 div add 0.15 add)
(! XA 0.4 \logic@LR {sub}{add} ifelse YA dy 2 div add)(! XA YA dy 2 div add 0.15 sub)
- \uput[\ifPst@logic@changeLR 180\else 0\fi](#3D){\psk@logic@nodestyle D}
- \uput{0.5}[\ifPst@logic@changeLR 180\else 0\fi](#3C){\psk@logic@nodestyle C}
+ \uput[\ifPst@logicChangeLR 180\else 0\fi](#3D){\psk@logic@nodestyle D}
+ \uput{0.5}[\ifPst@logicChangeLR 180\else 0\fi](#3C){\psk@logic@nodestyle C}
\pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 4 div add){#3Qneg}
\pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 4 div add){0.1}
\pnode(! XB YA dy 4 div 3 mul add){#3Q}
\psline(#3Q)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add)
\psline(#3Qneg)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div add)
- \uput[\ifPst@logic@changeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
- \uput{0.4}[\ifPst@logic@changeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$}
- \ifPst@logic@showDot
+ \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
+ \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$}
+ \ifPst@logicShowDot
\qdisk(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 4 div 3 mul add){3pt}
\qdisk(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add){3pt}
\qdisk(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt}
@@ -1683,13 +1598,13 @@
/yNew Step \n\space mul def
XA YA yNew add Step 2 div sub){#3J\n}
\pst@getcoor{#3J\n}\pst@tempc
- \uput[\ifPst@logic@changeLR 180\else 0\fi](#3J\n){\psk@logic@nodestyle J\n}
+ \uput[\ifPst@logicChangeLR 180\else 0\fi](#3J\n){\psk@logic@nodestyle J\n}
\pnode(!
/YC \pst@tempc exch pop \pst@number\psyunit div def
/XC \pst@tempc pop \pst@number\psxunit div def
XC 0.5 \logic@LR {add}{sub} ifelse YC){tempJ\n}
\psline(#3J\n)(tempJ\n)% input
- \ifPst@logic@showDot
+ \ifPst@logicShowDot
\qdisk(tempJ\n){3pt}
\fi
}
@@ -1699,13 +1614,13 @@
/yNew Step \n\space mul def
XA YB yNew sub Step 2 div add){#3K\n}
\pst@getcoor{#3K\n}\pst@tempc
- \uput[\ifPst@logic@changeLR 180\else 0\fi](#3K\n){\psk@logic@nodestyle K\n}
+ \uput[\ifPst@logicChangeLR 180\else 0\fi](#3K\n){\psk@logic@nodestyle K\n}
\pnode(!
/YC \pst@tempc exch pop \pst@number\psyunit div def
/XC \pst@tempc pop \pst@number\psxunit div def
XC 0.5 \logic@LR {add}{sub} ifelse YC){tempK\n}
\psline(#3K\n)(tempK\n)% input
- \ifPst@logic@showDot
+ \ifPst@logicShowDot
\qdisk(tempK\n){3pt}
\fi
}
@@ -1713,15 +1628,15 @@
(! XA 0.4 \logic@LR {sub}{add} ifelse YA dy 2 div add)(! XA YA dy 2 div add 0.15 sub)
\pnode(! XA YA dy 2 div add){#3C}
\psline(#3C)(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add)
- \uput{0.5}[\ifPst@logic@changeLR 180\else 0\fi](#3C){\psk@logic@nodestyle C}
+ \uput{0.5}[\ifPst@logicChangeLR 180\else 0\fi](#3C){\psk@logic@nodestyle C}
\pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 4 div add){#3Qneg}
\pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 4 div add){0.1}
\pnode(! XB YA dy 4 div 3 mul add){#3Q}
\psline(#3Q)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add)
\psline(#3Qneg)(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div add)
- \uput[\ifPst@logic@changeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
- \uput{0.4}[\ifPst@logic@changeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$}
- \ifPst@logic@showDot
+ \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
+ \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Qneg){\psk@logic@nodestyle $\mathrm{\overline{Q}}$}
+ \ifPst@logicShowDot
\qdisk(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div 3 mul add){3pt}
\qdisk(! XB 0.5 \logic@LR {sub}{add} ifelse YA dy 4 div add){3pt}
\qdisk(! XA 0.5 \logic@LR {add}{sub} ifelse YA dy 2 div add){3pt}
@@ -1746,11 +1661,11 @@
/XC \pst@tempc pop \pst@number\psxunit div def
XC \psk@logic@wireLength\space \logic@LR {add}{sub} ifelse YC){temp#3\n}
\psline(#3\n)(temp#3\n)% input
- \ifPst@logic@showDot
+ \ifPst@logicShowDot
\qdisk(temp#3\n){3pt}
\fi
- \ifPst@logic@showNode
- \uput[\ifPst@logic@changeLR 180\else 0\fi](#3\n){\psk@logic@nodestyle\n}
+ \ifPst@logicShowNode
+ \uput[\ifPst@logicChangeLR 180\else 0\fi](#3\n){\psk@logic@nodestyle\n}
\fi
}
\ifx\psk@logic@type\pst@logic@type@not\else
@@ -1759,11 +1674,11 @@
\ifx\psk@logic@type\pst@logic@type@exnor\else
\pnode(! XB YA dy 2 div add){#3Q}
\psline(#3Q)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add)% output
- \ifPst@logic@showDot
+ \ifPst@logicShowDot
\qdisk(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add){3pt}
\fi
- \ifPst@logic@showNode
- \uput[\ifPst@logic@changeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
+ \ifPst@logicShowNode
+ \uput[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
\fi
\fi
\fi
@@ -1775,11 +1690,11 @@
\pnode(! XB 0.2 \logic@LR {sub}{add} ifelse YA dy 2 div add){#3Q}
\pscircle[linewidth=0.5pt](! XB 0.1 \logic@LR {sub}{add} ifelse YA dy 2 div add){0.1}
\psline(#3Q)(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add)% output
- \ifPst@logic@showDot
+ \ifPst@logicShowDot
\qdisk(! XB \psk@logic@wireLength\space \logic@LR {sub}{add} ifelse YA dy 2 div add){3pt}
\fi
- \ifPst@logic@showNode
- \uput{0.4}[\ifPst@logic@changeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
+ \ifPst@logicShowNode
+ \uput{0.4}[\ifPst@logicChangeLR 0\else 180\fi](#3Q){\psk@logic@nodestyle Q}
\fi
\fi
\fi
@@ -1848,7 +1763,7 @@
\else
\pcline(#2)(#3)
\ifPst@intensity
- \ifPst@direct@convention
+ \ifPst@directconvention
\ncput[nrot=:U]{%
\psline[linecolor=\psk@I@color,
linewidth=\psk@I@width,arrowinset=0]{->}(-.1,0)(.1,0)}
@@ -1883,70 +1798,38 @@
%
%
%
-\newif\ifPst@inputarrow
-\define@key[psset]{pst-circ}{inputarrow}[false]{\@nameuse{Pst@inputarrow#1}}
-\newif\ifPst@programmable
-\define@key[psset]{pst-circ}{programmable}[false]{\@nameuse{Pst@programmable#1}}
-%
-\def\pst@Gstyle@old{old}
-\def\pst@Gstyle@ads{ads}
-\def\pst@Gstyle@triangle{triangle}
-\def\pst@Astyle@two{two}
-\def\pst@Astyle@three{three}
-\def\pst@Astyle@triangle{triangle}
-\def\pst@LOoutput@left{left}
-\def\pst@LOoutput@top{top}
-\def\pst@LOoutput@right{right}
-\def\pst@LOoutput@bottom{bottom}
-\def\pst@LOstyle@crystal{crystal}
-\def\pst@Dstyle@lowpass{lowpass}
-\def\pst@Dstyle@highpass{highpass}
-\def\pst@Dinput@right{right}
-\def\pst@Dinput@left{left}
-\def\pst@Dstyle@multiplier{multiplier}
-\def\pst@Dstyle@divider{divider}
-\def\pst@FMvalue@value{0}
-\def\pst@tripole@style@bottom{bottom}
-\def\pst@tripole@style@top{top}
-\def\pst@Tinput@left{left}
-\def\pst@Tinput@right{right}
-\def\pst@tripole@style@circulator{circulator}
-\def\pst@tripole@style@isolator{isolator}
-\def\pst@Tconfig@left{left}
-\def\pst@Tconfig@right{right}
-\def\pst@Qstyle@directional{directional}
-\def\pst@Qstyle@hybrid{hybrid}
-\def\pst@Qinput@left{left}
+\define@boolkey[psset]{pst-circ}[Pst@]{inputarrow}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{programmable}[true]{}
+\define@boolkey[psset]{pst-circ}[Pst@]{connectingdot}[true]{}
+%
+\def\pst@Gstyle@old{old} \def\pst@Gstyle@ads{ads} \def\pst@Gstyle@triangle{triangle}
+\def\pst@Astyle@two{two} \def\pst@Astyle@three{three} \def\pst@Astyle@triangle{triangle}
+\def\pst@LOoutput@left{left} \def\pst@LOoutput@top{top} \def\pst@LOoutput@right{right}
+\def\pst@LOoutput@bottom{bottom} \def\pst@LOstyle@crystal{crystal}\def\pst@Dstyle@lowpass{lowpass}
+\def\pst@Dstyle@highpass{highpass}\def\pst@Dinput@right{right} \def\pst@Dinput@left{left}
+\def\pst@Dstyle@multiplier{multiplier}\def\pst@Dstyle@divider{divider}\def\pst@FMvalue@value{0}
+\def\pst@tripole@style@bottom{bottom}\def\pst@tripole@style@top{top}\def\pst@Tinput@left{left}
+\def\pst@Tinput@right{right} \def\pst@tripole@style@circulator{circulator}
+\def\pst@tripole@style@isolator{isolator}\def\pst@Tconfig@left{left}\def\pst@Tconfig@right{right}
+\def\pst@Qstyle@directional{directional}\def\pst@Qstyle@hybrid{hybrid}\def\pst@Qinput@left{left}
\def\pst@Qinput@right{right}
-\define@key[psset]{pst-circ}{groundstyle}{\def\psk@Gstyle{#1}}
-\define@key[psset]{pst-circ}{antennastyle}{\def\psk@Astyle{#1}}
-\define@key[psset]{pst-circ}{output}{\def\psk@LOoutput{#1}}
-\define@key[psset]{pst-circ}{LOstyle}{\def\psk@LOstyle{#1}}
-\define@key[psset]{pst-circ}{dipoleinput}{\def\psk@Dinput{#1}}
-\define@key[psset]{pst-circ}{value}{\def\psk@FMvalue{#1}}
-\define@key[psset]{pst-circ}{tripoleinput}{\def\psk@Tinput{#1}}
-\define@key[psset]{pst-circ}{tripoleconfig}{\def\psk@Tconfig{#1}}
-\define@key[psset]{pst-circ}{couplerstyle}{\def\psk@Qstyle{#1}}
-\define@key[psset]{pst-circ}{quadripoleinput}{\def\psk@Qinput{#1}}
-%
-\newif\ifPst@connectingdot
-\define@key[psset]{pst-circ}{connectingdot}[true]{\@nameuse{Pst@connectingdot#1}}
-%
-\psset{groundstyle=ads,%
- antennastyle=two,%
- output=top,%
- dipoleinput=left,%
- dipolestyle=multiplier,%
- value=0,%
- dipoleinput=left,%
- inputarrow=false,%
- tripoleinput=left,%
- tripolestyle=bottom,%
- tripoleconfig=left,%
- quadripoleinput=left,%
- couplerstyle=hybrid,%
- connectingdot=true,
-}
+\define@key[psset]{pst-circ}{groundstyle}[ads]{\def\psk@Gstyle{#1}}
+\define@key[psset]{pst-circ}{antennastyle}[two]{\def\psk@Astyle{#1}}
+\define@key[psset]{pst-circ}{output}[top]{\def\psk@LOoutput{#1}}
+\define@key[psset]{pst-circ}{LOstyle}[]{\def\psk@LOstyle{#1}}
+\define@key[psset]{pst-circ}{dipoleinput}[left]{\def\psk@Dinput{#1}}
+\define@key[psset]{pst-circ}{value}[0]{\def\psk@FMvalue{#1}}
+\define@key[psset]{pst-circ}{tripoleinput}[left]{\def\psk@Tinput{#1}}
+\define@key[psset]{pst-circ}{tripoleconfig}[left]{\def\psk@Tconfig{#1}}
+\define@key[psset]{pst-circ}{couplerstyle}[hxbrid]{\def\psk@Qstyle{#1}}
+\define@key[psset]{pst-circ}{quadripoleinput}[left]{\def\psk@Qinput{#1}}
+%
+%
+\psset{groundstyle=ads, antennastyle=two, output=top,%
+ dipoleinput=left, dipolestyle=multiplier, value=0,%
+ dipoleinput=left, inputarrow=false, tripoleinput=left,%
+ tripolestyle=bottom,tripoleconfig=left, quadripoleinput=left,%
+ couplerstyle=hybrid, connectingdot=true, LOstyle={} }
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% monopole
@@ -2146,7 +2029,7 @@
}
%
\def\pst@draw@filter{%
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\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)
@@ -2197,7 +2080,7 @@
}
%
\def\pst@draw@isolator{%
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\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
@@ -2236,7 +2119,7 @@
}
%
\def\pst@draw@freqmult{%
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\pnode(0.5,0){dipole@2}
\psframe[linewidth=1.5\pslinewidth](-0.5,-0.5)(0.5,0.5)
\ifPst@programmable%
@@ -2296,7 +2179,7 @@
}
%
\def\pst@draw@phaseshifter{%
- \pnode(-0.4,0){dipole@i}
+ \pnode(-0.4,0){dipole@1}
\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)
@@ -2331,7 +2214,7 @@
}
%
\def\pst@draw@vco{%
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\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)%
@@ -2368,7 +2251,7 @@
}
%
\def\pst@draw@amplifier{%
- \pnode(-0.433,0){dipole@i}
+ \pnode(-0.433,0){dipole@1}
\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)
@@ -2407,7 +2290,7 @@
}
%
\def\pst@draw@detector{%
- \pnode(-0.5,0){dipole@i}
+ \pnode(-0.5,0){dipole@1}
\psline[fillstyle=none](-0.5,0)(-0.2165,0)
\pnode(0.5,0){dipole@2}
\psline[fillstyle=none](0.5,0)(0.2165,0)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 15:58:36 +0000