summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2019-10-15 03:01:23 +0000
committerNorbert Preining <norbert@preining.info>2019-10-15 03:01:23 +0000
commit14402f2e3de4ea4c565660dffad35276662c05ac (patch)
tree8e3c9ddb7a6210571c0d84fb42d2a99e95884c4c /graphics
parent370853b6ba0be6e880b2f320268d4fefbd6aeef6 (diff)
CTAN sync 201910150301
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pgf/contrib/kblocks/README.md31
-rw-r--r--graphics/pgf/contrib/kblocks/kblocks-doc.pdfbin0 -> 164718 bytes
-rw-r--r--graphics/pgf/contrib/kblocks/kblocks-doc.tex335
-rw-r--r--graphics/pgf/contrib/kblocks/kblocks.sty1082
-rw-r--r--graphics/svg/README.md5
-rw-r--r--graphics/svg/doc/svg.pdfbin1024563 -> 1024496 bytes
-rw-r--r--graphics/svg/source/svg.dtx31
7 files changed, 1475 insertions, 9 deletions
diff --git a/graphics/pgf/contrib/kblocks/README.md b/graphics/pgf/contrib/kblocks/README.md
new file mode 100644
index 0000000000..ea3b8b1263
--- /dev/null
+++ b/graphics/pgf/contrib/kblocks/README.md
@@ -0,0 +1,31 @@
+This is the file README for the kblocks package, v.1.0.
+
+Description: Easily typeset Control Block Diagrams and Signal Flow Graphs with TikZ/PGF
+
+Desiring to typeset control block diagrams in LaTeX and dissatisfied
+with the other LaTeX macro packages that can be found online,
+I thought: why not write my own macro package for this purpose.
+
+Like all LaTeX packages, TikZ/PGF inherits the steep learning curve, that is,
+no what you see is what you get.
+Basically, kblocks defines a number of macro commands to make drawing control block diagrams
+using TikZ/ PGF more structured and easier.
+This macro reduces the length of this learning curve and serves as a frontend,
+by focusing the theme on control block diagrams only.
+
+You will find a demo and an introduction in kblocks-doc.pdf file.
+
+Fortunately this documentation in kblocks-doc.pdf as it grows and gets to be improved,
+will come with a number of slowly-paced tutorials, which will guide you
+on creating control block diagrams with the kblocks macro.
+
+Licensing of this package is covered by the MIT Licence.
+
+Any feedback is welcome: oasomefun@futa.edu.ng
+My wish is that you find it helpful. Don’t forget to share and like.
+Please feel free to e-mail me for any improvement or suggestion with respect to
+using kblocks and making it useful for researchers, students and others involved
+in the applications and field of control theory.
+
+
+Author: Oluwasegun Somefun
diff --git a/graphics/pgf/contrib/kblocks/kblocks-doc.pdf b/graphics/pgf/contrib/kblocks/kblocks-doc.pdf
new file mode 100644
index 0000000000..91229861e6
--- /dev/null
+++ b/graphics/pgf/contrib/kblocks/kblocks-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/kblocks/kblocks-doc.tex b/graphics/pgf/contrib/kblocks/kblocks-doc.tex
new file mode 100644
index 0000000000..27daa38287
--- /dev/null
+++ b/graphics/pgf/contrib/kblocks/kblocks-doc.tex
@@ -0,0 +1,335 @@
+\documentclass[onecolumn,a4paper,10pt]{IEEEtran}
+
+
+\usepackage{kblocks}
+\usepackage{bm}
+\usepackage{listings}
+
+\usepackage{csquotes}
+
+\newcommand*{\kblocks}{\relax~\textit{k}\textsc{blocks}}
+\newcommand*{\Tikz}{
+ Ti\textit{k}Z
+}
+\newcommand*{\TikzPGF}{\relax~{Ti\textit{k}Z/\textsc{pgf}}}
+\newcommand*{\spacetweak}{\medskip\medskip}
+
+\begin{document}
+
+\lstset{
+ keywordstyle=\color{magenta},
+ numberstyle=\tiny\color{gray},
+ stringstyle=\color{purple},
+ basicstyle=\sffamily\bfseries\scriptsize,
+ breakatwhitespace=false,
+ breaklines=true,
+ captionpos=b,
+ keepspaces=true,
+ numbers=left,
+ numbersep=5pt,
+ showspaces=false,
+ showstringspaces=false,
+ showtabs=false,
+ tabsize=2
+}
+
+\title{\kblocks~Package}
+\author{
+
+\IEEEauthorblockN{
+\textsc{Oluwasegun~Somefun}~(\textbf{oasomefun@futa.edu.ng}) \\
+\footnotesize{\textsc{Department of Computer Engineering, Federal University of Technology, Akure, Nigeria}}
+}
+
+}
+
+\markboth{\kblocks~Demo. Version~1.0. 13, October~2019};
+
+\maketitle
+
+\section{Introduction}
+Welcome to the demo documentation of\kblocks. Desiring to typeset control block diagrams in \LaTeX~and dissatisfied with the other \LaTeX~macro packages that
+can be found online, I thought: \textit{why not write my own macro package for this purpose}.
+
+I wish to start with the question, \enquote{What is\kblocks?} The\kblocks~macro package is the product of using\TikzPGF~to
+directly typeset beautiful control block diagrams and signal flow graphs in my Masters' dissertation and papers directly with \LaTeX.
+Basically, it just defines a dedicated \enquote{kblock} environment and a number of macro commands to make drawing control block diagrams using\TikzPGF~ more structured and easier. In a sense, when you
+use\kblocks~you \textit{program} or typeset graphics for control block diagrams, just as you “program” graphics in your document when you use
+\LaTeX~using\TikzPGF.
+
+The powerful options offered by\TikzPGF~often intimidates beginner users not ready to spend careful time learning about\TikzPGF. Like all
+\LaTeX~packages,\TikzPGF~inherits the steep learning curve of \LaTeX, that is, no \textit{what you see is what you get}.
+The\kblocks~macro reduces the length of this learning curve, by focusing the graphics theme on control block diagrams only.
+Fortunately this documentation as it grows and gets to be improved, will come with a number of slowly-paced
+tutorials, which will guide you on creating control block diagrams with\kblocks~without your having to read the\TikzPGF~manual.
+
+My wish is that you do find it useful and helpful. Please, don't forget to share and like if you did.
+
+I will readily welcome any e-mails for improvement or suggestion with respect to
+using\kblocks~and making it useful for researchers, students and others involved in the applications and field of control theory.
+
+\centering
+
+\section{Demos}
+\subsection{}\spacetweak
+\begin{kblock}
+ \kStartNode[$r$]{R1}
+ \kPlusMinusDown{R1}{S1}{0cm}
+ \kTFRight[0cm]{S1}{B1}{$\frac{1}{s}$}
+ \kMarkNodeRight[0cm]{}{B1}{N1}
+ \kOutRight{N1}{Y1}{$y$}{0cm}
+
+ \kLinkVHHVAbove[0cm]{$1$}{N1}{S1}{0}{0}
+ \kLinkVHHVBelow[0cm]{$1$}{N1}{S1}{0}{0}
+ \kLink[]{R1}{S1}
+ \kLink[$e$]{S1}{B1}
+ \kLinkn[]{B1}{N1}
+\end{kblock}
+
+\begin{lstlisting}
+\begin{kblock}
+ \kStartNode[$r$]{R1}
+ \kPlusMinusDown{R1}{S1}{0cm}
+ \kTFRight[0cm]{S1}{B1}{$\frac{1}{s}$}
+ \kMarkNodeRight[0cm]{}{B1}{N1}
+ \kOutRight{N1}{Y1}{$y$}{0cm}
+
+ \kLinkVHHVAbove[0cm]{$1$}{N1}{S1}{0}{0}
+ \kLinkVHHVBelow[0cm]{$1$}{N1}{S1}{0}{0}
+ \kLink[]{R1}{S1}
+ \kLink[$e$]{S1}{B1}
+ \kLinkn[]{B1}{N1}
+\end{kblock}
+\end{lstlisting}
+
+
+\spacetweak
+
+\subsection{}\spacetweak
+\begin{kblock}
+ \kStartNodec[$r$]{(0,5)}{R1}
+ \kPlusMinusDown{R1}{S1}{0cm}
+ \kTFRight[0.33cm]{S1}{B1}{$G\left( s \right)$}
+ \kTFBelow[0cm]{B1}{B2}{$H\left( s \right)$}
+ \kMarkNodeRight[0.2cm]{}{B1}{N1}
+ \kOutRight{N1}{Y1}{$y$}{0}
+
+ \kLinkVHTFHVBelow{$y$}{$\hat{y}$}{N1}{B2}{S1}{0}{0}{0}
+ \kLink[]{R1}{S1}
+ \kLink[$e$]{S1}{B1}
+ \kLinkn[]{B1}{N1}
+
+ \kCoverRect[blue]{B1}{0.5cm}{1.5cm}{1.8cm}{1.5cm}
+ \kCoverTextRight{1cm}{0.5cm}{TX1}{Closed-loop system};
+\end{kblock}
+
+\begin{lstlisting}
+\begin{kblock}
+ \kStartNodec[$r$]{(0,5)}{R1}
+ \kPlusMinusDown{R1}{S1}{0cm}
+ \kTFRight[0.33cm]{S1}{B1}{$G\left( s \right)$}
+ \kTFBelow[0cm]{B1}{B2}{$H\left( s \right)$}
+ \kMarkNodeRight[0.2cm]{}{B1}{N1}
+ \kOutRight{N1}{Y1}{$y$}{0}
+
+ \kLinkVHTFHVBelow{$y$}{$\hat{y}$}{N1}{B2}{S1}{0}{0}{0}
+ \kLink[]{R1}{S1}
+ \kLink[$e$]{S1}{B1}
+ \kLinkn[]{B1}{N1}
+
+ \kCoverRect[blue]{B1}{0.5cm}{1.5cm}{1.8cm}{1.5cm}
+ \kCoverTextRight{1cm}{0.5cm}{TX1}{Closed-loop system};
+\end{kblock}
+\end{lstlisting}
+\spacetweak
+
+\subsection{}\spacetweak
+
+\begin{kblock}
+ \kStartNodec[]{(5,-5)}{R1}
+ \kTFRight{R1}{M1}{$\bm{\hat{m}$}\\\textbf{PID}\\\textbf{model}}
+ \kOutDown[]{M1}{um}{$u_m$}{0}
+ \kScaleDistX[1.5]
+ \kTFRight{M1}{C1}{$\bm{K\left(y_m,y\right)}$\\\textbf{PID}\\\textbf{controller}}
+ \kTFBelowRight{0cm}{0.2cm}{C1}{P1}{$\bm{P\left(s\right)}$\\\textbf{process}}
+
+ \kLink[$r$]{R1}{M1}
+ \kLink[$y_m$]{M1}{C1}
+ \kLinkHV[$u$]{C1}{P1}{north}{0}
+ \kLinkHV[$y$]{P1}{C1}{south}{0}
+\end{kblock}
+
+\begin{lstlisting}
+\begin{kblock}
+ \kStartNodec[]{(5,-5)}{R1}
+ \kTFRight{R1}{M1}{$\bm{\hat{m}$}\\\textbf{PID}\\\textbf{model}}
+ \kOutDown[]{M1}{um}{$u_m$}{0}
+ \kScaleDistX[1.5]
+ \kTFRight{M1}{C1}{$\bm{K\left(y_m,y\right)}$\\\textbf{PID}\\\textbf{controller}}
+ \kTFBelowRight{0cm}{0.2cm}{C1}{P1}{$\bm{P\left(s\right)}$\\\textbf{process}}
+
+ \kLink[$r$]{R1}{M1}
+ \kLink[$y_m$]{M1}{C1}
+ \kLinkHV[$u$]{C1}{P1}{north}{0}
+ \kLinkHV[$y$]{P1}{C1}{south}{0}
+\end{kblock}
+\end{lstlisting}
+\spacetweak
+
+\subsection{}\spacetweak
+
+\begin{kblock}
+ \kStartNodec[]{(-5,-5)}{R1}
+ \kTFRight{R1}{M1}{$\bm{\hat{m}$}\\\textbf{PID}\\\textbf{model}}
+ \kOutDown[]{M1}{um}{$u_m$}{0}
+ \kScaleDistX[1.75]
+ \kTFRight{M1}{C1}{$\bm{K\left(y_m,y\right)}$\\\textbf{PID}\\\textbf{controller}}
+ \kScaleDistX[1]
+ \kTFBelow{C1}{P1}{$\bm{P\left(s\right)}$\\\textbf{process}}
+
+ \kLink[$r$]{R1}{M1}
+ \kLink[$y_m$]{M1}{C1}
+ \kLinkHVHRight[0]{$u$}{C1}{P1}{0}{0}
+ \kLinkHVHLeft[0.33]{$y$}{P1}{C1}{0}{-0.25}
+\end{kblock}
+\begin{lstlisting}
+\begin{kblock}
+ \kStartNodec[]{(-5,-5)}{R1}
+ \kTFRight{R1}{M1}{$\bm{\hat{m}$}\\\textbf{PID}\\\textbf{model}}
+ \kOutDown[]{M1}{um}{$u_m$}{0}
+ \kScaleDistX[1.75]
+ \kTFRight{M1}{C1}{$\bm{K\left(y_m,y\right)}$\\\textbf{PID}\\\textbf{controller}}
+ \kScaleDistX[1]
+ \kTFBelow{C1}{P1}{$\bm{P\left(s\right)}$\\\textbf{process}}
+
+ \kLink[$r$]{R1}{M1}
+ \kLink[$y_m$]{M1}{C1}
+ \kLinkHVHRight[0]{$u$}{C1}{P1}{0}{0}
+ \kLinkHVHLeft[0.33]{$y$}{P1}{C1}{0}{-0.25}
+\end{kblock}
+\end{lstlisting}
+\spacetweak
+
+\subsection{}\spacetweak
+
+\begin{kblock}
+ \kJumpCS{R}{$(0,0)$}
+
+ \kJumpCSRight[-0.5cm]{R}{CR}{0}{3}
+ \kJumpCSLeft[-0.5cm]{R}{CR}{0}{9}
+ \kJumpCSAbove[-0.5cm]{R}{CR}{0}{12}
+ \kJumpCSBelow[-0.5cm]{R}{CR}{0}{6}
+
+ \kTFBelow{R}{C1}{\bfseries{PID}$\bm{(\cdot)}$}
+ \kScaleDistX[0.67]
+ \kTFBelow{C1}{P1}{$\bm{P(s)}$}
+ \kScaleDistX[1]
+
+ \kInLeft[0cm]{C1}{RI}{$r$}{0.1}
+
+ \kMarkNodeLeft[0cm]{}{P1}{ON}
+ \kLinkn[]{P1}{ON}
+ \kOutLeft[-0.5cm]{ON}{Y}{$y$}{0}
+ \kLinkVH[$y$]{ON}{C1}{west}{-0.1}
+
+ \kLinkHVHRight[0]{$u$}{C1}{P1}{0}{0}
+\end{kblock}
+
+\begin{lstlisting}
+\begin{kblock}
+ \kJumpCS{R}{$(0,0)$}
+
+ \kJumpCSRight[-0.5cm]{R}{CR}{0}{3}
+ \kJumpCSLeft[-0.5cm]{R}{CR}{0}{9}
+ \kJumpCSAbove[-0.5cm]{R}{CR}{0}{12}
+ \kJumpCSBelow[-0.5cm]{R}{CR}{0}{6}
+
+ \kTFBelow{R}{C1}{\bfseries{PID}$\bm{(\cdot)}$}
+ \kScaleDistX[0.67]
+ \kTFBelow{C1}{P1}{$\bm{P(s)}$}
+ \kScaleDistX[1]
+
+ \kInLeft[0cm]{C1}{RI}{$r$}{0.1}
+
+ \kMarkNodeLeft[0cm]{}{P1}{ON}
+ \kLinkn[]{P1}{ON}
+ \kOutLeft[-0.5cm]{ON}{Y}{$y$}{0}
+ \kLinkVH[$y$]{ON}{C1}{west}{-0.1}
+
+ \kLinkHVHRight[0]{$u$}{C1}{P1}{0}{0}
+\end{kblock}
+\end{lstlisting}
+\spacetweak
+
+\subsection{}\spacetweak
+
+\begin{kblock}
+ \kJumpCS{R1}{$(5,5)$}
+
+ \kTFRight{R1}{P1}{$\bm{P}$}
+ \kScaleDistX[0.67]
+ \kTFBelow{P1}{C1}{$\bm{C}$}
+ \kScaleDistX[1]
+
+ \kInLeft[]{P1}{RI}{$w$}{0.1}
+ \kInLeft[]{C1}{RC}{$r$}{-0.1}
+
+ \kLinkHVHRight[0.2]{$y$}{P1}{C1}{-0.1}{0.1}
+ \kLinkHVHLeft[0.2]{$u$}{C1}{P1}{0.1}{-0.1}
+
+ \kOutRight[0cm]{P1}{Z}{$z$}{0.1}
+ \kOutRight[]{C1}{V}{$v$}{-0.1}
+
+ \kCoverRect[blue!50!]{P1}{0.1cm}{0.1cm}{0.2cm}{0.2cm}
+ \kCoverTextAbove{0}{0}{TX1}{Physical System};
+
+ \kCoverRect[red]{C1}{0.1cm}{0.1cm}{0.2cm}{0.2cm}
+ \kCoverTextBelow{0cm}{0cm}{TX2}{Computing System};
+\end{kblock}
+
+\begin{lstlisting}
+\begin{kblock}
+ \kJumpCS{R1}{$(5,5)$}
+
+ \kTFRight{R1}{P1}{$\bm{P}$}
+ \kScaleDistX[0.67]
+ \kTFBelow{P1}{C1}{$\bm{C}$}
+ \kScaleDistX[1]
+
+ \kInLeft[]{P1}{RI}{$w$}{0.1}
+ \kInLeft[]{C1}{RC}{$r$}{-0.1}
+
+ \kLinkHVHRight[0.2]{$y$}{P1}{C1}{-0.1}{0.1}
+ \kLinkHVHLeft[0.2]{$u$}{C1}{P1}{0.1}{-0.1}
+
+ \kOutRight[0cm]{P1}{Z}{$z$}{0.1}
+ \kOutRight[]{C1}{V}{$v$}{-0.1}
+
+ \kCoverRect[blue!50!]{P1}{0.1cm}{0.1cm}{0.2cm}{0.2cm}
+ \kCoverTextAbove{0}{0}{TX1}{Physical System};
+
+ \kCoverRect[red]{C1}{0.1cm}{0.1cm}{0.2cm}{0.2cm}
+ \kCoverTextBelow{0cm}{0cm}{TX2}{Computing System};
+\end{kblock}
+\end{lstlisting}
+
+\spacetweak
+
+\subsection{}\spacetweak
+\begin{kblock}
+\kJumpCS{io}{$(0,0)$}
+\kJumpCSLeft[-0.5cm]{io}{jl}{0}{9}
+\kCoverRect[blue]{jl}{2cm}{2cm}{2cm}{2cm}
+\end{kblock}
+
+\begin{lstlisting}
+\begin{kblock}
+\kJumpCS{io}{$(0,0)$}
+\kJumpCSLeft[-0.5cm]{io}{jl}{0}{9}
+\kCoverRect[blue]{jl}{2cm}{2cm}{2cm}{2cm}
+\end{kblock}
+\end{lstlisting}
+
+\spacetweak
+
+\end{document}
diff --git a/graphics/pgf/contrib/kblocks/kblocks.sty b/graphics/pgf/contrib/kblocks/kblocks.sty
new file mode 100644
index 0000000000..54ea69c216
--- /dev/null
+++ b/graphics/pgf/contrib/kblocks/kblocks.sty
@@ -0,0 +1,1082 @@
+% kblocks.sty
+% TikZ-based block-diagram package for control theory applications
+% version 1.0 (October 2019)
+% Author: Somefun Oluwasegun {oasomefun@futa.edu.ng}
+% Change Log:
+% significant improvements and introduction of new macros and annotation
+
+% Credits:
+% (2014): motivated by the helpful pointers in https://tex.stackexchange.com/users/14704/s-c
+% (2005): motivated by the TikZ-bloques package by Alejandro Garces {Alejandro Garcesalejandrogarces@gmail.com}
+%
+
+% Copyright (c) 2019 by Oluwasegun Somefun <oasomefun@futa.edu.ng>.
+
+% MIT LICENSE
+% Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+% and associated documentation files (the "Software"), to deal in the Software without restriction,
+% including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+% and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+% subject to the following conditions:
+%
+% The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+%
+% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+% TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+% IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+% OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+%
+
+\typeout{**}
+
+\typeout{kblocks: A package to easily typeset Control Block Diagrams and Signal
+Flow Graphs with TikZ/PGF.}
+
+\typeout{(c) 2019. Oluwasegun Somefun}
+
+\typeout{*}
+
+\typeout{--Attention: The package has external dependency on TikZ/PGF.}
+
+\typeout{This package is covered with the MIT License.}
+
+\typeout{**}
+
+% Import Libraries
+\RequirePackage{tikz,circuitikz}
+\usepgflibrary{shapes.misc}
+\usetikzlibrary{math,calc,arrows,decorations.pathmorphing,decorations.markings,
+arrows.meta,backgrounds,fit,shadows}
+
+% Helpful
+
+\newcommand{\horizdist}{1.2cm}
+\newcommand{\sfghorizdist}{\horizdist*2}
+\newcommand{\verticdist}{1.2cm}
+\newcommand{\phasedist}{3.5cm}
+\newcommand{\minheight}{0.7cm}
+\newcommand{\textsize}{\footnotesize}
+\newcommand{\backgroundcolor}{white}
+\newcommand{\colortext}{black}
+\newcommand{\linecolor}{black}
+\newcommand{\dark}{0}
+\newcommand{\linetype}{very thick}
+\newcommand{\linepathtype}{semithick}
+
+\newcommand{\kShadow}{\renewcommand{\dark}{1}}
+\newcommand{\kColorB}[1]{\renewcommand{\backgroundcolor}{#1}}
+\newcommand{\kColorT}[1]{\renewcommand{\colortext}{#1}}
+\newcommand{\kColorL}[1]{\renewcommand{\linecolor}{#1}}
+
+\newcommand{\kScaleDistY}[1][1]{
+\renewcommand{\verticdist}{1.2cm * #1}
+}
+
+\newcommand{\kScaleDistX}[1][1]{
+\renewcommand{\horizdist}{1.5cm * #1}
+}
+
+% Global variables for Coordinate Calculations
+\newdimen\xc
+\newdimen\yc
+
+\newcommand*{\ExtractCoordinate}[1]{
+\path (#1);
+\pgfgetlastxy{\xc}{\yc};
+}%
+
+% Global styles
+\tikzset{every node/.style={anchor=center, text centered, align=center}}
+
+\tikzset{midarrow/.style={decoration={markings,
+mark=at position 0.5 with {\arrow{Latex[]}}},postaction={decorate}}}
+
+% DEDICATED ENVIRONMENT
+
+%% Usage:
+%\begin{kblock}
+%
+%\end{kblock}
+
+\newenvironment{kblock}{\begin{tikzpicture}\begin{scope}}{\end{scope}\end{tikzpicture}}
+
+
+% BLOCK DIAGRAM
+
+% Start Nodes
+
+\newcommand{\kStartNode}[2][]{
+% name coordinate label
+ \node (#2) {\color{\colortext}\textsize{#1}};
+}
+
+\newcommand{\kStartNodec}[3][]{
+ \node (#3) at #2 {\color{\colortext}\textsize{#1}};
+}
+
+
+% Area Cover Rectangle
+%% Usage [colour]{ref node}{north shift}{south shift}{west shift}{east shift}
+
+\newcommand{\kCoverRect}[6][black]{
+
+ \coordinate (centn) at (#2.north);
+ \coordinate (cents) at (#2.south);
+ \coordinate (cente) at (#2.east);
+ \coordinate (centw) at (#2.west);
+
+ \def\dn{#3};
+ \def\ds{#4};
+ \def\dw{#5};
+ \def\de{#6};
+
+ \ifx\dn\empty
+ \def\dn{0};
+ \else
+ \fi
+ \ifx\ds\empty
+ \def\ds{0};
+ \else
+ \fi
+ \ifx\dw\empty
+ \def\dw{0};
+ \else
+ \fi
+ \ifx\de\empty
+ \def\de{0};
+ \else
+ \fi
+
+
+ \newdimen\xn;%
+ \newdimen\yn;%
+ \path (centn); \pgfgetlastxy{\xn}{\yn};
+ \newdimen\xs;%
+ \newdimen\ys;%
+ \path (cents); \pgfgetlastxy{\xs}{\ys};
+
+ \newdimen\xw;%
+ \newdimen\yw;%
+ \path (centw); \pgfgetlastxy{\xw}{\yw};
+ \newdimen\xe;%
+ \newdimen\ye;%
+ \path (cente); \pgfgetlastxy{\xe}{\ye};
+
+ \newdimen\xonw;%
+ \newdimen\xone;%
+ \newdimen\xose;%
+ \newdimen\xosw;%
+ \newdimen\xon;%
+ \newdimen\yon;%
+ \newdimen\xos;%
+ \newdimen\yos;%
+
+ \tikzmath{
+ \xonw = \xw - \dw;%
+ \xone = \xe + \de;%
+ \xon = \xn;%
+ \yon = \yn + \dn;%
+ \xosw = \xw - \dw;%
+ \xose = \xe + \de;%
+ \xos = \xs;%
+ \yos = \ys - \ds;%
+}
+
+ \coordinate [label=] (BFitN) at ($(\xon,\yon)$);
+ \coordinate [label=] (BFitS) at ($(\xos,\yos)$);
+ \coordinate [label=] (BFitW) at ($(\xosw,\yw)$);
+ \coordinate [label=] (BFitE) at ($(\xone,\ye)$);
+
+ \coordinate [label=] (BFitNW) at ($(\xonw,\yon)$);
+ \coordinate [label=] (BFitNE) at ($(\xone,\yon)$);
+ \coordinate [label=] (BFitSW) at ($(\xosw,\yos)$);
+ \coordinate [label=] (BFitSE) at ($(\xose,\yos)$);
+
+\begin{scope}[on background layer]
+ \draw [color=#1, dashed] (BFitSW) -- (BFitSE) -- (BFitNE) -- (BFitNW) -- (BFitSW);
+\end{scope}
+
+}
+
+% Cover Text
+%% Usage: [optional shift dimension]{from node label}{to current tf node label}{tf text content}
+
+\newcommand{\kCoverTextRight}[5]{
+ \def\dxt{#1};
+ \def\dyt{#2};
+
+ \ifx\dxt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \ifx\dyt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \node [right of= BFitE, node distance= 0.2cm, xshift= \dxt, yshift = \dyt,
+ font=\textsize] (#3) {\color{\colortext}#4};
+}
+
+\newcommand{\kCoverTextLeft}[5]{
+ \def\dxt{#1};
+ \def\dyt{#2};
+
+ \ifx\dxt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \ifx\dyt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \node [left of= BFitW, node distance= 0.2cm, xshift= \dxt, yshift = \dyt, font=\textsize] (#3) {\color{\colortext}#4};
+}
+
+\newcommand{\kCoverTextAbove}[5]{
+ \def\dxt{#1};
+ \def\dyt{#2};
+
+ \ifx\dxt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \ifx\dyt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \node [above of= BFitN, node distance= 0.2cm, xshift= \dxt, yshift = \dyt, font=\textsize] (#3) {\color{\colortext}#4};
+}
+\newcommand{\kCoverTextBelow}[5]{
+ \def\dxt{#1};
+ \def\dyt{#2};
+
+ \ifx\dxt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \ifx\dyt\empty
+ \def\dxt{0};
+ \else
+ \fi
+
+ \node [below of= BFitS, node distance= 0.2cm, xshift= \dxt, yshift = \dyt, font=\textsize] (#3) {\color{\colortext}#4};
+}
+
+
+% Arithmetic Summer Blocks
+%% Usage: {from node label}{to current sum node label}{optional horizontal position shift}
+
+\newcommand{\kMinusPlusDown}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist + \dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+}
+
+\newcommand{\kMinusMinusDown}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist + \dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+}
+
+\newcommand{\kPlusMinusDown}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist + \dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+}
+
+\newcommand{\kPlusPlusDown}[3]{
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist + \dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+}
+
+\newcommand{\kMinusPlusUp}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+}
+\newcommand{\kMinusMinusUp}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+}
+
+\newcommand{\kPlusMinusUp}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+}
+
+\newcommand{\kPlusPlusUp}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+}
+\newcommand{\kPlusPlusMinus}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+}
+\newcommand{\kPlusMinusMinus}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+}
+
+\newcommand{\kPlusMinusPlus}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$-$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+}
+
+\newcommand{\kPlusPlusPlus}[3]{
+
+ \def\dxpm{#3};
+
+ \ifx\dxpm\empty
+ \def\dxpm{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, circle,minimum size=1.5em, right of= #1, node distance= \horizdist+\dxpm, \linetype,
+ fill=\backgroundcolor, drop shadow={opacity=\dark}, font=\textsize] (#2) {};
+ \node [draw, cross out, minimum size=1.0em, right of= #1, node distance= \horizdist + \dxpm, thin, draw=black] {};
+ \node [left of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [above of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+ \node [below of= #2, node distance = 0.45em] () { \color{\colortext}\tiny{$+$}};
+}
+
+% Circular Gain Block
+\newcommand{\kGain}[4][]{
+ \node [draw=\linecolor, circle, right of= #1, node distance= \horizdist,
+ minimum size = 1.5em, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#2) {\color{\colortext}#3};
+}
+
+%% Rectangular TF Block
+
+%% Usage:
+%\kTF {current tf node label}[tf text content]
+%\kTFCs {coordinates}{current tf node label}[tf text content]
+
+\newcommand{\kTF}[2]{
+ \node [draw=\linecolor, rectangle, node distance= \horizdist,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#1) {\color{\colortext}#2};
+}
+
+\newcommand{\kTFCs}[3]{
+ \node [draw=\linecolor, rectangle, node distance= \horizdist,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#2) at (#1) {\color{\colortext}#3};
+}
+
+%% Usage: [optional shift dimension]{from node label}{to current tf node label}{tf text content}
+\newcommand{\kTFRight}[4][]{
+ \def\dxtf{#1};
+
+ \ifx\dxtf\empty
+ \def\dxtf{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, rectangle, right of= #2, node distance= \horizdist + \dxtf,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#3) {\color{\colortext}#4};
+}
+
+\newcommand{\kTFLeft}[4][]{
+ \def\dxtf{#1};
+
+ \ifx\dxtf\empty
+ \def\dxtf{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, rectangle, left of= #2, node distance= \horizdist + \dxtf,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#3) {\color{\colortext}#4};
+}
+
+\newcommand{\kTFAbove}[4][]{
+ \def\dytfb{#1};
+
+ \ifx\dytfb\empty
+ \def\dytfb{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, rectangle, above of= #2, node distance= \verticdist + \dytfb,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#3) {\color{\colortext}#4};
+
+}
+
+\newcommand{\kTFBelow}[4][]{
+ \def\dytfb{#1};
+
+ \ifx\dytfb\empty
+ \def\dytfb{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, rectangle, below of= #2, node distance= \verticdist + \dytfb,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#3) {\color{\colortext}#4};
+}
+
+%% Usage: {vertical shift dimension}{horizontal shift dimension}{from node label}{to current tf node label}{tf text content}
+
+% TF: Right
+% Above
+\newcommand{\kTFAboveRight}[5]{
+ \def\dytf{#1};
+
+ \ifx\dytf\empty
+ \def\dytf{0};
+ \else
+ \fi
+
+ \def\dxtf{#2};
+
+ \ifx\dxtf\empty
+ \def\dxtf{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, rectangle, above of= #3, node distance= 1.2cm + \dytf, xshift=1.2cm+\dxtf,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#4) {\color{\colortext}#5};
+}
+% Line: Right Down
+\newcommand{\kTFBelowRight}[5]{
+ \def\dytf{#1};
+
+ \ifx\dytf\empty
+ \def\dytf{0};
+ \else
+ \fi
+
+ \def\dxtf{#2};
+
+ \ifx\dxtf\empty
+ \def\dxtf{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, rectangle, below of= #3, node distance= 1.2cm + \dytf, xshift=1.2cm+\dxtf,
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#4) {\color{\colortext}#5};
+}
+
+% TF Left
+% Above
+\newcommand{\kTFAboveLeft}[5]{
+ \def\dytf{#1};
+
+ \ifx\dytf\empty
+ \def\dytf{0};
+ \else
+ \fi
+
+ \def\dxtf{#2};
+
+ \ifx\dxtf\empty
+ \def\dxtf{0};
+ \else
+ \fi
+ \node [draw=\linecolor, rectangle, above of= #3, node distance=1.2cm + \dytf, xshift=-(1.2cm+\dxtf),
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#4) {\color{\colortext}#5};
+}
+% Below
+\newcommand{\kTFBelowLeft}[5]{
+ \def\dytf{#1};
+
+ \ifx\dytf\empty
+ \def\dytf{0};
+ \else
+ \fi
+
+ \def\dxtf{#2};
+
+ \ifx\dxtf\empty
+ \def\dxtf{0};
+ \else
+ \fi
+
+ \node [draw=\linecolor, rectangle, below of= #3, node distance=1.2cm + \dytf, xshift=-(1.2cm+\dxtf),
+ minimum height = \minheight, \linetype, fill=\backgroundcolor, drop shadow={opacity=\dark},
+ font=\textsize] (#4) {\color{\colortext}#5};
+}
+
+
+% Mark Visible Circular Nodes
+%% Usage: [optional distance shift]{optional node label}{from node label}{to current node label}
+
+% Place Node Right
+\newcommand{\kMarkNodeRight}[4][]{
+ \def\dxnr{#1};
+
+ \ifx\dxnr\empty
+ \def\dxnr{0};
+ \else
+ \fi
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.3em,
+ right of = #3, node distance= 1.2cm + \dxnr] (#4) {\textsize{#2}};
+
+}
+
+% Place Node Left
+\newcommand{\kMarkNodeLeft}[4][]{
+ \def\dxnl{#1};
+
+ \ifx\dxnl\empty
+ \def\dxnl{0};
+ \else
+ \fi
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.3em,
+ left of = #3, node distance= 1.2cm + \dxnl] (#4) {\textsize{#2}};
+
+}
+% Place Node Above
+\newcommand{\kMarkNodeAbove}[4][]{
+ \def\dxna{#1};
+
+ \ifx\dxna\empty
+ \def\dxna{0};
+ \else
+ \fi
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.3em,
+ above of = #3, node distance= 1.2cm + \dxna] (#4) {\textsize{#2}};
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.3em,
+ above of = #3, node distance= 1.2cm + \dxna] (#4) {\textsize{#2}};
+
+}
+% Place Node Below
+\newcommand{\kMarkNodeBelow}[4][]{
+ \def\dxnb{#1};
+
+ \ifx\dxnb\empty
+ \def\dxnb{0};
+ \else
+ \fi
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.3em,
+ below of = #3, node distance= 1.2cm + \dxnb] (#4) {\textsize{#2}};
+
+}
+
+% Place a Reference Invisible Node relative to other nodes
+%% Usage: [optional distance shift]{from node label}{to current coordinate label}{direction shift}{coordinate text label}
+
+\newcommand{\kJumpCSRight}[5][]{
+ \def\dxj{#1};
+ \ifx\dxj\empty
+ \def\dxj{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.east) + (0,#4)$);
+ \coordinate[right of= tmpn, node distance= 1cm + \dxj, font=\textsize, label=\tiny{#5}] (#3);
+}
+\newcommand{\kJumpCSLeft}[5][]{
+ \def\dxj{#1};
+ \ifx\dxj\empty
+ \def\dxj{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.west) + (0,#4)$);
+ \coordinate[left of= tmpn, node distance= 1cm + \dxj, font=\textsize, label=\tiny{#5}] (#3);
+}
+\newcommand{\kJumpCSAbove}[5][]{
+ \def\dxj{#1};
+ \ifx\dxj\empty
+ \def\dxj{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.north) + (#4,0)$);
+ \coordinate[above of= tmpn, node distance= 1cm + \dxj, font=\textsize, label=\tiny{#5}] (#3);
+}
+\newcommand{\kJumpCSBelow}[5][]{
+ \def\dxj{#1};
+ \ifx\dxj\empty
+ \def\dxj{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.south) + (#4,0)$);
+ \coordinate[below of= tmpn, node distance= 1cm + \dxj, font=\textsize, label=\tiny{#5}] (#3);
+}
+
+% Place a Reference Invisible Node at any specific coordinate
+%% Usage: {current coordinate label}{coordinate (x,y)}
+\newcommand{\kJumpCS}[2]{
+ \coordinate (#1) at (#2);
+}
+
+% Links %% swap, near end,mid, add label text above lines or besides
+%% Usage: [optional signal label]{from node label}{to node label}
+
+% Link Left or Right, Up or Down
+\newcommand{\kLink}[3][]{
+ \draw [-latex,\linecolor, \linepathtype] (#2) -- node[auto,above] {\textsize{#1}} (#3);
+}
+% no arrow
+\newcommand{\kLinkn}[3][]{
+ \draw [\linecolor, \linepathtype] (#2) -- node[auto,above] {\textsize{#1}} (#3);
+}
+% Link Horizontal(Right or Left) Vertical(Up or Down)
+%% Usage: [optional link label]{from node label}{to current node label}{direction}{direction shift}
+
+% Link: Left Up, Left Down, Right Up, Right Down
+
+\newcommand{\kLinkHV}[5][]{
+ \def\direct{#4};
+ \draw[-latex, \linecolor, \linepathtype] (#2) -| node[near end, above left] {\textsize{#1}} ($(#3.\direct) + (0,#5)$);
+}
+% Link Vertical(Up or Down) Horizontal(Right or Left)
+% Link Up Left, Up Right, Down Left, Down Right
+\newcommand{\kLinkVH}[5][]{
+ \def\direct{#4};
+ \draw[-latex, \linecolor, \linepathtype] (#2) |- node[near end, below] {\textsize{#1}} ($(#3.\direct) + (0,#5)$);
+}
+
+%% Usage: {optional link scale}{link label}{from node}{to node}{from node direction shift}{to node direction shift}
+
+\newcommand{\kLinkHVHRight}[6][]{
+ \def\dxr{#1};
+ \ifx\dxr\empty
+ \def\dxr{0};
+ \else
+ \fi
+ \coordinate (tmplr) at ($(#3.east) + (0,#5)$);
+ \coordinate (tmp) at ($(#3.east) + (0,#5) + (0.33+\dxr,0)$);
+ \draw[-latex, \linecolor, \linepathtype] (tmplr) -| (tmp) node[at end, below right] {\textsize{#2}} |-($(#4.east) + (0,#6)$);
+}
+\newcommand{\kLinkHVHLeft}[6][]{
+ \def\dxl{#1};
+ \ifx\dxl\empty
+ \def\dxl{0};
+ \else
+ \fi
+ \coordinate (tmpll) at ($(#3.west) + (0,#5)$);
+ \coordinate (tmp) at ($(#3.west) + (0,#5) + (-0.33-\dxl,0)$);
+ \draw[-latex, \linecolor, \linepathtype] (tmpll) -| (tmp) node[at end, above left] {\textsize{#2}} |- ($(#4.west) + (0,#6)$);
+}
+% Link Full Feedback/FeedForward Horizontal(Right or Left) Vertical(Up or Down)
+%% Usage: {optional link shift}{unity link label}{from node}{to node}{from node direction shift}{to node direction shift}
+
+% Above
+\newcommand{\kLinkVHHVAbove}[6][]{
+ \def\dxb{#1};
+ \ifx\dxb\empty
+ \def\dxb{0};
+ \else
+ \fi
+ \coordinate (tmpb) at ($(#3.north) + (#5,0)$);
+ \coordinate (tmpc) at ($(#4.north) + (#6,0)$);
+
+ \newdimen\xca;
+ \newdimen\yca;
+ \path (tmpb); \pgfgetlastxy{\xca}{\yca};
+ \newdimen\xcb;
+ \newdimen\ycb;
+ \path (tmpc); \pgfgetlastxy{\xcb}{\ycb};
+
+ \newdimen\xcr;
+
+ \tikzmath{
+ \xcr = 0.5 * (\xca+\xcb);
+ }
+
+ \coordinate [label=\tiny{#2}] (tmp) at ($ (\xcr,\yca) + (0,1cm-\dxb) $);
+ \draw [-latex,\linecolor, \linepathtype] (tmpb) |- (tmp) -| ($(#4.north) + (#6,0)$);
+}
+% Below
+\newcommand{\kLinkVHHVBelow}[6][]{
+ \def\dxb{#1};
+
+ \ifx\dxb\empty
+ \def\dxb{0};
+ \else
+ \fi
+ \coordinate (tmpb) at ($(#3.south) + (#5,0)$);
+ \coordinate (tmpc) at ($(#4.south) + (#6,0)$);
+
+ \newdimen\xca;
+ \newdimen\yca;
+ \path (tmpb); \pgfgetlastxy{\xca}{\yca};
+ \newdimen\xcb;
+ \newdimen\ycb;
+ \path (tmpc); \pgfgetlastxy{\xcb}{\ycb};
+
+ \newdimen\xcr;
+
+ \tikzmath{
+ \xcr = 0.5 * (\xca+\xcb);
+ }
+
+ \coordinate [label=\tiny{#2}] (tmp) at ($ (\xcr,\yca) + (0,-1cm-\dxb) $);
+ \draw [-latex,\linecolor, \linepathtype] (tmpb) |- (tmp) -| ($(#4.south) + (#6,0)$);
+}
+
+% Link Feedback/FeedForward with a TF Block in between
+%% Usage: {signal label before tf}{signal label after tf}{from node}{tf node}{to node}{from node direction shift}{tf direction shift}{to node direction shift}
+\newcommand{\kLinkVHTFHVBelow}[8]{
+ \coordinate (tmpb) at ($(#3.south) + (#6,0)$);
+ \coordinate (tmpu) at ($(#4.east) + (0,#7)$);
+ \coordinate (tmpv) at ($(#4.west) + (0,#7)$);
+ \draw [-latex,\linecolor, \linepathtype] (tmpb) |- node[auto,above left] {\textsize{#1}} (tmpu);
+ \draw [-latex,\linecolor, \linepathtype] (tmpv) -| node[auto,above left] {\textsize{#2}} ($(#5.south) + (#8,0)$);
+}
+\newcommand{\kLinkVHTFHVBelowRight}[8]{
+ \coordinate (tmpb) at ($(#3.south) + (#6,0)$);
+ \coordinate (tmpu) at ($(#4.west) + (0,#7)$);
+ \coordinate (tmpv) at ($(#4.east) + (0,#7)$);
+ \draw [-latex,\linecolor, \linepathtype] (tmpb) |- node[auto,above left] {\textsize{#1}} (tmpu);
+ \draw [-latex,\linecolor, \linepathtype] (tmpv) -| node[auto,above left] {\textsize{#2}} ($(#5.south) + (#8,0)$);
+}
+\newcommand{\kLinkVHTFHVAbove}[8]{
+ \coordinate (tmpb) at ($(#3.north) + (#6,0)$);
+ \coordinate (tmpu) at ($(#4.east) + (0,#7)$);
+ \coordinate (tmpv) at ($(#4.west) + (0,#7)$);
+ \draw [-latex,\linecolor, \linepathtype] (tmpb) |- node[auto,above left] {\textsize{#1}} (tmpu);
+ \draw [-latex,\linecolor, \linepathtype] (tmpv) -| node[auto,above left] {\textsize{#2}} ($(#5.north) + (#8,0)$);
+}
+\newcommand{\kLinkVHTFHVAboveRight}[8]{
+ \coordinate (tmpb) at ($(#3.north) + (#6,0)$);
+ \coordinate (tmpu) at ($(#4.west) + (0,#7)$);
+ \coordinate (tmpv) at ($(#4.east) + (0,#7)$);
+ \draw [-latex,\linecolor, \linepathtype] (tmpb) |- node[auto,above left] {\textsize{#1}} (tmpu);
+ \draw [-latex,\linecolor, \linepathtype] (tmpv) -| node[auto,above left] {\textsize{#2}} ($(#5.north) + (#8,0)$);
+}
+
+
+% Cross Links
+\newcommand{\kLinkCrossLeftAbove}[2]{
+ \coordinate [above of=#1, node distance= \verticdist, xshift=-\horizdist] (tmp);
+ \draw[-latex, \linecolor, \linepathtype] (#1)|-(tmp) -- ++(-\horizdist/2,0) -- ($(#2)-(0,\verticdist)$) -- (#2);
+}
+
+\newcommand{\kLinkCrossLeftBelow}[2]{
+ \coordinate [below of=#1, node distance= \verticdist, xshift=-\horizdist] (tmp);
+ \draw[-latex, \linecolor, \linepathtype] (#1)|-(tmp) -- ++(-\horizdist/2,0) -- ($(#2)+(0,\verticdist)$) -- (#2);
+}
+
+\newcommand{\kLinkCrossRightAbove}[2]{
+ \coordinate [above of=#1, node distance= \verticdist, xshift=\horizdist] (tmp);
+ \draw[-latex, \linecolor, \linepathtype] (#1)|-(tmp) -- ++(\horizdist/2,0) -- ($(#2)-(0,\verticdist)$) -- (#2);
+}
+
+\newcommand{\kLinkCrossRightBelow}[2]{
+ \coordinate [below of=#1, node distance= \verticdist, xshift=\horizdist] (tmp);
+ \draw[-latex, \linecolor, \linepathtype] (#1)|-(tmp) -- ++(\horizdist/2,0) -- ($(#2)+(0,\verticdist)$) -- (#2);
+}
+
+
+% Link Inputs Invisible Node
+%% Usage: [optional distance shift]{from node label}{to current node label}{in label}{direction}{direction shift}
+
+\newcommand{\kInRight}[5][]{
+ \def\dxinr{#1};
+ \ifx\dxinr\empty
+ \def\dxinr{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.east) + (0,#5)$);
+
+ \node[right of= tmpn, node distance= 1.2cm + \dxinr, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (#3)--(tmpn);
+}
+
+\newcommand{\kInLeft}[5][]{
+ \def\dxinr{#1};
+ \ifx\dxinr\empty
+ \def\dxinr{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.west) + (0,#5)$);
+
+ \node[left of= tmpn, node distance= 1.2cm + \dxinr, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (#3)--(tmpn);
+}
+
+\newcommand{\kInUp}[5][]{
+ \def\dxina{#1};
+ \ifx\dxina\empty
+ \def\dxina{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.north) + (#5,0)$);
+
+ \node[above of= tmpn, node distance= 1.2cm + \dxina, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (#3)--(tmpn);
+}
+
+\newcommand{\kInDown}[5][]{
+ \def\dxinr{#1};
+ \ifx\dxinr\empty
+ \def\dxinr{0};
+ \else
+ \fi
+
+ \coordinate (tmpn) at ($(#2.south) + (#5,0)$);
+
+ \node[below of= tmpn, node distance= 1.2cm + \dxinr, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (#3)--(tmpn);
+}
+
+
+% Link Outputs Invisible Node
+%% Usage: [optional distance shift]{from node label}{to current node label}{out signal label}{direction shift}
+\newcommand{\kOutRight}[5][]{
+ \def\dxoutr{#1};
+ \ifx\dxoutr\empty
+ \def\dxoutr{0};
+ \else
+ \fi
+
+ \coordinate (tmpo) at ($(#2.east) + (0,#5)$);
+
+ \node[right of= tmpo, node distance= 1.2cm + \dxoutr, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (tmpo)--(#3);
+}
+
+\newcommand{\kOutLeft}[5][]{
+ \def\dxoutr{#1};
+ \ifx\dxoutr\empty
+ \def\dxoutr{0};
+ \else
+ \fi
+
+ \coordinate (tmpo) at ($(#2.west) + (0,#5)$);
+
+ \node[left of= tmpo, node distance= 1.2cm + \dxoutr, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (tmpo)--(#3);
+}
+
+\newcommand{\kOutUp}[5][]{
+ \def\dxoutr{#1};
+ \ifx\dxoutr\empty
+ \def\dxoutr{0};
+ \else
+ \fi
+
+ \coordinate (tmpo) at ($(#2.north) + (#5,0)$);
+
+ \node[above of= tmpo, node distance= 1.2cm + \dxoutr, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (tmpo)--(#3);
+}
+
+\newcommand{\kOutDown}[5][]{
+ \def\dxoutr{#1};
+ \ifx\dxoutr\empty
+ \def\dxoutr{0};
+ \else
+ \fi
+
+ \coordinate (tmpo) at ($(#2.south) + (#5,0)$);
+
+ \node[below of= tmpo, node distance= 1.2cm + \dxoutr, font=\textsize] (#3) {\color{\colortext}#4};
+
+ \draw[-latex, \linecolor, \linepathtype] (tmpo)--(#3);
+}
+
+% ----------------------------------------------------------------------------------------
+
+% SIGNAL FLOW GRAPHS
+
+\newcommand{\sfgStart}[3]{
+ \node[draw,circle,fill=\linecolor,inner sep=0pt, outer sep=0pt, minimum size=0.5em,
+ node distance= \horizdist,label=below:\color{\colortext}\textsize{#3}] (#1) at #2 {};
+}
+
+\newcommand{\sfgNStart}[3]{
+ \node[draw,circle,fill=\linecolor,inner sep=0pt, outer sep=0pt, minimum size=0.5em,
+ node distance= \horizdist,label=below:\color{\colortext}\textsize{#3}] (#1) at #2 {};
+}
+
+\newcommand{\sfgNodeR}[5][]{
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.5em,
+ right of = #2, node distance= \sfghorizdist,label=#5:\color{\colortext}\textsize{#4}] (#3) {};
+ \draw [\linecolor, \linepathtype, midarrow] (#2)-- node[auto,above] {\textsize{#1}} (#3);
+}
+
+\newcommand{\sfgNodeL}[5][]{
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.5em,
+ left of = #2, node distance= \sfghorizdist,label=#5:\color{\colortext}\textsize{#4}] (#3) {};
+ \draw [\linecolor, \linepathtype, midarrow] (#2)-- node[auto,above] {\textsize{#1}} (#3);
+}
+
+\newcommand{\sfgNodeU}[5][]{
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.5em,
+ above of = #2, node distance= \sfghorizdist,label=#5:\color{\colortext}\textsize{#4}] (#3) {};
+ \draw [\linecolor, \linepathtype, midarrow] (#2)-- node[auto,above] {\textsize{#1}} (#3);
+}
+
+\newcommand{\sfgNodeD}[5][]{
+ \node[fill=\linecolor,circle,inner sep=0pt, outer sep=0pt, minimum size=.5em,
+ below of = #2, node distance= \sfghorizdist,label=#5:\color{\colortext}\textsize{#4}] (#3) {};
+ \draw [\linecolor, \linepathtype, midarrow] (#2)-- node[auto,above] {\textsize{#1}} (#3);
+}
+
+
+\newcommand{\sfgLinkSelfR}[2][]{
+ \draw[\linecolor, \linepathtype, midarrow,looseness=50]
+ (#2) to [out=45,in=-45] node[right] {\textsize{#1}} (#2);
+}
+
+\newcommand{\sfgLinkSelfL}[2][]{
+ \draw[\linecolor, \linepathtype, midarrow,looseness=50]
+ (#2) to [out=-135,in=-135] node[left] {\textsize{#1}} (#2);
+}
+
+\newcommand{\sfgLinkSelfU}[2][]{
+ \draw[\linecolor, \linepathtype, midarrow,looseness=50]
+ (#2) to [in=45,out=135] node[above] {\textsize{#1}} (#2);
+}
+
+\newcommand{\sfgLinkSelfD}[2][]{
+ \draw[\linecolor, \linepathtype, midarrow,looseness=50]
+ (#2) to [in=225,out=315] node[below] {\textsize{#1}} (#2);
+}
+
+\newcommand{\sfgCLinkFlip}[4][]{
+ \draw[midarrow, bend right=60] (#2) to node[#4] {\textsize{#1}} (#3);
+}
+\newcommand{\sfgCLink}[4][]{
+ \draw[midarrow, bend left=60] (#2) to node[#4] {\textsize{#1}} (#3);
+}
+%% node label positioning: at start near start midway near end at end, above below, sloped
diff --git a/graphics/svg/README.md b/graphics/svg/README.md
index cbc4e04637..fe8f917046 100644
--- a/graphics/svg/README.md
+++ b/graphics/svg/README.md
@@ -5,7 +5,7 @@
Copyright (C) Philip Ilten <philten@cern.ch>, 2012-2016
Copyright (C) Falk Hanisch <hanisch.latex@outlook.com>, 2017-
- svg 2018/11/12 v2.02b
+ svg 2019/10/10 v2.02c
----------------------------------------------------------------------------
@@ -34,6 +34,9 @@ it is rendered within the LaTeX document using either ***ImageMagick*** or
Versions
--------
+**v2.02c** (2019/10/10)
++ fix bugs with current kernel (2019/10/01) regarding file name parsing
+
**v2.02b** (2018/11/12)
+ fix bug for package **tikzscale** which changes `includgraphics` globally
diff --git a/graphics/svg/doc/svg.pdf b/graphics/svg/doc/svg.pdf
index 03c3912ed5..f186e95d93 100644
--- a/graphics/svg/doc/svg.pdf
+++ b/graphics/svg/doc/svg.pdf
Binary files differ
diff --git a/graphics/svg/source/svg.dtx b/graphics/svg/source/svg.dtx
index 5c0d749e15..7715e96811 100644
--- a/graphics/svg/source/svg.dtx
+++ b/graphics/svg/source/svg.dtx
@@ -1,4 +1,4 @@
-% \CheckSum{3811}
+% \CheckSum{3838}
% \iffalse meta-comment
%
% svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
@@ -115,7 +115,7 @@ svg-extract -- Extract independent graphic files from SVG pictures
%<package&option&base>\ProvidesPackage{svg}[%
%<package&option&extract>\ProvidesPackage{svg-extract}[%
%<*driver|package&option>
- 2018/11/12 v2.02b\space%
+ 2019/10/10 v2.02c\space%
%<package&option&base> (include SVG pictures)%
%<package&option&extract> (extract independent graphics from SVG pictures)%
]
@@ -257,6 +257,9 @@ svg-extract -- Extract independent graphic files from SVG pictures
% fix bug for package \pkg{tikzscale} which changes \cs{includegraphics}
% globally%
% }^^A
+% \changes{v2.02c}{2019/10/10}{%
+% fix bugs with current kernel (2019/10/01) regarding file name parsing
+% }^^A
% \ToDo{Workaround for missing \cs{transparent} (Lua\TeX lacks support)}[v2.03]
%
%
@@ -2383,7 +2386,8 @@ svg-extract -- Extract independent graphic files from SVG pictures
% \begin{macrocode}
\newcommand*\svg@extension@parse[1]{%
\IfArgIsEmpty{#1}{}{%
- \ifstr{#1}{\filename@ext}{}{%
+ \@expandtwoargs\ifstr%
+ {\detokenize\expandafter{\filename@ext}}{\detokenize\expandafter{#1}}{}{%
\begingroup%
% \end{macrocode}
% Macro \cs{svg@tempa} is used to temporarily store anything before the
@@ -2422,7 +2426,7 @@ svg-extract -- Extract independent graphic files from SVG pictures
\def\svg@extension@@parse#1.#2\@nil#3\@nil{%
\edef\svg@tempa{\svg@tempa.#1}%
\IfArgIsEmpty{#2}{}{%
- \ifstr{#2}{#3.}{%
+ \ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
% \end{macrocode}
% If the trailing extension is found, \cs{svg@tempb} is definied.
% \begin{macrocode}
@@ -3143,12 +3147,23 @@ svg-extract -- Extract independent graphic files from SVG pictures
}%
\svg@tempa%
% \end{macrocode}
-% Afterwards \cs{svg@tempa} is defined with the file name itself within
-% enclosing braces followed by the extension and \cs{svg@tempb} holds the
-% original file name plus extension without enclosing braces.
+% Afterwards \cs{svg@tempa} is defined with the file name within enclosing
+% braces followed by the extension---only if the file name itself contains any
+% dots--- and \cs{svg@tempb} holds the original file name plus extension
+% without enclosing braces.
% \begin{macrocode}
\svg@remove@leadingchar.\svg@tempa%
- \edef\svg@tempa{{\svg@tempa}.\svg@tempb}%
+ \begingroup%
+ \expandafter\filename@parse\expandafter{\svg@tempa}%
+ \edef\svg@tempa{%
+ \endgroup%
+ \ifx\filename@ext\relax%
+ \edef\noexpand\svg@tempa{\svg@tempa.\svg@tempb}%
+ \else%
+ \edef\noexpand\svg@tempa{{\svg@tempa}.\svg@tempb}%
+ \fi%
+ }%
+ \svg@tempa%
\edef\svg@tempb{#2}%
% \end{macrocode}
% If the export with \app{Inkscape} was done with \LaTeX~support enabled, the