diff options
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 16 insertions, 7 deletions
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 5158fbb5615..261eeafcc52 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex @@ -10,12 +10,11 @@ % % See the files gpl-3.0_license.txt and lppl-1-3c_license.txt for more details. -\def\pgfcircversion{1.5.0} -\def\pgfcircversiondate{2022/02/22} +\def\pgfcircversion{1.5.1} +\def\pgfcircversiondate{2022/02/26} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} \usemodule[tikz] -\usemodule[regexpatch]%for color hack \startmodule[circuitikz] \usetikzlibrary[calc] diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex index a5075f08f66..46ec314f570 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirc.defines.tex @@ -105,8 +105,17 @@ \pgfkeys{/tikz/fill/.add code={}{% \edef\ctikz@fillcolor{#1}}} % +% This is to try to track the "implicit" color specification of Tikz, +% like \draw[red,...] ...; which are not exactly the same than saying +% \draw[color=red,...] ...; +% This is too dangerous to issue by default (it was in 1.5.0 and it +% was an error), so we will just define a command and tell it in the +% manual. +% It needs \usepackage{regexpatch} (which is not compatible with +% xpatch, unfortunately) % I do not know how to do the xpatchcmd in ConTeXt... % +\def\ctikzPatchImplicitColor{% \ifpgfutil@format@is@latex \pgfkeysgetvalue{/tikz/.unknown/.@cmd}{\my@temp} \xpatchcmd*\my@temp % use starred-form to replace all (two places actually) @@ -119,8 +128,10 @@ \pgfkeyslet{/tikz/.unknown/.@cmd}{\my@temp} \else \pgfutil@packagewarning{circuitikz}{% - Not on LaTeX: patch failed, use only explicit color=...(see manual)} + Not on LaTeX: patch failed, ^^J% + use only explicit color=...(see manual).} \fi +} % \def\pgf@circ@setcolor{% \ifpgf@circ@setcolor diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty index c66633e787d..73ef1085793 100644 --- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty +++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty @@ -16,8 +16,8 @@ \providecommand\DeclareRelease[3]{} \providecommand\DeclareCurrentRelease[2]{} -\def\pgfcircversion{1.5.0} -\def\pgfcircversiondate{2022/02/22} +\def\pgfcircversion{1.5.1} +\def\pgfcircversiondate{2022/02/26} \DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex} \DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex} @@ -46,7 +46,6 @@ %% Version 3.0 of pgf/TikZ is required \RequirePackage{tikz} -\RequirePackage{regexpatch}%for color hack \usetikzlibrary{calc} % % "arrows" library is deprecated, and behave badly with |