summaryrefslogtreecommitdiff
path: root/graphics/pgf/contrib/circuitikz/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-10-15 03:00:58 +0000
committerNorbert Preining <norbert@preining.info>2020-10-15 03:00:58 +0000
commitff1e02dbf9c33ee832d7f0cb39a42648b376c9c5 (patch)
treea42fe5db4e9016144fdea322aff808927deeccd6 /graphics/pgf/contrib/circuitikz/tex
parent3a5a864b265cf29d47d0821fb7f03745f99b97d9 (diff)
CTAN sync 202010150300
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/pgfcirclabel.tex14
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex2
-rw-r--r--graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex4
4 files changed, 15 insertions, 9 deletions
diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
index 3fdb137c4b..24fde4cd3d 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.4}
-\def\pgfcircversiondate{2020/10/04}
+\def\pgfcircversion{1.2.5}
+\def\pgfcircversiondate{2020/10/14}
\ProvidesPackage{circuitikz}%
[\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion]
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
index a83279ee8c..5f65d77079 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
@@ -195,7 +195,8 @@
\pgf@circ@res@temp=1.5\pgf@circ@res@temp
\fi
%Calculate rotation of the label from direction and strip decimals
- \edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil}
+ \pgfmathsetmacro{\pgfcirclabrot}{round(\pgf@circ@direction)}
+ \edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgfcirclabrot\pgf@nil}
% rotate the label at second or third quadrant:
\ifnum \pgfcirclabrot > 90 \ifnum \pgfcirclabrot < 270
\pgfmathsubtract{\pgf@circ@direction}{180}
@@ -205,8 +206,10 @@
\pgf@circ@res@temp=1.5\pgf@circ@res@temp
\fi
\fi\fi
- \pgfmathparse{\ctikzvalof{bipole/#1/position}>0?\pgf@circ@direction+90:\pgf@circ@direction-90}
- \edef\pgf@circ@labposangle{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}
+ \pgfmathparse{\ctikzvalof{bipole/#1/position}>0?\pgf@circ@direction+90:\pgf@circ@direction-90}%
+ \edef\pgf@circ@labposangle{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil}%
+ \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix#1-direction\endcsname{\pgfcirclabrot}%
+ \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix-#1-anchor\endcsname{mid}%
}
% reset cm is not working correctly here
(pgfcirc@labelcoor)++(\pgf@circ@labposangle:\the\pgf@circ@res@temp) coordinate(pgfcirc@labelcoor)
@@ -250,7 +253,6 @@
\fi
\fi\fi
%Values between -5 and 5 are at pos /neg x-axis
- \pgfextra{\def\uffa{}\newdimen\realshift\realshift=\dimexpr1pt\relax}
\ifnum \pgfcircmathresult <6 \ifnum \pgfcircmathresult > -6
\ifnum \ctikzvalof{bipole/#1/position} < 0
\ifnum \pgf@circ@labanc > 90
@@ -281,6 +283,10 @@
\fi
\fi
\fi\fi
+ \pgfextra{%
+ \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix#1-direction\endcsname{0}%
+ \expandafter\xdef\csname pgfcirc@\pgfcirc@a@prefix-#1-anchor\endcsname{\pgf@circ@labanctext}%
+ }
(pgfcirc@labelcoor) node[anchor=\pgf@circ@labanctext,
inner sep=0.5\pgf@circ@res@temp, outer sep=0pt, \circuitikzbasekey/bipole #1 style,
](\ctikzvalof{bipole/name}#1){\strut\pgf@circ@finallabels{#1}%
diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
index 0b9c9dd779..d6c11db040 100644
--- a/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
+++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
@@ -177,7 +177,7 @@
\fi
\ifpgf@circuit@bipole@voltage@raised
\def\pgf@circ@bipole@voltage@label@anchor{center}
- \pgfmathsetlength{\absvshift}{\absvshift+height{"Q"}} % with the current font.
+ \pgfmathsetlength{\absvshift}{\absvshift+sign(\absvshift)*height{"Q"}} % with the current font.
\fi
}
% %\pgf@circ@Rlen/\ctikzvalof{current arrow scale} is equal to the length of the currarrow
diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
index 1b45f630bd..c571704c24 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.4}
-\def\pgfcircversiondate{2020/10/04}
+\def\pgfcircversion{1.2.5}
+\def\pgfcircversiondate{2020/10/14}
\writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion}
\usemodule[tikz]