summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/circuitikz
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-27 01:23:48 +0000
committerKarl Berry <karl@freefriends.org>2009-11-27 01:23:48 +0000
commitc2891584a71bef79217edf0f155772dae1f68b61 (patch)
treeaa182bbf18e9a50a6a3c89f4809535b30322f736 /Master/texmf-dist/doc/latex/circuitikz
parent5647d8caa246f321a52c4b2e3a3c863ebf7be802 (diff)
circuitikz 0.2.3 (26nov09)
git-svn-id: svn://tug.org/texlive/trunk@16183 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/circuitikz')
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/CHANGELOG26
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/README10
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdfbin262939 -> 337782 bytes
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex500
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/context.pdfbin0 -> 48571 bytes
-rw-r--r--Master/texmf-dist/doc/latex/circuitikz/context.tex20
6 files changed, 440 insertions, 116 deletions
diff --git a/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG b/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG
index 64227cc2576..89e1fc2f755 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/circuitikz/CHANGELOG
@@ -1,12 +1,36 @@
CircuiTikz - Changelog
+* Version 0.2.3
+ - fixed compatibility problem with label option from tikz
+ - Fixed resizing problem for shape ground
+ - Variable capacitor
+ - polarized capacitor
+ - ConTeXt support (read the manual!)
+ - nfet, nigfete, nigfetd, pfet, pigfete, pigfetd (contribution of Clemens Helfmeier and Theodor
+Borsche)
+ - njfet, pjfet (contribution of Danilo Piazzalunga)
+ - pigbt, nigbt
+ - *backward incompatibility* potentiometer is now the standard resistor-with-arrow-in-the-middle; the old potentiometer is now known as variable resistor (or vR), similarly to variable inductor and variable capacitor
+ - triac, thyristor, memristor
+ - new property "name" for bipoles
+ - fixed voltage problem for batteries in american voltage mode
+ - european logic gates
+ - *backward incompatibility* new american standard inductor. Old american inductor now called "cute inductor"
+ - *backward incompatibility* transformer now linked with the chosen type of inductor, and version with core, too. Similarly for variable inductor
+ - *backward incompatibility* styles for selecting shape variants now end are in the plural to avoid conflict with paths
+ - new placing option for some tripoles (mostly transistors)
+ - mirror path style
+
+
* Version 0.2.2 - 20090520
- - Added the shape for lamps.
+ - 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
+
* Version 0.2 - 20090417
First public release on CTAN
- *Backward incompatibility*: labels ending with \texttt{:}\textit{angle} are not parsed for positioning anymore.
diff --git a/Master/texmf-dist/doc/latex/circuitikz/README b/Master/texmf-dist/doc/latex/circuitikz/README
index 883d4728dc2..8dfab0ddae4 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.2.
+This is CircuiTikz, version 0.2.3.
This package provides a set of macros for naturally typesetting electrical and (somewhat less naturally, perhaps) electronical networks.
@@ -9,8 +9,8 @@ So I based everything with the very impressive (if somewhat verbose at times) \T
--------------
** Requirements
-Tikz graphics library
-
+Tikz graphics library, version 2
+xstrings not older than 2009/03/13
** Installation
Unpack everything in a directory in the TeX search path and refresh the TeX db.
@@ -19,6 +19,10 @@ Unpack everything in a directory in the TeX search path and refresh the TeX db.
Just place
\usepackage{circuitikz}
+
+or, for ConTeXt,
+
+ \usemodule[circuitikz]
in the preamble and compile away, both with PS and PDF target output.
diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
index eeb44b5d24b..51eaa7711eb 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
+++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
index ffd294534d1..d00398a98eb 100644
--- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
+++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
@@ -1,12 +1,12 @@
\documentclass[a4paper]{article}
-
+\usepackage{xltxtra}
\usepackage[siunitx]{circuitikz}
\usepackage{showexpl}
\usepackage{framed}
\usepackage{hyperref}
\hypersetup{
bookmarks=false, % show bookmarks bar?
- pdftitle={CircuitTikZ v. 0.2.2 - manual}, % title
+ pdftitle={CircuitTikZ v. \pgfcircversion\ - manual}, % title
pdfauthor={Massimo Redaelli}, % author
pdfsubject={CircuitTikZ manual}, % subject of the document
pdfkeywords={}, % list of keywords
@@ -17,22 +17,34 @@
urlcolor=black % color of external links
}
-\def\circuititem#1#2#3{\item #2 (\texttt{#1}) \par \begin{center}\begin{circuitikz} \draw (0,0) node[#1] {}; \end{circuitikz} \end{center}
+%\usepackage{xeindex}
+
+%\IndexList{mylist}{resistor, }
+
+\def\circuititem#1#2#3{\item {#2} (\texttt{#1}) \par \begin{center}\begin{circuitikz} \draw (0,0) node[#1] {}; \end{circuitikz} \end{center}
\par}
-\newcommand{\circuititembip}[3]{\item #2 (\texttt{#1}%
+\newcommand{\circuititembip}[3]{\item {#2} (\texttt{#1}%
\ifthenelse{\equal{#3}{}}{%
}{%
, or \texttt{#3}%
}%
)\par \begin{center}\begin{circuitikz} \draw (0,0) to[#1] (2,0); \end{circuitikz} \end{center}\par}
+
+\long\def\comment#1{}
+
\begin{document}
+\setcounter{secnumdepth}{3}
+\setcounter{tocdepth}{3}
+
\def\TikZ{Ti\emph{k}Z}
+\def\Circuitikz{Circui\TikZ}
+\def\ConTeXt{Con\TeX t}
\lstset{frameround=fttt}
\lstloadlanguages{TeX}
-\title{Circui\TikZ \\{\large version 0.2.2}}
+\title{\Circuitikz \\{\large version \pgfcircversion}}
\author{Massimo A. Redaelli}
\date{\today}
@@ -73,7 +85,7 @@ Much appreciated: \href{mailto:mredaelli@elet.polimi.it}{\texttt{mredaelli@elet.
\subsection{Requirements}
\begin{itemize}
\item \texttt{tikz}, version $\ge 2$;
- \item \texttt{xstring};
+ \item \texttt{xstring}, not older than 2009/03/13;
\item \texttt{siunitx}, if using \texttt{siunitx} option.
\end{itemize}
@@ -81,31 +93,91 @@ Much appreciated: \href{mailto:mredaelli@elet.polimi.it}{\texttt{mredaelli@elet.
None, as far as I know.
+\subsection{Introduction to version 0.2.3}
+
+Having waited a long time before updating the package, many feature requests piled on my desk. They should all be implemented now.
+
+There are a number of backward incompatibilities — I'm sorry, but I had to make a choice in order not to have a schizophrenic interface. They are mostly, in my opinion, minor problems that can be dealt with with appropriate package options:
+\begin{itemize}
+ \item \texttt{potentiometer} is now the standard resistor-with-arrow-in-the-middle; the old potentiometer is now known as \texttt{variable resistor} (or \texttt{vR}), similarly to \texttt{variable inductor} and \texttt{variable capacitor};
+ \item \texttt{american inductor} was not really the standard american inductor. The old american inductor has been renamed \texttt{cute inductor};
+ \item \texttt{transformer}, \texttt{transformer core} and \texttt{variable inductor} are now linked with the chosen type of \texttt{inductor};
+ \item styles for selecting shape variants (like \texttt{[american resistors]}) are now in the plural to avoid conflict with paths (like \texttt{to[american resistor]}).
+\end{itemize}
+
+\subsection{\ConTeXt\ compatibility}
+
+As requested by some users, I fixed the package for it to be compatible with \ConTeXt. Just use \verb!\usemodule[circuitikz]! in your preamble and include the code between \verb!\startcircuitikz! and \verb!\endcircuitikz!. Please notice that the package \texttt{siunitx} in \emph{not} available for \ConTeXt: the option \texttt{siunitx} simply defines a few measurement units typical in electric sciences.
+
+\medskip
+
+In actually using \Circuitikz\ with \TikZ\ version 2 in \ConTeXt\ an error comes up, saying something like
+\begin{verbatim}
+! Undefined control sequence.
+\tikz@cc@mid@checks -> \pgfutil@ifnextchar!
+\end{verbatim}
+
+
+The solution has been suggested to me by Aditya Mahajan, and involves modifying a file in \TikZ:
+\begin{verbatim}
+Here is the fix. In tikzlibrarycalc.code.tex change
+
+\def\tikz@cc@mid@checks{
+ \pgfutil@ifnextchar !{%AM: Added space
+ \tikz@cc@mid%
+ }{%
+ \advance\pgf@xa by\tikz@cc@factor\pgf@xb%
+ \advance\pgf@ya by\tikz@cc@factor\pgf@yb%
+ \tikz@cc@parse% continue
+ }%
+}
+
+\def\tikz@cc@mid !{%AM Added space
+ \pgfutil@ifnextchar({%
+ \tikz@scan@one@point\tikz@cc@project%
+ }{%
+ \tikz@cc@mid@num%
+ }%
+}
+\end{verbatim}
+
+As far as I know, this is a bug in \TikZ, and I notified the author, but until he fixes it, you know the workaround.
\section{Options}
\begin{itemize}
- \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{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{europeanvoltages}: uses arrows to define voltages, and uses european-style voltage sources;
+ \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;
+ \item \texttt{europeanresistors}: uses rectangular empty shape for resistors, as per european standards;
+ \item \texttt{americanresistors}: uses zig-zag shape for resistors, as per american standards;
+ \item \texttt{europeaninductors}: uses rectangular filled shape for inductors, as per european standards;
+ \item \texttt{americaninductors}: uses "4-bumps" shape for inductors, as per american standards;
+ \item \texttt{cuteinductors}: uses my personal favorite, "pig-tailed" shape for inductors;
+ \item \texttt{americanports}: uses triangular logic ports, as per american standards;
+ \item \texttt{europeanports}: uses rectangular logic ports, as per european standards;
+ \item \texttt{european}: equivalent to \texttt{europeancurrents}, \texttt{europeanvoltages}, \texttt{europeanresistors}, \texttt{europeaninductors}, \texttt{europeanports};
+ \item \texttt{american}: equivalent to \texttt{americancurrents}, \texttt{americanvoltages}, \texttt{americanresistors}, \texttt{americaninductors}, \texttt{americanports};
\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
- \item \texttt{emptydiode}: the various diodes are drawn \emph{but not} filled by default, i.e. when using styles such as \texttt{diode}, \texttt{D}, \texttt{sD}, \ldots Filled diode can always be forced with \texttt{D*}, \texttt{sD*}, \ldots
+ \item \texttt{fulldiodes}: 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
+ \item \texttt{emptydiodes}: the various diodes are drawn \emph{but not} filled by default, i.e. when using styles such as \texttt{diode}, \texttt{D}, \texttt{sD}, \ldots Filled diode can always be forced with \texttt{D*}, \texttt{sD*}, \ldots
\item \texttt{arrowmos}: pmos and nmos have arrows analogous to those of pnp and npn transistors;
\item \texttt{noarrowmos}: pmos and nmos do not have arrows analogous to those of pnp and npn transistors.
\end{itemize}
+The old options in the singular (like \texttt{american voltage}) are still available for compatibility, but are discouraged.
+
+\medskip
+
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]}.
+ \texttt{[europeancurrents, europeanvoltages, americanresistors, cuteinductors, americanports, nosiunitx, noarrowmos]}.
+
+\medskip
+
+In \ConTeXt\ the options are similarly specified: \texttt{current=european|american}, \texttt{voltage=european|american}, \texttt{resistor=american|european}, \texttt{inductor=cute|american|european}, \texttt{logic=american|european}, \texttt{siunitx=true|false}, \texttt{arrowmos=false|true}.
\section{The components}
@@ -113,7 +185,7 @@ Here follows the list of all the shapes defined by Circui\TikZ. These are all \t
\medskip
-Each bipole is shown using the following command, where \verb!#1! is the name of the component\footnote{If \texttt{\#1} is the name of the bipole/the style, then the actual name of the shape is \texttt{\#1shape}.}:
+Each bipole (plus triac and thyristors) are shown using the following command, where \verb!#1! is the name of the component\footnote{If \texttt{\#1} is the name of the bipole/the style, then the actual name of the shape is \texttt{\#1shape}.}:
\begin{verbatim}
\begin{center}\begin{circuitikz} \draw
@@ -128,6 +200,8 @@ The other shapes are shown with:
; \end{circuitikz} \end{center}
\end{verbatim}
+Please notice that for user convenience transistors can also be inputted using the syntax for bipoles. See section~\ref{sec:transasbip}.
+
\subsection{Monopoles}
\begin{itemize}
\circuititem{ground}{Ground}{}
@@ -136,39 +210,46 @@ The other shapes are shown with:
\subsection{Bipoles}
-\paragraph{Instruments}
+\subsubsection{Instruments}
\begin{itemize}
\circuititembip{ammeter}{Ammeter}{}
\circuititembip{voltmeter}{Voltmeter}{}
\end{itemize}
-\paragraph{Basic resistive bipoles}
+\subsubsection{Basic resistive bipoles}
\begin{itemize}
\circuititembip{short}{Short circuit}{}
\circuititembip{open}{Open circuit}{}
- \circuititembip{pR}{Potentiometer}{potentiometer}
\circuititembip{lamp}{Lamp}{}
\circuititembip{generic}{Generic (symmetric) bipole}{}
+ \circuititembip{tgeneric}{Tunable generic bipole}{}
\circuititembip{ageneric}{Generic asymmetric bipole}{}
- \circuititembip{fullgeneric}{Generic asymmetric bipole}{}
+ \circuititembip{fullgeneric}{Generic asymmetric bipole (full)}{}
+ \circuititembip{tfullgeneric}{Tunable generic bipole (full)}{}
+ \circuititembip{memristor}{Memristor}{Mr}
\end{itemize}
-\paragraph{The resistor}
+\subsubsection{Resistors and the like}
-If \texttt{europeanresistor} option is active (or the style \texttt{[european resistor]} is used), the resistor is displayed as follows:
+If (default behaviour) \texttt{americanresistors} option is active (or the style \texttt{[american resistors]} is used), the resistor is displayed as follows:
\begin{itemize}
- \ctikzset{european resistor=true}
- \circuititembip{R}{Resistor}{resistor}
+ \ctikzset{resistor=american}
+ \circuititembip{R}{Resistor}{american resistor}
+ \circuititembip{vR}{Variable resistor}{american variable resistor}
+ \circuititembip{pR}{Potentiometer}{american potentiometer}
\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:
+
+If instead \texttt{europeanresistors} option is active (or the style \texttt{[european resistors]} is used), the resistors, variable resistors and potentiometers are displayed as follows:
\begin{itemize}
- \ctikzset{european resistor=false}
- \circuititembip{R}{Resistor}{resistor}
+ \ctikzset{resistor=european}
+ \circuititembip{R}{Resistor}{european resistor}
+ \circuititembip{vR}{Variable resistor}{european variable resistor}
+ \circuititembip{pR}{Potentiometer}{european potentiometer}
+ \ctikzset{resistor=american} % reset default
\end{itemize}
-
-\paragraph{Stationary sources}
+\subsubsection{Stationary sources}
\begin{itemize}
\circuititembip{battery}{Battery}{}
\circuititembip{european voltage source}{Voltage source (european style)}{}
@@ -178,13 +259,14 @@ If instead (default behaviour) \texttt{americanresistor} option is active (or th
\end{itemize}
\begin{framed}
-The options \texttt{europeancurrent} [resp. \texttt{europeanvoltage}] (the default) and \texttt{americancurrent} [resp. \texttt{americanvoltage}] define which current [resp. voltage] source is selected by default when the abbreviated styles \texttt{current source}, \texttt{csource}, \texttt{I} [resp. \texttt{voltage source}, \texttt{vsource}, \texttt{V}] are used.
+If (default behaviour) \texttt{europeancurrents} option is active (or the style \texttt{[european currents]} is used), the shorthands \texttt{current source}, \texttt{isource}, and \texttt{I} are equivalent to \texttt{european current source}. Otherwise, if \texttt{americancurrents} option is active (or the style \texttt{[american currents]} is used) they are equivalent to \texttt{american current source}.
-One can also use the related styles \texttt{[european current]} [resp. \texttt{[european voltage]}] and \texttt{[american current]} [resp. \texttt{[american voltage]}].
+Similarly, if (default behaviour) \texttt{europeanvoltages} option is active (or the style \texttt{[european voltages]} is used), the shorthands \texttt{voltage source}, \texttt{vsource}, and \texttt{V} are equivalent to \texttt{european voltage source}. Otherwise, if \texttt{americanvoltages} option is active (or the style \texttt{[american voltages]} is used) they are equivalent to \texttt{american voltage source}.
\end{framed}
-\paragraph{Diodes and such}
+
+\subsubsection{Diodes and such}
\begin{itemize}
\circuititembip{empty diode}{Empty diode}{Do}
\circuititembip{empty Schottky diode}{Empty Schottky diode}{sDo}
@@ -203,27 +285,39 @@ One can also use the related styles \texttt{[european current]} [resp. \texttt{[
\end{itemize}
\begin{framed}
-The options \texttt{fulldiode} and \texttt{emptydiode} (and the styles \texttt{[full diode]} and \texttt{[full diode]}) define which shape will be used by abbreviated commands such that \texttt{D}, \texttt{sD}, \texttt{zD}, \texttt{tD}, \texttt{pD}, \texttt{leD}, and \texttt{VC}.
+The options \texttt{fulldiodes} and \texttt{emptydiodes} (and the styles \texttt{[full diodes]} and \texttt{[empty diodes]}) define which shape will be used by abbreviated commands such that \texttt{D}, \texttt{sD}, \texttt{zD}, \texttt{tD}, \texttt{pD}, \texttt{leD}, and \texttt{VC}.
\end{framed}
-\paragraph{Basic dynamical bipoles}
+\subsubsection{Basic dynamical bipoles}
\begin{itemize}
\circuititembip{capacitor}{Capacitor}{C}
+ \circuititembip{polar capacitor}{Polar capacitor}{pC}
+ \circuititembip{variable capacitor}{Variable capacitor}{vC}
\end{itemize}
-If \texttt{europeaninductor} option is active (or the style \texttt{[european inductor]} is used), the inductor is displayed as follows:
+If (default behaviour) \texttt{cuteinductors} option is active (or the style \texttt{[cute inductors]} is used), the inductors are displayed as follows:
+\begin{itemize}
+ \ctikzset{inductor=cute}
+ \circuititembip{L}{Inductor}{cute inductor}
+ \circuititembip{vL}{Variable inductor}{variable cute inductor}
+\end{itemize}
+
+If \texttt{americaninductors} option is active (or the style \texttt{[american inductors]} is used), the inductors are displayed as follows:
\begin{itemize}
- \ctikzset{european inductor=true}
- \circuititembip{L}{Inductor}{inductor}
+ \ctikzset{inductor=american}
+ \circuititembip{L}{Inductor}{american inductor}
+ \circuititembip{vL}{Variable inductor}{variable american 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:
+
+Finally, if \texttt{europeaninductors} option is active (or the style \texttt{[european inductors]} is used), the inductors are displayed as follows:
\begin{itemize}
- \ctikzset{european inductor=false}
- \circuititembip{L}{Inductor}{inductor}
+ \ctikzset{inductor=european}
+ \circuititembip{L}{Inductor}{european inductor}
+ \circuititembip{vL}{Variable inductor}{variable european inductor}
\end{itemize}
-\paragraph{Sinusoidal sources} Here because I was asked for them. But how do you distinguish one from the other?!
+\subsubsection{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}
\circuititembip{sinusoidal current source}{Sinusoidal current source}{isourcesin, sI}
@@ -232,10 +326,10 @@ If instead (default behaviour) \texttt{americaninductor} option is active (or th
%\begin{framed}
%The options \texttt{europeancurrent} [resp. \texttt{europeanvoltage}] (the default) and \texttt{americancurrent} [resp. \texttt{americanvoltage}] define which sinusoidal current [resp. voltage] source is selected by default when the abbreviated styles \texttt{sinusoidal current source}, \texttt{csourcesin}, \texttt{cI} [resp. \texttt{sinusoidal voltage source}, \texttt{vsourcesin}, \texttt{cV}] are used.
-%One can also use the related styles \texttt{[european current]} [resp. \texttt{[european voltage]}] and \texttt{[american current]} [resp. \texttt{[american voltage]}].
+%One can also use the related styles \texttt{[european currents]} [resp. \texttt{[european voltages]}] and \texttt{[american currents]} [resp. \texttt{[american voltages]}].
%\end{framed}
-\paragraph{Switch}
+\subsubsection{Switch}
\begin{itemize}
\circuititembip{closing switch}{Closing switch}{cspst}
\circuititembip{opening switch}{Opening switch}{ospst}
@@ -244,7 +338,7 @@ If instead (default behaviour) \texttt{americaninductor} option is active (or th
\subsection{Tripoles}
-\paragraph{Controlled sources} Admittedly, graphically they are bipoles. But I couldn't\ldots
+\subsubsection{Controlled sources} Admittedly, graphically they are bipoles. But I couldn't\ldots
\begin{itemize}
\circuititembip{european controlled voltage source}{Controlled voltage source (european style)}{}
\circuititembip{american controlled voltage source}{Controlled voltage source (american style)}{}
@@ -253,9 +347,9 @@ If instead (default behaviour) \texttt{americaninductor} option is active (or th
\end{itemize}
\begin{framed}
-The options \texttt{europeancurrent} [resp. \texttt{europeanvoltage}] (the default) and \texttt{americancurrent} [resp. \texttt{americanvoltage}] define which controlled current [resp. voltage] source is selected by default when the abbreviated styles are used.
+If (default behaviour) \texttt{europeancurrents} option is active (or the style \texttt{[european currents]} is used), the shorthands \texttt{controlled current source}, \texttt{cisource}, and \texttt{cI} are equivalent to \texttt{european controlled current source}. Otherwise, if \texttt{americancurrents} option is active (or the style \texttt{[american currents]} is used) they are equivalent to \texttt{american controlled current source}.
-One can also use the related styles \texttt{[european current]} [resp. \texttt{[european voltage]}] and \texttt{[american current]} [resp. \texttt{[american voltage]}].
+Similarly, if (default behaviour) \texttt{europeanvoltages} option is active (or the style \texttt{[european voltages]} is used), the shorthands \texttt{controlled voltage source}, \texttt{cvsource}, and \texttt{cV} are equivalent to \texttt{european controlled voltage source}. Otherwise, if \texttt{americanvoltages} option is active (or the style \texttt{[american voltages]} is used) they are equivalent to \texttt{american controlled voltage source}.
\end{framed}
\begin{itemize}
@@ -265,43 +359,104 @@ One can also use the related styles \texttt{[european current]} [resp. \texttt{[
-\paragraph{Transistors}
+\subsubsection{Transistors}
\begin{itemize}
- \circuititem{nmos}{nmos}{}
- \circuititem{pmos}{pmos}{}
- \circuititem{npn}{npn}{}
- \circuititem{pnp}{pnp}{}
+ \circuititem{nmos}{\scshape nmos}{}
+ \circuititem{pmos}{\scshape pmos}{}
+ \circuititem{npn}{\scshape npn}{}
+ \circuititem{pnp}{\scshape pnp}{}
+ \circuititem{nigbt}{\scshape npigbt}{}
+ \circuititem{pigbt}{\scshape pigbt}{}
\end{itemize}
If the option \texttt{arrowmos} is used (or after the commant \verb!\ctikzset{tripoles/mos style/arrows}! is given), this is the output:
\ctikzset{tripoles/mos style/arrows}
\begin{itemize}
- \circuititem{nmos}{nmos}{}
- \circuititem{pmos}{pmos}{}
+ \circuititem{nmos}{\scshape nmos}{}
+ \circuititem{pmos}{\scshape pmos}{}
\end{itemize}
\ctikzset{tripoles/mos style/no arrows}
+\textsc{nfet}s and \textsc{pfet}s have been incorporated based on code provided by Clemens Helfmeier and Theodor
+Borsche:
+\begin{itemize}
+ \circuititem{nfet}{\scshape nfet}{}
+ \circuititem{nigfete}{\scshape nigfete}{}
+ \circuititem{nigfetd}{\scshape nigfetd}{}
+ \circuititem{pfet}{\scshape pfet}{}
+ \circuititem{pigfete}{\scshape pigfete}{}
+ \circuititem{pigfetd}{\scshape pigfetd}{}
+\end{itemize}
+
+\textsc{njfet} and \textsc{pjfet} have been incorporated based on code provided by Danilo Piazzalunga:
+\begin{itemize}
+ \circuititem{njfet}{\scshape njfet}{}
+ \circuititem{pjfet}{\scshape pjfet}{}
+\end{itemize}
+
+\subsubsection{Other bipole-like tripoles}\label{sec:othertrip} The following tripoles are entered with the usual command of the form
+\begin{itemize}
+ \circuititembip{triac}{triac}{Tr}
+ \circuititembip{thyristor}{thyristor}{Ty}
+ %\circuititembip{IGBT}{IGBT}{}
+\end{itemize}
+
\subsection{Double bipoles}
+Transformers automatically use the inductor shape currently selected. These are the three possibilities:
\begin{itemize}
- \circuititem{transformer}{Transformer}{}
- \circuititem{gyrator}{Gyrator}{}
+ \ctikzset{inductor=cute}
+ \circuititem{transformer}{Transformer (cute inductor)}{}
+ \ctikzset{inductor=american}
+ \circuititem{transformer}{Transformer (american inductor)}{}
+ \ctikzset{inductor=european}
+ \circuititem{transformer}{Transformer (european inductor)}{}
+\end{itemize}
+
+
+Transformers with core are also available:
+\begin{itemize}
+ \ctikzset{inductor=cute}
+ \circuititem{transformer core}{Transformer core (cute inductor)}{}
+ \ctikzset{inductor=american}
+ \circuititem{transformer core}{Transformer core (american inductor)}{}
+ \ctikzset{inductor=european}
+ \circuititem{transformer core}{Transformer core (european inductor)}{}
+ \ctikzset{inductor=cute} % reset default
\end{itemize}
+\begin{itemize}
+ \circuititem{gyrator}{Gyrator}{}
+\end{itemize}
\subsection{Logic gates}
\begin{itemize}
- \circuititem{and port}{AND port}{}
- \circuititem{or port}{OR port}{}
- \circuititem{not port}{NOT port}{}
- \circuititem{nand port}{NAND port}{}
- \circuititem{nor port}{NOR port}{}
- \circuititem{xor port}{XOR port}{}
- \circuititem{xnor port}{XNOR port}{}
+ \circuititem{american and port}{American \textsc{and} port}{}
+ \circuititem{american or port}{American \textsc{or} port}{}
+ \circuititem{american not port}{American \textsc{not} port}{}
+ \circuititem{american nand port}{American \textsc{nand} port}{}
+ \circuititem{american nor port}{American \textsc{nor} port}{}
+ \circuititem{american xor port}{American \textsc{xor} port}{}
+ \circuititem{american xnor port}{American \textsc{xnor} port}{}
\end{itemize}
+\begin{itemize}
+ \circuititem{european and port}{European \textsc{and} port}{}
+ \circuititem{european or port}{European \textsc{or} port}{}
+ \circuititem{european not port}{European \textsc{not} port}{}
+ \circuititem{european nand port}{European \textsc{nand} port}{}
+ \circuititem{european nor port}{European \textsc{nor} port}{}
+ \circuititem{european xor port}{European \textsc{xor} port}{}
+ \circuititem{european xnor port}{European \textsc{xnor} port}{}
+\end{itemize}
+
+\begin{framed}
+If (default behaviour) \texttt{americanports} option is active (or the style \texttt{[american ports]} is used), the shorthands \texttt{and port}, \texttt{or port}, \texttt{not port}, \texttt{nand port}, \texttt{not port}, \texttt{xor port}, and \texttt{xnor port} are equivalent to the american version of the respective logic port.
+
+If otherwise \texttt{europeanports} option is active (or the style \texttt{[european ports]} is used), the shorthands \texttt{and port}, \texttt{or port}, \texttt{not port}, \texttt{nand port}, \texttt{not port}, \texttt{xor port}, and \texttt{xnor port} are equivalent to the european version of the respective logic port.
+\end{framed}
\subsection{Operational Amplifier}
\begin{itemize}
@@ -462,54 +617,54 @@ Also
\subsection{Voltages}
-\paragraph{European style} The default, with arrows. Use option \texttt{europeanvoltage} or style \verb![european voltage]!.
+\subsubsection{European style} The default, with arrows. Use option \texttt{europeanvoltage} or style \verb![european voltages]!.
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[european voltage]
+\begin{circuitikz}[european voltages]
\draw (0,0) to[R, v^>=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[european voltage]
+\begin{circuitikz}[european voltages]
\draw (0,0) to[R, v^<=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[european voltage]
+\begin{circuitikz}[european voltages]
\draw (0,0) to[R, v_>=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[european voltage]
+\begin{circuitikz}[european voltages]
\draw (0,0) to[R, v_<=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
-\paragraph{American style} For those who like it (not me). Use option \texttt{americanvoltage} or set \verb![american voltage]!.
+\subsubsection{American style} For those who like it (not me). Use option \texttt{americanvoltage} or set \verb![american voltages]!.
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[R, v^>=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[R, v^<=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[R, v_>=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[R, v_<=$v_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
@@ -566,6 +721,7 @@ Also
\end{circuitikz}
\end{LTXexample}
+
\subsection{Special components}
For some components label, current and voltage behave as one would expect:
@@ -602,36 +758,36 @@ For some components label, current and voltage behave as one would expect:
\end{circuitikz}
\end{LTXexample}
-The following results from using the option \texttt{americancurrent} or using the style \verb![american current]!.
+The following results from using the option \texttt{americancurrent} or using the style \verb![american currents]!.
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american current]
+\begin{circuitikz}[american currents]
\draw (0,0) to[I=$a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american current]
+\begin{circuitikz}[american currents]
\draw (0,0) to[I, i=$a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american current]
+\begin{circuitikz}[american currents]
\draw (0,0) to[cI=$k\cdot a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american current]
+\begin{circuitikz}[american currents]
\draw (0,0) to[sI=$a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american current]
+\begin{circuitikz}[american currents]
\draw (0,0) to[csI=$k\cdot a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
@@ -670,44 +826,43 @@ The same holds for voltage sources:
\end{circuitikz}
\end{LTXexample}
-The following results from using the option \texttt{americanvoltage} or the style \verb![american voltage]!.
+The following results from using the option \texttt{americanvoltage} or the style \verb![american voltages]!.
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[V=$a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[V, v=$a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[cV=$k\cdot a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[sV=$a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
\begin{LTXexample}[varwidth=true]
-\begin{circuitikz}[american voltage]
+\begin{circuitikz}[american voltages]
\draw (0,0) to[csV=$k\cdot a_1$] (2,0);
\end{circuitikz}
\end{LTXexample}
-
\subsection{Integration with {\ttfamily siunitx}}
-If the option {\ttfamily siunitx} is active, then the following are equivalent:
+If the option {\ttfamily siunitx} is active (and \emph{not} in \ConTeXt), then the following are equivalent:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -745,6 +900,45 @@ If the option {\ttfamily siunitx} is active, then the following are equivalent:
\end{circuitikz}
\end{LTXexample}
+
+
+\subsection{Mirroring}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[pD] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[pD, mirror] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+At the moment, placing labels and currents on mirrored bipoles works:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[ospst=T] (2,0);
+\end{circuitikz}
+\end{LTXexample}
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz}
+ \draw (0,0) to[ospst=T, mirror, i=$i_1$] (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);
+\end{circuitikz}
+\end{LTXexample}
+
+Sorry about that.
+
\subsection{Putting them together}
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}
@@ -760,12 +954,11 @@ If the option {\ttfamily siunitx} is active, then the following are equivalent:
\end{circuitikz}
\end{LTXexample}
-%} %comment
\section{Not only bipoles}
-Since only bipoles can be placed "along a line", components with more than two terminals are placed as nodes:
+Since only bipoles (but see section~\ref{sec:transasbip}) can be placed "along a line", components with more than two terminals are placed as nodes:
\begin{LTXexample}[varwidth=true]
\tikz \node[npn] at (0,0) {};
\end{LTXexample}
@@ -774,7 +967,7 @@ Since only bipoles can be placed "along a line", components with more than two t
In order to allow connections with other components, all components define anchors.
-\paragraph{Logical ports} All logical ports, except NOT, have to inputs and one output. They are called respectively \texttt{in 1}, \texttt{in 2}, \texttt{out}:
+\subsubsection{Logical ports} All logical ports, except \textsc{not}, have to inputs and one output. They are called respectively \texttt{in 1}, \texttt{in 2}, \texttt{out}:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
@@ -795,7 +988,7 @@ In order to allow connections with other components, all components define ancho
;\end{circuitikz}
\end{LTXexample}
-In the case of NOT, there are only \texttt{in} and \texttt{out}:
+In the case of \textsc{not}, there are only \texttt{in} and \texttt{out} (although for compatibility reasons \texttt{in 1} is still defined and equal to \texttt{in}):
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
@@ -808,7 +1001,7 @@ In the case of NOT, there are only \texttt{in} and \texttt{out}:
;\end{circuitikz}
\end{LTXexample}
-\paragraph{Transistors} For MOS transistors one has \texttt{base}, \texttt{gate}, \texttt{source} and \texttt{drain} anchors (which can be abbreviated with \texttt{B}, \texttt{G}, \texttt{S} and \texttt{D}):
+\subsubsection{Transistors} For \textsc{nmos}, \textsc{pmos}, \textsc{nfet}, \textsc{nigfete}, \textsc{nigfetd}, \textsc{pfet}, \textsc{pigfete}, and \textsc{pigfetd} transistors one has \texttt{base}, \texttt{gate}, \texttt{source} and \texttt{drain} anchors (which can be abbreviated with \texttt{B}, \texttt{G}, \texttt{S} and \texttt{D}):
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
@@ -822,15 +1015,26 @@ In the case of NOT, there are only \texttt{in} and \texttt{out}:
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
- (0,0) node[pmos] (mos) {}
- (mos.B) node[anchor=west] {B}
- (mos.G) node[anchor=east] {G}
- (mos.D) node[anchor=north] {D}
- (mos.S) node[anchor=south] {S}
+ (0,0) node[pigfete] (pigfete) {}
+ (pigfete.B) node[anchor=west] {B}
+ (pigfete.G) node[anchor=east] {G}
+ (pigfete.D) node[anchor=south] {D}
+ (pigfete.S) node[anchor=north] {S}
;\end{circuitikz}
\end{LTXexample}
-For BJT transistors the anchors are \texttt{base}, \texttt{emitter} and \texttt{collector} anchors (which can be abbreviated with \texttt{B}, \texttt{E} and \texttt{C}):
+Similarly \textsc{njfet} and \textsc{pjfet} have \texttt{gate}, \texttt{source} and \texttt{drain} anchors (which can be abbreviated with \texttt{G}, \texttt{S} and \texttt{D}):
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+ (0,0) node[pjfet] (pjfet) {}
+ (pjfet.G) node[anchor=east] {G}
+ (pjfet.D) node[anchor=north] {D}
+ (pjfet.S) node[anchor=south] {S}
+;\end{circuitikz}
+\end{LTXexample}
+
+For \textsc{npn}, \textsc{pnp}, \textsc{nigbt}, and \textsc{pigbt} transistors the anchors are \texttt{base}, \texttt{emitter} and \texttt{collector} anchors (which can be abbreviated with \texttt{B}, \texttt{E} and \texttt{C}):
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
@@ -843,10 +1047,10 @@ For BJT transistors the anchors are \texttt{base}, \texttt{emitter} and \texttt
\begin{LTXexample}[varwidth=true]
\begin{circuitikz} \draw
- (0,0) node[pnp] (pnp) {}
- (pnp.B) node[anchor=east] {B}
- (pnp.C) node[anchor=north] {C}
- (pnp.E) node[anchor=south] {E}
+ (0,0) node[pigbt] (pigbt) {}
+ (pigbt.B) node[anchor=east] {B}
+ (pigbt.C) node[anchor=north] {C}
+ (pigbt.E) node[anchor=south] {E}
;\end{circuitikz}
\end{LTXexample}
@@ -863,7 +1067,30 @@ Here is one composite example (please notice that the \texttt{xscale=-1} style w
(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:
+
+Similarly, transistors can be reflected vertically:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+ (0,0) node[pigfete, yscale=-1] (pigfete) {}
+ (pigfete.B) node[anchor=west] {B}
+ (pigfete.G) node[anchor=east] {G}
+ (pigfete.D) node[anchor=north] {D}
+ (pigfete.S) node[anchor=south] {S}
+;\end{circuitikz}
+\end{LTXexample}
+
+\subsubsection{Other tripoles} When inserting a thrystor, a triac or a potentiometer, one needs to refer to the third node — gate (\texttt{gate} or \texttt{G}) for the former two; wiper (\texttt{wiper} or \texttt{W}) for the latter one. This is done by giving a name to the bipole:
+
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+ (0,0) to[Tr, n=TRI] (2,0)
+ to[pR, n=POT] (4,0);
+ \draw[dashed] (TRI.G) -| (POT.wiper)
+;\end{circuitikz}
+\end{LTXexample}
+
+
+\subsubsection{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]
\begin{circuitikz} \draw
@@ -888,7 +1115,7 @@ There are also two more anchors defined, \texttt{up} and \texttt{down}, for the
\end{LTXexample}
-\paragraph{Double bipoles} All the (few, actually) double bipoles/quadrupoles have
+\subsubsection{Double bipoles} All the (few, actually) double bipoles/quadrupoles have
the four anchors, two for each port. The first port, to the left, is port \texttt{A}, having the anchors \texttt{A1} (up) and \texttt{A2} (down); same for port \texttt{B}. They also expose the \texttt{base} anchor, for labelling:
\begin{LTXexample}[varwidth=true]
@@ -913,6 +1140,33 @@ the four anchors, two for each port. The first port, to the left, is port \textt
;\end{circuitikz}
\end{LTXexample}
+\subsection{Transistor paths}\label{sec:transasbip}
+
+For syntactical convenience transistors can be placed using the normal path notation used for bipoles. The transitor type can be specified by simply adding a ``T'' (for transistor) in front of the node name of the transistor. It will be placed with the base/gate orthogonal to the direction of the path:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw
+ (0,0) node[njfet] {1}
+ (-1,2) to[Tnjfet=2] (1,2)
+ to[Tnjfet=3, mirror] (3,2);
+;\end{circuitikz}
+\end{LTXexample}
+
+Access to the gate and/or base nodes can be gained by naming the transistors with the \texttt{n} or \texttt{name} path style:
+\begin{LTXexample}[varwidth=true]
+\begin{circuitikz} \draw[yscale=1.1, xscale=.8]
+ (2,4.5) -- (0,4.5) to[Tpmos, n=p1] (0,3)
+ to[Tnmos, n=n1] (0,1.5)
+ to[Tnmos, n=n2] (0,0) node[ground] {}
+ (2,4.5) to[Tpmos,n=p2] (2,3) to[short, -*] (0,3)
+ (p1.G) -- (n1.G) to[short, *-o] ($(n1.G)+(3,0)$)
+ (n2.G) ++(2,0) node[circ] {} -| (p2.G)
+ (n2.G) to[short, -o] ($(n2.G)+(3,0)$)
+ (0,3) to[short, -o] (-1,3)
+;\end{circuitikz}
+\end{LTXexample}
+
+The \texttt{name} property is available also for bipoles, although this is useful mostly for triac, potentiometer and thyristor (see~\ref{sec:othertrip}).
+
\section{Customization}
\subsection{Parameters}
@@ -941,8 +1195,8 @@ All can be varied using the \verb!\ctikzset! command, anywhere in the code:
\begin{LTXexample}[varwidth=true]
\tikz \draw (0,0) node[nand port] {}; \par
-\ctikzset{tripoles/nand port/input height=.2}
-\ctikzset{tripoles/nand port/port width=.2}
+\ctikzset{tripoles/american nand port/input height=.2}
+\ctikzset{tripoles/american nand port/port width=.2}
\tikz \draw (0,0) node[nand port] {};
\end{LTXexample}
@@ -956,8 +1210,8 @@ All can be varied using the \verb!\ctikzset! command, anywhere in the code:
Admittedly, not all graphical properties have understandable names, but for the time it will have to do:
\begin{LTXexample}[varwidth=true]
\tikz \draw (0,0) node[xnor port] {};
-\ctikzset{tripoles/xnor port/aaa=.2}
-\ctikzset{tripoles/xnor port/bbb=.6}
+\ctikzset{tripoles/american xnor port/aaa=.2}
+\ctikzset{tripoles/american xnor port/bbb=.6}
\tikz \draw (0,0) node[xnor port] {};
\end{LTXexample}
@@ -1131,7 +1385,29 @@ And yes: this is a bug and \emph{not} a feature\ldots
\section{Revision history}
\begin{itemize}
-
+\item[\itshape version 0.2.3] (20091118).
+ \begin{enumerate}
+ \item fixed compatibility problem with label option from tikz
+ \item Fixed resizing problem for shape ground
+ \item Variable capacitor
+ \item polarized capacitor
+ \item ConTeXt support (read the manual!)
+ \item nfet, nigfete, nigfetd, pfet, pigfete, pigfetd (contribution of Clemens Helfmeier and Theodor
+Borsche)
+ \item njfet, pjfet (contribution of Danilo Piazzalunga)
+ \item pigbt, nigbt
+ \item \emph{backward incompatibility} potentiometer is now the standard resistor-with-arrow-in-the-middle; the old potentiometer is now known as variable resistor (or vR), similarly to variable inductor and variable capacitor
+ \item triac, thyristor, memristor
+ \item new property "name" for bipoles
+ \item fixed voltage problem for batteries in american voltage mode
+ \item european logic gates
+ \item \emph{backward incompatibility} new american standard inductor. Old american inductor now called "cute inductor"
+ \item \emph{backward incompatibility} transformer now linked with the chosen type of inductor, and version with core, too. Similarly for variable inductor
+ \item \emph{backward incompatibility} styles for selecting shape variants now end are in the plural to avoid conflict with paths
+ \item new placing option for some tripoles (mostly transistors)
+ \item mirror path style
+\end{enumerate}
+
\item[\itshape version 0.2.2] (20090520).
\begin{enumerate}
\item Added the shape for lamps.
diff --git a/Master/texmf-dist/doc/latex/circuitikz/context.pdf b/Master/texmf-dist/doc/latex/circuitikz/context.pdf
new file mode 100644
index 00000000000..ec6b653d1bd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/circuitikz/context.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/circuitikz/context.tex b/Master/texmf-dist/doc/latex/circuitikz/context.tex
new file mode 100644
index 00000000000..13f3ade1cde
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/circuitikz/context.tex
@@ -0,0 +1,20 @@
+
+\usemodule[circuitikz]
+
+\starttext
+
+A simple example to test the installation.
+
+\startcircuitikz[scale=1.2]
+ \draw
+ (0,2) to[I=1\milli\ampere] (2,2)
+ to[R, l_=2\kilo\ohm, *-*] (0,0)
+ to[R, l_=2\kilo\ohm] (2,0)
+ to[V, v_=2\volt] (2,2)
+ to[cspst, l=$t_0$] (4,2) -- (4,1.5)
+ to [generic, i=$i_1$, v=$v_1$] (4,-.5) -- (4,-1.5)
+ (0,2) -- (0,-1.5) to[V, v_=4\volt] (2,-1.5)
+ to [R, l=1\kilo\ohm] (4,-1.5);
+\stopcircuitikz
+
+\stoptext