diff options
author | Karl Berry <karl@freefriends.org> | 2009-05-22 23:38:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-05-22 23:38:38 +0000 |
commit | ffb491abf8a482d1a6ba3ec359cda6cc63e4ec4f (patch) | |
tree | c51e8d49073f0f5fdcc420e10494a368be5ef759 /Master/texmf-dist/doc/latex/circuitikz | |
parent | dff4dbf8de3762428b08cd3164f27a2e6bd7ab4c (diff) |
circuitikz 0.2.2 (20may09)
git-svn-id: svn://tug.org/texlive/trunk@13393 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/circuitikz')
-rw-r--r-- | Master/texmf-dist/doc/latex/circuitikz/CHANGELOG | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/circuitikz/README | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf | bin | 262410 -> 262939 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex | 71 |
4 files changed, 59 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG b/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG index 619f95681d8..64227cc2576 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG +++ b/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG @@ -1,5 +1,9 @@ CircuiTikz - Changelog +* Version 0.2.2 - 20090520 + - Added the shape for lamps. + - Added options \texttt{europeanresistor}, \texttt{europeaninductor}, \texttt{americanresistor} and \texttt{americaninductor}, with corresponding styles. + - FIXED: error in transistor arrow positioning and direction under negative \texttt{xscale} and \texttt{yscale}. * Version 0.2.1 - 20090503 - Op-amps added - added options arrowmos and noarrowmos, to add arrows to pmos and nmos diff --git a/Master/texmf-dist/doc/latex/circuitikz/README b/Master/texmf-dist/doc/latex/circuitikz/README index a03af7bda4a..883d4728dc2 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/README +++ b/Master/texmf-dist/doc/latex/circuitikz/README @@ -1,4 +1,4 @@ -This is CircuiTikz, version 0.2.1. +This is CircuiTikz, version 0.2.2. This package provides a set of macros for naturally typesetting electrical and (somewhat less naturally, perhaps) electronical networks. diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf Binary files differindex 0b687addc0b..eeb44b5d24b 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf +++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex index 8ae502a7706..ffd294534d1 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex @@ -6,7 +6,7 @@ \usepackage{hyperref} \hypersetup{ bookmarks=false, % show bookmarks bar? - pdftitle={CircuitTikZ v. 0.2.1 - manual}, % title + pdftitle={CircuitTikZ v. 0.2.2 - manual}, % title pdfauthor={Massimo Redaelli}, % author pdfsubject={CircuitTikZ manual}, % subject of the document pdfkeywords={}, % list of keywords @@ -32,7 +32,7 @@ \lstset{frameround=fttt} \lstloadlanguages{TeX} -\title{Circui\TikZ \\{\large version 0.2.1}} +\title{Circui\TikZ \\{\large version 0.2.2}} \author{Massimo A. Redaelli} \date{\today} @@ -70,7 +70,6 @@ particular purpose. \subsection{Feedback} Much appreciated: \href{mailto:mredaelli@elet.polimi.it}{\texttt{mredaelli@elet.polimi.it}}. Although I don't guarantee quick answers. - \subsection{Requirements} \begin{itemize} \item \texttt{tikz}, version $\ge 2$; @@ -90,9 +89,13 @@ None, as far as I know. \item \texttt{europeanvoltage}: uses arrows to define voltages, and uses european-style voltage sources; \item \texttt{americanvoltage}: uses $-$ and $+$ to define voltages, and uses american-style voltage sources; \item \texttt{europeancurrent}: uses european-style current sources; - \item \texttt{americanvoltage}: uses american-style current sources; - \item \texttt{european}: equivalent to \texttt{europeancurrent} and \texttt{europeanvoltage}; - \item \texttt{american}: equivalent to \texttt{americancurrent} and \texttt{americanvoltage}; + \item \texttt{americancurrent}: uses american-style current sources; + \item \texttt{europeanresistor}: uses rectangular empty shape for resistors, as per european standards; + \item \texttt{americanresistor}: uses zig-zag shape for resistors, as per american standards; + \item \texttt{europeaninductor}: uses rectangular filled shape for inductors, as per european standards; + \item \texttt{americaninductor}: uses coil shape for inductors, as per american standards; + \item \texttt{european}: equivalent to \texttt{europeancurrent}, \texttt{europeanvoltage}, \texttt{europeanresistor}, \texttt{europeaninductor}; + \item \texttt{american}: equivalent to \texttt{americancurrent}, \texttt{americanvoltage}, \texttt{americanresistor}, \texttt{americaninductor}; \item \texttt{siunitx}: integrates with \texttt{SIunitx} package. If labels, currents or voltages are of the form \verb!#1<#2>! then what is shown is actually \verb!\SI{#1}{#2}!; \item \texttt{nosiunitx}: labels are not interpreted as above; \item \texttt{fulldiode}: the various diodes are drawn \emph{and} filled by default, i.e. when using styles such as \texttt{diode}, \texttt{D}, \texttt{sD}, \ldots Un-filled diode can always be forced with \texttt{Do}, \texttt{sDo}, \ldots @@ -101,9 +104,9 @@ None, as far as I know. \item \texttt{noarrowmos}: pmos and nmos do not have arrows analogous to those of pnp and npn transistors. \end{itemize} -Loading the package with no options is equivalent to:\\ - \verb!\usepackage[european, nosiunitx, noarrowmos]{circuitikz}!. - +Loading the package with no options is equivalent to my own personal liking, that is to the following options:\\ + \texttt{[european current, european voltage, american resistor, american inductor, nosiunitx, noarrowmos]}. + \section{The components} Here follows the list of all the shapes defined by Circui\TikZ. These are all \texttt{pgf} nodes, so they are usable in both \texttt{pgf} and \TikZ. @@ -144,12 +147,27 @@ The other shapes are shown with: \circuititembip{short}{Short circuit}{} \circuititembip{open}{Open circuit}{} - \circuititembip{R}{Resistor}{resistor} \circuititembip{pR}{Potentiometer}{potentiometer} + \circuititembip{lamp}{Lamp}{} \circuititembip{generic}{Generic (symmetric) bipole}{} \circuititembip{ageneric}{Generic asymmetric bipole}{} + \circuititembip{fullgeneric}{Generic asymmetric bipole}{} \end{itemize} +\paragraph{The resistor} + +If \texttt{europeanresistor} option is active (or the style \texttt{[european resistor]} is used), the resistor is displayed as follows: +\begin{itemize} + \ctikzset{european resistor=true} + \circuititembip{R}{Resistor}{resistor} +\end{itemize} +If instead (default behaviour) \texttt{americanresistor} option is active (or the style \texttt{[american resistor]} is used), the resistor is displayed as follows: +\begin{itemize} + \ctikzset{european resistor=false} + \circuititembip{R}{Resistor}{resistor} +\end{itemize} + + \paragraph{Stationary sources} \begin{itemize} \circuititembip{battery}{Battery}{} @@ -165,6 +183,7 @@ The options \texttt{europeancurrent} [resp. \texttt{europeanvoltage}] (the defau One can also use the related styles \texttt{[european current]} [resp. \texttt{[european voltage]}] and \texttt{[american current]} [resp. \texttt{[american voltage]}]. \end{framed} + \paragraph{Diodes and such} \begin{itemize} \circuititembip{empty diode}{Empty diode}{Do} @@ -190,9 +209,20 @@ The options \texttt{fulldiode} and \texttt{emptydiode} (and the styles \texttt{[ \paragraph{Basic dynamical bipoles} \begin{itemize} \circuititembip{capacitor}{Capacitor}{C} - \circuititembip{inductor}{Inductor}{L} \end{itemize} +If \texttt{europeaninductor} option is active (or the style \texttt{[european inductor]} is used), the inductor is displayed as follows: +\begin{itemize} + \ctikzset{european inductor=true} + \circuititembip{L}{Inductor}{inductor} +\end{itemize} +If instead (default behaviour) \texttt{americaninductor} option is active (or the style \texttt{[american inductor]} is used), the inductor is displayed as follows: +\begin{itemize} + \ctikzset{european inductor=false} + \circuititembip{L}{Inductor}{inductor} +\end{itemize} + + \paragraph{Sinusoidal sources} Here because I was asked for them. But how do you distinguish one from the other?! \begin{itemize} \circuititembip{sinusoidal voltage source}{Sinusoidal voltage source}{vsourcesin, sV} @@ -820,19 +850,19 @@ For BJT transistors the anchors are \texttt{base}, \texttt{emitter} and \texttt ;\end{circuitikz} \end{LTXexample} -Here is one composite example: +Here is one composite example (please notice that the \texttt{xscale=-1} style would also reflect the label of the transistors, so here a new node is added and its text is used, instead of that of \texttt{pnp1}): \begin{LTXexample}[varwidth=true] \begin{circuitikz} \draw - (0,0) node[pnp] (pnp2) {} + (0,0) node[pnp] (pnp2) {2} (pnp2.B) node[pnp, xscale=-1, anchor=B] (pnp1) {} + (pnp1) node {1} (pnp1.C) node[npn, anchor=C] (npn1) {} (pnp2.C) node[npn, xscale=-1, anchor=C] (npn2) {} (pnp1.E) -- (pnp2.E) (npn1.E) -- (npn2.E) (pnp1.B) node[circ] {} |- (pnp2.C) node[circ] {} ;\end{circuitikz} \end{LTXexample} - \paragraph{Operational amplifier} The op amp defines the inverting input (\texttt{-}), the non-inverting input (\texttt{+}) and the output (\texttt{out}) anchors: \begin{LTXexample}[varwidth=true] @@ -1101,6 +1131,15 @@ And yes: this is a bug and \emph{not} a feature\ldots \section{Revision history} \begin{itemize} + +\item[\itshape version 0.2.2] (20090520). + \begin{enumerate} + \item Added the shape for lamps. + \item Added options \texttt{europeanresistor}, \texttt{europeaninductor}, \texttt{americanresistor} and \texttt{americaninductor}, with corresponding styles. + \item \textbf{Fixed}: error in transistor arrow positioning and direction under negative \texttt{xscale} and \texttt{yscale}. + \end{enumerate} + + \item[\itshape version 0.2.1] (20090503). \begin{enumerate} \item Op-amps added. @@ -1122,11 +1161,9 @@ And yes: this is a bug and \emph{not} a feature\ldots \item[\itshape version 0.1] First public release (2007). \end{itemize} -\end{document} - - +\end{document} |