diff options
Diffstat (limited to 'graphics/pgf/contrib/circuitikz/tex')
4 files changed, 66 insertions, 15 deletions
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty index 5ca3373737..e558e4199a 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.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} diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex index 82e841212a..6bf0b72ac7 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/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/graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex index 6c0229c3d6..a3317ad5fb 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex +++ b/graphics/pgf/contrib/circuitikz/tex/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/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex index 8cc8b39131..d4358b98c3 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.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} |