From a6ca78f24091e7023516b4761d400b3699f82937 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 26 May 2024 03:01:14 +0000 Subject: CTAN sync 202405260301 --- graphics/pgf/contrib/circuitikz/doc/changelog.tex | 29 ++++ .../contrib/circuitikz/doc/circuitikz-context.pdf | Bin 13862 -> 13867 bytes .../contrib/circuitikz/doc/circuitikzmanual.pdf | Bin 2422724 -> 2431321 bytes .../contrib/circuitikz/doc/circuitikzmanual.tex | 65 +++++++-- graphics/pgf/contrib/circuitikz/tex/circuitikz.sty | 4 +- .../pgf/contrib/circuitikz/tex/pgfcircbipoles.tex | 151 ++++++++++++++++++++- .../pgf/contrib/circuitikz/tex/pgfcirctripoles.tex | 24 +++- .../pgf/contrib/circuitikz/tex/t-circuitikz.tex | 4 +- 8 files changed, 251 insertions(+), 26 deletions(-) (limited to 'graphics') diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex index d9594dc1fc..0806a20b78 100644 --- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex +++ b/graphics/pgf/contrib/circuitikz/doc/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/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf index d4f9bc36a2..cc6865c72f 100644 Binary files a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf and b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf differ diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf index 9d1e52303d..9f3d2b57e0 100644 Binary files a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf and b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf differ diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex index 20a79f3d68..ac116af09e 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +++ b/graphics/pgf/contrib/circuitikz/doc/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} diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty index 69ce1bbddd..afa91d4b2b 100644 --- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty @@ -16,8 +16,8 @@ \providecommand\DeclareRelease[3]{} \providecommand\DeclareCurrentRelease[2]{} -\def\pgfcircversion{1.6.8} -\def\pgfcircversiondate{2024/05/05} +\def\pgfcircversion{1.6.9} +\def\pgfcircversiondate{2024/05/25} \DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex} \DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex} diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex index 4978311dca..626ed28812 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex @@ -3696,9 +3696,9 @@ \pgf@circuit@fulldiodefalse \ctikzset{diode/.is choice} -\ctikzset{diode/empty/.code = \pgf@circuit@fulldiodefalse\pgf@circuit@strokediodefalse}%default -\ctikzset{diode/full/.code = \pgf@circuit@fulldiodetrue } -\ctikzset{diode/stroke/.code = \pgf@circuit@strokediodetrue} +\ctikzset{diode/empty/.code = \pgf@circuit@fulldiodefalse\pgf@circuit@strokediodefalse}%default +\ctikzset{diode/full/.code = \pgf@circuit@fulldiodetrue\pgf@circuit@strokediodefalse} +\ctikzset{diode/stroke/.code = \pgf@circuit@fulldiodefalse\pgf@circuit@strokediodetrue} \tikzset{full diodes/.style = { \circuitikzbasekey/diode = full}} \tikzset{empty diodes/.style = { \circuitikzbasekey/diode = empty}} @@ -6977,7 +6977,7 @@ \ctikzset{bipoles/tlmic/width/.initial=.5}% it MUST be mic width *5/8 \ctikzset{bipoles/mic/bar thickness/.initial=1} -% arresters, fuses, lamps, etc +% arresters, fuses, relais, lamps, etc \ctikzset{bipoles/european gas filled surge arrester/height/.initial=.30} \ctikzset{bipoles/european gas filled surge arrester/width/.initial=.80} @@ -6994,6 +6994,7 @@ \ctikzset{bipoles/afuse/height/.initial=.20} \ctikzset{bipoles/afuse/width/.initial=.50} \ctikzset{bipoles/lamp/height/.initial=.60} +\ctikzset{bipoles/lamp/width/.initial=.60} \ctikzset{bipoles/wfuse/height/.initial=.20} \ctikzset{bipoles/wfuse/width/.initial=.50} \ctikzset{bipoles/wfuse/shape/.initial=ocirc} @@ -7001,9 +7002,22 @@ \ctikzset{bipoles/wfuse/dots/.is choice} \ctikzset{bipoles/wfuse/dots/.is if=pgf@circ@wfuse@dots} % -\ctikzset{bipoles/lamp/width/.initial=.60} +\ctikzset{bipoles/relais/height/.initial=.8} +\ctikzset{bipoles/relais/width/.initial=.3} +% \ctikzset{bipoles/bulb/height/.initial=.8} \ctikzset{bipoles/bulb/width/.initial=.8} +% suggested by @bogger33, see https://github.com/circuitikz/circuitikz/issues/793 +\ctikzset{bipoles/neonlampcc/height/.initial=.60} +\ctikzset{bipoles/neonlampac/height/.initial=.60} +\pgf@circ@declare@family@arrows{sparkgap} +\newif\ifpgf@sparkgap@dot +\newif\ifpgf@sparkgap@circle +\ctikzset{sparkgap/circle/.is if=pgf@sparkgap@circle} +\ctikzset{sparkgap/dot/.is if=pgf@sparkgap@dot} +\ctikzset{sparkgap/gap/.initial=.05} +\ctikzset{bipoles/sparkgap/height/.initial=.60} +% \ctikzset{bipoles/squid/height/.initial=.60} \ctikzset{bipoles/squid/width/.initial=.60} \ctikzset{bipoles/barrier/height/.initial=.60} @@ -7233,6 +7247,25 @@ \pgfnode{\cshape}{center}{}{\thisshape-right}{\pgfusepath{draw}} \fi } + +%% Relais +\pgfcircdeclarebipolescaled{misc} +{} +{\ctikzvalof{bipoles/relais/height}} +{relais} +{\ctikzvalof{bipoles/relais/height}} +{\ctikzvalof{bipoles/relais/width}} +{ + \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}} + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgf@circ@draworfill + \pgfscope + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}} + \pgfusepath{draw} + \endpgfscope +} + %% SQUID added by Cor Molenaar 5 March 2010 \pgfcircdeclarebipolescaled{misc} {} @@ -7340,11 +7373,116 @@ \pgfsetbeveljoin \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@zero}} \pgfusepath{draw} -}% %>>> +}% +% neon lamps, suggested by @bogger33 https://github.com/circuitikz/circuitikz/issues/793 +% implemented by Romano +% double-cathode (capacitor) style +\pgfcircdeclarebipolescaled{misc} +{} +{\ctikzvalof{bipoles/neonlampcc/height}} +{neonlampcc} +{\ctikzvalof{bipoles/neonlampcc/height}} +{\ctikzvalof{bipoles/neonlampcc/height}} +{ + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}} + \pgf@circ@draworfill + %% leads in + \pgfsetlinewidth{\pgfstartlinewidth} + \def\@@w{0.2}\def\@@h{0.6} + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}} + \pgfpathlineto{\pgfpoint{\@@w\pgf@circ@res@left}{0pt}} + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}} + \pgfpathlineto{\pgfpoint{\@@w\pgf@circ@res@right}{0pt}} + %% "capacitor style" symbol + \pgfusepath{draw} + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgfpathmoveto{\pgfpoint{\@@w\pgf@circ@res@right}{\@@h\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{\@@w\pgf@circ@res@right}{\@@h\pgf@circ@res@up}} + \pgfpathmoveto{\pgfpoint{\@@w\pgf@circ@res@left}{\@@h\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{\@@w\pgf@circ@res@left}{\@@h\pgf@circ@res@up}} + \pgfusepath{draw} + %% dot + \pgftransformshift{\pgfpoint{\@@w\pgf@circ@res@left-3*\ctikzvalof{nodes width}\pgf@circ@Rlen} + {\@@h\pgf@circ@res@down + 2*\ctikzvalof{nodes width}\pgf@circ@Rlen}} + \pgfnode{circ}{center}{}{}{\pgfusepath{draw,fill}} +} +% anode-cathode style +\pgfcircdeclarebipolescaled{misc} +{} +{\ctikzvalof{bipoles/neonlampac/height}} +{neonlampac} +{\ctikzvalof{bipoles/neonlampac/height}} +{\ctikzvalof{bipoles/neonlampac/height}} +{ + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgfpathellipse{\pgfpointorigin}{\pgfpoint{0}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@left}{0}} + \pgf@circ@draworfill + %% leads in + \pgfsetlinewidth{\pgfstartlinewidth} + \def\@@w{0.5}\def\@@h{0.5} + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}} + \pgfpathlineto{\pgfpoint{\@@w\pgf@circ@res@left}{0pt}} + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}} + \pgfpathlineto{\pgfpoint{\@@w\pgf@circ@res@right}{0pt}} + \pgfusepath{draw} + %% one terminal is a straight plate + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgfpathmoveto{\pgfpoint{\@@w\pgf@circ@res@left}{\@@h\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{\@@w\pgf@circ@res@left}{\@@h\pgf@circ@res@up}} + \pgfusepath{draw} + %% the other is an "ocirc" shape + \pgftransformshift{\pgfpoint{\@@w\pgf@circ@res@right}{0pt}} + \pgfnode{ocirc}{center}{}{}{\pgfusepath{draw,fill}} + %% dot + \pgftransformshift{\pgfpoint{-\@@w\pgf@circ@res@right}{\@@h\pgf@circ@res@down}} + \pgfnode{circ}{center}{}{}{\pgfusepath{draw,fill}} +} +% spark gap, suggested by @bogger33 https://github.com/circuitikz/circuitikz/issues/800 +\pgfcircdeclarebipolescaled{misc} +{ + \savedmacro{\changeh}{\edef\changeh{\ifpgf@sparkgap@circle 1 \else 0.5 \fi}} + \pgfcirc@border@extend@updown{\changeh}{\changeh} +} +{\ctikzvalof{bipoles/sparkgap/height}} +{sparkgap} +{\ctikzvalof{bipoles/sparkgap/height}} +{\ctikzvalof{bipoles/sparkgap/height}}{ + % circle (if requested) + \pgfscope + \ifpgf@sparkgap@circle + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgfpathcircle{\pgfpointorigin}{\pgf@circ@res@up} + \pgf@circ@draworfill + \fi + \endpgfscope + % arrows + \pgfscope + \pgfcirc@set@arrows{sparkgap}{}{Triangle[scale=2]} + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@right}{0pt}} + \pgfpathlineto{\pgfpoint{\ctikzvalof{sparkgap/gap}\pgf@circ@res@right}{0pt}} + \pgfusepath{draw} + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}} + \pgfpathlineto{\pgfpoint{\ctikzvalof{sparkgap/gap}\pgf@circ@res@left}{0pt}} + \pgfusepath{draw} + \endpgfscope{} + % dot (if requested) + \ifpgf@sparkgap@dot + \pgftransformshift{\pgfpoint + {\ctikzvalof{sparkgap/gap}\pgf@circ@res@left-1*\ctikzvalof{nodes width}\pgf@circ@Rlen} + {-4*\ctikzvalof{nodes width}\pgf@circ@Rlen}} + \pgfnode{circ}{center}{}{}{\pgfusepath{draw,fill}} + \fi +} + +%>>> %% Path definitions for Miscellaneous%<<< \pgfcirc@activate@bipole@simple{l}{lamp} +\pgfcirc@activate@bipole@simple{l}{neonlampcc} +\pgfcirc@activate@bipole@simple{l}{neonlampac} +\pgfcirc@activate@bipole@simple{l}{sparkgap} \pgfcirc@activate@bipole@simple{l}{bulb} \pgfcirc@activate@bipole@simple{l}{squid} \pgfcirc@activate@bipole@simple{l}{barrier} @@ -7355,6 +7493,7 @@ \pgfcirc@style@to@style{asymmetric fuse}{afuse} \pgfcirc@activate@bipole@simple{l}{wfuse} \pgfcirc@activate@bipole{l}{wfuse}{wfuse}{wiggly fuse} +\pgfcirc@activate@bipole@simple{l}{relais} \def\pgf@circ@gfsurgearrester@path#1{\ifpgf@circuit@europeangfsurgearrester\pgf@circ@europeangfsurgearrester@path{#1}\else\pgf@circ@americangfsurgearrester@path{#1}\fi} \pgfcirc@activate@bipole{l}{europeangfsurgearrester}{european gas filled surge arrester}{european gas filled surge arrester} \pgfcirc@activate@bipole{l}{americangfsurgearrester}{american gas filled surge arrester}{american gas filled surge arrester} diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex index 7457dabb46..d8d089dd92 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex @@ -4025,6 +4025,8 @@ \pgfmathsetmacro{\@@BDscale}{\ctikzvalof{tripoles/#1/bodydiode scale}* \ctikzvalof{\ctikzclass/scale}/\ctikzvalof{diodes/scale}} \pgftransformscale{\@@BDscale} \ifpgf@circuit@fulldiode + % I'm not sure why this is needed, but... + \pgf@circ@maybe@color{transistor bodydiode/color} \pgfnode{fulldiodeshape}{center}{}{pgf@bodydiode}{\pgfusepath{fill}} \else \pgfnode{emptydiodeshape}{center}{}{pgf@bodydiode}{\pgfusepath{fill}} @@ -8613,6 +8615,11 @@ \pgf@y=\pgf@circ@res@up\advance\pgf@y by -\pgf@circ@res@right \fi } + \savedmacro{\tubes@filament@angle}{\edef\tubes@filament@angle{\ctikzvalof{tubes/filament angle}}} + \savedmacro{\tubes@filament@distance}{\edef\tubes@filament@distance{\ctikzvalof{tubes/filament distance}}} + \savedmacro{\tubes@tube@radius}{\edef\tubes@tube@radius{\ctikzvalof{tubes/tube radius}}} + \savedmacro{\tubes@cathode@width}{\edef\tubes@cathode@width{\ctikzvalof{tubes/cathode width}}} + \savedmacro{\tubes@cathode@distance}{\edef\tubes@cathode@distance{\ctikzvalof{tubes/cathode distance}}} \anchor{tube ne}{\tubene} \anchor{tubesq ne}{\tubesquarene} % tube shape anchors: geo @@ -8647,30 +8654,37 @@ \anchor{cathode}{% \northwest \pgf@y=-\pgf@y - \pgf@x=\ctikzvalof{tubes/cathode width}\pgf@x + \pgf@x=\tubes@cathode@width\pgf@x } \anchor{cathode 1}{% \northwest \pgf@y=-\pgf@y - \pgf@x=\ctikzvalof{tubes/cathode width}\pgf@x + \pgf@x=\tubes@cathode@width\pgf@x } \anchor{cathode 2}{% \northwest \pgf@y=-\pgf@y - \pgf@x=-\ctikzvalof{tubes/cathode width}\pgf@x + \pgf@x=-\tubes@cathode@width\pgf@x } \anchor{filament 1}{% \northwest - \pgfmathparse{(\ctikzvalof{tubes/tube radius}*sin(\ctikzvalof{tubes/filament angle})} + \pgfmathparse{(\tubes@tube@radius*sin(\tubes@filament@angle)} \pgf@x=\pgfmathresult\pgf@x \pgf@y=-\pgf@y } \anchor{filament 2}{% \northwest - \pgfmathparse{(\ctikzvalof{tubes/tube radius}*sin(\ctikzvalof{tubes/filament angle})} + \pgfmathparse{(\tubes@tube@radius*sin(\tubes@filament@angle)} \pgf@x=-\pgfmathresult\pgf@x \pgf@y=-\pgf@y } + \anchor{filament center}{% + \northwest + \pgf@ya=0.5\pgf@y + \pgf@ya=-\tubes@cathode@distance\pgf@y + \advance\pgf@ya by -\tubes@filament@distance\pgf@y + \pgf@x=0pt\pgf@y=\pgf@ya + } % Extra anchors #2% diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex index a738c664ea..4e4861071f 100644 --- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex @@ -16,8 +16,8 @@ \startmodule[circuitikz] \usemodule[tikz] -\def\pgfcircversion{1.6.8} -\def\pgfcircversiondate{2024/05/05} +\def\pgfcircversion{1.6.9} +\def\pgfcircversiondate{2024/05/25} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} -- cgit v1.2.3