texlive[55843] Master/texmf-dist: circuitikz (15jul20)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 16 00:14:16 CEST 2020
Revision: 55843
http://tug.org/svn/texlive?view=revision&revision=55843
Author: karl
Date: 2020-07-16 00:14:16 +0200 (Thu, 16 Jul 2020)
Log Message:
-----------
circuitikz (15jul20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
Modified: trunk/Master/texmf-dist/doc/context/third/circuitikz/circuitikz-context.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md
===================================================================
--- trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md 2020-07-15 22:14:16 UTC (rev 55843)
@@ -1,6 +1,11 @@
<!--- CircuiTikz - Changelog --->
The major changes among the different circuitikz versions are listed here. See <https://github.com/circuitikz/circuitikz/commits> for a full list of changes.
+* Version 1.2.2 (2020-07-15)
+
+ Bug-fix release: coordinate name leakage. The node and coordinate names are global; the internal coordinate names have been made stronger.
+
+
* Version 1.2.1 (2020-07-06)
Several changes, both internal and user-visible. These are quite risky, although they *should* be backeard-compatible.
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex 2020-07-15 22:14:16 UTC (rev 55843)
@@ -5,6 +5,12 @@
\begin{itemize}
\item
+ Version 1.2.2 (2020-07-15)
+
+ Bug-fix release: coordinate name leakage. The node and coordinate
+ names are global; the internal coordinate names have been made
+ stronger.
+\item
Version 1.2.1 (2020-07-06)
Several changes, both internal and user-visible. These are quite
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex 2020-07-15 22:14:16 UTC (rev 55843)
@@ -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.1}
-\def\pgfcircversiondate{2020/07/06}
+\def\pgfcircversion{1.2.2}
+\def\pgfcircversiondate{2020/07/15}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirccurrent.tex 2020-07-15 22:14:16 UTC (rev 55843)
@@ -198,9 +198,9 @@
\else% normal bipole or source
\ifpgf at circuit@bipole at current@before
coordinate (\pgfcirc at a@prefix-Ifrom) at (\tikztostart)
- coordinate (\pgfcirc at a@prefix-Ito) at (anchorstartnode)
+ coordinate (\pgfcirc at a@prefix-Ito) at (pgfcirc at anchorstartnode)
\else
- coordinate (\pgfcirc at a@prefix-Ifrom) at (anchorendnode)
+ coordinate (\pgfcirc at a@prefix-Ifrom) at (pgfcirc at anchorendnode)
coordinate (\pgfcirc at a@prefix-Ito) at (\tikztotarget)
\fi
\fi
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircflow.tex 2020-07-15 22:14:16 UTC (rev 55843)
@@ -183,9 +183,9 @@
\else% normal bipole or source
\ifpgf at circuit@bipole at flow@before
coordinate (pgfcirc at Ffrom@flat) at (\tikztostart)
- coordinate (pgfcirc at Fto@flat) at (anchorstartnode)
+ coordinate (pgfcirc at Fto@flat) at (pgfcirc at anchorstartnode)
\else
- coordinate (pgfcirc at Ffrom@flat) at (anchorendnode)
+ coordinate (pgfcirc at Ffrom@flat) at (pgfcirc at anchorendnode)
coordinate (pgfcirc at Fto@flat) at (\tikztotarget)
\fi
\fi
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex 2020-07-15 22:14:16 UTC (rev 55843)
@@ -141,7 +141,7 @@
% \typeout{FIN: TEMP\space\pgf at circ@temp\space LABANC\space\pgf at circ@labanc}
}
%Firstly, place a coordinate directly at the edge of the shape
- (\ctikzvalof{bipole/name}.\pgf at circ@temp) coordinate (labelcoor)
+ (\ctikzvalof{bipole/name}.\pgf at circ@temp) coordinate (pgfcirc at labelcoor)
%now decide, which labels should be drawn
\pgfextra{
\edef\pgf at temp{\ctikzvalof{label/align}}
@@ -209,7 +209,7 @@
\edef\pgf at circ@labposangle{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
}
% reset cm is not working correctly here
- (labelcoor)++(\pgf at circ@labposangle:\the\pgf at circ@res at temp) coordinate(labelcoor)
+ (pgfcirc at labelcoor)++(\pgf at circ@labposangle:\the\pgf at circ@res at temp) coordinate(pgfcirc at labelcoor)
node[anchor=mid, rotate=\pgfcirclabrot, \circuitikzbasekey/bipole #1 style]
(\ctikzvalof{bipole/name}#1){\pgf at circ@finallabels{#1}}
}
@@ -259,7 +259,7 @@
% the inner sep, so recover it by shifting the anchor
% reset cm is not working sometime, use @marmot solution
% see https://tex.stackexchange.com/a/476018/38080
- (labelcoor) ++(-\pgf at circ@labanc:\pgf at circ@res at temp) coordinate(labelcoor)
+ (pgfcirc at labelcoor) ++(-\pgf at circ@labanc:\pgf at circ@res at temp) coordinate(pgfcirc at labelcoor)
\pgfextra{\def\pgf at circ@labanctext{base}}%base
\else
\pgfextra{\def\pgf at circ@labanctext{north}}%north
@@ -267,13 +267,13 @@
\else
\ifnum \pgf at circ@labanc < 90
% shift, as above
- (labelcoor) ++(-\pgf at circ@labanc:\pgf at circ@res at temp) coordinate(labelcoor)
+ (pgfcirc at labelcoor) ++(-\pgf at circ@labanc:\pgf at circ@res at temp) coordinate(pgfcirc at labelcoor)
\pgfextra{\def\pgf at circ@labanctext{base}}%base
\else
\ifnum \pgf at circ@labanc > 180
% this shouldn't happen, but somehow it does (270 degree anchors)
% shift, as above
- (labelcoor) ++(-\pgf at circ@labanc:\pgf at circ@res at temp) coordinate(labelcoor)
+ (pgfcirc at labelcoor) ++(-\pgf at circ@labanc:\pgf at circ@res at temp) coordinate(pgfcirc at labelcoor)
\pgfextra{\def\pgf at circ@labanctext{base}}%base
\else
\pgfextra{\def\pgf at circ@labanctext{north}}%north
@@ -281,7 +281,7 @@
\fi
\fi
\fi\fi
- (labelcoor) node[anchor=\pgf at circ@labanctext,
+ (pgfcirc at labelcoor) node[anchor=\pgf at circ@labanctext,
inner sep=0.5\pgf at circ@res at temp, outer sep=0pt, \circuitikzbasekey/bipole #1 style,
](\ctikzvalof{bipole/name}#1){\strut\pgf at circ@finallabels{#1}%
}
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex 2020-07-15 22:14:16 UTC (rev 55843)
@@ -15,9 +15,9 @@
% swap two coordinates
\def\pgfcirc at swap@coordinates#1#2{%
- coordinate (tmp) at (#1)
+ coordinate (pgfcirc at tmp@swap) at (#1)
coordinate (#1) at (#2)
- coordinate (#2) at (tmp)
+ coordinate (#2) at (pgfcirc at tmp@swap)
}
% Names
@@ -107,7 +107,7 @@
\def\pgf at circ@temp{}
\ifx\pgf at temp\pgf at circ@temp % if it has not a name
\pgfmathrandominteger{\pgf at circ@rand}{1000}{9999}
- \ctikzset{bipole/name = #3\pgf at circ@rand} % create it (re-usage should not create problem, but...)
+ \ctikzset{bipole/name = pgfcirc@#3\pgf at circ@rand} % create it (re-usage should not create problem, but...)
\edef\pgfcirc at a@prefix{pgfcirc}% do not pollute the namespace for nothing
\else
\edef\pgfcirc at a@prefix{\ctikzvalof{bipole/name}}% for exporting v-i-f anchors
@@ -131,19 +131,19 @@
% set start and end labels
\ifpgf at circuit@bipole at inverted
\ifcsname pgf at anchor@#3#1 at pathstart\endcsname%if special path-anchors are defined, use them!
- coordinate (anchorstartnode) at (\ctikzvalof{bipole/name}.pathend)
- coordinate (anchorendnode) at (\ctikzvalof{bipole/name}.pathstart)
+ coordinate (pgfcirc at anchorstartnode) at (\ctikzvalof{bipole/name}.pathend)
+ coordinate (pgfcirc at anchorendnode) at (\ctikzvalof{bipole/name}.pathstart)
\else
- coordinate (anchorstartnode) at (\ctikzvalof{bipole/name}.right)
- coordinate (anchorendnode) at (\ctikzvalof{bipole/name}.left)
+ coordinate (pgfcirc at anchorstartnode) at (\ctikzvalof{bipole/name}.right)
+ coordinate (pgfcirc at anchorendnode) at (\ctikzvalof{bipole/name}.left)
\fi
\else
\ifcsname pgf at anchor@#3#1 at pathstart\endcsname%if special path-anchors are defined, use them!
- coordinate (anchorstartnode) at (\ctikzvalof{bipole/name}.pathstart)
- coordinate (anchorendnode) at (\ctikzvalof{bipole/name}.pathend)
+ coordinate (pgfcirc at anchorstartnode) at (\ctikzvalof{bipole/name}.pathstart)
+ coordinate (pgfcirc at anchorendnode) at (\ctikzvalof{bipole/name}.pathend)
\else
- coordinate (anchorstartnode) at (\ctikzvalof{bipole/name}.left)
- coordinate (anchorendnode) at (\ctikzvalof{bipole/name}.right)
+ coordinate (pgfcirc at anchorstartnode) at (\ctikzvalof{bipole/name}.left)
+ coordinate (pgfcirc at anchorendnode) at (\ctikzvalof{bipole/name}.right)
\fi
\fi
% draw the leads unless it's an open circuit
@@ -152,7 +152,7 @@
\ifx\pgf at temp\pgf at circ@temp % if it is an open do nothing
\else
% it is important to start the path with -- to have correct line joins!
- -- (\tikztostart) -- (anchorstartnode)
+ -- (\tikztostart) -- (pgfcirc at anchorstartnode)
\fi
% Add all the "ornaments": labels, annotations, voltages, currents and flows
\drawpoles
@@ -169,7 +169,7 @@
\ifx\pgf at temp\pgf at circ@temp % if it is an open do nothing
(\tikztotarget)
\else
- (anchorendnode) -- (\tikztotarget)
+ (pgfcirc at anchorendnode) -- (\tikztotarget)
\fi
% reset internal circuit keys
\pgfextra{\pgfcircresetpath}
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex 2020-07-15 22:14:16 UTC (rev 55843)
@@ -182,12 +182,12 @@
}
% %\pgf at circ@Rlen/\ctikzvalof{current arrow scale} is equal to the length of the currarrow
%absolute move, minimum space is length of arrowhead
- coordinate (pgfcirc at midtmp) at ($(\tikztostart) ! \pgf at circ@Rlen/\ctikzvalof{current arrow scale} ! (anchorstartnode)$)
- coordinate (pgfcirc at midtmp) at ($(pgfcirc at midtmp) ! \distancefromnode ! (anchorstartnode)$)
+ coordinate (pgfcirc at midtmp) at ($(\tikztostart) ! \pgf at circ@Rlen/\ctikzvalof{current arrow scale} ! (pgfcirc at anchorstartnode)$)
+ coordinate (pgfcirc at midtmp) at ($(pgfcirc at midtmp) ! \distancefromnode ! (pgfcirc at anchorstartnode)$)
coordinate (pgfcirc at Vfrom@flat) at (pgfcirc at midtmp)
%absolute move, minimum space is length of arrowhead
- coordinate (pgfcirc at midtmp) at ($(\tikztotarget) ! \pgf at circ@Rlen/\ctikzvalof{current arrow scale} ! (anchorendnode)$)
- coordinate (pgfcirc at midtmp) at ($(pgfcirc at midtmp) ! \distancefromnode ! (anchorendnode)$)
+ coordinate (pgfcirc at midtmp) at ($(\tikztotarget) ! \pgf at circ@Rlen/\ctikzvalof{current arrow scale} ! (pgfcirc at anchorendnode)$)
+ coordinate (pgfcirc at midtmp) at ($(pgfcirc at midtmp) ! \distancefromnode ! (pgfcirc at anchorendnode)$)
coordinate (pgfcirc at Vto@flat) at (pgfcirc at midtmp)
coordinate (pgfcirc at mid) at ($(pgfcirc at Vfrom@flat)!0.5!(pgfcirc at Vto@flat)$)
@@ -203,8 +203,8 @@
coordinate (\pgfcirc at a@prefix-Vlab) at ($(\pgfcirc at a@prefix-Vto)!0.5!(\pgfcirc at a@prefix-Vfrom) $)
coordinate (pgfcirc at Vdir) at (\pgfcirc at a@prefix-Vto)
\else
- coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! \absvshift!90 : (anchorendnode)$)
- coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! \absvshift!-90 : (anchorstartnode)$)
+ coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! \absvshift!90 : (pgfcirc at anchorendnode)$)
+ coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! \absvshift!-90 : (pgfcirc at anchorstartnode)$)
coordinate (pgfcirc at Vcont1t) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.-110)$)
coordinate (pgfcirc at Vcont2t) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.-70)$)
coordinate (\pgfcirc at a@prefix-Vcont1) at ($(pgfcirc at Vcont1t) ! -\absvshift!90 : (pgfcirc at Vcont2t)$)
@@ -214,8 +214,8 @@
\fi
\else
% we are in case of american here
- coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! \absvshift!90 : (anchorendnode)$)
- coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! \absvshift!-90 : (anchorstartnode)$)
+ coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! \absvshift!90 : (pgfcirc at anchorendnode)$)
+ coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! \absvshift!-90 : (pgfcirc at anchorstartnode)$)
coordinate (pgfcirc at bottom) at (\ctikzvalof{bipole/name}.-90)
coordinate (pgfcirc at Vdir0) at ($(pgfcirc at mid)+(pgfcirc at bottom)-(pgfcirc at Vfrom@flat)$)
coordinate (\pgfcirc at a@prefix-Vlab) at ($(pgfcirc at bottom) ! \absvshift!-90 : (pgfcirc at Vdir0)$)
@@ -241,8 +241,8 @@
coordinate (pgfcirc at Vdir) at (\pgfcirc at a@prefix-Vto)
\else
% european voltages here
- coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! -\absvshift!90 : (anchorendnode)$)
- coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! -\absvshift!-90 : (anchorstartnode)$)
+ coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! -\absvshift!90 : (pgfcirc at anchorendnode)$)
+ coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! -\absvshift!-90 : (pgfcirc at anchorstartnode)$)
% identify the two control points for the "arc" of the voltage
coordinate (pgfcirc at Vcont1t) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.110)$)
coordinate (pgfcirc at Vcont2t) at ($(\ctikzvalof{bipole/name}.center) ! \bumpb ! (\ctikzvalof{bipole/name}.70)$)
@@ -255,8 +255,8 @@
\fi
\else
% we are in case of american here
- coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! \absvshift!-90 : (anchorendnode)$)
- coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! \absvshift!90 : (anchorstartnode)$)
+ coordinate (\pgfcirc at a@prefix-Vto) at ($(pgfcirc at Vto@flat) ! \absvshift!-90 : (pgfcirc at anchorendnode)$)
+ coordinate (\pgfcirc at a@prefix-Vfrom) at ($(pgfcirc at Vfrom@flat) ! \absvshift!90 : (pgfcirc at anchorstartnode)$)
coordinate (pgfcirc at top) at (\ctikzvalof{bipole/name}.90)
% move parallel to the component line
coordinate (pgfcirc at Vdir0) at ($(pgfcirc at mid)+(pgfcirc at top)-(pgfcirc at Vfrom@flat)$)
@@ -275,8 +275,8 @@
coordinate (\pgfcirc at a@prefix-Vfrom) at (pgfcirc at Vfrom@flat)
\fi
\ifpgf at circ@debugv
- node [ocirc, fill=red] at (anchorstartnode) {}
- node [ocirc, fill=blue] at (anchorendnode) {}
+ node [ocirc, fill=red] at (pgfcirc at anchorstartnode) {}
+ node [ocirc, fill=blue] at (pgfcirc at anchorendnode) {}
node [ocirc, fill=green] at (\pgfcirc at a@prefix-Vto) {}
node [ocirc, fill=yellow] at (\pgfcirc at a@prefix-Vfrom) {}
node [odiamondpole, fill=green!50!black] at (pgfcirc at Vto@flat) {}
Modified: trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty 2020-07-15 22:13:28 UTC (rev 55842)
+++ trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty 2020-07-15 22:14:16 UTC (rev 55843)
@@ -12,8 +12,8 @@
\NeedsTeXFormat{LaTeX2e}
-\def\pgfcircversion{1.2.1}
-\def\pgfcircversiondate{2020/07/06}
+\def\pgfcircversion{1.2.2}
+\def\pgfcircversiondate{2020/07/15}
\ProvidesPackage{circuitikz}%
[\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
More information about the tex-live-commits
mailing list.