From 067cb21a3a797493d44fed615554c1e1e1b1ed1a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 8 Sep 2016 21:57:45 +0000 Subject: circuitikz (8sep16) git-svn-id: svn://tug.org/texlive/trunk@42017 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/circuitikz/changelog.tex | 27 +++++++++++ .../doc/latex/circuitikz/circuitikzmanual.pdf | Bin 261924 -> 272705 bytes .../doc/latex/circuitikz/circuitikzmanual.tex | 53 ++++++++++++++++----- 3 files changed, 69 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/doc/latex/circuitikz') diff --git a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex index c8d89491bed..9be77ba6782 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex @@ -5,6 +5,33 @@ full list of changes. \begin{itemize} \itemsep1pt\parskip0pt\parsep0pt +\item + Version 0.7 (2016-09-08) + + \begin{itemize} + \itemsep1pt\parskip0pt\parsep0pt + \item + Added second annotation label, showing, e.g., the value of an + component + \item + Added new symbol: magnetron + \item + Fixed name conflict of diamond shape with tikz.shapes package + \item + Fixed varcap symbol at small scalings + \item + New packet-option ``straightvoltages, to draw straight(no curved) + voltage arrows + \item + New option ``invert'' to revert the node direction at paths + \item + Fixed american voltage label at special sources and battery + \item + Fixed/rotated battery symbol(longer lines by default positive + voltage) + \item + New symbol Schmitttrigger + \end{itemize} \item Version 0.6 (2016-06-06) diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf index 2654b941356..54caadf2efc 100644 Binary files a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf and b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf differ diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex index 676900927aa..f49f9600445 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex @@ -146,6 +146,7 @@ The easiest way to contact the authors is via the official Github repository: \u \section{Incompabilities between version} Here, we will provide a list of incompabilitys between different version of circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than including a lot of switches and compatibility layers. \begin{itemize} +\item Since v0.7?: The label behaviour at mirrored bipoles has changes, this fixes the voltage drawing, but perhaps you have to adjust your label positions. \item Since v0.5.1: The parts pfet,pigfete,pigfetebulk and pigfetd are now mirrored by default. Please adjust your yscale-option to correct this. \item Since v0.5: New voltage counting direction, here exists an option to use the old behaviour \end{itemize} @@ -185,6 +186,7 @@ Feel free to load the package with your own cultural options: \noindent Here is the list of all the options: \begin{itemize} \item \texttt{europeanvoltages}: uses arrows to define voltages, and uses european-style voltage sources; + \item \texttt{straightvoltages}: uses arrows to define voltages, and and uses straight voltage arrows; \item \texttt{americanvoltages}: uses $-$ and $+$ to define voltages, and uses american-style voltage sources; \item \texttt{europeancurrents}: uses european-style current sources; \item \texttt{americancurrents}: uses american-style current sources; @@ -634,6 +636,23 @@ Borsche. Use the package options \texttt{fetsolderdot}/\texttt{nofetsolderdot} t \circuititem{isfet}{\scshape isfet}{} \end{itemize} +\subsubsection{Electronic Tubes} +\begin{itemize} + \circuititem{magnetron}{Magnetron}{} +\end{itemize} +\begin{LTXexample}[varwidth=true] + \begin{circuitikz} + \draw (0,-2)node[rground](gnd){} to[voltage source,v<={HV}]++(0,3)--++(1,0)to[V,n=DC]++(2,0); + \draw (2,-1) node[magnetron,scale=1](magn){}; + \draw (DC.left)++(-0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode1); + \draw (DC.right)++(0.2,0)to [short,*-] ++(0,-1) to [short] (magn.cathode2); + \draw (magn.anode) to [short] (magn.anode|-gnd) node[rground]{}; + \draw (magn.cathode1)node[above]{$1$}; + \draw (magn.cathode2)node[above]{$2$}; + \draw[->](magn.east) --++(1,0)node[right]{$RF_{out}$}; + \end{circuitikz} +\end{LTXexample} + \subsubsection{Block diagram} These come from Stefan Erhardt's contribution of block diagram components. Add a box around them with the option \texttt{box}. \begin{itemize} @@ -759,6 +778,7 @@ If otherwise \texttt{europeanports} option is active (or the style \texttt{[euro \circuititem{inputarrow}{Arrow to draw at its tip, useful for block diagrams.}{} \circuititem{circ}{Connected terminal}{} \circuititem{ocirc}{Unconnected terminal}{} + \circuititem{diamondpole}{Diamond-style terminal}{} \end{itemize} @@ -810,17 +830,20 @@ Long names/styles for the bipoles can be used: ;\end{circuitikz} \end{LTXexample} -\subsection{Labels} +\subsection{Labels and Annotations} +Since Version 0.7, beside the original label (l) option, there is a new option to place a second label, called annotation (a) at each bipole. Up to now this is a beta-test and there can be problems. For example, up to now this option is not compatible with the concurrent use of voltage labels. + +The position of (a) and (l) labels can be adjusted with \_ and \^, respectively. \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[R, l^=$R_1$] (2,0); + \draw (0,0) to[R, l=$R_1$,a=1<\kilo\ohm>] (2,0); \end{circuitikz} \end{LTXexample} \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[R, l_=$R_1$] (2,0); + \draw (0,0) to[R, l_=$R_1$,a^=1<\kilo\ohm>] (2,0); \end{circuitikz} \end{LTXexample} @@ -1326,7 +1349,8 @@ If the option {\ttfamily siunitx} is active (and \emph{not} in \ConTeXt), then t -\subsection{Mirroring} +\subsection{Mirroring and Inverting} +Bipole paths can also mirrored and inverted (or reverted) to change the drawing direction. \begin{LTXexample}[varwidth=true] \begin{circuitikz} @@ -1338,30 +1362,37 @@ If the option {\ttfamily siunitx} is active (and \emph{not} in \ConTeXt), then t \begin{circuitikz} \draw (0,0) to[pD, mirror] (2,0); \end{circuitikz} +\end{LTXexample} +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[pD, invert] (2,0); +\end{circuitikz} \end{LTXexample} -At the moment, placing labels and currents on mirrored bipoles works: +Placing labels, currents and voltages works also, please note, that mirroring and inverting does not incfluence the positioning of labels and voltages. Labels are by default above/right of the bipole and voltages below/left, respectively. \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[ospst=T] (2,0); + \draw (0,0) to[ospst=T, i=$i_1$, v=$v$] (2,0); \end{circuitikz} \end{LTXexample} \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[ospst=T, mirror, i=$i_1$] (2,0); + \draw (0,0) to[ospst=T, mirror, i=$i_1$, v=$v$] (2,0); \end{circuitikz} \end{LTXexample} -But voltages don't: - \begin{LTXexample}[varwidth=true] \begin{circuitikz} - \draw (0,0) to[ospst=T, mirror, v=v] (2,0); + \draw (0,0) to[ospst=T, invert, i=$i_1$, v=$v$] (2,0); +\end{circuitikz} +\end{LTXexample} +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} + \draw (0,0) to[ospst=T,mirror,invert, i=$i_1$, v=$v$] (2,0); \end{circuitikz} \end{LTXexample} -Sorry about that. \subsection{Putting them together} \begin{LTXexample}[varwidth=true] -- cgit v1.2.3