summaryrefslogtreecommitdiff
path: root/graphics/pgf/contrib/circuitikz/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-02 03:04:23 +0000
committerNorbert Preining <norbert@preining.info>2021-06-02 03:04:23 +0000
commit138d0a6cfd5f2187973fb6b83ad2fb0dcf5a8348 (patch)
treea95fba7d01d57bba550f5114c936ec76d57a49ac /graphics/pgf/contrib/circuitikz/tex
parent0f69e2fd4a9928663f0cc64b8cac1f0d8baee9d6 (diff)
CTAN sync 202106020304
Diffstat (limited to 'graphics/pgf/contrib/circuitikz/tex')
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/circuitikz.sty4
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex47
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex4
3 files changed, 38 insertions, 17 deletions
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index dd8864f683..c87b1251d5 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
@@ -12,8 +12,8 @@
\NeedsTeXFormat{LaTeX2e}
-\def\pgfcircversion{1.3.6}
-\def\pgfcircversiondate{2021/05/09}
+\def\pgfcircversion{1.3.7}
+\def\pgfcircversiondate{2021/06/01}
\ProvidesPackage{circuitikz}%
[\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
index b29aea5135..6fc5db6b93 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
@@ -1648,6 +1648,12 @@
% noise sources
\ctikzset{bipoles/noise sources/fillcolor/.initial=gray!50}
+% for special symbols in the sources: sin, square, triangle, delta, wye, zig, etc.
+\ctikzset{sources/symbol/thickness/.initial={1}}
+\ctikzset{csources/symbol/thickness/.initial={1}}
+\ctikzset{sources/symbol/rotate/.initial={90}}
+\ctikzset{csources/symbol/rotate/.initial={90}}
+
% % % ootransformer
\ctikzset{bipoles/oosourcetrans/height/.initial=.6}
\ctikzset{bipoles/oosourcetrans/width/.initial=.6}
@@ -1687,6 +1693,7 @@
\pgfkeys{tikz/tert/delta/.add code={}{\pgf@circ@tert@deltatrue}}
\pgfkeys{tikz/tert/wye/.add code={}{\pgf@circ@tert@wyetrue}}
\pgfkeys{tikz/tert/zig/.add code={}{\pgf@circ@tert@zigtrue}}%
+
%%>>>
%% Nodes definitions for sources%<<<
@@ -1803,6 +1810,17 @@
%% Round and diamond sources
%%%%%%%%%%%
+% % % symbol drawing macros (NOT for delta, wye, zig)
+\def\pgf@circ@sources@symbol@setup{% called in a pgfscope
+ \edef\@@@auto{auto}\edef\@@@rotate{\ctikzvalof{\ctikzclass/symbol/rotate}}
+ \ifx\@@@auto\@@@rotate
+ \pgfgettransformentries\a\b\temp\temp\temp\temp
+ \pgfmathsetmacro{\@@@rotate}{-atan2(\b,\a)}
+ \fi
+ \pgftransformrotate{\@@@rotate}%
+ \pgf@circ@set@relative@thickness{symbol/thickness}%
+}
+
%% Independent voltage source
\pgfcircdeclarebipolescaled{sources}
{}
@@ -1861,7 +1879,7 @@
\pgf@circ@res@up = .5\pgf@circ@res@up
\pgfscope
- \pgftransformrotate{90}
+ \pgf@circ@sources@symbol@setup
\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
@@ -1884,7 +1902,7 @@
\pgf@circ@draworfill
\pgf@circ@res@up = .5\pgf@circ@res@up
\pgfscope
- \pgftransformrotate{90}
+ \pgf@circ@sources@symbol@setup
\pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@up}{0cm}}
\pgfpathlineto{\pgfpoint{-1\pgf@circ@res@up}{1\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{0\pgf@circ@res@up}{1\pgf@circ@res@up}}
@@ -1910,7 +1928,7 @@
\pgf@circ@res@up = .5\pgf@circ@res@up
\pgfscope
- \pgftransformrotate{90}
+ \pgf@circ@sources@symbol@setup
\pgfpathmoveto{\pgfpoint{-1\pgf@circ@res@up}{0cm}}
\pgfpathlineto{\pgfpoint{-0.5\pgf@circ@res@up}{0.75\pgf@circ@res@up}}
\pgfpathlineto{\pgfpoint{0.5\pgf@circ@res@up}{-0.75\pgf@circ@res@up}}
@@ -2088,14 +2106,18 @@
}
% % % winding symbols
+\ctikzset{sources/symbol/delta scale/.initial={1}}
+\ctikzset{sources/symbol/wye scale/.initial={1}}
+\ctikzset{sources/symbol/zig scale/.initial={1}}
% triangle
\def\pgf@circ@delta#1{
\pgfscope
- \pgftransformscale{-.01\pgf@circ@res@left*#1}
+ \pgftransformscale{-.01*\ctikzvalof{\ctikzclass/symbol/delta 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{\pgf@circ@res@left}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}}
\pgfpathlineto{\pgfpoint{0}{.866\pgf@circ@res@up}}
@@ -2107,11 +2129,12 @@
% star
\def\pgf@circ@wye#1{
\pgfscope
- \pgftransformscale{-.015\pgf@circ@res@left*#1}
+ \pgftransformscale{-.015*\ctikzvalof{\ctikzclass/symbol/wye 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@down}}
\pgfpathlineto{\pgfpointorigin}
\pgfpathlineto{\pgfpointpolar{-30}{\pgf@circ@res@down}}
@@ -2124,11 +2147,12 @@
% zigzag
\def\pgf@circ@zig#1{
\pgfscope
- \pgftransformscale{-.015\pgf@circ@res@left*#1}
+ \pgftransformscale{-.015*\ctikzvalof{\ctikzclass/symbol/zig 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{\pgfpointorigin}
\pgfpathlineto{\pgfpointpolar{90}{.5\pgf@circ@res@up}}
\pgfpathlineto{\pgfpointpolar{60}{\pgf@circ@res@up}}
@@ -2164,10 +2188,7 @@
\pgfpathcircle{\pgfpoint{\ctikzvalof{bipoles/oosourcetrans/circleoffset}\pgf@circ@res@left}{0}}
{\ctikzvalof{bipoles/oosourcetrans/circlesize}\pgf@circ@res@left}
\pgfusepath{draw}
-
-
-% % % % draw inner symbols
-
+ % % % % draw inner symbols
%%primary winding
\ifpgf@circ@prim@delta
\pgfscope
@@ -2441,7 +2462,7 @@
\pgf@circ@res@up = .5\pgf@circ@res@up
\pgfscope
- \pgftransformrotate{90}
+ \pgf@circ@sources@symbol@setup
\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
@@ -2544,7 +2565,7 @@
\pgf@circ@res@up = .5\pgf@circ@res@up
\pgfscope
- \pgftransformrotate{90}
+ \pgf@circ@sources@symbol@setup
\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
@@ -2576,7 +2597,7 @@
\pgf@circ@res@up = .5\pgf@circ@res@up
\pgfscope
- \pgftransformrotate{90}
+ \pgf@circ@sources@symbol@setup
\pgfpathmoveto{\pgfpoint{-\pgf@circ@res@up}{0cm}}
\pgfpathsine{\pgfpoint{.5\pgf@circ@res@up}{.5\pgf@circ@res@up}}
\pgfpathcosine{\pgfpoint{.5\pgf@circ@res@up}{-.5\pgf@circ@res@up}}
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index 6349bd81be..671a47c952 100644
--- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
@@ -10,8 +10,8 @@
%
% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
-\def\pgfcircversion{1.3.6}
-\def\pgfcircversiondate{2021/05/09}
+\def\pgfcircversion{1.3.7}
+\def\pgfcircversiondate{2021/06/01}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]