From 037b5617dc1197da3c4065d8784e9e6887caab2a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Feb 2021 22:15:19 +0000 Subject: circuitikz (21feb21) git-svn-id: svn://tug.org/texlive/trunk@57831 c570f23f-e606-0410-a88d-b1316a301751 --- .../third/circuitikz/circuitikz-context.pdf | Bin 17743 -> 17743 bytes .../texmf-dist/doc/generic/circuitikz/CHANGELOG.md | 6 +++++ .../texmf-dist/doc/latex/circuitikz/changelog.tex | 12 +++++++++ .../doc/latex/circuitikz/circuitikzmanual.pdf | Bin 1128310 -> 1128438 bytes .../doc/latex/circuitikz/circuitikzmanual.tex | 27 +++++++++++-------- .../tex/context/third/circuitikz/t-circuitikz.tex | 4 +-- .../tex/generic/circuitikz/pgfcircbipoles.tex | 18 +++++++------ .../texmf-dist/tex/latex/circuitikz/circuitikz.sty | 29 ++++++++++++--------- 8 files changed, 62 insertions(+), 34 deletions(-) diff --git a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf index f53891b6d94..047b3dd3788 100644 Binary files a/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf and b/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf differ diff --git a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md index 184fcc31df2..bb390e3dfb7 100644 --- a/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md +++ b/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md @@ -1,6 +1,12 @@ The major changes among the different circuitikz versions are listed here. See for a full list of changes. +* Version 1.3.1 (2021-02-20) + + - Fixed a bug in "fuse" and "afuse" fill + - Remove the voltage direction warning. Nobody really ever cared + - Minor fixes and enhancements to the manual + * Version 1.3.0 (2021-01-19) - Fixed a long-standing problem with labels and similar decoration with equal signs and commas diff --git a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex index 6b78c471137..cbf38e1cf8a 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/changelog.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/changelog.tex @@ -4,6 +4,18 @@ here. See \url{https://github.com/circuitikz/circuitikz/commits} for a full list of changes. \begin{itemize} +\item + Version 1.3.1 (2021-02-20) + + \begin{itemize} + \tightlist + \item + Fixed a bug in ``fuse'' and ``afuse'' fill + \item + Remove the voltage direction warning. Nobody really ever cared + \item + Minor fixes and enhancements to the manual + \end{itemize} \item Version 1.3.0 (2021-01-19) diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf index 10c780223cb..00a4f917635 100644 Binary files a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf and b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf differ diff --git a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex index 4186402412f..f69ca43b060 100644 --- a/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex +++ b/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex @@ -280,6 +280,7 @@ The \texttt{use fpu reciprocal} key seems to have no side effects, but given tha Here, we will provide a list of incompabilitys between different version of circuitikz. We will try to hold this list short, but sometimes it is easier to break with old syntax than including a lot of switches and compatibility layers. You can check the used version at your local installation using the macro \verb!\pgfcircversion{}!. \begin{itemize} + \item Version 1.3.1 removes the warning if you do not specify a voltage direction. \item After 1.2.7 a big code reorganization (which by the way fixed some bug) has been made; no changes should be visible, but a fallback point at 1.2.7 has been added. \item You \textbf{must} upgrade to v1.2.7 or newer if you use a \TikZ{} 3.1.8 or 3.1.8a (but better upgrade both packages to the current version). \item After v1.2.1: \textbf{Important:} the routine that implement the \texttt{to[...]} component positioning has been rewritten. That should enhance the line joins in path, and it's safer, but it can potentially change behavior. @@ -409,7 +410,7 @@ Feel free to load the package with your own cultural options: \item \texttt{RPvoltages} (meaning Rising Potential voltages): the arrow is in direction of rising potential, like in \texttt{oldvoltagedirection}, but batteries and current sources are fixed to follow the passive/active standard; \item \texttt{EFvoltages} (meaning Electric Field voltages): the arrow is in direction of the electric field, like in \texttt{nooldvoltagedirection}, but batteries are fixed; \end{itemize} - If none of these option are given, the package will default to \texttt{nooldvoltagedirection}, but will give a warning. The behavior is also selectable circuit by circuit with the \texttt{voltage dir} style. + If none of these option are given, the package will default to \texttt{nooldvoltagedirection}. The behavior is also selectable circuit by circuit with the \texttt{voltage dir} style. \item \texttt{betterproportions}\footnote{May change in the future!}: nicer proportions of transistors in comparision to resistors; \end{itemize} @@ -431,7 +432,15 @@ Feel free to load the package with your own cultural options: \section{Tutorials} -To draw a circuit, you have to load the \texttt{circuitikz} package; this can be done with +Before even starting with \Circuitikz{} you should be sure to have understood the basics of \TikZ{}. It is \emph{higlhly recommended} that you read and go through \emph{at least} the following parts of the \TikZ{} manual: +\begin{itemize} + \item ``Tutorial: A Picture for Karl's Students'' (around page 30); + \item ``Specifying Coordinates'' (around page 131) + \item ``Nodes and their shapes'' (around page 220) +\end{itemize} +\dots but obviously a good knowledge of \TikZ{} will help you a lot. Remember, a circuit drawn with \Circuitikz{} is nothing more than a \texttt{tikzpicture} with an (albeit powerful and extended) set of shapes and commodity macros. + +Said that, to draw a circuit, you have to load the \Circuitikz{} package; this can be done with \begin{lstlisting} \usepackage[siunitx, RPvoltages]{circuitikz} \end{lstlisting} @@ -1133,7 +1142,7 @@ In the last (green) example, you can see a workaround using local path and the k \begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily, pos=t] -Plotted using Ti\emph{k}Z version \pgfversion{} and CircuitTi\emph{k}Z version \pgfcircversion{}. +Plotted using Ti\emph{k}Z version \pgfversion{} and CircuiTi\emph{k}Z version \pgfcircversion{}. \begin{tikzpicture} \draw[color=red] (0,0) to[R] +(2,0) +(0,0) -- ++(0,-1); @@ -1355,11 +1364,7 @@ You can change the visual appearance of a circuit by using a circuit style diffe Let's see the effect over a simple circuit\footnote{This is a just an example, the circuit is not intended to be functional.}. -\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}} -\newcommand\bjtname[1]{($(#1.C)!0.5!(#1.E)$) node[anchor=west]{\killdepth{#1}} } \begin{lstlisting}[basicstyle=\scriptsize\ttfamily] -\def\killdepth#1{{\raisebox{0pt}[\height][0pt]{#1}}} -\newcommand\bjtname[1]{($(#1.C)!0.5!(#1.E)$) node[anchor=west]{\killdepth{#1}} } \begin{circuitikz}[american, cute inductors] \node [op amp](A1){\texttt{OA1}}; \draw (A1.-) to[short] ++(0,1) coordinate(tmp) to[R, l_=$R$] (tmp -| A1.out) to[short] (A1.out); @@ -1368,8 +1373,8 @@ Let's see the effect over a simple circuit\footnote{This is a just an example, t \draw (A1.-) to [L=$L$] ++(-2,0) coordinate(tmp) to[sV, l=$v_s$, fill=yellow] (tmp |-GND) node[ground]{}; \draw (A1.out) to[R=$R_s$] ++(2,0) coordinate(bb) to[I, l_=$I_B$, invert] ++(0,2) node[vcc](VCC){}; \draw (bb) to[D, l=$D$, *-] ++(0,-2) coordinate(bb1) to[R=$R_m$] ++(0,-2) node[vee](VEE){}; - \draw (bb) --++(1,0) node[npn, anchor=B](Q1){} \bjtname{Q1}; - \draw (bb1) --++(1,0) node[pnp, anchor=B](Q2){} \bjtname{Q2}; + \draw (bb) --++(1,0) node[npn, anchor=B](Q1){Q1}; + \draw (bb1) --++(1,0) node[pnp, anchor=B](Q2){Q2}; \draw (Q1.E) -- (Q2.E) ($(Q1.E)!0.5!(Q2.E)$) to [short, *-o, name=S] ++(2.5,0) node[right]{$v_{o_Q}$}; \draw (S.s) to[european resistor, l=$Z_L$, *-] (S.s|-GND) node[ground]{}; @@ -1391,8 +1396,8 @@ This code, with the default parameters, will render like the following image. \draw (A1.-) to [L=$L$] ++(-2,0) coordinate(tmp) to[sV, l=$v_s$, fill=yellow] (tmp |-GND) node[ground]{}; \draw (A1.out) to[R=$R_s$] ++(2,0) coordinate(bb) to[I, l_=$I_B$, invert] ++(0,2) node[vcc](VCC){}; \draw (bb) to[D, l=$D$, *-] ++(0,-2) coordinate(bb1) to[R=$R_m$] ++(0,-2) node[vee](VEE){}; - \draw (bb) --++(1,0) node[npn, anchor=B](Q1){} \bjtname{Q1}; - \draw (bb1) --++(1,0) node[pnp, anchor=B](Q2){} \bjtname{Q2}; + \draw (bb) --++(1,0) node[npn, anchor=B](Q1){Q1}; + \draw (bb1) --++(1,0) node[pnp, anchor=B](Q2){Q2}; \draw (Q1.E) -- (Q2.E) ($(Q1.E)!0.5!(Q2.E)$) to [short, *-o, name=S] ++(2.5,0) node[right]{$v_{o_Q}$}; \draw (S.s) to[european resistor, l=$Z_L$, *-] (S.s|-GND) node[ground]{}; diff --git a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex index 9876b8f290b..76090560e1d 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/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.0} -\def\pgfcircversiondate{2021/01/19} +\def\pgfcircversion{1.3.1} +\def\pgfcircversiondate{2021/02/20} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} \usemodule[tikz] diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex index 2044c1320c5..5a4d5b0d288 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircbipoles.tex @@ -5509,14 +5509,16 @@ {\ctikzvalof{bipoles/fuse/height}} {\ctikzvalof{bipoles/fuse/width}} { + \pgfscope + \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}} + \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} + \pgf@circ@draworfill + \endpgfscope + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}} \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}} \pgfusepath{draw} - \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}} - \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} - - \pgf@circ@draworfill } %% asymmetric fuse @@ -5527,16 +5529,16 @@ {\ctikzvalof{bipoles/afuse/height}} {\ctikzvalof{bipoles/afuse/width}} { - \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}} - \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}} - \pgfusepath{draw} - \pgfscope \pgfpathrectanglecorners{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}} \pgf@circ@setlinewidth{bipoles}{\pgfstartlinewidth} \pgf@circ@draworfill \endpgfscope + \pgfpathmoveto{\pgfpoint{\pgf@circ@res@left}{0}} + \pgfpathlineto{\pgfpoint{\pgf@circ@res@right}{0}} + \pgfusepath{draw} + \pgfpathrectanglecorners{\pgfpoint{.7\pgf@circ@res@right}{\pgf@circ@res@up}}{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@down}} \pgfusepath{stroke,fill} } diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty index 7309dd6d18a..a5ec75f3aff 100644 --- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty +++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty @@ -12,8 +12,8 @@ \NeedsTeXFormat{LaTeX2e} -\def\pgfcircversion{1.3.0} -\def\pgfcircversiondate{2021/01/19} +\def\pgfcircversion{1.3.1} +\def\pgfcircversiondate{2021/02/20} \ProvidesPackage{circuitikz}% [\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion] @@ -354,17 +354,20 @@ \fi %% This should be executed *after* all the options! -\AtEndOfPackage{% -\ifpgf@circ@explicitvdir\else - \PackageWarningNoLine{circuitikz}{% - You did not specify one of the voltage directions:\MessageBreak - \space\space oldvoltagedirection, nooldvoltagedirection, \MessageBreak - \space\space RPvoltages or EFvoltages \MessageBreak - Default directions may have changed, \MessageBreak - please check the manual% - } -\fi -} +% +% Remove the warning; nobody cares. +% +% \AtEndOfPackage{% +% \ifpgf@circ@explicitvdir\else +% \PackageWarningNoLine{circuitikz}{% +% You did not specify one of the voltage directions:\MessageBreak +% \space\space oldvoltagedirection, nooldvoltagedirection, \MessageBreak +% \space\space RPvoltages or EFvoltages \MessageBreak +% Default directions may have changed, \MessageBreak +% please check the manual% +% } +% \fi +% } \newenvironment{circuitikz}{\begin{tikzpicture}}{\end{tikzpicture}} %override (unused) circuitikz environment for compability to externalization) -- cgit v1.2.3