summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-01-29 22:38:00 +0000
committerKarl Berry <karl@freefriends.org>2014-01-29 22:38:00 +0000
commit0964195cec3d92b65a1c5e4571c01b1b72ecfa63 (patch)
tree2429651ef1590417c177487719782553e3aed6b1 /Master/texmf-dist
parent60a49629ff32042b4f8fc3dab59ac2578736b1f1 (diff)
sa-tikz (29jan14)
git-svn-id: svn://tug.org/texlive/trunk@32815 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/sa-tikz/README2
-rw-r--r--Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.pdfbin887202 -> 890448 bytes
-rw-r--r--Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.tex12
-rw-r--r--Master/texmf-dist/tex/latex/sa-tikz/sa-tikz.sty84
-rw-r--r--Master/texmf-dist/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex82
5 files changed, 92 insertions, 88 deletions
diff --git a/Master/texmf-dist/doc/latex/sa-tikz/README b/Master/texmf-dist/doc/latex/sa-tikz/README
index 93c2a940d89..46fd39f320b 100644
--- a/Master/texmf-dist/doc/latex/sa-tikz/README
+++ b/Master/texmf-dist/doc/latex/sa-tikz/README
@@ -1,7 +1,7 @@
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
% Sa-TikZ: TikZ library to draw switching architectures
%
-% Version v0.7 2014/1/21 - (C) Claudio Fiandrino
+% Version v0.7a 2014/1/29 - (C) Claudio Fiandrino
%
% E-mail: claudio dot fiandrino at gmail dot com
%
diff --git a/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.pdf b/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.pdf
index 6d28614332b..2c841d92dc3 100644
--- a/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.pdf
+++ b/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.tex b/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.tex
index 4e8d4d73bf8..3bc3365edb5 100644
--- a/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.tex
+++ b/Master/texmf-dist/doc/latex/sa-tikz/sa-tikz-doc.tex
@@ -51,8 +51,8 @@
/pdflinks/show labels=false,
}
\makeindex
-\newcommand{\version}{0.7}
-\newcommand{\versiondate}{January 21, 2014}
+\newcommand{\version}{0.7a}
+\newcommand{\versiondate}{January 29, 2014}
\title{\saTikZ\footnote{This package has version number \textit{v}\version\ of \versiondate; it is released under and subject to the \href{http://www.latex-project.org/lppl/}{\LaTeX\ Project Public License (LPPL)}.}}
\author{Claudio Fiandrino \\ \small\href{mailto:claudio.fiandrino@gmail.com}{\texttt{claudio.fiandrino@gmail.com}}}
@@ -80,7 +80,7 @@ or by means of:
\end{flushleft}
In both cases the auxiliary \Tikz\ libraries \bgroup\color{red!75!black}\verb|calc|\egroup{}, \bgroup\color{red!75!black}\verb|decorations.pathreplacing|\egroup\ and \bgroup\color{red!75!black}\verb|positioning|\egroup\ are automatically loaded; in the latter case also the \Tikz\ package is loaded.
-The version \textit{v}\version\ is compliant with \Tikz\ 3.0.0 and provides a way to draw Clos Networks Strictly-non-Blocking (snb) and Rearrangeable (rear), Benes Networks and Banyan Networks (in particular Omega\footnote{Implementation of Omega Networks by João Gabriel Reis.} and Flip Networks); moreover, the package provides the possibility to fully customize the aspect of the drawn network: the dimensions of module, their distance and the font used are some examples. Finally, \saTikZ\ let users to draw connections among the stages by accessing the single ports of the modules.
+The version \textit{v}\version\ is compliant with \Tikz\ 3.0.0\footnote{In order to compile the documentation, and only for this scope, \Tikz\ 3.0.0 is \emph{mandatory}.} and provides a way to draw Clos Networks Strictly-non-Blocking (snb) and Rearrangeable (rear), Benes Networks and Banyan Networks (in particular Omega\footnote{Implementation of Omega Networks by João Gabriel Reis.} and Flip Networks); moreover, the package provides the possibility to fully customize the aspect of the drawn network: the dimensions of module, their distance and the font used are some examples. Finally, \saTikZ\ let users to draw connections among the stages by accessing the single ports of the modules.
\section{Basic usage}
The simplest use of the package is to define a
@@ -380,7 +380,7 @@ Here is a Benes Network $4 \times 4$ which presents an extremely large font size
\end{tikzpicture}
\end{codeexample}
-Consider the following $16 \times 16$ Omega Network:
+The following example is a $16 \times 16$ Omega Network.
\begin{codeexample}[]
\tikzset{module size=0.6cm,pin length factor=0.6,
module ysep=0.65, module xsep=3.5,}
@@ -689,7 +689,7 @@ An example with the default values for the labels:
\end{tikzpicture}
\end{codeexample}
-To have automatically all labels in math mode, use:
+To have automatically all the labels in math mode, you can use:
\begin{key}{/tikz/set math mode labels=\mchoice{true,false} (default false)}
This option is normally disabled |set math mode labels/.default=false|; to ensure labels be set completely in math mode is sufficient set |set math mode labels=true| before the type of the network.
\end{key}
@@ -732,7 +732,7 @@ r1 label=q, m1 label=z, r2 label=z,r3 label=q, m3 label=z}
\clearpage
\appendix
-\section{Benes complete internal connections algorithm}
+\section{Algorithm for drawing connections in Benes Networks}
\label{sec:benesconnalg}
To explain how the connections of the |benes complete| networks are drawn, the following reference example will be considered:
\begin{center}
diff --git a/Master/texmf-dist/tex/latex/sa-tikz/sa-tikz.sty b/Master/texmf-dist/tex/latex/sa-tikz/sa-tikz.sty
index bb4d1983080..e3e87b23c14 100644
--- a/Master/texmf-dist/tex/latex/sa-tikz/sa-tikz.sty
+++ b/Master/texmf-dist/tex/latex/sa-tikz/sa-tikz.sty
@@ -1,10 +1,10 @@
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
%
-% Sa-TikZ package v0.7 * * (C) Claudio Fiandrino 2012-2014
+% Sa-TikZ package v0.7a * * (C) Claudio Fiandrino 2012-2014
%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sa-tikz}[2014/1/21 v0.7 Switching architectures design library.]
+\ProvidesPackage{sa-tikz}[2014/1/29 v0.7a Switching architectures design library.]
\RequirePackage{tikz}
\usetikzlibrary{backgrounds,calc,positioning,decorations.pathreplacing}
@@ -12,6 +12,24 @@
% UTILITY
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+% PGFMATHISODD: 1 = true, 0 = false
+% from TikZ 3.0.0
+% Test for checking whether \pgfmathisodd is defined or not
+% for compatibility with TikZ 2.10
+%
+\@ifundefined{pgfmathisodd}{
+\pgfmathdeclarefunction{isodd}{1}{%
+ \begingroup
+ \pgfmathsetcount\c@pgfmath@counta{abs(int(#1))}%
+ \ifodd\c@pgfmath@counta
+ \def\pgfmathresult{1}%
+ \else
+ \def\pgfmathresult{0}%
+ \fi
+ \pgfmath@smuggleone\pgfmathresult
+ \endgroup}
+}{}
+
% PGFMATHOMEGAROTATION:
%
% #1: number to be rotated
@@ -39,80 +57,71 @@
% N is the key representing the number of inputs x number of modules first stage
\pgfkeys{/tikz/.cd,%
- N/.initial=10,%
- N/.get=\N,%
N/.store in=\N,%
+ N=10,%
}%
% N label
\pgfkeys{/tikz/.cd,%
- N label/.initial=N,%
N label/.store in=\Nlabel,%
- N label/.get=\Nlabel,%
+ N label=N,%
}%
% r1 is the number of modules first stage
% m1 is the number of inputs first stage per module
\pgfkeys{/tikz/.cd,%
- r1/.initial=5,%
r1/.store in=\rone,%
- r1/.get=\rone,%
+ r1=5,%
}%
% r1 label
\pgfkeys{/tikz/.cd,%
- r1 label/.initial={r\ensuremath{_1}},%
r1 label/.store in=\ronelabel,%
- r1 label/.get=\ronelabel,%
+ r1 label={r\ensuremath{_1}},%
}%
% m1 label
-\pgfkeys{/tikz/.cd,
- m1 label/.initial={m\ensuremath{_1}},%
+\pgfkeys{/tikz/.cd,%
m1 label/.store in=\monelabel,%
- m1 label/.get=\monelabel,%
+ m1 label={m\ensuremath{_1}},%
}%
% r2 label
\pgfkeys{/tikz/.cd,%
- r2 label/.initial={r\ensuremath{_2}},%
r2 label/.store in=\rtwolabel,%
- r2 label/.get=\rtwolabel,%
+ r2 label={r\ensuremath{_2}},%
}%
% M is the key representing the number of inputs x number of modules last stage
\pgfkeys{/tikz/.cd,%
- M/.initial=10,%
- M/.get=\M,%
M/.store in=\M,%
+ M=10,%
}%
% M label
\pgfkeys{/tikz/.cd,%
- M label/.initial=M,%
M label/.store in=\Mlabel,%
- M label/.get=\Mlabel,%
+ M label=M,%
}%
% r3 is the number of modules last stage
% m3 is the number of inputs last stage per module
-\pgfmathtruncatemacro\rthree{5}%
-\pgfkeys{/tikz/.cd, r3/.initial=5}%
-\pgfkeys{/tikz/.cd, r3/.store in=\rthree}%
+\pgfkeys{/tikz/.cd,%
+ r3/.store in=\rthree,%
+ r3=5
+}%
% r3 label
\pgfkeys{/tikz/.cd,%
- r3 label/.initial={r\ensuremath{_3}},%
r3 label/.store in=\rthreelabel,%
- r3 label/.get=\rthreelabel,%
+ r3 label={r\ensuremath{_3}},%
}%
% m3 label
-\pgfkeys{/tikz/.cd,
- m3 label/.initial={m\ensuremath{_3}},%
+\pgfkeys{/tikz/.cd,
m3 label/.store in=\mthreelabel,%
- m3 label/.get=\mthreelabel,%
+ m3 label={m\ensuremath{_3}},%
}%
% * * * * * * * * * * * * * * * * * *
@@ -121,9 +130,8 @@
% P is the number of input/output ports
\pgfkeys{/tikz/.cd,%
- P/.initial=8,%
- P/.get=\P,%
P/.store in=\P,%
+ P=8,%
}%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -132,27 +140,23 @@
% module customization
\pgfkeys{/tikz/.cd,%
- module size/.initial={1cm},%
- module size/.get=\modulesize,%
module size/.store in=\modulesize,%
+ module size={1cm},%
}%
\pgfkeys{/tikz/.cd,%
- module ysep/.initial={1.5},%
- module ysep/.get=\moduleysep,%
module ysep/.store in=\moduleysep,%
+ module ysep={1.5},
}%
\pgfkeys{/tikz/.cd,%
- module xsep/.initial={3},%
- module xsep/.get=\modulexsep,%
module xsep/.store in=\modulexsep,%
+ module xsep={3},%
}%
\pgfkeys{/tikz/.cd,%
- module font/.initial=\normalfont,%
- module font/.get=\modulefont,%
module font/.store in=\modulefont,%
+ module font={\normalfont},%
}%
\tikzset{module/.style={%
@@ -168,9 +172,8 @@
}
\pgfkeys{/tikz/.cd,%
- module label opacity/.initial={1},%
- module label opacity/.get=\modulelabelopacity,%
module label opacity/.store in=\modulelabelopacity,%
+ module label opacity={1},%
}%
\tikzset{module opacity/.style={
@@ -179,9 +182,8 @@
}
\pgfkeys{/tikz/.cd,%
- pin length factor/.initial={1},%
- pin length factor/.get=\pinlength,%
pin length factor/.store in=\pinlength,%
+ pin length factor={1},%
}%
% setting labels in math mode
diff --git a/Master/texmf-dist/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex b/Master/texmf-dist/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex
index 6b4351887a4..995bd194a54 100644
--- a/Master/texmf-dist/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex
+++ b/Master/texmf-dist/tex/latex/sa-tikz/tikzlibraryswitching-architectures.code.tex
@@ -1,6 +1,6 @@
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
%
-% Sa-TikZ package v0.7 * * (C) Claudio Fiandrino 2012-2014
+% Sa-TikZ package v0.7a * * (C) Claudio Fiandrino 2012-2014
%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -14,6 +14,24 @@
% UTILITY
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+% PGFMATHISODD: 1 = true, 0 = false
+% from TikZ 3.0.0
+% Test for checking whether \pgfmathisodd is defined or not
+% for compatibility with TikZ 2.10
+%
+\@ifundefined{pgfmathisodd}{
+\pgfmathdeclarefunction{isodd}{1}{%
+ \begingroup
+ \pgfmathsetcount\c@pgfmath@counta{abs(int(#1))}%
+ \ifodd\c@pgfmath@counta
+ \def\pgfmathresult{1}%
+ \else
+ \def\pgfmathresult{0}%
+ \fi
+ \pgfmath@smuggleone\pgfmathresult
+ \endgroup}
+}{}
+
% PGFMATHOMEGAROTATION:
%
% #1: number to be rotated
@@ -41,80 +59,71 @@
% N is the key representing the number of inputs x number of modules first stage
\pgfkeys{/tikz/.cd,%
- N/.initial=10,%
- N/.get=\N,%
N/.store in=\N,%
+ N=10,%
}%
% N label
\pgfkeys{/tikz/.cd,%
- N label/.initial=N,%
N label/.store in=\Nlabel,%
- N label/.get=\Nlabel,%
+ N label=N,%
}%
% r1 is the number of modules first stage
% m1 is the number of inputs first stage per module
\pgfkeys{/tikz/.cd,%
- r1/.initial=5,%
r1/.store in=\rone,%
- r1/.get=\rone,%
+ r1=5,%
}%
% r1 label
\pgfkeys{/tikz/.cd,%
- r1 label/.initial={r\ensuremath{_1}},%
r1 label/.store in=\ronelabel,%
- r1 label/.get=\ronelabel,%
+ r1 label={r\ensuremath{_1}},%
}%
% m1 label
-\pgfkeys{/tikz/.cd,
- m1 label/.initial={m\ensuremath{_1}},%
+\pgfkeys{/tikz/.cd,%
m1 label/.store in=\monelabel,%
- m1 label/.get=\monelabel,%
+ m1 label={m\ensuremath{_1}},%
}%
% r2 label
\pgfkeys{/tikz/.cd,%
- r2 label/.initial={r\ensuremath{_2}},%
r2 label/.store in=\rtwolabel,%
- r2 label/.get=\rtwolabel,%
+ r2 label={r\ensuremath{_2}},%
}%
% M is the key representing the number of inputs x number of modules last stage
\pgfkeys{/tikz/.cd,%
- M/.initial=10,%
- M/.get=\M,%
M/.store in=\M,%
+ M=10,%
}%
% M label
\pgfkeys{/tikz/.cd,%
- M label/.initial=M,%
M label/.store in=\Mlabel,%
- M label/.get=\Mlabel,%
+ M label=M,%
}%
% r3 is the number of modules last stage
% m3 is the number of inputs last stage per module
-\pgfmathtruncatemacro\rthree{5}%
-\pgfkeys{/tikz/.cd, r3/.initial=5}%
-\pgfkeys{/tikz/.cd, r3/.store in=\rthree}%
+\pgfkeys{/tikz/.cd,%
+ r3/.store in=\rthree,%
+ r3=5
+}%
% r3 label
\pgfkeys{/tikz/.cd,%
- r3 label/.initial={r\ensuremath{_3}},%
r3 label/.store in=\rthreelabel,%
- r3 label/.get=\rthreelabel,%
+ r3 label={r\ensuremath{_3}},%
}%
% m3 label
-\pgfkeys{/tikz/.cd,
- m3 label/.initial={m\ensuremath{_3}},%
+\pgfkeys{/tikz/.cd,
m3 label/.store in=\mthreelabel,%
- m3 label/.get=\mthreelabel,%
+ m3 label={m\ensuremath{_3}},%
}%
% * * * * * * * * * * * * * * * * * *
@@ -123,9 +132,8 @@
% P is the number of input/output ports
\pgfkeys{/tikz/.cd,%
- P/.initial=8,%
- P/.get=\P,%
P/.store in=\P,%
+ P=8,%
}%
% * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -134,27 +142,23 @@
% module customization
\pgfkeys{/tikz/.cd,%
- module size/.initial={1cm},%
- module size/.get=\modulesize,%
module size/.store in=\modulesize,%
+ module size={1cm},%
}%
\pgfkeys{/tikz/.cd,%
- module ysep/.initial={1.5},%
- module ysep/.get=\moduleysep,%
module ysep/.store in=\moduleysep,%
+ module ysep={1.5},
}%
\pgfkeys{/tikz/.cd,%
- module xsep/.initial={3},%
- module xsep/.get=\modulexsep,%
module xsep/.store in=\modulexsep,%
+ module xsep={3},%
}%
\pgfkeys{/tikz/.cd,%
- module font/.initial=\normalfont,%
- module font/.get=\modulefont,%
module font/.store in=\modulefont,%
+ module font={\normalfont},%
}%
\tikzset{module/.style={%
@@ -170,9 +174,8 @@
}
\pgfkeys{/tikz/.cd,%
- module label opacity/.initial={1},%
- module label opacity/.get=\modulelabelopacity,%
module label opacity/.store in=\modulelabelopacity,%
+ module label opacity={1},%
}%
\tikzset{module opacity/.style={
@@ -181,9 +184,8 @@
}
\pgfkeys{/tikz/.cd,%
- pin length factor/.initial={1},%
- pin length factor/.get=\pinlength,%
pin length factor/.store in=\pinlength,%
+ pin length factor={1},%
}%
% setting labels in math mode