From f54d59c4fcbb03552550891dca04939761a8d37a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Jan 2010 23:32:15 +0000 Subject: pst-circ 1.52 update (17jan10) git-svn-id: svn://tug.org/texlive/trunk@16757 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/pst-circ/Changes | 5 + .../doc/generic/pst-circ/pst-circ-doc.pdf | Bin 531073 -> 519815 bytes .../doc/generic/pst-circ/pst-circ-doc.tex | 159 ++++++++++++++++++++- 3 files changed, 158 insertions(+), 6 deletions(-) (limited to 'Master/texmf-dist/doc/generic/pst-circ') 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 Binary files a/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf and b/Master/texmf-dist/doc/generic/pst-circ/pst-circ-doc.pdf 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] -- cgit v1.2.3