texlive[61231] Master/texmf-dist: circuitikz (6dec21)
commits+karl at tug.org
commits+karl at tug.org
Mon Dec 6 22:21:18 CET 2021
Revision: 61231
http://tug.org/svn/texlive?view=revision&revision=61231
Author: karl
Date: 2021-12-06 22:21:18 +0100 (Mon, 06 Dec 2021)
Log Message:
-----------
circuitikz (6dec21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
trunk/Master/texmf-dist/doc/latex/circuitikz/ctikzmanutils.sty
trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmultipoles.tex
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
Modified: trunk/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md 2021-12-06 21:21:18 UTC (rev 61231)
@@ -1,6 +1,14 @@
<!--- 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.4.5 (2021-12-06)
+
+ Important fix for ConTeXt users, thanks to @TeXnician for reporting.
+
+ - Fixed an incompatibility introduced with subcircuits that made compilation in ConTeXt fail
+ - Added `\ctikzflip[x][y]` utility macros for ConTeXt too
+ - Fixed stray characters in some Ti*k*Z environment
+
* Version 1.4.4 (2021-10-31)
Normal maintenance release; minor bugs fixed, a new component and a new option. No Halloween component, sorry...
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex 2021-12-06 21:21:18 UTC (rev 61231)
@@ -5,6 +5,22 @@
\begin{itemize}
\item
+ Version 1.4.5 (2021-12-06)
+
+ Important fix for ConTeXt users, thanks to @TeXnician for reporting.
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Fixed an incompatibility introduced with subcircuits that made
+ compilation in ConTeXt fail
+ \item
+ Added \texttt{\textbackslash{}ctikzflip{[}x{]}{[}y{]}} utility
+ macros for ConTeXt too
+ \item
+ Fixed stray characters in some Ti\emph{k}Z environment
+ \end{itemize}
+\item
Version 1.4.4 (2021-10-31)
Normal maintenance release; minor bugs fixed, a new component and a
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex 2021-12-06 21:21:18 UTC (rev 61231)
@@ -150,6 +150,8 @@
\tikz \draw (0,0) to[R=$R_1$] (2,0);
\end{LTXexample}
+There is really no support for Plain TeX --- the maintainers are willing to consider patches if somebody is interested.
+
\subsection{Installing a new version of the package.}
The stable version of the package should come with your \LaTeX\ distribution. Downloading the files from CTAN and installing them locally is, unfortunately, a distribution-dependent task and sometime not so trivial. If you search for \texttt{local texmf tree} and the name of your distribution on \url{https://tex.stackexchange.com/} you will find a lot of hints.
@@ -171,8 +173,11 @@
\item \texttt{siunitx}, if using \texttt{siunitx} option (better \texttt{v2} or newer).
\end{itemize}
+A similar approach for \ConTeXt\ is available, with the file \texttt{t-circuitikzgit.tex}.
+
This manual has been typeset with \Circuitikz{} \pgfcircversion{} (\pgfcircversiondate) on \TikZ{} \pgfversion{} (\pgfversiondate).
+
\subsection{Incompatible packages}
\TikZ's own \texttt{circuit} library, which was based on \Circuitikz, (re?)defines several styles used by this library. In order to have them work together you can use the \texttt{compatibility} package option, which basically prefixes the names of all \Circuitikz\ \texttt{to[]} styles with an asterisk.
@@ -935,7 +940,8 @@
% and connect it
% (not up) -- (#1-NOT.in) (#1-NOT.out) |- (#1-AND2.in 2)
% with the new path-style not
- to[inline not] (#1-in |- #1-AND2.in 2) -- (#1-AND2.in 2);
+ to[inline not] (#1-in |- #1-AND2.in 2) -- (#1-AND2.in 2)
+ % no ; to end the path, must add in usage!
}
\newcommand*{\fullcirc}[1][]{%
\begin{circuitikz}
@@ -1070,7 +1076,7 @@
(#1-FF.pin 3) -- (#1-FF.pin 3 -| #1-AND1.out)
node[and port, anchor=out](#1-AND2){}
(#1-AND1.in 1) to[short, -*] ++(-1,0) coordinate(#1-in)
- to[inline not] (#1-in |- #1-AND2.in 2) -- (#1-AND2.in 2);
+ to[inline not] (#1-in |- #1-AND2.in 2) -- (#1-AND2.in 2)
}
\end{lstlisting}
@@ -1442,11 +1448,11 @@
\end{circuitikz}
\end{LTXexample}
-To simplify this task, \Circuitikz{} when used in \LaTeX{} has three helper macros --- \verb|\ctikzflipx{}|, \verb|\ctikzflipy{}|,
-and \verb|\ctikzflipxy{}|, that can be used to ``un-rotate'' the text of nodes drawn with, respectively,
+To simplify this task, \Circuitikz{} has three helper macros --- \verb|\ctikzflipx{}|,
+\verb|\ctikzflipy{}|, and \verb|\ctikzflipxy{}|, that can be used to ``un-rotate''
+the text of nodes drawn with, respectively,
\texttt{xscale=-1}, \texttt{yscale=-1}, and \texttt{scale=-1} (which is equivalent to
\texttt{xscale=-1, yscale=-1}).
-In other formats they are undefined; contributions to fill the gap are welcome.
\begin{LTXexample}[varwidth=true]
\begin{circuitikz}[scale=0.7, transform shape]
@@ -4000,7 +4006,7 @@
\begin{circuitikz} \draw
(0,0) node[njfet] {1}
(-1,2) to[Tnjfet=2] (1,2)
- to[Tnjfet=3, mirror] (3,2);
+ to[Tnjfet=3, mirror] (3,2)
;\end{circuitikz}
\end{LTXexample}
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/ctikzmanutils.sty
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuitikz/ctikzmanutils.sty 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/doc/latex/circuitikz/ctikzmanutils.sty 2021-12-06 21:21:18 UTC (rev 61231)
@@ -158,7 +158,7 @@
% 1 2 3 4 5 6 7 8
\NewDocumentCommand{\circuitdescbip}{s o m d<> m m d() d[]}
{%
-\index{#3} \tikz\foreach \i in {#6} {\index{\i|see{#3}} };
+\index{#3} \tikz{\foreach \i in {#6} {\index{\i|see{#3}} }}%
\twopartbox{%
\begin{circuitikz}
\IfBooleanTF{#1}{%
Modified: trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex 2021-12-06 21:21:18 UTC (rev 61231)
@@ -10,8 +10,8 @@
%
% See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details.
-\def\pgfcircversion{1.4.4}
-\def\pgfcircversiondate{2021/10/31}
+\def\pgfcircversion{1.4.5}
+\def\pgfcircversiondate{2021/12/06}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmultipoles.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmultipoles.tex 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmultipoles.tex 2021-12-06 21:21:18 UTC (rev 61231)
@@ -885,7 +885,7 @@
\noexpand\pgf at circ@rotaryanchor{\the\pgf at circ@count at a}{0}{1}%
}
\expandafter\xdef\csname pgf at anchor@rotaryswitch at sqout\space\the\pgf at circ@count at a\endcsname{%
- \noexpand\pgf at circ@rotarysqanchor{\the\pgf at circ@count at a}{0}%
+ \noexpand\pgf at circ@rotarysqanchor{\the\pgf at circ@count at a}%
}
\advance\pgf at circ@count at a by -1\relax%
\repeatpgfmathloop%
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex 2021-12-06 21:21:18 UTC (rev 61231)
@@ -57,9 +57,14 @@
\def\ctikztextnot#1{$\overline{\hbox{#1}}\m at th$}
\else\ifpgfutil at format@is at plain
% text mode overbar
+ % but really circuitikz will not work in plain...
% Thanks to @egreg https://tex.stackexchange.com/a/24133/38080
\def\ctikztextnot#1{$\overline{\hbox{#1}}$}
\else\ifpgfutil at format@is at context
+ %% flipping text
+ \def\ctikzflipx#1{\mirror{#1}}
+ \def\ctikzflipy#1{\mirror{\rotate[rotation=180]{#1}}}
+ \def\ctikzflipxy#1{\rotate[rotation=180]{#1}}
% text mode overbar
% Thanks to @egreg https://tex.stackexchange.com/a/24133/38080
\def\ctikztextnot#1{$\overline{\hbox{#1}}$}
@@ -104,13 +109,13 @@
\expandafter\gdef\csname #1 at Anchor\endcsname{}%
\expandafter\gdef\csname #1 at setanchors\endcsname{%
\setbox\ctikz at scratchbox=\hbox{%
- \begin{circuitikz}
+ \tikzpicture
\draw (0,0) \csname#1\endcsname{T-#1}{};
\foreach [count=\i] \anchor in {#2}
% reference anchor is -center
\draw (0,{2-\i/2}) let \p1 = ($(T-#1-subckt at reference)-(T-#1-\anchor)$) in
node[right]{\anchor: \x1,\y1 \expandafter\xdef\csname #1 at Anchor\anchor\endcsname{++(\x1,\y1)}};
- \end{circuitikz}%
+ \endtikzpicture
}%
}%
\expandafter\gdef\csname#1\endcsname##1##2{%
@@ -384,7 +389,7 @@
\def\ctikztunablearrow at full[#1]#2#3#4#5{%
% add tunable arrow to a component
% relative thickness, relative length, rotation from axis, name of the component
- \begin{scope}
+ \scope
\draw
\pgfextra{\pgfcirc at set@arrows{tunable}{}{latexslim}
\pgfsetlinewidth{#2\pgflinewidth}} [#1]
@@ -393,6 +398,6 @@
\n2 = {atan2(\y2,\x2)} in
% node[above]{\n1, \n2}
(#5.center) ++({\n2+(#4)}:{-0.5*(\n1)*(#3)}) -- ++({\n2+(#4)}:{(\n1)*(#3)});
- \end{scope}%
+ \endscope
}
\endinput
Modified: trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty 2021-12-06 21:20:44 UTC (rev 61230)
+++ trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty 2021-12-06 21:21:18 UTC (rev 61231)
@@ -16,8 +16,8 @@
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
-\def\pgfcircversion{1.4.4}
-\def\pgfcircversiondate{2021/10/31}
+\def\pgfcircversion{1.4.5}
+\def\pgfcircversiondate{2021/12/06}
\DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex}
\DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex}
More information about the tex-live-commits
mailing list.