diff options
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf | bin | 13461 -> 13459 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/circuitikz/changelog.tex | 16 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf | bin | 1736212 -> 1738145 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex | 21 | ||||
-rw-r--r-- | Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex | 71 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex | 2 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty | 4 |
9 files changed, 106 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf Binary files differindex 42c752e23b1..c105bd373a8 100644 --- a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf +++ b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf diff --git a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md index da67c73ca96..8730a6a680c 100644 --- a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md +++ b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md @@ -1,6 +1,13 @@ <!--- CircuiTikz - Changelog ---> The major changes among the different CircuiTikZ versions are listed here. See <https://github.com/circuitikz/circuitikz/commits> for a full list of changes. +* Version 1.6.6 (2023-12-09) + + Several new components. + + - Added the symbol for metal-oxide varistor `mov` + - Added another symbol for fuse (wiggly fuse `wfuse`) + * Version 1.6.5 (2023-10-29) This version features an important overhaul of the `muxdemux` configurable component/shape, making it much more flexible and powerful, by adding configurable labels and negation and clock symbols to the pins. diff --git a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex index 0586f67004d..c2e1f56ffba 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex @@ -5,6 +5,18 @@ full list of changes. \begin{itemize} \item + Version 1.6.6 (2023-12-09) + + Several new components. + + \begin{itemize} + \tightlist + \item + Added the symbol for metal-oxide varistor \texttt{mov} + \item + Added another symbol for fuse (wiggly fuse \texttt{wfuse}) + \end{itemize} +\item Version 1.6.5 (2023-10-29) This version features an important overhaul of the \texttt{muxdemux} @@ -281,7 +293,7 @@ full list of changes. B. Cameron, user \texttt{@cameroncb1} on GitHub) \item Added Shockley diode (suggested by - \href{https://tex.stackexchange.com/questions/646039/creating-a-shockley-diode-in-circuitikz}{@dauph}) + {[}@dauph{]}(https://tex.stackexchange.com/questions/646039/creating-a-shockley-diode-in-circuitikz)) \end{itemize} \item Version 1.5.2 (2022-05-08) @@ -1459,7 +1471,7 @@ A detailed list of changes can be seen below. \item Fixed varcap symbol at small scalings \item - New packet-option ``straightvoltages, to draw straight(no curved) + New packet-option "straightvoltages, to draw straight(no curved) voltage arrows \item New option ``invert'' to revert the node direction at paths diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf Binary files differindex 8583d870a74..b53cafb444f 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 32a8a8c532a..f0f68f16ff0 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex @@ -2054,6 +2054,7 @@ If instead \texttt{europeanresistors} option is active (or the style \texttt{[e Other miscellaneous resistor-like devices: \begin{groupdesc} \circuitdescbip*{varistor}{Varistor}{} + \circuitdescbip*{mov}{Metal-Oxide varistor}{} \circuitdescbip*[photoresistor]{phR}{Photoresistor}{photoresistor}(arrows/0/0.3) \circuitdescbip*[thermistor]{thR}{Thermistor}{thermistor} \circuitdescbip*[thermistorptc]{thRp}{PTC thermistor}{thermistor ptc} @@ -3162,7 +3163,6 @@ Or, if you want a more physical structure for the measurement setup: You can change the scale of all the mechanical elements by setting the key \texttt{mechanicals/scale} to something different from the default \texttt{1.0}. - \subsection{Miscellaneous bipoles} Here you'll find bipoles that are not easily grouped in the categories above. @@ -3171,12 +3171,13 @@ Here you'll find bipoles that are not easily grouped in the categories above. \circuitdescbip{thermocouple}{Thermocouple}{} \circuitdescbip*{fuse}{Fuse}{} \circuitdescbip*{afuse}{Asymmetric fuse}{asymmetric fuse} + \circuitdescbip{wfuse}{``wiggly'' fuse}{wiggly fuse}()[left/110/0.2, right/70/0.2] \circuitdescbip{squid}{Squid}{} \circuitdescbip{barrier}{Barrier}{} \circuitdescbip{openbarrier}{Open barrier}{} \end{groupdesc} - You can tune how big is the gap in the \texttt{openbarrier} component by setting the key \texttt{bipoles/openbarrier/gap} (default value \texttt{0.5}; \texttt{0} means no gap and \texttt{1} full gap). +You can tune how big is the gap in the \texttt{openbarrier} component by setting the key \texttt{bipoles/openbarrier/gap} (default value \texttt{0.5}; \texttt{0} means no gap and \texttt{1} full gap). \begin{groupdesc} \circuitdescbip*{european gas filled surge arrester}{European gas filled surge arrester}{} @@ -3231,6 +3232,22 @@ You have two types of microphones; \texttt{mic} has protruding connection and \t 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}. +\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}. +The pole nodes are named \texttt{-left} and \texttt{-right} so that you can access their borders. + +\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily] +\begin{circuitikz} + \draw (0,3) to[wfuse, bipoles/wfuse/dots=false] ++(2,0); + \draw (0,2) to[wfuse, name=A] ++(2,0); + \ctikzset{bipoles/wfuse/shape=osquarepole} + \draw (0,1) to[wfuse, name=B] ++(2,0); + \draw [red, densely dashed] + (A-left.-135) to[bend right] (B-left.135); + \ctikzset{bipoles/wfuse/shape=circ} + \draw (0,0) to[wfuse, name=B] ++(2,0); +\end{circuitikz} +\end{LTXexample} + \subsection{Multiple wires (buses)} These are simple drawings to indicate multiple wires. diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex index 8cc8b391313..d4358b98c3c 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex @@ -16,8 +16,8 @@ \startmodule[circuitikz] \usemodule[tikz] -\def\pgfcircversion{1.6.5} -\def\pgfcircversiondate{2023/10/29} +\def\pgfcircversion{1.6.6} +\def\pgfcircversiondate{2023/12/09} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex index 82e841212ae..6bf0b72ac76 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex @@ -504,7 +504,28 @@ \pgf@circ@text@strokecolor \pgftext[top,x=.65\pgf@circ@res@left,y=1.2\pgf@circ@res@down]{{\pgf@circ@font@tiny\textsf{U}}} } - +%% MOV +\pgfcircdeclarebipolescaled{resistors} +{ + \pgfcirc@border@extend@updown{1.2}{1.2} +} +{\ctikzvalof{bipoles/varistor/height}} +{mov} +{\ctikzvalof{bipoles/varistor/height}} +{\ctikzvalof{bipoles/varistor/width}} +{ + \pgfscope + \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\ctikzvalof{bipoles/varistor/main}\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{-\ctikzvalof{bipoles/varistor/main}\pgf@circ@res@up}} + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgf@circ@draworfill + \pgf@circ@set@relative@thickness{modifier thickness} + \pgfpathmoveto{\pgfpoint{-\pgf@circ@res@left}{-1.1\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{-0.7\pgf@circ@res@left}{-1.1\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{0.7\pgf@circ@res@left}{1.1\pgf@circ@res@down}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{1.1\pgf@circ@res@down}} + \pgfusepath{draw} + \endpgfscope +} %% Generic tunable \pgfcircdeclarebipolescaled{resistors} { @@ -837,6 +858,7 @@ \pgfcirc@activate@bipole@simple{l}{photoresistor} \pgfcirc@style@to@style{photoresistor}{phR} \pgfcirc@activate@bipole@simple{l}{varistor} +\pgfcirc@activate@bipole@simple{l}{mov} \pgfcirc@activate@bipole@simple{l}{memristor} \pgfcirc@style@to@style{memristor}{Mr}% % %>>> @@ -2477,7 +2499,7 @@ \pgftransformscale{-.015*\ctikzvalof{\ctikzclass/symbol/eyw scale}*\pgf@circ@res@left*#1} \def\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil} \pgftransformrotate{-\pgfcircmathresult} - + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} \pgf@circ@set@relative@thickness{symbol/thickness} \pgfpathmoveto{\pgfpoint{0}{\pgf@circ@res@up}} @@ -2567,7 +2589,7 @@ \pgftransformxshift{\ctikzvalof{bipoles/oosourcetrans/circlesize}\pgf@circ@res@left} \pgf@circ@wye{\ctikzvalof{bipoles/oosourcetrans/vectorgroupscale}} \endpgfscope - + \else\ifpgf@circ@prim@eyw \pgfscope \pgftransformxshift{\ctikzvalof{bipoles/oosourcetrans/circlesize}\pgf@circ@res@left} @@ -2593,7 +2615,7 @@ \pgftransformxshift{\ctikzvalof{bipoles/oosourcetrans/circlesize}\pgf@circ@res@right} \pgf@circ@wye{\ctikzvalof{bipoles/oosourcetrans/vectorgroupscale}} \endpgfscope - + \else\ifpgf@circ@sec@eyw \pgfscope \pgftransformxshift{\ctikzvalof{bipoles/oosourcetrans/circlesize}\pgf@circ@res@right} @@ -2781,7 +2803,7 @@ \pgftransformxshift{.6\pgf@circ@res@left} \pgf@circ@wye{\ctikzvalof{bipoles/ooosource/vectorgroupscale}} \endpgfscope - + \else\ifpgf@circ@prim@eyw \pgfscope \pgftransformxshift{.6\pgf@circ@res@left} @@ -2808,7 +2830,7 @@ \pgftransformshift{\pgfpointpolar{60}{0.6\pgf@circ@res@right}} \pgf@circ@wye{\ctikzvalof{bipoles/ooosource/vectorgroupscale}} \endpgfscope - + \else\ifpgf@circ@sec@eyw \pgfscope \pgftransformshift{\pgfpointpolar{60}{0.6\pgf@circ@res@right}} @@ -2834,7 +2856,7 @@ \pgftransformshift{\pgfpointpolar{-60}{0.6\pgf@circ@res@right}} \pgf@circ@wye{\ctikzvalof{bipoles/ooosource/vectorgroupscale}} \endpgfscope - + \else\ifpgf@circ@tert@eyw \pgfscope \pgftransformshift{\pgfpointpolar{-60}{0.6\pgf@circ@res@right}} @@ -6910,12 +6932,20 @@ \ctikzset{bipoles/american gas filled surge arrester/inside/.initial=.15} \ctikzset{bipoles/american gas filled surge arrester/dot x/.initial=.25} \ctikzset{bipoles/american gas filled surge arrester/dot y/.initial=.45} +% fuses: normal, asymmetric, wiggle \ctikzset{bipoles/american gas filled surge arrester/size/.initial=.1} \ctikzset{bipoles/fuse/height/.initial=.20} \ctikzset{bipoles/fuse/width/.initial=.50} \ctikzset{bipoles/afuse/height/.initial=.20} \ctikzset{bipoles/afuse/width/.initial=.50} \ctikzset{bipoles/lamp/height/.initial=.60} +\ctikzset{bipoles/wfuse/height/.initial=.20} +\ctikzset{bipoles/wfuse/width/.initial=.50} +\ctikzset{bipoles/wfuse/shape/.initial=ocirc} +\newif\ifpgf@circ@wfuse@dots\pgf@circ@wfuse@dotstrue +\ctikzset{bipoles/wfuse/dots/.is choice} +\ctikzset{bipoles/wfuse/dots/.is if=pgf@circ@wfuse@dots} +% \ctikzset{bipoles/lamp/width/.initial=.60} \ctikzset{bipoles/bulb/height/.initial=.8} \ctikzset{bipoles/bulb/width/.initial=.8} @@ -7085,7 +7115,6 @@ \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}} \pgfusepath{draw} } - %% fuse \pgfcircdeclarebipolescaled{misc} {} @@ -7105,7 +7134,6 @@ \pgfusepath{draw} } - %% asymmetric fuse \pgfcircdeclarebipolescaled{misc} {} @@ -7128,7 +7156,28 @@ \pgf@circ@fill@strokecolor \pgfusepath{stroke,fill} } - +%% wiggly fuse +\pgfcircdeclarebipolescaled{misc} +{ + \savedmacro{\thisshape}{\def\thisshape{\tikz@fig@name}} + \savedmacro{\cshape}{\def\cshape{\ctikzvalof{bipoles/wfuse/shape}}} +} +{\ctikzvalof{bipoles/wfuse/height}} +{wfuse} +{\ctikzvalof{bipoles/wfuse/height}} +{\ctikzvalof{bipoles/wfuse/width}} +{ + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0pt}} + \pgfpatharc{0}{180}{.5\pgf@circ@res@left} + \pgfpatharc{0}{-180}{.5\pgf@circ@res@left} + \pgfusepath{draw} + \ifpgf@circ@wfuse@dots + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} + \pgfnode{\cshape}{center}{}{\thisshape-left}{\pgfusepath{draw}} + \pgftransformshift{\pgfpoint{2\pgf@circ@res@right}{0pt}} + \pgfnode{\cshape}{center}{}{\thisshape-right}{\pgfusepath{draw}} + \fi +} %% SQUID added by Cor Molenaar 5 March 2010 \pgfcircdeclarebipolescaled{misc} {} @@ -7249,6 +7298,8 @@ \pgfcirc@activate@bipole@simple{l}{fuse} \pgfcirc@activate@bipole{l}{afuse}{afuse}{asymmetric fuse} \pgfcirc@style@to@style{asymmetric fuse}{afuse} +\pgfcirc@activate@bipole@simple{l}{wfuse} +\pgfcirc@activate@bipole{l}{wfuse}{wfuse}{wiggly fuse} \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/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex index 6c0229c3d68..a3317ad5fb3 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircshapes.tex @@ -456,7 +456,7 @@ %% use strange names to keep ot private \newif\ifpgfcirc@really@draw@flowarrow\pgfcirc@really@draw@flowarrowtrue \ctikzset{phantom@flowarrow/.code=\pgfcirc@really@draw@flowarrowfalse} -\ctikzset{normal@flowarrow/.code=\pgfcirc@really@draw@vlowarrowtrue} +\ctikzset{normal@flowarrow/.code=\pgfcirc@really@draw@flowarrowtrue} \pgfdeclareshape{flowarrow}{ \savedanchor{\northeast}{% diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty index 5ca33737374..e558e4199ac 100644 --- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty +++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty @@ -16,8 +16,8 @@ \providecommand\DeclareRelease[3]{} \providecommand\DeclareCurrentRelease[2]{} -\def\pgfcircversion{1.6.5} -\def\pgfcircversiondate{2023/10/29} +\def\pgfcircversion{1.6.6} +\def\pgfcircversiondate{2023/12/09} \DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex} \DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex} |