summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-01-17 23:32:15 +0000
committerKarl Berry <karl@freefriends.org>2010-01-17 23:32:15 +0000
commitf54d59c4fcbb03552550891dca04939761a8d37a (patch)
treefc0260371a1e47e746d8fba06f49961b8c15b5d5 /Master
parent3ef45f121b2400ef5c6896eee0cf334828dfd5b9 (diff)
pst-circ 1.52 update (17jan10)
git-svn-id: svn://tug.org/texlive/trunk@16757 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.pdfbin531073 -> 519815 bytes
-rw-r--r--Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.tex159
-rw-r--r--Master/texmf-dist/source/generic/pst-circ/Makefile2
-rw-r--r--Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex202
5 files changed, 343 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/generic/pst-circ/Changes b/Master/texmf-dist/doc/generic/pst-circ/Changes
index a89f6d49004..19be26ece4a 100644
--- a/Master/texmf-dist/doc/generic/pst-circ/Changes
+++ b/Master/texmf-dist/doc/generic/pst-circ/Changes
@@ -1,3 +1,8 @@
+1.52 2010-01-15 - add photo diode symbol
+ quadripol symbol
+ RelayNOP symbol (Relay normally open)
+ Suppressor symbol
+ Arrestor symbol
1.51 2009-02-21 - add SQUID symbol
1.50 2009-02-01 - add RFLine symbol
- internal changes to the code
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 9a7bd221d6e..0ae3fddbc53 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 144df1a3960..0a3f61c61d2 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,13 +1,14 @@
-%% $Id: pst-circ-doc.tex 96 2009-02-21 09:18:47Z herbert $
+%% $Id: pst-circ-doc.tex 257 2010-01-15 17:18:51Z herbert $
\documentclass[11pt,english,BCOR10mm,DIV12,bibliography=totoc,parskip=false,smallheadings
headexclude,footexclude,oneside]{pst-doc}
\usepackage[utf8]{inputenc}
\usepackage{pst-circ}
+\usepackage{amsmath}
\let\pstCircFV\fileversion
-\lstset{pos=l,wide=false,language=PSTricks,
+\lstset{explpreset={pos=l,wide=false,rframe=},language=PSTricks,
morekeywords={multidipole,parallel},basicstyle=\footnotesize\ttfamily}
%
-\newcommand{\CircPackage}{\textsf{`pst-circ'}}
+\newcommand\CircPackage{\LPack{pst-circ}}
\makeatletter
\renewenvironment{description}
{\list{}{\labelwidth\z@ \itemindent-\leftmargin
@@ -16,6 +17,53 @@
{\endlist}
\makeatother
+\def\bgImage{\resizebox{0.75\linewidth}{!}{%
+\begin{pspicture}(1,2)(19,9)
+ \pnode(2,8){A} \antenna{90}(A)
+ \rput(4,8){\rnode{B}{\psframebox{\begin{tabular}{c}Ferrite\\Switch\end{tabular}}}}
+ \ncline{A}{B}
+ %%% Branche Calibration
+ \pnode(4,6){C} \pnode(4,4){D} \pnode(5,5){E}
+ \circulator[tripolestyle=isolator,tripoleconfig=right]{90}(C)(D)(E){Isolator}{}
+ \ncline{B}{C}
+ \pnode(3,3){F} \pnode(5,3){G}
+ \resistor[unit=0.5,dipolestyle=zigzag,variable=true](F)(G){}
+ \pnode(4,3){H}
+ \ncline{D}{H}
+ \rput[t](4,2.75){%
+ \begin{tabular}{c}
+ Hot and Cold\\
+ loads for calibration
+ \end{tabular}}
+ %%% Branche reception
+ \pnode(6,8){R1} \pnode(8,8){R2} \pnode(7,7){X1}
+ \circulator[tripolestyle=isolator,tripoleconfig=right]{180}(R1)(R2)(X1){Isolator}{}
+ \ncline{B}{R1}
+ \pnode(10,8){R3} \pnode(9,7){X2}
+ \mixer[inputarrow=true](R2)(R3)(X2){Mixer}{}
+ \pnode(9,6){X3}
+ \oscillator[output=top](X3){LO}{}
+ \pnode(12,8){R4}
+ \ncline{R3}{R4}
+ \naput{0.5~GHZ}
+ \pnode(14,8){R5}
+ \filter(R4)(R5){BPF}%
+ \pnode(16,8){R6}
+ \amplifier[inputarrow=true](R5)(R6){IF~Amp}
+ \pnode(18,8){R7}
+ \detector[inputarrow=true](R6)(R7){Detector}
+ \pnode(18,4){R8}
+ \amplifier[inputarrow=true,labeloffset=-1](R7)(R8){Amp}
+ \pscircle[fillstyle=solid,fillcolor=white](18,4){0.1}
+ \rput[t](18,3.9){%
+ \begin{tabular}{c}
+ Output\\
+ for processing
+ \end{tabular}}
+\end{pspicture}}
+}
+
+
\begin{document}
\title{\texttt{pst-circ}}
@@ -54,7 +102,9 @@ Thanks to: \\
\mbox{Jean-C\^ome Charpentier},
\mbox{Patrick Drechsler},
\mbox{Amit Finkler},
+ \mbox{Markus Graube},
\mbox{Henning Heinze},
+ \mbox{Michael Lauterbach}
\mbox{Manuel Luque},
\mbox{Ted Pavlic},
\mbox{Alan Ristow},
@@ -270,6 +320,35 @@ objects you are drawing. You'll find a list in Section~\ref{sec:para} on p.~\pag
\end{pspicture}
\end{LTXexample}
+\xLcs{RelayNOP}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,3)
+ \pnode(0,0){A}
+ \pnode(3,0){B}% Relay normally open
+ \RelayNOP[labeloffset=1.6](A)(B){RelayNOP}
+\end{pspicture}
+\end{LTXexample}
+
+\xLcs{Suppressor}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+ \pnode(0,1){A}
+ \pnode(3,1){B}% Suppressor (Diode)
+ \Suppressor[labeloffset=0.5](A)(B){Supressor}
+\end{pspicture}
+\end{LTXexample}
+
+\xLcs{Arrestor}
+\begin{LTXexample}[width=3.5cm]
+\begin{pspicture}(3,2)
+ \pnode(0,1){A}
+ \pnode(3,1){B}% Arrestor (Lightning protection)
+ \Arrestor(A)(B){Arrestor}
+\end{pspicture}
+\end{LTXexample}
+
+
+
\bigskip
\subsubsection{Tripole macros}
@@ -308,6 +387,27 @@ well chosen, so don't try to use tripole macros in strange situations!
\end{pspicture}
\end{LTXexample}
+\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}
+\transistor[TRot=180](A)(B)(C)
+\end{pspicture}
+\end{LTXexample}
+
+\xLkeyword{TRot}
+\begin{LTXexample}[width=5.5cm]
+\begin{pspicture}[showgrid=true](5,5)
+\pnode(1,3){b}
+\transistor[TRot=90](b){emitter}{collector}
+\transistor[TRot=45](4,4){emitter}{collector}
+\transistor[TRot=180](1,1){emitter}{collector}
+\transistor[TRot=180,transistorinvert=true]%
+ (4,1){emitter}{collector}
+\end{pspicture}
+\end{LTXexample}
+
\xLkeyset{transistortype=PNP}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(3,4)
@@ -383,6 +483,17 @@ well chosen, so don't try to use tripole macros in strange situations!
\bigskip
\subsubsection{Quadrupole macros}
+\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}
+ \quadripole(A)(B)(C)(D){Text}
+\end{pspicture}
+\end{LTXexample}
+
\xLcs{transformer}
\begin{LTXexample}[width=5.5cm]
\begin{pspicture}(5,5)
@@ -406,6 +517,8 @@ well chosen, so don't try to use tripole macros in strange situations!
\end{LTXexample}
+
+
\subsubsection{Multidipole}
\Lcs{multidipole} is a macro that allows multiple dipoles to be drawn between two specified nodes.
@@ -445,9 +558,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,1){A}\pnode(3,1){B}\wire(A)(B)
+ \pnode(0,0){A}\pnode(3,0){B}\wire[arrows=o-*](A)(B)
\end{pspicture}
\end{LTXexample}
@@ -1238,6 +1350,41 @@ the coils are drawn as rectangles and the resistor as a \Lkeyword{zigzag}.
\end{pspicture}
\end{LTXexample}
+
+
+
+\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}
+ \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)
+ \capacitor[labeloffset=.9](C)(D){$C_B$}
+ \qdisk(C){2pt} \qdisk(D){2pt}
+ \wire(C)(K_LU)
+ \wire[intensitylabel=$\underline{i}_W$](D)(K_LO)
+ \quadripole(K_LO)(K_LU)(K_RO)(K_RU){\parbox{3cm}{%
+ \begin{align*}
+ \underline{u} &= \frac{\underline{p}}{X} \\[2ex]
+ \underline{i}_W &= X \underline{q}_U
+ \end{align*}}}
+ \wire(K_RO)(K_RO1)
+ \tension[labeloffset=0.5](K_RO1)(K_RU1){$\underline{p}$}
+ \coil[dipolestyle=rectangle](K_RO)(E){$M_{a,K}$}
+ \capacitor(E)(F){$N_{a,K}$}
+ \wire[intensitylabel=$\underline{q}_U$,arrows=-o](F)(O_O)
+ \wire[arrows=-o](K_RU)(O_U)
+ \tension[labeloffset=0.5](O_O)(O_U){$\underline{p}_U$}
+\end{pspicture}
+\end{LTXexample}
+
+
+
+
\begin{LTXexample}[width=8.5cm]
\begin{pspicture}(-0.25,-0.25)(6,6)
% [subgriddiv=1,griddots=10]
diff --git a/Master/texmf-dist/source/generic/pst-circ/Makefile b/Master/texmf-dist/source/generic/pst-circ/Makefile
index dfa5688cf48..599459285df 100644
--- a/Master/texmf-dist/source/generic/pst-circ/Makefile
+++ b/Master/texmf-dist/source/generic/pst-circ/Makefile
@@ -14,7 +14,7 @@ ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Chan
TDS = ~/PSTricks/PSTricks-TDS
-all : doc clean
+all : doc clean tds
doc: $(MAIN).pdf
$(MAIN).pdf : $(MAIN).ps
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 e3977b6e1cd..17c3227d19f 100644
--- a/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
+++ b/Master/texmf-dist/tex/generic/pst-circ/pst-circ.tex
@@ -7,8 +7,8 @@
%%
%% Original idea: A.Premoli I.Maio, M.Luque,
%%
-%% Christophe Jorssen <CJ@PSTricks.de>
-%% Herbert Voss <voss@PSTricks.de>
+%% Christophe Jorssen
+%% Herbert Voss <hvoss@tug.org>
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -24,13 +24,13 @@
%
% Require PSTricks and pst-node packages
%
-\ifx\PSTricksLoaded\endinput\else\input pstricks.tex\fi
-\ifx\PSTnodeLoaded\endinput\else\input pst-node.tex\fi
-\ifx\PSTXKeyLoaded\endinput\else\input pst-xkey \fi
+\ifx\PSTricksLoaded\endinput \else\input pstricks.tex\fi
+\ifx\PSTnodeLoaded\endinput \else\input pst-node.tex\fi
+\ifx\PSTXKeyLoaded\endinput \else\input pst-xkey \fi
\ifx\PSTMultidoLoaded\endinput\else\input multido.tex\fi
%
-\def\fileversion{1.51}
-\def\filedate{2009/02/20}
+\def\fileversion{1.52}
+\def\filedate{2010/01/15}
\message{`pst-circ' v\fileversion (CJ,hv,pd)}
%
\edef\PstAtCode{\the\catcode`\@}
@@ -68,6 +68,7 @@
\def\pst@Dstyle@varistor{varistor}
\def\pst@Dstyle@thyristor{thyristor}
\def\pst@Dstyle@GTO{GTO}
+\def\pst@Dstyle@photo{photo}
\def\pst@Dstyle@triac{triac}
\def\pst@Dstyle@Z{Z}
% end Herbert 2003-07-17
@@ -168,7 +169,6 @@
\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}
@@ -270,6 +270,20 @@
\def\pst@LED[#1](#2)(#3)#4{{%
\pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@LED}\ignorespaces}
%
+%-mla-----------------------------------------------
+\def\Suppressor{\@ifnextchar[{\pst@Suppressor}{\pst@Suppressor[]}}
+\def\pst@Suppressor[#1](#2)(#3)#4{{%
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Suppressor}\ignorespaces}
+%
+\def\Arrestor{\@ifnextchar[{\pst@Arrestor}{\pst@Arrestor[]}}
+\def\pst@Arrestor[#1](#2)(#3)#4{{%
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@Arrestor}\ignorespaces}
+%
+\def\RelayNOP{\@ifnextchar[{\pst@RelayNOP}{\pst@RelayNOP[]}}
+\def\pst@RelayNOP[#1](#2)(#3)#4{{%
+ \pst@draw@dipole{#1}{#2}{#3}{#4}\pst@draw@RelayNOP}\ignorespaces}
+%-mla----------------------------------------------
+%
% pd start ====================================================
\def\dashpot{\@ifnextchar[{\pst@dashpot}{\pst@dashpot[]}}
\def\pst@dashpot[#1](#2)(#3)#4{{%
@@ -666,6 +680,41 @@
\ignorespaces%
}
%
+\def\quadripole{\pst@object{quadripole}}% Markus Graube
+\def\quadripole@i(#1)(#2)(#3)(#4)#5{%
+ \addbefore@par{dimen=middle,arm=0}%
+ \begin@ClosedObj%
+ \pst@getcoor{#1}\pst@tempa
+ \pst@getcoor{#2}\pst@tempb
+ \pst@getcoor{#3}\pst@tempc
+ \pst@getcoor{#4}\pst@tempd
+ \pnode(!%
+ \pst@tempa /Y1 exch \pst@number\psyunit div def
+ /X1 exch \pst@number\psxunit div def
+ \pst@tempb /Y2 exch \pst@number\psyunit div def
+ /X2 exch \pst@number\psxunit div def
+ \pst@tempc /Y3 exch \pst@number\psyunit div def
+ /X3 exch \pst@number\psxunit div def
+ \pst@tempc /Y4 exch \pst@number\psyunit div def
+ /X4 exch \pst@number\psxunit div def
+ /XC X1 X2 lt {X2} {X1} ifelse X3 X4 lt {X3} {X4} ifelse add 2 div def
+ /YC Y1 Y3 lt {Y1} {Y3} ifelse Y2 Y4 lt {Y2} {Y4} ifelse add 2 div def
+ XC YC){C@}
+ \rput(C@){#5}
+ \rput(C@){\psframe[linewidth=1.5\pslinewidth](-1.5,-1.2)(1.5,1.2)
+ \pnode(-1.5,1){inup@} \pnode(-1.5,-1){indown@}
+ \pnode(1.5,-1){outdown@} \pnode(1.5,1){outup@}}
+ \ncangle[arrows=-,arm=0.5,angleB=180]{#1}{inup@}
+ \ncangle[arrows=-,arm=0.5,angleB=180]{#2}{indown@}
+ \ncangle[arrows=-,arm=0.5,angleB=0]{#3}{outup@}
+ \ncangle[arrows=-,arm=0.5,angleB=0]{#4}{outdown@}
+ \ncline[arrows=-,linestyle=none,fillstyle=none]{indown@}{outdown@}
+ \pcline[linestyle=none](#1)(#3)% for the end arrows
+ \pcline[linestyle=none](#2)(#4)% for the end arrows
+ \end@ClosedObj%
+ \ignorespaces%
+}
+%
% The logical circuits part
%
\def\logic{\@ifnextchar[{\pst@draw@logic}{\pst@draw@logic[]}}
@@ -775,10 +824,13 @@
\else\ifx\amplifier #4\let\pscirc@next\pst@multidipole@amplifier%
\else\ifx\detector #4\let\pscirc@next\pst@multidipole@detector% 22
\else\ifx\SQUID #4\let\pscirc@next\pst@multidipole@SQUID% 23
+ \else\ifx\Suppressor #4\let\pscirc@next\pst@multidipole@Suppressor %%% mla change
+ \else\ifx\Arrestor #4\let\pscirc@next\pst@multidipole@Arrestor %%% mla change 25
+ \else\ifx\RelayNOP #4\let\pscirc@next\pst@multidipole@RelayNOP %%% mla 26
\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\fi% 21..23
+ \fi\fi\fi\fi\fi\fi% 21..26
\advance\pst@count@i\@ne
\advance\pst@count@iii\@ne
\pscirc@next}
@@ -807,10 +859,13 @@
\else\ifx\amplifier#1\let\pscirc@next\pst@multidipole@amplifier%
\else\ifx\detector #1\let\pscirc@next\pst@multidipole@detector% 22
\else\ifx\SQUID #1\let\pscirc@next\pst@multidipole@SQUID% 23
+ \else\ifx\Suppressor #1\let\pscirc@next\pst@multidipole@Suppressor%% mla change
+ \else\ifx\Arrestor #1\let\pscirc@next\pst@multidipole@Arrestor%% mla change 25
+ \else\ifx\RelayNOP #1\let\pscirc@next\pst@multidipole@RelayNOP%% mla change 26
\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\fi
+ \fi\fi\fi\fi\fi\fi
\advance\pst@count@i\@ne
\advance\pst@count@iii\@ne
\pscirc@next
@@ -1035,6 +1090,65 @@
\pst@multidipole@
}
%
+%mla change
+\def\pst@multidipole@Suppressor{\@ifnextchar[{\pst@multidipole@Suppressor@}{\pst@multidipole@Suppressor@[]}}
+\def\pst@multidipole@Suppressor@[#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\Suppressor[#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@
+}
+%
+\def\pst@multidipole@Arrestor{\@ifnextchar[{\pst@multidipole@Arrestor@}{\pst@multidipole@Arrestor@[]}}
+\def\pst@multidipole@Arrestor@[#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\Arrestor[#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@
+}
+%
+\def\pst@multidipole@RelayNOP{\@ifnextchar[{\pst@multidipole@RelayNOP@}{\pst@multidipole@RelayNOP@[]}}
+\def\pst@multidipole@RelayNOP@[#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\RelayNOP[#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@
+}
+%%%mla change end
+%
\def\pst@multidipole@lamp{\@ifnextchar[{\pst@multidipole@lamp@}{\pst@multidipole@lamp@[]}}
%
\def\pst@multidipole@lamp@[#1]#2{%
@@ -1433,20 +1547,24 @@
\psline[arrows=-,linewidth=1.5\pslinewidth](-0.25,-0.4)(-0.25,0.4)
\psline[arrows=-,linewidth=1.5\pslinewidth](0.25,-0.4)(0.25,0.4)
\psline[arrows=-,linewidth=\pslinewidth](0.25,-0.2)(0.5,-0.3)(0.5,-0.6)
- \else
+ \else%
\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)
\ifx\psk@Dstyle\pst@Dstyle@thyristor
\psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.1)(0,-0.35)
- \fi
+ \fi%
\ifx\psk@Dstyle\pst@Dstyle@GTO
\psline[arrows=-,linewidth=1.5\pslinewidth](-0.1,-0.12)(-0.1,-0.35)
\psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.1)(0,-0.35)
- \fi
- \fi
- \pnode(-0.25,0){dipole@1}
- \pnode(0.25,0){dipole@2}
- }
+ \else
+ \ifx\psk@Dstyle\pst@Dstyle@photo
+ \multips(-0.15,0.3)(0.25,0){2}{\psline[arrows=<-](0.25,0.22)}%
+ \fi%
+ \fi%
+ \fi%
+ \pnode(-0.25,0){dipole@1}%
+ \pnode(0.25,0){dipole@2}%
+}
%
\def\pst@draw@Zener{%
\pspolygon[linewidth=1.5\pslinewidth](-0.25,-0.2)(-0.25,0.2)(0.25,0)
@@ -1459,6 +1577,54 @@
\pnode(0.25,0){dipole@2}
}
%
+%-------------------mla change
+\def\pst@draw@Suppressor{%
+ \pspolygon[linewidth=1.5\pslinewidth](-0.5,-0.2)(-0.5,0.2)(0.0,0.0)
+ \pspolygon[linewidth=1.5\pslinewidth](0.5,-0.2)(0.5,0.2)(0.0,0.0)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.5,0.0)(0.5,0.0)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.15,0.35)(0.0,0.25)(0.0,-0.25)(0.15,-0.35)
+% \ifx\psk@Dstyle\pst@Dstyle@Z
+% \psline[arrows=-,linewidth=1.5\pslinewidth](0.1,0.35)(0.25,0.25)(0.25,-0.25)(0.4,-0.35)
+% \else
+% \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.25)(0.25,-0.25)(0,-0.25)
+% \fi
+ \pnode(-0.5,0.0){dipole@1}
+ \pnode(0.50,0.0){dipole@2}
+}
+\def\pst@draw@Arrestor{%
+ \pscircle[linewidth=1.5\pslinewidth](0.0,0.0){0.3}
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.1,-0.12)(-0.1,0.12)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](0.1,-0.12)(0.1,0.12)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](0,-0.12)(0.0,0.3)
+% \ifx\psk@Dstyle\pst@Dstyle@Z
+% \psline[arrows=-,linewidth=1.5\pslinewidth](0.1,0.35)(0.25,0.25)(0.25,-0.25)(0.4,-0.35)
+% \else
+% \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.25)(0.25,-0.25)(0,-0.25)
+% \fi
+ \pnode(-0.3,0.0){dipole@1}
+ \pnode(0.3,0.0){dipole@2}
+}
+%
+\def\pst@draw@RelayNOP{%
+% \pscircle[linewidth=1.5\pslinewidth](0.0,0.0){0.3}
+ \psframe[arrows=-,linewidth=1.5\pslinewidth](-0.2,0.5)(0.2,1.3)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.2,1.3)(0.2,0.5)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.2,0.9)(-0.5,0.9)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](0.2,0.9)(0.5,0.9)
+%
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.5,0.0)(-0.2,0.0)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](-0.2,0.0)(0.2,0.1)
+ \psline[arrows=-,linewidth=1.5\pslinewidth](0.2,0.0)(0.5,0.0)
+ \psline[linestyle=dashed,arrows=-,linewidth=1.5\pslinewidth](0.0,0.5)(0.0,0.1)
+% \ifx\psk@Dstyle\pst@Dstyle@Z
+% \psline[arrows=-,linewidth=1.5\pslinewidth](0.1,0.35)(0.25,0.25)(0.25,-0.25)(0.4,-0.35)
+% \else
+% \psline[arrows=-,linewidth=1.5\pslinewidth](0.25,0.25)(0.25,-0.25)(0,-0.25)
+% \fi
+ \pnode(-0.5,0){dipole@1}
+ \pnode(0.5,0){dipole@2}
+}
+%%%----------------------mla change end
\def\pst@draw@lamp{%
\pscircle[linewidth=1.5\pslinewidth]{0.5}
\psline[arrows=-,linewidth=1.5\pslinewidth](0.5;45)(0.5;225)
@@ -1777,7 +1943,7 @@
% end hv 2003-07-28
%
\def\pst@draw@wire[#1](#2)(#3){{%
- \psset{#1}%
+ \psset{#1}
\ifx\psk@I@label\@empty\else\psset{intensity=true}\fi
\ifx\psk@Dconvention\pst@Dconvention@generator
\Pst@Dconventiontrue