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 --- .../tex/context/third/circuitikz/t-circuitikz.tex | 4 +-- .../tex/generic/circuitikz/pgfcircbipoles.tex | 18 ++++++++------ .../texmf-dist/tex/latex/circuitikz/circuitikz.sty | 29 ++++++++++++---------- 3 files changed, 28 insertions(+), 23 deletions(-) (limited to 'Master/texmf-dist/tex') 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