From 5d04032d3de48582e3199329b8ec2219cc20a2eb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 14 Oct 2020 21:44:17 +0000 Subject: circuitikz (14oct20) git-svn-id: svn://tug.org/texlive/trunk@56660 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex | 14 ++++++++++---- .../texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/generic/circuitikz') diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex index a83279ee8ce..5f65d770794 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/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/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex index 0b9c9dd779f..d6c11db0405 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircvoltage.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/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 -- cgit v1.2.3