From 6336c19969656f3ee5f0b0fed00aaf64369a40e7 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 7 Dec 2021 03:01:53 +0000 Subject: CTAN sync 202112070301 --- graphics/pgf/contrib/circuitikz/doc/changelog.tex | 16 ++++++++++++++++ .../contrib/circuitikz/doc/circuitikz-context.pdf | Bin 17688 -> 17688 bytes .../contrib/circuitikz/doc/circuitikzmanual.pdf | Bin 1460564 -> 1461547 bytes .../contrib/circuitikz/doc/circuitikzmanual.tex | 18 ++++++++++++------ .../pgf/contrib/circuitikz/doc/ctikzmanutils.sty | 2 +- graphics/pgf/contrib/circuitikz/tex/circuitikz.sty | 4 ++-- .../contrib/circuitikz/tex/pgfcircmultipoles.tex | 2 +- .../pgf/contrib/circuitikz/tex/pgfcircutils.tex | 13 +++++++++---- .../pgf/contrib/circuitikz/tex/t-circuitikz.tex | 4 ++-- 9 files changed, 43 insertions(+), 16 deletions(-) (limited to 'graphics/pgf/contrib') diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex index b715c12dc0..3247e63a1c 100644 --- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex +++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex @@ -4,6 +4,22 @@ here. See \url{https://github.com/circuitikz/circuitikz/commits} for a full list of changes. \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) diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf index 1ca5e368bf..a781b6ced2 100644 Binary files a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf and b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf differ diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf index 57f2065ef9..e1906ae396 100644 Binary files a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf and b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf differ diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex index 79e6359475..8cf24b70db 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex @@ -150,6 +150,8 @@ This package is author-maintained. Permission is granted to copy, distribute and \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 @@ instead of \texttt{circuitikz}. This is also advantageous for ``future resilienc \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 you will obtain the following diagram with the exact same code (I just remov % 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 @@ We will change the names of the nodes and the coordinates to be different for an (#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 @@ Mirroring and flipping of node components is obtained by using the \TikZ\ keys \ \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 @@ For syntactical convenience standard transistors (not multi-terminal ones) can b \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} diff --git a/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty b/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty index 68b1bd37b7..5102bb32ff 100644 --- a/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty +++ b/graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty @@ -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}{% diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty index 15540ac36f..67ed70f53b 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.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} diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex index 9abaf1e8b6..30a4a26800 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex @@ -885,7 +885,7 @@ \noexpand\pgf@circ@rotaryanchor{\the\pgf@circ@count@a}{0}{1}% } \expandafter\xdef\csname pgf@anchor@rotaryswitch@sqout\space\the\pgf@circ@count@a\endcsname{% - \noexpand\pgf@circ@rotarysqanchor{\the\pgf@circ@count@a}{0}% + \noexpand\pgf@circ@rotarysqanchor{\the\pgf@circ@count@a}% } \advance\pgf@circ@count@a by -1\relax% \repeatpgfmathloop% diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex index e1d7314931..c132b16c85 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex @@ -57,9 +57,14 @@ \def\ctikztextnot#1{$\overline{\hbox{#1}}\m@th$} \else\ifpgfutil@format@is@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@format@is@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@Anchor\endcsname{}% \expandafter\gdef\csname #1@setanchors\endcsname{% \setbox\ctikz@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@reference)-(T-#1-\anchor)$) in node[right]{\anchor: \x1,\y1 \expandafter\xdef\csname #1@Anchor\anchor\endcsname{++(\x1,\y1)}}; - \end{circuitikz}% + \endtikzpicture }% }% \expandafter\gdef\csname#1\endcsname##1##2{% @@ -384,7 +389,7 @@ \def\ctikztunablearrow@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@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 diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex index 2e57a795e0..12733bdd1c 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.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] -- cgit v1.2.3