From 40834c5a5192dc289a67333b621a28265ebb5290 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 25 May 2024 19:35:09 +0000 Subject: circuitikz (25may24) git-svn-id: svn://tug.org/texlive/trunk@71354 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/circuitikz/changelog.tex | 29 +++++++++ .../doc/latex/circuitikz/circuitikzmanual.pdf | Bin 2422724 -> 2431321 bytes .../doc/latex/circuitikz/circuitikzmanual.tex | 65 +++++++++++++++++---- 3 files changed, 83 insertions(+), 11 deletions(-) (limited to 'Master/texmf-dist/doc/latex') diff --git a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex index d9594dc1fcd..0806a20b78d 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex @@ -4,6 +4,35 @@ here. See \url{https://github.com/circuitikz/circuitikz/commits} for a full list of changes. \begin{itemize} +\item + Version 1.6.9 (2024-05-25) + + Several new components and a bug fix for a nasty long-standing bug + about switching diode types. + + \begin{itemize} + \tightlist + \item + Added a Relais-Shape (contributed by + \href{https://github.com/circuitikz/circuitikz/pull/795}{Jakob + ``DraUX'' on GitHub} + \item + Added a center tap anchor for tube filament (suggested by + \href{https://github.com/circuitikz/circuitikz/issues/792}{user + bogger33 on GitHub}) + \item + Added neon lamps (two versions, suggested by + \href{https://github.com/circuitikz/circuitikz/issues/793}{user + bogger33 on GitHub}) + \item + Added a configurable spark gap (suggested by + \href{https://github.com/circuitikz/circuitikz/issues/800}{user + bogger33 on GitHub}) + \item + Fix a long-standing problem when + \href{https://github.com/circuitikz/circuitikz/issues/794}{(locally) + switching diode type} + \end{itemize} \item Version 1.6.8 (2024-05-05) diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf index 9d1e52303dc..9f3d2b57e02 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 20a79f3d681..ac116af09e0 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex @@ -3266,6 +3266,8 @@ Here you'll find bipoles that are not easily grouped in the categories above. \circuitdescbip*{fuse}{Fuse}{} \circuitdescbip*{afuse}{Asymmetric fuse}{asymmetric fuse} \circuitdescbip{wfuse}{``wiggly'' fuse}{wiggly fuse}()[left/110/0.2, right/70/0.2] + \circuitdescbip*{relais}{Relais\footnotemark}{} + \footnotetext{Contributed by \href{https://github.com/circuitikz/circuitikz/pull/795}{Jakob «DraUX»}} \circuitdescbip{squid}{Squid}{} \circuitdescbip{barrier}{Barrier}{} \circuitdescbip{openbarrier}{Open barrier}{} @@ -3287,6 +3289,13 @@ If otherwise \texttt{americangfsurgearrester} option is active (or the style \te \begin{groupdesc} \circuitdescbip*{lamp}{Lamp}{} \circuitdescbip*{bulb}{Bulb}{} + \circuitdescbip*{neonlampcc}{Neon lamp\footnotemark\ (double cathode style)}{} + \footnotetext{The neon lamps have been added in \texttt{v1.6.9} thanks to a suggestion by \href{https://github.com/circuitikz/circuitikz/issues/793}{user bogger33 on GitHub}.} + \circuitdescbip*{neonlampac}{Neon lamp (anode and cathode style)}{} + \circuitdescbip*{sparkgap}{Spark gap\footnotemark (unenclosed)}{} + \footnotetext{The spark gap has been added in \texttt{v1.6.9} thanks to a suggestion by \href{https://github.com/circuitikz/circuitikz/issues/800}{user bogger33 on GitHub}.} + \circuitdescbip*[sparkgap]{sparkgap, sparkgap/circle}{Spark gap}{} + \circuitdescbip*[sparkgap]{sparkgap, sparkgap/dot, sparkgap/circle}{Spark gap (gas filled)}{} \circuitdescbip*{loudspeaker}{loudspeaker}{}( north/90/0.4, ne/45/0.4, east/0/0.4, se/-45/0.4, south/-90/0.4, sw/-135/0.4, west/180/0.4, nw/135/0.4, left/135/0.2, right/45/0.2, center/-135/0.2) \circuitdescbip*{mic}{mic}{}( north/90/0.4, east/0/0.4, south/-90/0.4, west/180/0.4, left/135/0.2, right/45/0.2, center/-135/0.2) \circuitdescbip*{tlmic}{tail-less mic\footnotemark}{}( north/90/0.4, east/0/0.4, south/-90/0.4, west/180/0.4, left/135/0.2, right/45/0.2, center/-135/0.2) @@ -3324,9 +3333,9 @@ You have two types of microphones; \texttt{mic} has protruding connection and \t \subsubsection{Miscellaneous element customization}\label{sec:tweak-misc} -You can change the scale of all the miscellaneous elements by setting the key \texttt{misc/scale} to something different from the default \texttt{1.0}. +You can change the scale of all the miscellaneous elements by setting the key \texttt{misc/scale} to something different from the default \texttt{1.0}; relative thickness can be controlled with \texttt{misc/thickness}. -\paragraph{Wiggly fuses} can have (or not have) poles; you can switch between the two forms by setting to \texttt{true} or \texttt{false} (default \texttt{true}) the key \texttt{bipoles/wfuse/dots}; if they have poles, you can choose any of the pole shapes with the key \texttt{bipoles/wfuse/shape}. +\paragraph{Wiggly fuses.} Wiggly fuses can have (or not have) poles; you can switch between the two forms by setting to \texttt{true} or \texttt{false} (default \texttt{true}) the key \texttt{bipoles/wfuse/dots}; if they have poles, you can choose any of the pole shapes with the key \texttt{bipoles/wfuse/shape}. The pole nodes are named \texttt{-left} and \texttt{-right} so that you can access their borders. \begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily] @@ -3342,6 +3351,30 @@ The pole nodes are named \texttt{-left} and \texttt{-right} so that you can acce \end{circuitikz} \end{LTXexample} +\paragraph{Neon lamps.} Neon lamp ``dot'' size is the same as the size of poles (\texttt{circ} and \texttt{ocirc}), and they can be changed locally: +\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily] +\begin{tikzpicture} + \draw (0,0) to[neonlampcc, nodes width=0.03] ++(2,0) + to[neonlampac, misc/thickness=3] ++(2,0); +\end{tikzpicture} +\end{LTXexample} + +\paragraph{Spark gap.} The \texttt{sparkgap} component is similar to the (American) surge arrester, but it's more configurable; it will render bare (unenclosed) by default, but you can add a (fillable) enclosure with the key \texttt{sparkgap/circle} and a dot with \texttt{sparkgap/dot} (they are boolean keys, false by default). +Moreover, the arrows are configurable like other arrows in the package (see~\ref{sec:tunablearrows}) using the \texttt{sparkgap end arrow} key (default \texttt{Triangle[scale=2]}). The gap is tunable with \texttt{sparkgap/gap} (default \texttt{0.05}). +\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily] +\begin{tikzpicture} + \draw (0,2) to[sparkgap, l=gap\textsubscript{1}] ++(2,0) + to[sparkgap, sparkgap/circle, + sparkgap/dot, l=S2] ++(2,0); + \ctikzset{sparkgap end arrow={Kite[scale=1.5]}} + \draw (0,0) to[sparkgap, l=S3] ++(2,0) + to[sparkgap, l=S4, sparkgap/circle, + sparkgap/gap=0.15] ++(2,0); +\end{tikzpicture} +\end{LTXexample} +As in neon lamps, the dot (if activated by the key \texttt{sparkgap/dot}) follows the size of poles and can be changed locally. + + \subsection{Multiple wires (buses)} These are simple drawings to indicate multiple wires. @@ -4827,7 +4860,8 @@ Note that the \verb|diodetube| is used as component name to avoid clashes with t Normally, the filament is not drawn. If you want a filament, put the \verb|filament| option in the node description: \begin{groupdesc} - \circuitdesc*{diodetube,filament}{Tube Diode}{}(anode/90/0.2, filament 1/-135/0.2, filament 2/-45/0.2 ) + \circuitdesc*{diodetube,filament}{Tube Diode\footnotemark}{}(anode/90/0.2, filament 1/-90/0.4, filament 2/-45/0.2, filament center/0/0.5 ) + \footnotetext{The \texttt{filament center} anchor has been added in \texttt{v1.6.9} thanks to a suggestion by \href{https://github.com/circuitikz/circuitikz/issues/792}{user bogger33 on GitHub}.} \end{groupdesc} Sometimes, you don't want the cathode to be drawn (but you do want the filament). Use the \verb|nocathode| option in the node description: @@ -4869,18 +4903,27 @@ fully configurable, and the attributes are described below: \verb|tubes/filament angle| & \verb|15| & angle from the centerpoint \\ \end{tabular} -Conventionally, the model of the tube is indicated at the \verb|east| anchor: +Conventionally, the model of the tube is indicated at the \verb|east| anchor, and you can access filament anchors if you need them: -\begin{LTXexample}[varwidth] -\ctikzset{tubes/width=1.4} -\ctikzset{tubes/height=1} -\begin{circuitikz} -\draw (0,0) node[triode] (Tri) {}; -\draw (Tri.east) node[right] {12AX7}; -\end{circuitikz} +\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily] +\ctikzset{tubes/width=1.4, tubes/height=1} +\begin{circuitikz} + \draw (0,2) node[triode, filament] (Tri) {}; + \draw (Tri.east) node[right] {12AX7}; + \ctikzset{tubes/filament angle=40, + tubes/filament distance=0.2} + \draw (0,0) node[triode, filament] (Pent) {}; + \draw (Pent.east) node[right] {BOH}; + \path (Tri.filament 1) node[red,ocirc]{}; + \path (Pent.filament 1) node[red,ocirc]{}; + \path (Tri.filament center) node[blue,ocirc]{}; + \draw (Pent.filament center) -- ++(0,-1) node[tlground]{}; + \end{circuitikz} \end{LTXexample} + + Example triode amplifier: \begin{lstlisting} -- cgit v1.2.3