summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-19 23:30:21 +0000
committerKarl Berry <karl@freefriends.org>2014-04-19 23:30:21 +0000
commit6e6ff4eb973db72c0299ac48ea360cb9ae300943 (patch)
tree63c33b9dc6c7a7a1144af3f7b222757797560d4b /Master
parent8f8bb5335be5855b6abb7818bddd6fc38ae6a3a5 (diff)
pst-circ (19apr14)
git-svn-id: svn://tug.org/texlive/trunk@33547 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/Changes1
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdfbin781069 -> 755554 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex529
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex80
-rw-r--r--Master/tlpkg/tlpsrc/luatex.tlpsrc2
5 files changed, 209 insertions, 403 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index 91702134d1d..d6e6c6a9168 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,4 @@
+2.08 2014-04-19 - added labeloffset for \mixer
2.07 2014-04-15 - added some more symbols for microwaves
2.06 2014-04-01 - small fix for missing arrowinset
2.05 2013-10-03 - added new optional argument tensionstyle
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 0120cfaa459..928a85532d9 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 8188536c015..9cb2a63d4a3 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 906 2014-04-15 19:37:50Z herbert $
+%% $Id: pst-circ-doc.tex 909 2014-04-19 08:32:02Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
@@ -110,7 +110,7 @@ Thanks to: \\
\mbox{Felix Gottwald},
\mbox{Markus Graube},
\mbox{Henning Heinze},
- \mbox{Christoph Jorssen},
+ \mbox{Christophe Jorssen},
\mbox{Bernd Landwehr},
\mbox{Michael Lauterbach},
\mbox{Manuel Luque},
@@ -119,7 +119,7 @@ Thanks to: \\
\mbox{Alan Ristow},
\mbox{Uwe Siart},
\mbox{Carlos Marcelo de Oliveira Stein},
- \mbox{Pierre Vivignis},
+ \mbox{Pierre Vivegnis},
\mbox{Douglas Waud}, and
\mbox{Richard Weissnar}.
\end{sloppypar}
@@ -131,7 +131,7 @@ Thanks to: \\
\subsection{Parameters}
-There are specific paramaters defined to change easily the behaviour of the pst-circ
+There are specific paramaters defined to change easily the behaviour of the \LPack{pst-circ}
objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pageref{sec:para}.
\iffalse
@@ -203,8 +203,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=true](3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\resistor(A)(B){$R$}
\end{pspicture}
\end{LTXexample}
@@ -212,8 +211,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{RFLine}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=true](3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\RFLine(A)(B){R}
\end{pspicture}
\end{LTXexample}
@@ -221,8 +219,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=true](3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\capacitor(A)(B){$C$}
\end{pspicture}
\end{LTXexample}
@@ -230,8 +227,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{battery}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\battery(A)(B){$E$}
\end{pspicture}
\end{LTXexample}
@@ -239,8 +235,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\coil(A)(B){$L$}
\end{pspicture}
\end{LTXexample}
@@ -248,8 +243,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{Ucc}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\Ucc(A)(B){$E$}
\end{pspicture}
\end{LTXexample}
@@ -257,8 +251,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{Icc}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\Icc(A)(B){$\eta$}
\end{pspicture}
\end{LTXexample}
@@ -266,8 +259,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{switch}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\switch(A)(B){$K$}
\end{pspicture}
\end{LTXexample}
@@ -275,8 +267,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\diode(A)(B){$D$}
\end{pspicture}
\end{LTXexample}
@@ -284,8 +275,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{Zener}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\Zener(A)(B){$D$}
\end{pspicture}
\end{LTXexample}
@@ -293,8 +283,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{lamp}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\lamp(A)(B){$\mathcal L$}
\end{pspicture}
\end{LTXexample}
@@ -302,8 +291,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{circledipole}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\circledipole(A)(B){$\mathcal G$}
\end{pspicture}
\end{LTXexample}
@@ -311,8 +299,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLkeyword{labeloffset}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\circledipole[labeloffset=0](A)(B){\Large\textbf{A}}
\end{pspicture}
\end{LTXexample}
@@ -320,16 +307,14 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{LED}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\LED(A)(B){$\mathcal D$}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\SQUID(A)(B){S}
\end{pspicture}
\end{LTXexample}
@@ -337,8 +322,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{RelayNOP}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,3)
- \pnode(0,0){A}
- \pnode(3,0){B}% Relay normally open
+ \pnodes(0,0){A}(3,0){B}%Relay normally open
\RelayNOP[labeloffset=1.6](A)(B){RelayNOP}
\end{pspicture}
\end{LTXexample}
@@ -346,8 +330,7 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{Suppressor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}% Suppressor (Diode)
+ \pnodes(0,1){A}(3,1){B}% Suppressor (Diode)
\Suppressor[labeloffset=0.5](A)(B){Supressor}
\end{pspicture}
\end{LTXexample}
@@ -355,8 +338,8 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\xLcs{Arrestor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}% Arrestor (Lightning protection)
+ \pnodes(0,1){A}(3,1){B}
+ % Arrestor (Lightning protection)
\Arrestor(A)(B){Arrestor}
\end{pspicture}
\end{LTXexample}
@@ -375,9 +358,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{OA}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,0){A}
- \pnode(0,3){B}
- \pnode(5,1.5){C}
+ \pnodes(0,0){A}(0,3){B}(5,1.5){C}
\OA(B)(A)(C)
\end{pspicture}
\end{LTXexample}
@@ -385,9 +366,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLkeyword{OApower}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,0){A}
- \pnode(0,3){B}
- \pnode(5,1.5){C}
+ \pnodes(0,0){A}(0,3){B}(5,1.5){C}
\OA[OApower=true](B)(A)(C)
\end{pspicture}
\end{LTXexample}
@@ -395,8 +374,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{transistor}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(3,4)
-\pnode(0,2){A}\pnode(3,1){B}
-\pnode(3,3){C}
+\pnodes(0,2){A}(3,1){B}(3,3){C}
\transistor(A)(B)(C)
\end{pspicture}
\end{LTXexample}
@@ -404,8 +382,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{transistor}\xLkeyword{TRot}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(3,4)
-\pnode(3,2){A}\pnode(0,1){B}
-\pnode(0,3){C}
+\pnodes(3,2){A}(0,1){B}(0,3){C}
\transistor[TRot=180](A)(B)(C)
\end{pspicture}
\end{LTXexample}
@@ -425,8 +402,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLkeyset{transistortype=PNP}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(3,4)
-\pnode(0,2){A}\pnode(3,1){B}
-\pnode(3,3){C}
+\pnodes(0,2){A}(3,1){B}(3,3){C}
\transistor[transistortype=PNP](A)(B)(C)
\end{pspicture}
\end{LTXexample}
@@ -434,9 +410,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLkeyword{basesep}\xLkeyword{arrows}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,1.5){A}
- \pnode(5,0){B}
- \pnode(5,3){C}
+ \pnodes(0,1.5){A}(5,0){B}(5,3){C}
\transistor[basesep=2cm,arrows=o-o](A)(B)(C)
\end{pspicture}
\end{LTXexample}
@@ -477,9 +451,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{Tswitch}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,2)
- \pnode(0,2){A}
- \pnode(5,2){B}
- \pnode(0,0){C}
+ \pnodes(0,2){A}(5,2){B}(0,0){C}
\Tswitch(A)(B)(C){$K$}
\end{pspicture}
\end{LTXexample}
@@ -487,9 +459,7 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{potentiometer}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,3)
- \pnode(0,1){A}
- \pnode(3,1){B}
- \pnode(3,2.25){C}
+ \pnodes(0,1){A}(3,1){B}(3,2.25){C}
\potentiometer[labeloffset=0pt](A)(B)(C){$P$}
\end{pspicture}
\end{LTXexample}
@@ -501,20 +471,20 @@ well chosen, so don't try to use tripole macros in strange situations!
\psset{circedge=\pcTran,connectingdot=false}
\begin{pspicture}(10,10)
-\pnode(1,1){G1}\pnode(6,1){G2}\pnode(7.5,1){G3}
+\pnodes(1,1){G1}(6,1){G2}(7.5,1){G3}
\newground[arrows=o](G1)\newground(G2)\newground(G3)
-\pnode(1,3){D1u}\pnode(7,3){T1B}\pnode(0,3){IB}\pnode(4,4){T2B}
+\pnodes(1,3){D1u}(7,3){T1B}(0,3){IB}(4,4){T2B}
\newdiode(G1)(D1u){D1}\qdisk(D1u){2pt}
\transistor[TRot=270,arrows=-o](T2B)(IB)(T1B)
\pnode(8,7){O1}%junction to out
\transistor(T1B)(G3)(O1)
-\pnode(1,6){D2u}\pnode(1,4){G4}
+\pnodes(1,6){D2u}(1,4){G4}
\newground(G4)
\newdiode(G4)(D2u){D2}\qdisk(D2u){2pt}
-\pnode(2.5,7){T4B}\pnode(0,6){IA}\pnode(5.5,5){T3B}\pnode(6,7){R3d}
+\pnodes(2.5,7){T4B}(0,6){IA}(5.5,5){T3B}(6,7){R3d}
\transistor[TRot=270,arrows=-o](T4B)(IA)(T3B)\uput[90](IA){$\mathtt{A}$}
\transistor(T3B)(G2)(R3d)\uput[90](IB){$\mathtt{B}$}
-\pnode(2.5,10){VCC1}\pnode(4,10){VCC2}\pnode(6,10){VCC3}
+\pnodes(2.5,10){VCC1}(4,10){VCC2}(6,10){VCC3}
\resistor[arrows=o-](VCC1)(T4B){4{,}7k\Omega}
\resistor[arrows=o-](VCC2)(T2B){4{,}7k\Omega}
\resistor[arrows=o-](VCC3)(R3d){100\Omega}
@@ -534,10 +504,8 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{quadripole}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,2.5){A}
- \pnode(0,0.5){B}
- \pnode(4,2.5){C}
- \pnode(4,0.5){D}
+ \pnodes(0,2.5){A}(0,0.5){B}%
+ (4,2.5){C}(4,0.5){D}
\quadripole(A)(B)(C)(D){Text}
\end{pspicture}
\end{LTXexample}
@@ -545,10 +513,8 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{transformer}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,5)
- \pnode(0,5){A}
- \pnode(0,0){B}
- \pnode(5,5){C}
- \pnode(5,0){D}
+ \pnodes(0,5){A}(0,0){B}%
+ (5,5){C}(5,0){D}
\transformer(A)(B)(C)(D){$\mathcal T$}
\end{pspicture}
\end{LTXexample}
@@ -556,10 +522,8 @@ well chosen, so don't try to use tripole macros in strange situations!
\xLcs{optoCoupler}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,2.5){A}
- \pnode(0,0.5){B}
- \pnode(4,2.5){C}
- \pnode(4,0.5){D}
+ \pnodes(0,2.5){A}(0,0.5){B}%
+ (4,2.5){C}(4,0.5){D}
\optoCoupler(A)(B)(C)(D){$OC$}
\end{pspicture}
\end{LTXexample}
@@ -577,7 +541,7 @@ after the last dipole.
\xLcs{diode}\xLcs{resistor}\xLcs{caoacitor}
\begin{minipage}{7cm}
\begin{pspicture}(7,7)
- \pnode(0,0){A} \pnode(7,7){B}
+ \pnodes(0,0){A}(7,7){B}
\multidipole(A)(B)\resistor{$R$}%
\capacitor[linecolor=red]{$C$}%
\diode{$D$}{}\rnode{Dot2}{}.
@@ -585,8 +549,7 @@ after the last dipole.
\end{minipage}\hfill
\begin{minipage}{6cm}
\verb+\begin{pspicture}(7,7)+\\
-\verb+ \pnode(0,0){A}+\\
-\verb+ \pnode(7,7){B}+\\
+\verb+ \pnodes(0,0){A}(7,7){B}+\\
\verb+ \multidipole(A)(B)\resistor{$R$}%+\\
\verb+ \capacitor[linecolor=red]{$C$}%+\\
\verb+ \diode{$D$}{}+\rnode{Dot2}{}.\\
@@ -606,8 +569,8 @@ restore original values. We recommand not using it.
\xLcs{wire}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}\pnode(3,1){B}\wire(A)(B)
- \pnode(0,0){A}\pnode(3,0){B}\wire[arrows=o-*](A)(B)
+ \pnodes(0,1){A}(3,1){B}\wire(A)(B)
+ \pnodes(0,0){A}(3,0){B}\wire[arrows=o-*](A)(B)
\end{pspicture}
\end{LTXexample}
@@ -617,8 +580,7 @@ restore original values. We recommand not using it.
\xLcs{tension}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\tension(A)(B){$u$}
\end{pspicture}
\end{LTXexample}
@@ -629,9 +591,7 @@ restore original values. We recommand not using it.
\xLcs{ground}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0.5,1){A}
- \pnode(1,1){B}
- \pnode(2.5,1){C}
+ \pnodes(0.5,1){A}(1,1){B}(2.5,1){C}
\ground(A)
\ground{135}(B)
\ground[linecolor=blue]{180}(C)
@@ -646,8 +606,7 @@ restore original values. We recommand not using it.
\def\Wave{\psscalebox{3}{$\approx$}}
\def\PM{\psscalebox{2}{$+\,\,-$}}
\begin{pspicture}(4,3)
-\pnode(0,0){A}\pnode(2,3){B}\pnode(4,3){C}
-\pnode(4,0){D}
+\pnodes(0,0){A}(2,3){B}(4,3){C}(4,0){D}
\OpenDipol[radius=3pt,labelangle=:U,
labeloffset=-0.5](A)(B){\Wave}
\OpenDipol[radius=3pt,labelangle=:U](B)(C){\PM}
@@ -665,8 +624,7 @@ restore original values. We recommand not using it.
\xLcs{resitor}\xLkeyword{labeloffset}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,1)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[labeloffset=0](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
@@ -674,16 +632,14 @@ restore original values. We recommand not using it.
\xLcs{resitor}\xLkeyset{labelangle=:U}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,0){A}
- \pnode(3,2){B}
+ \pnodes(0,0){A}(3,2){B}
\resistor[labelangle=:U](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,0){A}
- \pnode(3,2){B}
+ \pnodes(0,0){A}(3,2){B}
\resistor[labelangle=0](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
@@ -691,10 +647,7 @@ restore original values. We recommand not using it.
\xLcs{transformer}\xLkeyword{primarylabel}\xLkeyword{secondarylabel}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,5)
- \pnode(0,5){A}
- \pnode(0,0){B}
- \pnode(5,5){C}
- \pnode(5,0){D}
+ \pnodes(0,5){A}(0,0){B}(5,5){C}(5,0){D}
\transformer[primarylabel=$n_1$,
secondarylabel=$n_2$](A)(B)(C)(D){$\mathcal T$}
\end{pspicture}
@@ -703,14 +656,11 @@ restore original values. We recommand not using it.
\xLkeyword{labelInside}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,4.5)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\Ucc[labelInside=1](A)(B){$V$}
- \pnode(0,2){A}
- \pnode(3,2){B}
+ \pnodes(0,2){A}(3,2){B}
\Ucc[labelInside=2](A)(B){$V$}
- \pnode(0,3.5){A}
- \pnode(3,3.5){B}
+ \pnodes(0,3.5){A}(3,3.5){B}
\Ucc[labelInside=3](A)(B){$V$}
\end{pspicture}
\end{LTXexample}
@@ -730,8 +680,7 @@ parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator
\xLkeyword{intensity}\xLkeyword{tension}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[intensity,tension](A)(B){}
\end{pspicture}
\end{LTXexample}
@@ -739,8 +688,7 @@ parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator
\xLkeyword{intensity}\xLkeyword{tensionstyle}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[intensity,tension,tensionstyle=pm](A)(B){}
\end{pspicture}
\end{LTXexample}
@@ -748,8 +696,7 @@ parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator
\xLkeyword{intensity}\xLkeyword{tension}\xLkeyset{dipoleconvention=generator}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[intensity,tension,dipoleconvention=generator](A)(B){}
\end{pspicture}
\end{LTXexample}
@@ -757,8 +704,7 @@ parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator
\xLkeyword{intensity}\xLkeyword{tension}\xLkeyword{directconvention}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[intensity,tension,directconvention=false](A)(B){}
\end{pspicture}
\end{LTXexample}
@@ -766,8 +712,7 @@ parameters. \Lkeyword{dipoleconvention} can take two values~: \Lkeyval{generator
\xLkeyword{intensity}\xLkeyword{tension}\xLkeyset{dipoleconvention=generator}\xLkeyword{directconvention}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[intensity,tension,
dipoleconvention=generator,directconvention=false](A)(B){}
\end{pspicture}
@@ -779,8 +724,7 @@ automatically set to true.
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[intensitylabel=$i$,tensionlabel=$u$](A)(B){}
\end{pspicture}
\end{LTXexample}
@@ -789,8 +733,7 @@ automatically set to true.
\xLkeyword{tensionlabel}\xLkeyword{tensionoffset}\xLkeyword{tensionlabeloffset}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1.5){A}
- \pnode(3,1.5){B}
+ \pnodes(0,1.5){A}(3,1.5){B}
\resistor[intensitylabel=$i$,intensitylabeloffset=-0.5,
tensionlabel=$u$,tensionlabeloffset=-1.2,
tensionoffset=-1](A)(B){}
@@ -801,8 +744,7 @@ automatically set to true.
\xLkeyword{tensionwidth}\xLkeyword{tensionlabel}\xLkeyword{tensioncolor}\xLkeyword{tensionlabelcolor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor[intensitylabel=$i$,intensitywidth=3\pslinewidth,
intensitycolor=red,intensitylabelcolor=yellow,
tensionlabel=$u$,tensionwidth=2\pslinewidth,
@@ -815,9 +757,7 @@ Some specific intensity parameters are available for \Index{tripole}s and \Index
\xLkeyword{OAiminuslabel}\xLkeyword{OAipluslabel}\xLkeyword{OAioutlabel}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,0){A}
- \pnode(0,3){B}
- \pnode(5,1.5){C}
+ \pnodes(0,0){A}(0,3){B}(5,1.5){C}
\OA[OAipluslabel=$i_+$,
OAiminuslabel=$i_-$,
OAioutlabel=$i_o$](B)(A)(C)
@@ -827,9 +767,7 @@ Some specific intensity parameters are available for \Index{tripole}s and \Index
\xLkeyword{basesep}\xLkeyword{transistoribaselabel}\xLkeyword{transistoricollectorlabel}\xLkeyword{transistoriemitterlabel}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,1.5){A}
- \pnode(5,0){B}
- \pnode(5,3){C}
+ \pnodes(0,1.5){A}(5,0){B}(5,3){C}
\transistor[basesep=2cm,transistoribaselabel=$i_B$,
transistoricollectorlabel=$i_C$,
transistoriemitterlabel=$i_E$](A)(B)(C)
@@ -840,10 +778,7 @@ Some specific intensity parameters are available for \Index{tripole}s and \Index
\xLkeyword{transformeriprimarylabel}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,5)
- \pnode(0,5){A}
- \pnode(0,0){B}
- \pnode(5,5){C}
- \pnode(5,0){D}
+ \pnodes(0,5){A}(0,0){B}(5,5){C}(5,0){D}
\transformer[transformeriprimarylabel=$i_1$,
transformerisecondarylabel=$i_2$]%
(A)(B)(C)(D){$\mathcal T$}
@@ -858,8 +793,7 @@ connecting the nodes.
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,3)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor(A)(B){}
\resistor[parallel](A)(B){}
\end{pspicture}
@@ -867,8 +801,7 @@ connecting the nodes.
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,3)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor(A)(B){}
\resistor[parallel,parallelsep=.5](A)(B){}
\end{pspicture}
@@ -876,8 +809,7 @@ connecting the nodes.
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,3)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor(A)(B){}
\resistor[parallel,parallelsep=.3,
parallelarm=2](A)(B){}
@@ -886,8 +818,7 @@ connecting the nodes.
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,3)
- \pnode(0,.5){A}
- \pnode(3,.5){B}
+ \pnodes(0,.5){A}(3,.5){B}
\resistor(A)(B){}
\resistor[parallel,parallelsep=.3,
parallelarm=2,parallelnode](A)(B){}
@@ -896,8 +827,7 @@ connecting the nodes.
\begin{LTXexample}[width=8.5cm]
\begin{pspicture}(8,8)
- \pnode(0,0){A}
- \pnode(8,8){B}
+ \pnodes(0,0){A}(8,8){B}
\multidipole(A)(B)\resistor{$R$}%
\capacitor[linecolor=red]{$C$}%
\coil[parallel,parallelsep=.1]{$L$}%
@@ -914,10 +844,7 @@ must not be set for the first dipole.
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,3)
- \pnode(0,0){A}
- \pnode(3,3){B}
- \pnode(0,3){C}
- \pnode(3,0){D}
+ \pnodes(0,0){A}(3,3){B}(0,3){C}(3,0){D}
\wire(A)(B)
\wire[intersect,intersectA=A,intersectB=B](C)(D)
\end{pspicture}
@@ -927,10 +854,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\begin{LTXexample}[width=6.5cm]
\begin{pspicture}(7,7)
- \pnode(0,0){A}
- \pnode(6,6){B}
- \pnode(0,6){C}
- \pnode(6,0){D}
+ \pnodes(0,0){A}(6,6){B}(0,6){C}(6,0){D}
\wire(A)(B)
\multidipole(C)(D)\resistor{$R$}%
\wire[intersect,intersectA=A,intersectB=B]%
@@ -945,8 +869,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=twoCircles}\xLcs{ICC}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\Icc[dipolestyle=twoCircles](A)(B){$I$}
\end{pspicture}
\end{LTXexample}
@@ -954,8 +877,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=zigzag}\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\resistor[dipolestyle=zigzag](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
@@ -963,8 +885,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=varistor}\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\resistor[dipolestyle=varistor](A)(B){U}
\end{pspicture}
\end{LTXexample}
@@ -972,8 +893,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=chemical}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\capacitor[dipolestyle=chemical](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
@@ -981,8 +901,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=elektor}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\capacitor[dipolestyle=elektor](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
@@ -990,8 +909,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=elektorchemical}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\capacitor[dipolestyle=elektorchemical](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
@@ -999,8 +917,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=crystal}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\capacitor[dipolestyle=crystal](A)(B){$Q$}
\end{pspicture}
\end{LTXexample}
@@ -1008,8 +925,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=rectangle}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\coil[dipolestyle=rectangle](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
@@ -1017,8 +933,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=curved}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\coil[dipolestyle=curved](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
@@ -1026,8 +941,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=elektor}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\coil[dipolestyle=elektor](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
@@ -1035,8 +949,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=elektorcurved}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\coil[dipolestyle=elektorcurved](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
@@ -1044,8 +957,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=thyristor}\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\diode[dipolestyle=thyristor](A)(B){$T$}
\end{pspicture}
\end{LTXexample}
@@ -1053,8 +965,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=GTO}\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\diode[dipolestyle=GTO](A)(B){$T$}
\end{pspicture}
\end{LTXexample}
@@ -1062,8 +973,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=triac}\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\diode[dipolestyle=triac](A)(B){$T$}
\end{pspicture}
\end{LTXexample}
@@ -1071,8 +981,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyset{dipolestyle=schottky}\xLcs{diode}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\diode[dipolestyle=schottky](A)(B){$T$}
\end{pspicture}
\end{LTXexample}
@@ -1080,8 +989,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyword{variable}\xLcs{resistor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\resistor[variable](A)(B){$R$}
\end{pspicture}
\end{LTXexample}
@@ -1089,8 +997,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyword{variable}\xLcs{capacitor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\capacitor[variable](A)(B){$C$}
\end{pspicture}
\end{LTXexample}
@@ -1098,8 +1005,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyword{variable}\xLcs{coil}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\coil[variable](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
@@ -1107,8 +1013,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyword{variable}\xLcs{battery}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\battery[variable](A)(B){$U$}
\end{pspicture}
\end{LTXexample}
@@ -1116,8 +1021,7 @@ Wire intersect parameters work also with \Lcs{multidipole}.
\xLkeyword{variable}\xLcs{coil}\xLkeyset{dipolestyle=elektor}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}(3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\coil[dipolestyle=elektor,variable](A)(B){$L$}
\end{pspicture}
\end{LTXexample}
@@ -1128,9 +1032,7 @@ 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)
- \pnode(0,0){A}
- \pnode(3,3){B}
- \pnode(3,1.5){C}
+ \pnodes(0,0){A}(3,3){B}(3,1.5){C}
\potentiometer[dipolestyle=zigzag,%
labelangle=:U](A)(B)(C){$P$}
\end{pspicture}
@@ -1139,10 +1041,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{transformer}\xLkeyset{dipolestyle=rectangle}
\begin{LTXexample}[width=4.5cm]
\begin{pspicture}(4,4)
- \pnode(0,4){A}
- \pnode(0,0){B}
- \pnode(4,4){C}
- \pnode(4,0){D}
+ \pnodes(0,4){A}(0,0){B}(4,4){C}(4,0){D}
\transformer[dipolestyle=rectangle](A)(B)(C)(D){$\mathcal T$}
\end{pspicture}
\end{LTXexample}
@@ -1153,9 +1052,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{Tswitch}\xLkeyset{tripolestyle=left}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,2){A}
- \pnode(5,2){B}
- \pnode(0,0){C}
+ \pnodes(0,2){A}(5,2){B}(0,0){C}
\Tswitch[tripolestyle=left](A)(B)(C){$K$}
\end{pspicture}
\end{LTXexample}
@@ -1163,9 +1060,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{Tswitch}\xLkeyset{tripolestyle=right}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,2){A}
- \pnode(5,2){B}
- \pnode(0,0){C}
+ \pnodes(0,2){A}(5,2){B}(0,0){C}
\Tswitch[tripolestyle=right](A)(B)(C){$K$}
\end{pspicture}
\end{LTXexample}
@@ -1173,9 +1068,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{OA}\xLkeyset{tripolestyle=french}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,3){A}
- \pnode(0,0){B}
- \pnode(5,1.5){C}
+ \pnodes(0,3){A}(0,0){B}(5,1.5){C}
\OA[tripolestyle=french](A)(B)(C)
\end{pspicture}
\end{LTXexample}
@@ -1184,24 +1077,18 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{potentiometer}\xLkeyword{labeloffset}
\begin{pspicture}(3,3)
- \pnode(0,1){A}
- \pnode(3,1){B}
- \pnode(3,2){C}
+ \pnodes(0,1){A}(3,1){B}(3,2){C}
\potentiometer[labeloffset=0pt](A)(B)(C){P}
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \pnode(0,2.5){A}
- \pnode(3,2.5){B}
- \pnode(0,1){C}
+ \pnodes(0,2.5){A}(3,2.5){B}(0,1){C}
\potentiometer[labeloffset=0pt](A)(B)(C){P}
\end{pspicture}
\hfill
\xLcs{potentiometer}\xLkeyword{labeloffset}\xLkeyset{labelangle=:U}
\begin{pspicture}(3,3)
- \pnode(0,0){A}
- \pnode(3,2){B}
- \pnode(2.5,3){C}
+ \pnodes(0,0){A}(3,2){B}(2.5,3){C}
\potentiometer[labeloffset=0pt,labelangle=:U](A)(B)(C){P}
\end{pspicture}
@@ -1209,23 +1096,17 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\noindent
\xLcs{potentiometer}\xLkeyword{labeloffset}
\begin{pspicture}(3,3)
- \pnode(1,0){A}
- \pnode(1,3){B}
- \pnode(2.5,0){C}
+ \pnodes(1,0){A}(1,3){B}(2.5,0){C}
\potentiometer[labeloffset=0pt](A)(B)(C){P}
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \pnode(0,3){A}
- \pnode(3,0){B}
- \pnode(2,0){C}
+ \pnodes(0,3){A}(3,0){B}(2,0){C}
\potentiometer[labeloffset=0pt,labelangle=:U](A)(B)(C){P}
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \pnode(0,2){A}
- \pnode(3,2){B}
- \pnode(1.5,0){C}
+ \pnodes(0,2){A}(3,2){B}(1.5,0){C}
\potentiometer[labeloffset=0pt](A)(B)(C){P}
\end{pspicture}
@@ -1233,23 +1114,17 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\vspace{1cm}
\noindent
\begin{pspicture}(3,3)
- \pnode(1,0){A}
- \pnode(1,3){B}
- \pnode(2.5,0){C}
+ \pnodes(1,0){A}(1,3){B}(2.5,0){C}
\potentiometer[dipolestyle=zigzag](A)(B)(C){P}
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \pnode(0,3){A}
- \pnode(3,0){B}
- \pnode(2,0){C}
+ \pnodes(0,3){A}(3,0){B}(2,0){C}
\potentiometer[dipolestyle=zigzag,labelangle=:U](A)(B)(C){P}
\end{pspicture}
\hfill
\begin{pspicture}(3,3)
- \pnode(0,2){A}
- \pnode(3,2){B}
- \pnode(1.5,0){C}
+ \pnodes(0,2){A}(3,2){B}(1.5,0){C}
\potentiometer[dipolestyle=zigzag](A)(B)(C){P}
\end{pspicture}
@@ -1258,9 +1133,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLkeyword{OAinvert}\xLcs{OA}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,0){A}
- \pnode(0,3){B}
- \pnode(5,1.5){C}
+ \pnodes(0,0){A}(0,3){B}(5,1.5){C}
\OA[OAinvert=false](B)(A)(C)
\end{pspicture}
\end{LTXexample}
@@ -1268,18 +1141,14 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLkeyword{OAperfect}\xLcs{OA}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,0){A}
- \pnode(0,3){B}
- \pnode(5,1.5){C}
+ \pnodes(0,0){A}(0,3){B}(5,1.5){C}
\OA[OAperfect=false](B)(A)(C)
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,3)
- \pnode(0,1.5){A}
- \pnode(5,0){B}
- \pnode(5,3){C}
+ \pnodes(0,1.5){A}(5,0){B}(5,3){C}
\transistor[basesep=2cm,%
transistorinvert,transistorcircle=false](A)(B)(C)
\end{pspicture}
@@ -1335,7 +1204,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\pswall{1,8}{2.5,8.5}{2.5,8}% top
\psline(1.75,8)(1.75,7)% top vertical line
% node definitions:
- \pnode(1,7){ul1}\pnode(2.5,7){ur1} \pnode(1,3){ll1}\pnode(2.5,3){lr1}%
+ \pnodes(1,7){ul1}(2.5,7){ur1}(1,3){ll1}(2.5,3){lr1}%
\psline(ul1)(ur1)% top line
\psline(ll1)(lr1)% bottom line
\resistor[dipolestyle=zigzag,linewidth=0.5pt](ul1)(ll1){}% spring
@@ -1344,7 +1213,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
% Maxwell model (spring and dashpot serial): ==================
\rput[c](4.5,8.85){\sffamily Maxwell}
\pswall{4,8}{5,8.5}{5,8}% top
- \pnode(4.5,8){t}\pnode(4.5,4){b}% node definitions
+ \pnodes(4.5,8){t}(4.5,4){b}% node definitions
\resistor[dipolestyle=zigzag,linewidth=0.5pt,labeloffset=1.8](t)(b)% spring
{\sffamily\small\begin{tabular}{c}\textbf{elasticity}\\(Hookean solid)\end{tabular}}% end spring
\dashpot[linewidth=0.5pt,labeloffset=1.8](4.5,5)(4.5,3)% dashpot
@@ -1369,10 +1238,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{NewDiode}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,4)
- \pnode(0,1){A}
- \pnode(3,1){B}
- \pnode(0,3){C}
- \pnode(3,3){D}
+ \pnodes(0,1){A}(3,1){B}(0,3){C}(3,3){D}
\newdiode(C)(D){$D_1$}
\newdiode[ison=false](A)(B){$D_2$}
\end{pspicture}
@@ -1385,10 +1251,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{NewZener}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,4)
- \pnode(0,1){A}
- \pnode(3,1){B}
- \pnode(0,3){C}
- \pnode(3,3){D}
+ \pnodes(0,1){A}(3,1){B}(0,3){C}(3,3){D}
\newZener(C)(D){$D_1$}
\newZener[ison=false](A)(B){$D_2$}
\end{pspicture}
@@ -1401,10 +1264,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{NewLED}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,4)
- \pnode(0,1){A}
- \pnode(3,1){B}
- \pnode(0,3){C}
- \pnode(3,3){D}
+ \pnodes(0,1){A}(3,1){B}(0,3){C}(3,3){D}
\newLED(C)(D){$D_1$}
\newLED[ison=false](A)(B){$D_2$}
\end{pspicture}
@@ -1417,10 +1277,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{NewSwitch}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,4)
- \pnode(0,1){A}
- \pnode(3,1){B}
- \pnode(0,3){C}
- \pnode(3,3){D}
+ \pnodes(0,1){A}(3,1){B}(0,3){C}(3,3){D}
\newSwitch(C)(D){$S_1$}
\newSwitch[ison=false](A)(B){$S_2$}
\end{pspicture}
@@ -1433,8 +1290,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{RFLine}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\newcapacitor(A)(B){$C_1$}
\end{pspicture}
\end{LTXexample}
@@ -1446,10 +1302,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{RFLine}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,4)
- \pnode(0,1){A}
- \pnode(3,1){B}
- \pnode(0,3){C}
- \pnode(3,3){D}
+ \pnodes(0,1){A}(3,1){B}(0,3){C}(3,3){D}
\newarmature[labelInside=1](C)(D){$M_{CC}$}
\newarmature[labelInside=2](A)(B){$G_{CC}$}
\end{pspicture}
@@ -1462,8 +1315,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{RFLine}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\vdc(A)(B){$V_{DC}$}
\end{pspicture}
\end{LTXexample}
@@ -1475,86 +1327,56 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\xLcs{RFLine}
\begin{LTXexample}[width=3.5cm]
\begin{pspicture}[showgrid=false](3,2)
- \pnode(0,1){A}
- \pnode(3,1){B}
+ \pnodes(0,1){A}(3,1){B}
\vac(A)(B){$V_{AC}$}
\end{pspicture}
\end{LTXexample}
+\clearpage
\section{Examples}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1.5,-1)(6,5)
-% [subgriddiv=1,griddots=10]
- % Node definitions
- \pnode(0,0){A}
- \pnode(0,3){B}
- \pnode(4.5,3){C}
- \pnode(4.5,0){D}
- % Dipole node connection
+ \pnodes(0,0){A}(0,3){B}(4.5,3){C}(4.5,0){D}
\Ucc[tension,dipoleconvention=generator](A)(B){$E$}
\multidipole(B)(C)%
\switch[intensitylabel=$i$]{$K$}%
\resistor[labeloffset=0,tensionlabel=$u_R$]{$R$}.
- \capacitor[tensionlabel={$u_C$},
- tensionlabeloffset=-1.2,tensionoffset=-1,
- directconvention=false](D)(C){$C$}
- % Wire to complete circuit
+ \capacitor[tensionlabel={$u_C$},tensionlabeloffset=-1.2,
+ tensionoffset=-1,directconvention=false](D)(C){$C$}
\wire(A)(D)
- % Ground
\ground(D)
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-0.5,0)(7,8)
-% [subgriddiv=1,griddots=10]
- % Node definitions
- \pnode(0.5,1){A}
- \pnode(3.5,1){B}
- \pnode(6.5,1){C}
- \pnode(0.5,4){D}
- \pnode(3.5,4){Minus}
- \pnode(3.5,3){Plus}
- \pnode(6.5,5){S}
- \pnode(3.5,5){E}
- % Dipole node connections
+ \pnodes(0.5,1){A}(3.5,1){B}(6.5,1){C}(0.5,4){D}(3.5,4){Minus}
+ (3.5,3){Plus}(6.5,5){S}(3.5,5){E}
\resistor(D)(Minus){$R_2$}
\capacitor(E)(S){$C$}
\resistor[parallel,parallelarm=2](E)(S){$R_1$}
\OA[intensity](Minus)(Plus)(S)
- % Wires
\wire(Minus)(E)
\wire(Plus)(B)
- % Tensions
\tension(A)(D){$u_E$}
\makeatletter % (special tricks see below)
\tension(C)(S@@){$u_S$}
\tension[linecolor=blue](Plus@@)(Minus@@){$\epsilon$}
\makeatother
- % Grounds
- \ground(A)
- \ground(B)
- \ground(C)
+ \ground(A) \ground(B) \ground(C)
\end{pspicture}
\end{LTXexample}
\begin{LTXexample}[pos=t]
\begin{pspicture}(-1,0)(7,8)
-% [subgriddiv=1,griddots=10]
- % Node definitions
- \pnode(1,1){A}
- \pnode(1,7){B}
- \pnode(3,1){C}
- \pnode(3,7){D}
- % Dipole node connections
+ \pnodes(1,1){A}(1,7){B}(3,1){C}(3,7){D}
\Ucc[tensionlabel=$E$](A)(B){}
\resistor(B)(D){$R$}
\coil(D)(C){$L$}
\capacitor[parallel,parallelarm=2.5](D)(C){$C$}
- % Wire
\wire(A)(C)
\end{pspicture}
\end{LTXexample}
@@ -1565,10 +1387,8 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\begin{LTXexample}[pos=t]
% \usepackage{amsmath} % example by Markus Graube
\begin{pspicture}(0,.5)(13,4)
- \pnode(1,1){I_U} \pnode(1,3){I_O} \pnode(2.5,1){C} \pnode(2.5,3){D}
- \pnode(4,1){K_LU} \pnode(4,3){K_LO} \pnode(7,1){K_RU} \pnode(7,3){K_RO}
- \pnode(9,3){E} \pnode(7.3,3){K_RO1}\pnode(7.3,1){K_RU1} \pnode(11,3){F}
- \pnode(12,1){O_U} \pnode(12,3){O_O}
+ \pnodes(1,1){I_U}(1,3){I_O}(2.5,1){C}(2.5,3){D}(4,1){K_LU}(4,3){K_LO}(7,1){K_RU}%
+ (7,3){K_RO}(9,3){E}(7.3,3){K_RO1}(7.3,1){K_RU1}(11,3){F}(12,1){O_U}(12,3){O_O}
\tension[labeloffset=-0.5](I_O)(I_U){$\underline{u}$}
\wire[arrows=o-](I_U)(C)
\wire[intensitylabel=$\underline{i}$, arrows=o-](I_O)(D)
@@ -1596,11 +1416,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\begin{LTXexample}[width=8.5cm]
\begin{pspicture}(-0.25,-0.25)(6,6)
-% [subgriddiv=1,griddots=10]
- % Node definitions
- \pnode(0,3){A}
- \pnode(3,3){B}
- \pnode(6,3){C}
+ \pnodes(0,3){A}(3,3){B}(6,3){C}
% Dipole node connections
\coil[intensitylabel=$i$](A)(B){$L$}
\coil[intensitylabel=$i'$,intensitycolor=green,%
@@ -1611,14 +1427,8 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\begin{LTXexample}[pos=t]
\begin{pspicture}(6,6)
-% [subgriddiv=1,griddots=10]
- % Node definitions
- \pnode(0,0){A}\pnode(6,0){B}
- \pnode(0.3,4){Cprime}\pnode(5.7,4){Dprime}
- \pnode(2.5,4){Gprime}\pnode(2.5,0){Hprime}
- \pnode(0,4){C}\pnode(6,4){D}
- \pnode(0.3,6){E}\pnode(5.7,6){F}
- \pnode(4,6){G}\pnode(4,0){H}
+ \pnodes(0,0){A}(6,0){B}(0.3,4){Cprime}(5.7,4){Dprime}(2.5,4){Gprime}%
+ (2.5,0){Hprime}(0,4){C}(6,4){D}(0.3,6){E}(5.7,6){F}(4,6){G}(4,0){H}
\multidipole(G)(H)%
\wire[intersect,
intersectA=C,intersectB=D]
@@ -1637,9 +1447,7 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\begin{LTXexample}[pos=t]
\begin{pspicture}(0,-0.25)(9,11)
- % Node definitions
- \pnode(0,0){A}\pnode(9,0){B}\pnode(0,6){C}\pnode(9,6){D}\pnode(4.5,1){E}\pnode(4.5,10.5){F}
- %
+ \pnodes(0,0){A}(9,0){B}(0,6){C}(9,6){D}(4.5,1){E}(4.5,10.5){F}
\switch(A)(C){$K$}
\multidipole(A)(B)\resistor{$R$}\battery[intensitylabel=$i$]{$V$}.
\wire(B)(D)
@@ -1746,44 +1554,33 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
The following example was written by Manuel Luque.
\begin{LTXexample}[pos=t]
- \begin{pspicture}(0,-0.5)(14,4)
-% [subgriddiv=1,griddots=10]
- \pnode(0,-0.50){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}
- \pnode(10,2.5){K}\pnode(10,1){L} \pnode(14,2.5){M}\pnode(12,1){N}
- \pnode(3,1){H'}\pnode(14,2.5){O} \pnode(14,1){P}\pnode(13.5,1){Q}
+\begin{pspicture}(0,-0.5)(14,4)
+ \pnodes(0,-0.50){B}(0,3){A}(2.5,3.5){C}(2.5,-0.5){D}(5,3){E}(6.5,1.5){F}(5,0){G}%
+ (3.5,1.5){H}(8,2.5){I}(8,1){J}(10,2.5){K}(10,1){L}(14,2.5){M}(12,1){N}%
+ (3,1){H'}(14,2.5){O}(14,1){P}(13.5,1){Q}
\transformer[transformeriprimarylabel=$i_1$,transformerisecondarylabel=$i_2$,
primarylabel=$n_1$,secondarylabel=$n_2$](A)(B)(C)(D){$T_1$}
{\psset{fillstyle=solid,fillcolor=black}
\diode(H)(E){}\diode(H)(G){} \diode(E)(F){}\diode(G)(F){}}
\capacitor[dipolestyle=chemical](I)(J){} \capacitor(K)(L){}
- \REG(K)(M)(N)%
- {\shortstack{\textsf{%
- \textbf{\large LM7805}}\\\textbf{+5V}}}
+ \REG(K)(M)(N){\shortstack{\textsf{\textbf{\large LM7805}}\\\textbf{+5V}}}
\ncangle{I}{F}\psline(I)(K) \ncangle{E}{C}\ncangle{G}{D}
\ncangle[arm=0]{P}{Q} \ncangle[arm=0]{H}{H'}
- \ground(H')\ground(J)\ground(L)\ground(N)
- \ground(Q)\qdisk(I){1.5pt}\qdisk(K){1.5pt}\qdisk(E){1.5pt}
- \qdisk(G){1.5pt}\qdisk(H){1.5pt}\qdisk(F){1.5pt}
- \pscircle[fillstyle=solid](A){0.075} \pscircle[fillstyle=solid](B){0.075}
- \pscircle[fillstyle=solid](P){0.075} \pscircle[fillstyle=solid](O){0.075}
- \end{pspicture}
+ \ground(H')\ground(J)\ground(L)\ground(N)\ground(Q)
+ \psdots(A)(B)(P)(O)(G)(H)(F)(I)(K)(E)
+\end{pspicture}
\end{LTXexample}
-\clearpage
-The following example was written by Lionel Cordesses.
+The following example was written by Lionel Cordesses.
+
\begin{LTXexample}[pos=t]
- \begin{pspicture}(11,3)
+\begin{pspicture}(11,3)
\psset{dipolestyle=elektor}
- \pnode(1,2){Vin}\pnode(0.5,2){S}\pnode(0.5,0){Sm}
- \pnode(2.5,2){A}\pnode(4.5,2){B}\pnode(6.5,2){C}
- \pnode(8,2){Cd}\pnode(8.5,2){D}\pnode(9.5,2){E}
- \pnode(2.5,0){Am}\pnode(4.5,0){Bm}\pnode(6.5,0){Cm}
- \pnode(8.5,0){Dm}\pnode(9.5,0){Em}
+ \pnodes(1,2){Vin}(0.5,2){S}(0.5,0){Sm}(2.5,2){A}(4.5,2){B}(6.5,2){C}(8,2){Cd}%
+ (8.5,2){D}(9.5,2){E}(2.5,0){Am}(4.5,0){Bm}(6.5,0){Cm}(8.5,0){Dm}(9.5,0){Em}
\Ucc[labeloffset=0.9](Sm)(S){$V_{in}$}\resistor(Vin)(A){$R$}
\capacitor(A)(Am){$C_1$} \capacitor(B)(Bm){$C_3$}
\capacitor[labeloffset=-0.7](D)(Dm){$C_n$}\resistor(E)(Em){$R$}
@@ -1791,23 +1588,17 @@ The following example was written by Lionel Cordesses.
\wire(Am)(Bm)\wire(Bm)(Cm)\wire(Cm)(Dm)\wire(Dm)(Em)\wire(D)(E)
\wire(Cd)(D)\psline[linestyle=dashed](C)(Cd)
\wire(S)(Vin)\wire(Sm)(Am)
- \pscircle*(D){2\pslinewidth} \pscircle*(Dm){2\pslinewidth}
- \pscircle*(A){2\pslinewidth} \pscircle*(Am){2\pslinewidth}
- \pscircle*(B){2\pslinewidth} \pscircle*(Bm){2\pslinewidth}
- \end{pspicture}
+ \psdots(D)(Dm)(A)(Am)(B)(Bm)
+\end{pspicture}
\end{LTXexample}
-\clearpage
The following example was written by Christian Hoffmann.
\begin{LTXexample}[pos=t]
\SpecialCoor
\begin{pspicture}(0,-1)(7,6.5)%
- \pnode(0,6){plus}
- \pnode(3,3){basis}
- \pnode([nodesep=-2] basis){schalter}
- \pnode(0,0){masse}
+ \pnodes(0,6){plus}(3,3){basis}([nodesep=-2] basis){schalter}(0,0){masse}
\wire[arrows=o-*](plus)(basis|plus)
\uput[l](plus){$U_0$}
\resistor[labeloffset=.8](basis|plus)(basis){$R_1$}
@@ -1830,18 +1621,16 @@ The following example was written by Christian Hoffmann.
Variable radius for \xLcs{circledipole}
\begin{LTXexample}[pos=t]
-\begin{pspicture}(8,5)
-\circledipole(0,1)(3,1){}
-\pnode(4,1){A}\pnode(7,1){B}
+\begin{pspicture}(\linewidth,3)
+\circledipole(0,1)(3,1){} \pnodes(4,1){A}(7,1){B}
\circledipole[radius=7mm,labeloffset=1cm](A)(B){Strommesser}\rput(5.5,1){\Huge I}
-\circledipole[radius=4mm,fillstyle=solid,fillcolor=blue!30](0,3)(3,3){C}
+\circledipole[radius=4mm,fillstyle=solid,fillcolor=blue!30](10,1)(13,1){C}
\end{pspicture}
\end{LTXexample}
-\clearpage
\section{Microwave symbols}
Since for microwave signal, the direction in which the signal spreads is very important,
There are dipoleinput or tripoleinput or quadripoleinput and arrowinput parameters.
@@ -1871,8 +1660,7 @@ argument.
\begin{LTXexample}[width=3.5cm,rframe={}]
\begin{pspicture}(4,2)
- \pnode(0.5,1){A}
- \pnode(3.5,1){B}
+ \pnodes(0.5,1){A}(3.5,1){B}
\multidipole(A)(B)\filter{BPF}%
\resistor{$R$}.
\end{pspicture}
@@ -1881,8 +1669,7 @@ argument.
\bigskip
\begin{LTXexample}[width=3.5cm,rframe={}]
\begin{pspicture}(4,2)
- \pnode(0.5,1){A}
- \pnode(3.5,1){B}
+ \pnodes(0.5,1){A}(3.5,1){B}
\multidipole(A)(B)\amplifier{LNA}%
\resistor{$R$}.
\end{pspicture}
@@ -1897,9 +1684,7 @@ argument.
\begin{LTXexample}[width=3.5cm,rframe={}]
\begin{pspicture}(3,2)
- \pnode(0.5,1){A}
- \pnode(1,1){B}
- \pnode(2.5,1){C}
+ \pnodes(0.5,1){A}(1,1){B}(2.5,1){C}
\newground(A)
\newground[groundstyle=old]{135}(B)
\newground[linecolor=blue,groundstyle=triangle]{180}(C)
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 d5f9905cd4d..14d5c2a7fae 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 @@
-%% $Id: pst-circ.tex 906 2014-04-15 19:37:50Z herbert $
+%% $Id: pst-circ.tex 909 2014-04-19 08:32:02Z herbert $
%% This is file `pst-circ.tex'
%%
%% IMPORTANT NOTICE:
@@ -26,8 +26,8 @@
\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{2.07}
-\def\filedate{2014/04/15}
+\def\fileversion{2.08}
+\def\filedate{2014/04/19}
\message{`pst-circ' v\fileversion (hv)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -1043,6 +1043,17 @@
\ignorespaces%
}
%
+\def\pst@draw@battery{%
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.10,-0.5)(-0.10,0.5)
+ \psline[arrows=-,linewidth=3\pslinewidth](0.10,-0.25)(0.10,0.25)
+ \pnode(-0.1,0){dipole@1}
+ \pnode(0.1,0){dipole@2}
+ \ifPst@variable%
+ \psline{->}(-0.75,-0.5)(0.75,0.5)%
+ \fi
+ }
+%
+%
\newif\ifPst@temp
\def\transistor{\def\pst@par{}\pst@object{transistor}}
\def\transistor@i(#1){%
@@ -1782,30 +1793,30 @@
\psframe[linewidth=1.5\pslinewidth](-1,-0.75)(1,0.75)
\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)
+% USUAL AOP
+ \pspolygon[arrows=-,linewidth=1.5\pslinewidth](-1,-1)(-1,1)(1,0)(-1,-1)
+ %\pspolygon[arrows=-](-1,-0.75)(-1,0.75)(1,0)(-1,-0.75)
+
+% Supply pins Position
\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){$-$}
+ \psline{-}(0,0.5)(0,0.75)%\uput[90](0,1){$+$}
+ %\psline{-o}(0,0.375)(0,0.75)\uput[90](0,0.75){$+$}
+ \psline{-}(0,-0.5)(0,-0.75)%\uput[-90](0,-1){$-$}
+ %\psline{-o}(0,-0.375)(0,-0.75)\uput[-90](0,-0.75){$-$}
\fi
\fi
- \pnode(-1,0.25){\ifPst@OAinvert Minus@\else Plus@\fi}
- \pnode(-1,-0.25){\ifPst@OAinvert Plus@\else Minus@\fi}
+% Input Pins Position
+ \pnode(-1,0.5){\ifPst@OAinvert Minus@\else Plus@\fi}
+ \pnode(-1,-0.5){\ifPst@OAinvert Plus@\else Minus@\fi}
\pnode(1,0){S@}
- \uput{0.1}[0](-1,0.25){\ifPst@OAinvert$-$\else$+$\fi}
- \uput{0.1}[0](-1,-0.25){\ifPst@OAinvert$+$\else$-$\fi}
+% + and - Position
+ \uput{0.1}[0](-1,0.5){\ifPst@OAinvert$-$\else$+$\fi}
+ %\uput{0.1}[0](-1,0.25){\ifPst@OAinvert$-$\else$+$\fi}
+ \uput{0.1}[0](-1,-0.5){\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@1}
- \pnode(0.1,0){dipole@2}
- \ifPst@variable%
- \psline{->}(-0.75,-0.5)(0.75,0.5)%
- \fi
- }
-%
\def\pst@draw@coil{%
\ifx\psk@Dstyle\pst@Dstyle@curved
\pscurve[arrows=-](-0.7,0)(-0.6,0.3)(-0.35,0)(-0.4,-0.2)
@@ -2721,7 +2732,6 @@
%
\def\mixer{\pst@object{mixer}}
\def\mixer@i(#1)(#2)(#3)#4#5{%
- \addbefore@par{dimen=middle}%
\pst@getcoor{#1}\pst@tempa
\pst@getcoor{#2}\pst@tempb
\pst@getcoor{#3}\pst@tempc
@@ -2735,7 +2745,14 @@
/XC X1 X2 add 2 div def
/YC Y2 def
XC YC){C@}
- \begingroup\use@par
+ \begingroup
+ \use@keep@par
+ \ifx\psk@tripole@style\pst@tripole@style@top
+ \addbefore@par{labeloffset=-0.9,dimen=middle}%
+ \else
+ \addbefore@par{labeloffset=0.9,dimen=middle}%
+ \fi
+ \use@par
\rput(C@){\pst@draw@mixer{#3}{#4}{#5}}
\endgroup
\ifx\psk@Tinput\pst@Tinput@left%
@@ -2762,10 +2779,9 @@
\let\psk@fillstyle\psfs@none
\psline[linewidth=1.5\pslinewidth](-0.3535,-0.3535)(0.3535,0.3535)
\psline[linewidth=1.5\pslinewidth](-0.3535,0.3535)(0.3535,-0.3535)
- \pnode(-0.5,0){Tport@left}%
- \pnode(0.5,0){Tport@right}%
+ \pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}
+ \pcline[linestyle=none,offset=\psk@label@offset](Tport@left)(Tport@right)\ncput{#2}
\ifx\psk@tripole@style\pst@tripole@style@top%
- \rput[t](0,-0.6){#2}
\pnode(0,0.5){Tport@center}
\ifPst@inputarrow
\ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=90]{#1}{Tport@center}
@@ -2773,7 +2789,6 @@
\ncangle[arrows=-,arm=0.5,angleB=90]{#1}{Tport@center}
\fi
\else
- \rput[b](0,0.6){#2}
\pnode(0,-0.5){Tport@center}
\ifPst@inputarrow
\ncangle[arrows=->,arrowinset=0,arm=0.5,angleB=-90]{#1}{Tport@center}
@@ -5223,7 +5238,6 @@
%
\def\splitter{\pst@object{splitter}}
\def\splitter@i(#1)(#2)(#3)#4#5{%
- \addbefore@par{dimen=middle}%
\pst@getcoor{#1}\pst@tempa
\pst@getcoor{#2}\pst@tempb
\pst@getcoor{#3}\pst@tempc
@@ -5237,7 +5251,14 @@
/XC X1 X2 add 2 div def
/YC Y2 def
XC YC){C@}
- \begingroup\use@par
+ \begingroup
+ \use@keep@par
+ \ifx\psk@tripole@style\pst@tripole@style@top
+ \addbefore@par{labeloffset=-0.9,dimen=middle}%
+ \else
+ \addbefore@par{labeloffset=0.9,dimen=middle}%
+ \fi
+ \use@par
\rput(C@){\pst@draw@splitter{#3}{#4}{#5}}
\ifx\psk@Tinput\pst@Tinput@left%
\ifPst@inputarrow
@@ -5277,12 +5298,11 @@
\fi
\fi
\pnodes(-0.5,0){Tport@left}(0.5,0){Tport@right}%
+ \pcline[offset=\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
\ifx\psk@tripole@style\pst@tripole@style@top%
- \pcline[offset=-\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
\pnode(0,0.5){Tport@center}
\ncangle[arrows=-,arm=0.5,angleB=90]{#1}{Tport@center}
\else
- \pcline[offset=\psk@label@offset,linestyle=none](Tport@left)(Tport@right)\ncput{#2}%
\pnode(0,-0.5){Tport@center}
\ncangle[arrows=-,arm=0.5,angleB=270]{#1}{Tport@center}
\fi%
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index d6b1bbde5b7..57e94563d81 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -28,7 +28,7 @@ binpattern f bin/${ARCH}/texluac
binpattern f bin/win32/lua*.dll
tlpsetvar no_luajit_platforms \
- alpha-linux,armhf-linux,\
+ alpha-linux,\
i386-cygwin,i386-netbsd,i386-solaris,\
mips-irix,mipsel-linux,powerpc-linux,sparc-solaris,x86_64-solaris
#