summaryrefslogtreecommitdiff
path: root/graphics/pgf/contrib/circuitikz/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-12-28 03:03:19 +0000
committerNorbert Preining <norbert@preining.info>2020-12-28 03:03:19 +0000
commit07b20138841bb0e4c45e74a2a1d06cc91fe5a861 (patch)
treed55ace28f6d10d6a13406f1742f079c0ebf5f245 /graphics/pgf/contrib/circuitikz/tex
parent40e40fcb2049d49871ddd4bdfff9a414b2cbb50e (diff)
CTAN sync 202012280303
Diffstat (limited to 'graphics/pgf/contrib/circuitikz/tex')
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/circuitikz.sty4
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex35
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex4
3 files changed, 34 insertions, 9 deletions
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index bc1581cb54..cd1637a3f7 100644
--- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
+++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
@@ -12,8 +12,8 @@
\NeedsTeXFormat{LaTeX2e}
-\def\pgfcircversion{1.2.6}
-\def\pgfcircversiondate{2020/12/16}
+\def\pgfcircversion{1.2.7}
+\def\pgfcircversiondate{2020/12/27}
\ProvidesPackage{circuitikz}%
[\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
index 0b15f0f160..0c2df7cd70 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
@@ -59,6 +59,30 @@
}
}
+%
+% expandable IF for the extra nodes (thanks to Henri Menke)
+% see https://chat.stackexchange.com/transcript/message/56560808#56560808
+%
+\def\pgfcirc@if@has@i{%
+ \ifpgfcirc@has@i
+ \expandafter\pgfutil@firstoftwo
+ \else
+ \expandafter\pgfutil@secondoftwo
+ \fi}
+\def\pgfcirc@if@has@v{%
+ \ifpgfcirc@has@v
+ \expandafter\pgfutil@firstoftwo
+ \else
+ \expandafter\pgfutil@secondoftwo
+ \fi}
+\def\pgfcirc@if@has@f{%
+ \ifpgfcirc@has@f
+ \expandafter\pgfutil@firstoftwo
+ \else
+ \expandafter\pgfutil@secondoftwo
+ \fi}
+
+
%% Generic bipole path
\def\pgf@circ@bipole@path#1#2{
@@ -158,11 +182,12 @@
\drawpoles
\pgf@circ@ifkeyempty{bipole/label/name}\else\pgf@circ@drawlabels{label}\fi
\pgf@circ@ifkeyempty{bipole/annotation/name}\else\pgf@circ@drawlabels{annotation}\fi
- \ifpgfcirc@has@v\pgf@circ@drawvoltage\fi
- % \pgf@circ@ifkeyempty{bipole/current/label/name}\else\pgf@circ@drawcurrent\fi
- \ifpgfcirc@has@i\pgf@circ@drawcurrent\fi
- % \pgf@circ@ifkeyempty{bipole/flow/label/name}\else\pgf@circ@drawflow\fi
- \ifpgfcirc@has@f\pgf@circ@drawflow\fi
+ % the following must be made in their own path scope to avoid crash in TikZ 3.1.8/3.1.8a
+ % it should be logically safe for older version too --- even if TikZ reverted the change
+ % use explandable ifs too, thanks to Henri Menke
+ {\pgfcirc@if@has@v{\pgf@circ@drawvoltage}{}}%
+ {\pgfcirc@if@has@i{\pgf@circ@drawcurrent}{}}%
+ {\pgfcirc@if@has@f{\pgf@circ@drawflow}{}}%
% finish the path from the component to the final target
% you never know --- re-set \pgf@temp to detect open
\pgfextra{\def\pgf@temp{open}\def\pgf@circ@temp{#3}}
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index 39a332e0f6..6af1ae4ed5 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.2.6}
-\def\pgfcircversiondate{2020/12/16}
+\def\pgfcircversion{1.2.7}
+\def\pgfcircversiondate{2020/12/27}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]