diff options
author | Karl Berry <karl@freefriends.org> | 2017-03-25 20:53:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-03-25 20:53:31 +0000 |
commit | a79dbfe42116cdc40c6e2ff7cf46b97075a04585 (patch) | |
tree | 2bb4e1417d5d4ae32c9f35c10388fc354058db88 /Master/texmf-dist/tex | |
parent | 44cbf1fc60eb94ba3557cb07676bf514332c7957 (diff) |
circuitikz (25mar17)
git-svn-id: svn://tug.org/texlive/trunk@43598 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
6 files changed, 51 insertions, 102 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 cf74436658d..46de1dd5a98 100644 --- a/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex +++ b/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex @@ -1,5 +1,5 @@ -\def\pgfcircversion{0.8} -\def\pgfcircversiondate{2017/03/08} +\def\pgfcircversion{0.8.1} +\def\pgfcircversiondate{2017/03/25} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} \usemodule[tikz] @@ -19,7 +19,6 @@ \input pgfcirc.defines.tex \input pgfcircutils.tex -\input pgfcircmath.tex \input pgfcircshapes.tex \input pgfcircmonopoles.tex diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex index 81aacdc99a3..a298b6a3a0e 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex @@ -32,6 +32,7 @@ l=#1, \circuitikzbasekey/bipole/label/position=90 } } + \ctikzset{l^/.style = { l=#1, \circuitikzbasekey/bipole/label/position=90 } @@ -41,18 +42,19 @@ l=#1, \circuitikzbasekey/bipole/label/position=-90 } } + \ctikzset{l_/.style = { l=#1, \circuitikzbasekey/bipole/label/position=-90 } } -%value options + \ctikzset{annotation/.style = { a=#1 } } -\ctikzset{a/.code = { +\ctikzset{a/.code = { \pgfkeys{/tikz/circuitikz/bipole/annotation/name=#1} \ctikzsetvalof{bipole/annotation/unit}{} - \ifpgf@circ@siunitx + \ifpgf@circ@siunitx \pgf@circ@handleSI{#1} - \ifpgf@circ@siunitx@res + \ifpgf@circ@siunitx@res \edef\pgf@temp{\pgf@circ@handleSI@val} \pgfkeyslet{/tikz/circuitikz/bipole/annotation/name}{\pgf@temp} \edef\pgf@temp{\pgf@circ@handleSI@unit} @@ -63,12 +65,11 @@ \fi }} - - \ctikzset{annotation above/.code = { a=#1, \circuitikzbasekey/bipole/annotation/position=90 } } + \ctikzset{a^/.style = { a=#1, \circuitikzbasekey/bipole/annotation/position=90 } @@ -97,7 +98,7 @@ \ifx\pgf@temp\pgf@circ@temp %rotate \pgf@circ@drawrotlabels{#1} \else % smart - \pgf@circ@drawsmartlabels{#1} + \pgf@circ@drawsmartlabels{#1} \fi \fi } @@ -105,48 +106,42 @@ \def\pgf@circ@drawsmartlabels#1{ \pgfextra{ - %\pgfmathadd{\pgf@circ@direction}{360} \pgfmathmod{\pgf@circ@direction}{90} \edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} } - \ifnum \pgfcircmathresult > 20 - \ifnum \pgfcircmathresult < 70 % NON quasi retto + \ifnum \pgfcircmathresult > 20 + \ifnum \pgfcircmathresult < 70 \pgf@circ@drawrotlabels{#1} \else \pgf@circ@drawreglabels{#1} \fi - \else + \else \pgf@circ@drawreglabels{#1} \fi } -%% Output routing -%% #1 - node name \def\pgf@circ@drawrotlabels#1{ \pgfextra{ - % calcolo rotazione label - \def\pgf@circ@temp{\ctikzvalof{bipole/#1/position}} %%% àncora label - \edef\pgfcirclabrot{\pgf@circ@direction} % primo e quarto quadrante + \def\pgf@circ@temp{\ctikzvalof{bipole/#1/position}} + \edef\pgfcirclabrot{\pgf@circ@direction} % first or fourth quadrant \edef\pgfcircmathresult{\expandafter\pgf@circ@stripdecimals\pgf@circ@direction\pgf@nil} - \ifnum \pgfcircmathresult > 90 \ifnum \pgfcircmathresult < 270 % terzo e secondo + \ifnum \pgfcircmathresult > 90 \ifnum \pgfcircmathresult < 270 % second or third quadrant \pgfmathsubtract{\pgf@circ@direction}{180} \edef\pgfcirclabrot{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} \pgfmathadd{\pgf@circ@temp}{180} %%% \edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} %%% \fi\fi - - } + + \pgfmathadd{\pgf@circ@direction}{90} + \edef\pgf@circ@labpos{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} + } \ifnum \ctikzvalof{mirror value} = -1 - % \pgfmathadd{\pgf@circ@temp}{180} - % \edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} - coordinate (labelcoor) at ($(\ctikzvalof{bipole/name})!2!(\ctikzvalof{bipole/name}.south)$) - (labelcoor) node [rotate=\pgfcirclabrot] {\pgf@circ@finallabels{#1}} % c'era un transform shape + (\ctikzvalof{bipole/name}.south)++(\pgf@circ@labpos:1.5ex) coordinate (labelcoor) \else - coordinate (labelcoor) at ($(\ctikzvalof{bipole/name})!2!(\ctikzvalof{bipole/name}.north)$) - (labelcoor) node [rotate=\pgfcirclabrot] {\pgf@circ@finallabels{#1}} % c'era un transform shape + (\ctikzvalof{bipole/name}.north)++(\pgf@circ@labpos:1.5ex) coordinate (labelcoor) \fi - + (labelcoor) node [rotate=\pgfcirclabrot,anchor=mid] {\pgf@circ@finallabels{#1}} } \def\pgf@circ@drawreglabels#1{ @@ -154,7 +149,7 @@ \pgfmathsubtract{\pgf@circ@direction}{90} \edef\pgf@circ@labanc{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} - \edef\pgf@circ@temp{\ctikzvalof{bipole/#1/position}} %%% àncora label + \edef\pgf@circ@temp{\ctikzvalof{bipole/#1/position}} \ifnum \pgf@circ@temp < 0 \pgfmathadd{\pgf@circ@labanc}{180} \edef\pgf@circ@labanc{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} @@ -168,9 +163,21 @@ \pgfmathadd{\pgf@circ@temp}{180} \edef\pgf@circ@temp{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} \fi + \pgfmathadd{\pgf@circ@direction}{90} + \edef\pgf@circ@labpos{\expandafter\pgf@circ@stripdecimals\pgfmathresult\pgf@nil} } - node [ anchor = \pgf@circ@labanc] - at (\ctikzvalof{bipole/name}.\pgf@circ@temp) {\pgf@circ@finallabels{#1}} + + \ifnum \pgf@circ@labanc = -90 + \ifnum \ctikzvalof{mirror value} = -1 + (\ctikzvalof{bipole/name}.south)++(\pgf@circ@labpos:1.5ex) coordinate (labelcoor) + \else + (\ctikzvalof{bipole/name}.north)++(\pgf@circ@labpos:1.5ex) coordinate (labelcoor) + \fi + (labelcoor) node [anchor=mid] {\pgf@circ@finallabels{#1}} + + \else + (\ctikzvalof{bipole/name}.\pgf@circ@temp) node [anchor=\pgf@circ@labanc]{\pgf@circ@finallabels{#1}} + \fi } \def\pgf@circ@finallabels#1{% @@ -183,10 +190,8 @@ \fi% } - \ctikzset{text/.style = { t=#1 } } \ctikzset{t/.code = { \ctikzsetvalof{bipoles/twoport/text}{#1} }} - -\endinput +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircmath.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircmath.tex deleted file mode 100644 index 2cfac94739f..00000000000 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircmath.tex +++ /dev/null @@ -1,51 +0,0 @@ -% Copyright 2007-2009 by Massimo Redaelli -% -% This file may be distributed and/or modified -% -% 1. under the LaTeX Project Public License and/or -% 2. under the GNU Public License. -% -% See the file doc/LICENSE for more details. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Math routines - -\def\pgf@circ@stripdecimals#1.#2\pgf@nil{#1} - -% angle between 0 and 360 -\def\pgf@circ@slope#1#2{% - \pgf@process{#1}% - \pgf@xa=\pgf@x% - \pgf@ya=\pgf@y% - \pgf@process{#2}% - \advance\pgf@x by-\pgf@xa% - \advance\pgf@y by-\pgf@ya% - \ifdim\pgf@x<0.1pt - \ifdim\pgf@x>-0.1pt % vertical - \ifdim\pgf@y<0pt - \def\pgfmathresult{-90.0} - \else - \def\pgfmathresult{+90.0} - \fi - \else % oblique with dx < 0 - \pgfmathdivide{\pgf@y}{\pgf@x} - \pgfmathatan{\pgfmathresult} - \ifdim\pgf@x<0pt - \pgfmathsubtract{\pgfmathresult}{+180} - \fi - \fi - \else % oblique with dx > 0 - \pgfmathdivide{\pgf@y}{\pgf@x} - \pgfmathatan{\pgfmathresult} - \ifdim\pgf@x<0pt - \pgfmathsubtract{\pgfmathresult}{+180} - \fi - \fi - \pgf@x=\pgfmathresult pt - \ifdim\pgf@x<0pt - \pgfmathadd{\pgfmathresult}{+360} - \fi - } - -\endinput - diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex index 2af7aaa9e78..ae43c40cd65 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex @@ -59,11 +59,11 @@ \fi \pgfsyssoftpath@getcurrentpath{\myp@th}%% save current path to extend after calculation of correct start/end coordinates } - + (\tikztostart) coordinate (\ctikzvalof{bipole/name}start)%necessary to get correct coordinates in the case of relativ start/end or constructions like ((node1)-|(node2)) - (\tikztotarget) coordinate (\ctikzvalof{bipole/name}end) + (\tikztotarget)++(0,0) coordinate (\ctikzvalof{bipole/name}end) %++(0,0) needed, if tikztotarget is a node, maybe a bug at tikz/pgf? \pgfextra{ - \pgf@circ@slope{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}} + \pgfmathanglebetweenpoints{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}} {\pgfpointanchor{\ctikzvalof{bipole/name}end}{center}} \edef\pgf@circ@direction{\pgfmathresult}%Calculate direction(angle) of path \pgfsyssoftpath@setcurrentpath{\myp@th} @@ -629,7 +629,7 @@ (\tikztotarget) node[coordinate] (\ctikzvalof{bipole/name}end) {} \fi \pgfextra{ - \pgf@circ@slope{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}} + \pgfmathanglebetweenpoints{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}} {\pgfpointanchor{\ctikzvalof{bipole/name}end}{center}} \pgfmathadd{\pgfmathresult}{-90} \edef\pgf@circ@direction{\pgfmathresult} @@ -637,8 +637,6 @@ ($(\tikztostart) ! .5 ! (\tikztotarget)$) node[#1, /tikz/rotate=\pgf@circ@direction, xscale=\ctikzvalof{mirror value}] (\ctikzvalof{bipole/name}) {} node {\ctikzvalof{bipole/label/name}} - node[#1, /tikz/rotate=\pgf@circ@direction, xscale=\ctikzvalof{mirror value}] - (\ctikzvalof{bipole/name}) {} node {\ctikzvalof{bipole/value/name}} \ifcsname pgf@anchor@#1@pathstart\endcsname%if special path-anchors are defined, use them! (\ctikzvalof{bipole/name}start.center) --(\ctikzvalof{bipole/name}.pathstart) (\ctikzvalof{bipole/name}.pathend) -- (\ctikzvalof{bipole/name}end.center) diff --git a/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex b/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex index e7d2b6bd9d5..568eb05385a 100644 --- a/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex +++ b/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex @@ -52,4 +52,10 @@ \ifx\pgf@circ@temp\pgf@temp } +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% Math routines + +\def\pgf@circ@stripdecimals#1.#2\pgf@nil{#1} + + \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty index 3c2641d7807..3999270e77d 100644 --- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty +++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty @@ -8,17 +8,10 @@ % See the file doc/LICENSE for more details. -%%%%% -%%%%% -%%%%% -%%%%% Se c'è l'opzione symbol, fallback to siunitx with warning -%%%%% -%%%%% - \NeedsTeXFormat{LaTeX2e} -\def\pgfcircversion{0.8} -\def\pgfcircversiondate{2017/03/08} +\def\pgfcircversion{0.8.1} +\def\pgfcircversiondate{2017/03/25} \ProvidesPackage{circuitikz}% [\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion] @@ -308,7 +301,6 @@ %%%%%%%%% \input pgfcirc.defines.tex \input pgfcircutils.tex -\input pgfcircmath.tex \input pgfcircshapes.tex \input pgfcircmonopoles.tex |