texlive[43598] Master/texmf-dist: circuitikz (25mar17)
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 25 21:53:31 CET 2017
Revision: 43598
http://tug.org/svn/texlive?view=revision&revision=43598
Author: karl
Date: 2017-03-25 21:53:31 +0100 (Sat, 25 Mar 2017)
Log Message:
-----------
circuitikz (25mar17)
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/generic/circuitikz/README.md
trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.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/pgfcircutils.tex
trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmath.tex
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 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/doc/generic/circuitikz/CHANGELOG.md 2017-03-25 20:53:31 UTC (rev 43598)
@@ -1,6 +1,12 @@
<!--- 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 0.8.1 (2017-03-25)
+ - Fixed unwanted line through components if target coordinate is a name of a node
+ - Fixed position of labels with subscript letters.
+ - Absolute distance calculation in terms of ex at rotated labels
+ - Fixed label for transistor paths (no label drawn)
+
* Version 0.8 (2017-03-08)
- Allow use of voltage label at a [short]
- Correct line joins between path components (to[...])
Modified: trunk/Master/texmf-dist/doc/generic/circuitikz/README.md
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/doc/latex/circuitikz/changelog.tex 2017-03-25 20:53:31 UTC (rev 43598)
@@ -6,6 +6,21 @@
\begin{itemize}
\tightlist
\item
+ Version 0.8.1 (2017-03-25)
+
+ \begin{itemize}
+ \tightlist
+ \item
+ Fixed unwanted line through components if target coordinate is a
+ name of a node
+ \item
+ Fixed position of labels with subscript letters.
+ \item
+ Absolute distance calculation in terms of ex at rotated labels
+ \item
+ Fixed label for transistor paths (no label drawn)
+ \end{itemize}
+\item
Version 0.8 (2017-03-08)
\begin{itemize}
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/doc/latex/circuitikz/circuitikzmanual.tex 2017-03-25 20:53:31 UTC (rev 43598)
@@ -1,6 +1,6 @@
% % Konfiguration für Texstudio (Version > 2.9)
-% % !TeX program = xelatex
-%% !TeX TXS-program:compile = txs:///xelatex/[-8bit]
+% !TeX program = xelatex
+% !TeX TXS-program:compile = txs:///xelatex/[-8bit]
% !BIB program = biber
% !TeX spellcheck = en_US
% !TeX encoding = utf8
@@ -44,9 +44,9 @@
\usepackage{hyperref}
\hypersetup{
bookmarks=false, % show bookmarks bar?
- pdftitle={CircuitTikZ v. \pgfcircversion\ - manual}, % title
- pdfauthor={Massimo Redaelli}, % author
- pdfsubject={CircuitTikZ manual}, % subject of the document
+ pdftitle={CircuiTikZ \pgfcircversion\ - manual}, % title
+ pdfauthor={Massimo Redaelli, Stefan Lindner, Stefan Erhardt}, % author
+ pdfsubject={CircuiTikZ manual}, % subject of the document
pdfkeywords={}, % list of keywords
colorlinks=true, % false: boxed links; true: colored links
linkcolor=black, % color of internal links
@@ -2118,9 +2118,10 @@
\begin{tabular}{l}\label{ex:compatibility}
- \fbox{\includegraphics{compatibility.pdf}}
- \\
- \begin{lstlisting}
+\IfFileExists{compatibility.pdf}
+{\fbox{\includegraphics{compatibility.pdf}}}
+\\
+\begin{lstlisting}
\documentclass{standalone}
\usepackage{tikz}
Modified: trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/tex/context/third/circuitikz/t-circuitikz.tex 2017-03-25 20:53:31 UTC (rev 43598)
@@ -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
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcirclabel.tex 2017-03-25 20:53:31 UTC (rev 43598)
@@ -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 at circ@siunitx
+ \ifpgf at circ@siunitx
\pgf at circ@handleSI{#1}
- \ifpgf at circ@siunitx at res
+ \ifpgf at circ@siunitx at res
\edef\pgf at temp{\pgf at circ@handleSI at val}
\pgfkeyslet{/tikz/circuitikz/bipole/annotation/name}{\pgf at temp}
\edef\pgf at temp{\pgf at circ@handleSI at 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 at temp\pgf at circ@temp %rotate
\pgf at circ@drawrotlabels{#1}
\else % smart
- \pgf at circ@drawsmartlabels{#1}
+ \pgf at circ@drawsmartlabels{#1}
\fi
\fi
}
@@ -105,48 +106,42 @@
\def\pgf at circ@drawsmartlabels#1{
\pgfextra{
- %\pgfmathadd{\pgf at circ@direction}{360}
\pgfmathmod{\pgf at circ@direction}{90}
\edef\pgfcircmathresult{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
}
- \ifnum \pgfcircmathresult > 20
- \ifnum \pgfcircmathresult < 70 % NON quasi retto
+ \ifnum \pgfcircmathresult > 20
+ \ifnum \pgfcircmathresult < 70
\pgf at circ@drawrotlabels{#1}
\else
\pgf at circ@drawreglabels{#1}
\fi
- \else
+ \else
\pgf at circ@drawreglabels{#1}
\fi
}
-%% Output routing
-%% #1 - node name
\def\pgf at circ@drawrotlabels#1{
\pgfextra{
- % calcolo rotazione label
- \def\pgf at circ@temp{\ctikzvalof{bipole/#1/position}} %%% àncora label
- \edef\pgfcirclabrot{\pgf at circ@direction} % primo e quarto quadrante
+ \def\pgf at circ@temp{\ctikzvalof{bipole/#1/position}}
+ \edef\pgfcirclabrot{\pgf at circ@direction} % first or fourth quadrant
\edef\pgfcircmathresult{\expandafter\pgf at circ@stripdecimals\pgf at circ@direction\pgf at nil}
- \ifnum \pgfcircmathresult > 90 \ifnum \pgfcircmathresult < 270 % terzo e secondo
+ \ifnum \pgfcircmathresult > 90 \ifnum \pgfcircmathresult < 270 % second or third quadrant
\pgfmathsubtract{\pgf at circ@direction}{180}
\edef\pgfcirclabrot{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
\pgfmathadd{\pgf at circ@temp}{180} %%%
\edef\pgf at circ@temp{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil} %%%
\fi\fi
-
- }
+
+ \pgfmathadd{\pgf at circ@direction}{90}
+ \edef\pgf at circ@labpos{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
+ }
\ifnum \ctikzvalof{mirror value} = -1
- % \pgfmathadd{\pgf at circ@temp}{180}
- % \edef\pgf at circ@temp{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
- coordinate (labelcoor) at ($(\ctikzvalof{bipole/name})!2!(\ctikzvalof{bipole/name}.south)$)
- (labelcoor) node [rotate=\pgfcirclabrot] {\pgf at circ@finallabels{#1}} % c'era un transform shape
+ (\ctikzvalof{bipole/name}.south)++(\pgf at circ@labpos:1.5ex) coordinate (labelcoor)
\else
- coordinate (labelcoor) at ($(\ctikzvalof{bipole/name})!2!(\ctikzvalof{bipole/name}.north)$)
- (labelcoor) node [rotate=\pgfcirclabrot] {\pgf at circ@finallabels{#1}} % c'era un transform shape
+ (\ctikzvalof{bipole/name}.north)++(\pgf at circ@labpos:1.5ex) coordinate (labelcoor)
\fi
-
+ (labelcoor) node [rotate=\pgfcirclabrot,anchor=mid] {\pgf at circ@finallabels{#1}}
}
\def\pgf at circ@drawreglabels#1{
@@ -154,7 +149,7 @@
\pgfmathsubtract{\pgf at circ@direction}{90}
\edef\pgf at circ@labanc{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
- \edef\pgf at circ@temp{\ctikzvalof{bipole/#1/position}} %%% àncora label
+ \edef\pgf at circ@temp{\ctikzvalof{bipole/#1/position}}
\ifnum \pgf at circ@temp < 0
\pgfmathadd{\pgf at circ@labanc}{180}
\edef\pgf at circ@labanc{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
@@ -168,9 +163,21 @@
\pgfmathadd{\pgf at circ@temp}{180}
\edef\pgf at circ@temp{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
\fi
+ \pgfmathadd{\pgf at circ@direction}{90}
+ \edef\pgf at circ@labpos{\expandafter\pgf at circ@stripdecimals\pgfmathresult\pgf at nil}
}
- node [ anchor = \pgf at circ@labanc]
- at (\ctikzvalof{bipole/name}.\pgf at circ@temp) {\pgf at circ@finallabels{#1}}
+
+ \ifnum \pgf at circ@labanc = -90
+ \ifnum \ctikzvalof{mirror value} = -1
+ (\ctikzvalof{bipole/name}.south)++(\pgf at circ@labpos:1.5ex) coordinate (labelcoor)
+ \else
+ (\ctikzvalof{bipole/name}.north)++(\pgf at circ@labpos:1.5ex) coordinate (labelcoor)
+ \fi
+ (labelcoor) node [anchor=mid] {\pgf at circ@finallabels{#1}}
+
+ \else
+ (\ctikzvalof{bipole/name}.\pgf at circ@temp) node [anchor=\pgf at circ@labanc]{\pgf at circ@finallabels{#1}}
+ \fi
}
\def\pgf at 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
Deleted: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmath.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmath.tex 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircmath.tex 2017-03-25 20:53:31 UTC (rev 43598)
@@ -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 at circ@stripdecimals#1.#2\pgf at nil{#1}
-
-% angle between 0 and 360
-\def\pgf at circ@slope#1#2{%
- \pgf at process{#1}%
- \pgf at xa=\pgf at x%
- \pgf at ya=\pgf at y%
- \pgf at process{#2}%
- \advance\pgf at x by-\pgf at xa%
- \advance\pgf at y by-\pgf at ya%
- \ifdim\pgf at x<0.1pt
- \ifdim\pgf at x>-0.1pt % vertical
- \ifdim\pgf at y<0pt
- \def\pgfmathresult{-90.0}
- \else
- \def\pgfmathresult{+90.0}
- \fi
- \else % oblique with dx < 0
- \pgfmathdivide{\pgf at y}{\pgf at x}
- \pgfmathatan{\pgfmathresult}
- \ifdim\pgf at x<0pt
- \pgfmathsubtract{\pgfmathresult}{+180}
- \fi
- \fi
- \else % oblique with dx > 0
- \pgfmathdivide{\pgf at y}{\pgf at x}
- \pgfmathatan{\pgfmathresult}
- \ifdim\pgf at x<0pt
- \pgfmathsubtract{\pgfmathresult}{+180}
- \fi
- \fi
- \pgf at x=\pgfmathresult pt
- \ifdim\pgf at x<0pt
- \pgfmathadd{\pgfmathresult}{+360}
- \fi
- }
-
-\endinput
-
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircpath.tex 2017-03-25 20:53:31 UTC (rev 43598)
@@ -59,11 +59,11 @@
\fi
\pgfsyssoftpath at getcurrentpath{\myp at 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 at circ@slope{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}}
+ \pgfmathanglebetweenpoints{\pgfpointanchor{\ctikzvalof{bipole/name}start}{center}}
{\pgfpointanchor{\ctikzvalof{bipole/name}end}{center}}
\edef\pgf at circ@direction{\pgfmathresult}%Calculate direction(angle) of path
\pgfsyssoftpath at setcurrentpath{\myp at th}
@@ -629,7 +629,7 @@
(\tikztotarget) node[coordinate] (\ctikzvalof{bipole/name}end) {}
\fi
\pgfextra{
- \pgf at 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 at circ@direction{\pgfmathresult}
@@ -637,8 +637,6 @@
($(\tikztostart) ! .5 ! (\tikztotarget)$)
node[#1, /tikz/rotate=\pgf at circ@direction, xscale=\ctikzvalof{mirror value}]
(\ctikzvalof{bipole/name}) {} node {\ctikzvalof{bipole/label/name}}
- node[#1, /tikz/rotate=\pgf at circ@direction, xscale=\ctikzvalof{mirror value}]
- (\ctikzvalof{bipole/name}) {} node {\ctikzvalof{bipole/value/name}}
\ifcsname pgf at anchor@#1 at 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)
Modified: trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/tex/generic/circuitikz/pgfcircutils.tex 2017-03-25 20:53:31 UTC (rev 43598)
@@ -52,4 +52,10 @@
\ifx\pgf at circ@temp\pgf at temp
}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Math routines
+
+\def\pgf at circ@stripdecimals#1.#2\pgf at nil{#1}
+
+
\endinput
\ No newline at end of file
Modified: trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty 2017-03-25 01:02:39 UTC (rev 43597)
+++ trunk/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty 2017-03-25 20:53:31 UTC (rev 43598)
@@ -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
More information about the tex-live-commits
mailing list