summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/circuitikz
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-06 20:31:34 +0000
committerKarl Berry <karl@freefriends.org>2021-07-06 20:31:34 +0000
commitd045558bbb6184c258cfc1daa90ab4e47a1b224d (patch)
tree5d3aadccdbf11ac79a51b0775f316ab4868233e3 /Master/texmf-dist/tex/generic/circuitikz
parentb97f297879f8d65309e8fd032505a072bbb8e6d1 (diff)
circuitikz (6jul21)
git-svn-id: svn://tug.org/texlive/trunk@59856 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/circuitikz')
-rw-r--r--Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-legacy.tex8
-rw-r--r--Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-romano.tex11
-rw-r--r--Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex2
-rw-r--r--Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex23
4 files changed, 21 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-legacy.tex b/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-legacy.tex
index c4ce332209a..25bd5f29126 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-legacy.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-legacy.tex
@@ -111,12 +111,12 @@ logic ports/scale=1.0,
logic ports/fill=none,
logic ports/thickness=none,
logic ports origin=legacy, % it can be "center" (better)
-american or shape=roundy,% could be pointy
+american or shape/.try=roundy,% could be pointy
%
% flip-flops
-flipflops/scale=1.0,
-flipflops/fill=none,
-flipflops/thickness=none,
+flipflops/scale/.try=1.0,
+flipflops/fill/.try=none,
+flipflops/thickness/.try=none,
%
% Integrated circuits
chips/scale=1.0,
diff --git a/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-romano.tex b/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-romano.tex
index 6227a23d32b..c244c605c61 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-romano.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/ctikzstyle-romano.tex
@@ -54,15 +54,18 @@ amplifiers/scale=1.0,
amplifiers/thickness=3.0,
%
% Logic ports
-logic ports/.try=ieee,
+logic ports/ieee/.try,
+% this way of setting the key does nothing if ieee option
+% does not exist; logic ports/.try=ieee does not work
+% if the key exists but the value is not defined
logic ports/scale=1.0,
logic ports/thickness=2.0,
logic ports origin=center,
-american or shape=pointy,
+american or shape/.try=pointy,
%
% flip-flops
-flipflops/scale=1.0,
-flipflops/thickness=2.0,
+flipflops/scale/.try=1.0,
+flipflops/thickness/.try=2.0,
%
% Switches
bipoles/cuteswitch/thickness=0.5,
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
index eadf5fd117c..ee9d285fff6 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
@@ -160,7 +160,7 @@
\ifx\pgf@temp\pgf@circ@temp % if it is an open do nothing
\else
% it is important to start the path with -- to have correct line joins!
- -- (\tikztostart) -- (pgfcirc@anchorstartnode)
+ -- (pgfcirc@anchorstartnode)
\fi
% Add all the "ornaments": labels, annotations, voltages, currents and flows
\drawpoles
diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
index 86732077b0b..2759f80c9c8 100644
--- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
+++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
@@ -93,12 +93,12 @@
%% subcircuits (experimental)
%%
%% introduced by Romano Giannetti around April 2021
-%%
+%% changes suggested by Jonathan P. Spratte
%%
\newbox\ctikz@scratchbox
\long\def\ctikzsubcircuitdef#1#2#3{%
- \expandafter\gdef\csname #1@Anchor\endcsname{}
- \expandafter\gdef\csname #1@setanchors\endcsname{
+ \expandafter\gdef\csname #1@Anchor\endcsname{}%
+ \expandafter\gdef\csname #1@setanchors\endcsname{%
\setbox\ctikz@scratchbox=\hbox{%
\begin{circuitikz}
\draw (0,0) \csname#1\endcsname{T-#1}{};
@@ -106,17 +106,12 @@
% reference anchor is -center
\draw (0,{2-\i/2}) let \p1 = ($(T-#1-subckt@reference)-(T-#1-\anchor)$) in
node[right]{\anchor: \x1,\y1 \expandafter\xdef\csname #1@Anchor\anchor\endcsname{++(\x1,\y1)}};
- \end{circuitikz}
- }
- }
- \expandafter\gdef\csname#1\endcsname##1##2{\csname#1aux\endcsname{##1}{\csname #1@Anchor##2\endcsname}}
- \expandafter\gdef\csname#1aux\endcsname##1##2{%
- % move to the anchor
- ##2
- % reference anchor should be -reference
- coordinate (##1-subckt@reference)
- #3
- }
+ \end{circuitikz}%
+ }%
+ }%
+ \expandafter\gdef\csname#1\endcsname##1##2{%
+ \csname #1@Anchor##2\endcsname coordinate(##1-subckt@reference)#3%
+ }%
}
\long\def\ctikzsubcircuitactivate#1{\csname #1@setanchors\endcsname}