texlive[57949] Master/texmf-dist: blox (26feb21)
commits+karl at tug.org
commits+karl at tug.org
Fri Feb 26 23:22:21 CET 2021
Revision: 57949
http://tug.org/svn/texlive?view=revision&revision=57949
Author: karl
Date: 2021-02-26 23:22:21 +0100 (Fri, 26 Feb 2021)
Log Message:
-----------
blox (26feb21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/blox/README
trunk/Master/texmf-dist/doc/latex/blox/blox.pdf
trunk/Master/texmf-dist/source/latex/blox/blox.dtx
trunk/Master/texmf-dist/tex/latex/blox/blox.sty
Modified: trunk/Master/texmf-dist/doc/latex/blox/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/blox/README 2021-02-26 22:21:59 UTC (rev 57948)
+++ trunk/Master/texmf-dist/doc/latex/blox/README 2021-02-26 22:22:21 UTC (rev 57949)
@@ -5,6 +5,7 @@
..README
..blox.dtx
..blox.pdf
+..blox.sty
Purpose
This package, along with tikz, will typeset block diagrams for
@@ -18,7 +19,7 @@
License.
blox: Just an English translation of the schemabloc package.
-Copyright (C) 2014 Ben Reish
+Copyright (C) 2014-2021 Ben Reish
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Modified: trunk/Master/texmf-dist/doc/latex/blox/blox.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/blox/blox.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/blox/blox.dtx 2021-02-26 22:21:59 UTC (rev 57948)
+++ trunk/Master/texmf-dist/source/latex/blox/blox.dtx 2021-02-26 22:22:21 UTC (rev 57949)
@@ -1,7 +1,7 @@
% \iffalse meta-comment
% \preamble
%
-% Copyright (C) 2014 by Ben Reish
+% Copyright (C) 2014-2021 by Ben Reish
% -----------------------------------
%
% This file may be distributed and/or modified under the
@@ -17,15 +17,18 @@
% \endpreamble
% \fi
%
+% \iffalse %% makeindex -s gind.ist -o blox.ind blox.idx \fi
+% \iffalse %% makeindex -s gglo.ist -o blox.gls blox.glo
+% \fi
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{blox}%
-%<package>[2014/08/20 v2.5 Just an English translation of schemabloc]
+%<package>[2021/2/22 v2.51 Just an English translation of schemabloc]
%
%<*batchfile>
\begingroup
%%
-%% Copyright (C) 2014 by Ben Reish
+%% Copyright (C) 2014-2021 by Ben Reish
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -42,7 +45,7 @@
\usedir{tex/latex/blox}
\preamble
This is a generated file.
-Copyright (C) 2014 by Ben Reish
+Copyright (C) 2014-2021 by Ben Reish
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3 of this license or (at your option) any later
@@ -84,7 +87,7 @@
%</driver>
% \fi
%
-% \CheckSum{261}
+% \CheckSum{267}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -260,7 +263,7 @@
% There are several commands for making blocks in the \blox\ package. They are context sensitive, so where you use them matters. Some do multiple things.
%
% \DescribeMacro{\bXBloc}
-% Usually, something happens inside a block of a block diagram. You'll want to describe what is happening inside the block. The first command for making blocks in \textsf{bloX} is |\bXBloc|\oarg{distance}\marg{Name}\marg{Contents}\marg{Previous Node}. This command makes a single block outline around whatever is in \meta{contents} and places it to the right of \meta{Previous Node} by \meta{distance} units (the default is 2).
+% Usually, something happens inside a block of a block diagram. You'll want to describe what is happening inside the block. The first command for making blocks in \textsf{blox} is |\bXBloc|\oarg{distance}\marg{Name}\marg{Contents}\marg{Previous Node}. This command makes a single block outline around whatever is in \meta{contents} and places it to the right of \meta{Previous Node} by \meta{distance} units (the default is 2).
%
% \DescribeMacro{\bXBlocL}
% The second command for making blocks to the right of the last item is |\bXBlocL|\oarg{distance}\marg{Name}\marg{Contents}\marg{Previous Node}. This command makes a block outline around whatever is in \meta{contents} and places it to the right of \meta{Previous Node} by \meta{distance} units (the default is 2) and then draws the connecting link between \meta{Previous Node} and the new block. (This is a slight labor savings if you don't want to label the link between the two.)
@@ -379,6 +382,10 @@
% |\bXLinkyx|\marg{Previous Node}\marg{Next Node} is the syntax. It creates a link which goes vertically, makes a right angle, and then goes horizontally. It has no label.
%
% To create a feedback loop where there is measurement noise, use |\bXLinkyx|, then create the noise block with |\bXBlocr|, and then use |\bXLinkxy| to finish the feedback loop. If no noise is in the measurement, then use a return.
+%
+% \DescribeMacro{\bXLinktyx}\DescribeMacro{\bXLinktb}
+% |\bXLinktyx|\marg{Previous Node}\marg{Next Node} draws a link from the top, center of \meta{Previous Node} to the closest horizontal connecting node on \meta{Next Node} via a right-angle turn. |\bXLinktb|\marg{Previous Node}\marg{Next Node} draws a link from the top, center of \meta{Previous Node} to the bottom, center connecting node on \meta{Next Node} in a straight line. Neither macro accounts for creating a label. If a label is required, use |\bXBranchy|, or |\bXBranchx| and |\bXLinkName|.
+% \changes{v2.51}{2014/12/04}{Added description of \texttt{bXLinktyx} and \texttt{bXLinktb} macros.}
%
% \subsection{Returns}
% Returns are what I generalized the simple feedback loop as: a line connecting the end of a linear block diagram to the beginning.
@@ -417,17 +424,17 @@
%
% \begin{figure}
% \centering
-% \begin{minipage}{.45\textwidth}
+% \begin{minipage}{.6\textwidth}
% \begin{tikzpicture}
% \bXInput[r]{A}
-% \bXLoop[1.25]{A}{c/Md,d/kid,e/$4<$}
+% \bXLoop[2]{A}{c/Md,d/kid,e/$4<$}
% \end{tikzpicture}
% \end{minipage}\hfil
-% \begin{minipage}{.45\textwidth}
+% \begin{minipage}{.4\textwidth}\vrbfnt
% \begin{verbatim}
% \begin{tikzpicture}
% \bXInput[r]{A}
-% \bXLoop[1.5]{A}{c/Md,d/kid,e/$4<$}
+% \bXLoop[2]{A}{c/Md,d/kid,e/$4<$}
% \end{tikzpicture}
% \end{verbatim}
% \end{minipage}
@@ -485,7 +492,7 @@
% \bXStyleBlocDefault
% \bXBloc[4]{H}{$P_3(s)$}{G}\bXLink[$y_2=u_3$]{G}{H}
% \bXReturn{G-H}{D}{}
-% \end{tiny
+% \end{tiny}
% \bXOutput{I}{H}\bXLink[$y_3$]{H}{I}
% \bXLabelStyle{green!80!black}
% \bXLineStyle{dashed, brown, text=purple}
@@ -642,8 +649,8 @@
% Normal beginning package commands to provide for making sure the package works correctly.
% \begin{macrocode}
\typeout{* }
-\typeout{bloX: Just an English translation of schemabloc package.}
-\typeout{bloX Copyright (C) 2014 Ben Reish}
+\typeout{blox: Just an English translation of schemabloc package.}
+\typeout{blox Copyright (C) 2014-2021 Ben Reish}
\typeout{* }
\typeout{This program comes with ABSOLUTELY NO WARRANTY.}
\typeout{This is free software, and you are welcome to redistribute it}
@@ -814,8 +821,9 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\bXLink}\begin{macro}{\bXLinkxy}\begin{macro}{\bXLinkyx}
-% These macros tell \stikz\ where to place links, between which blocks. The normal macro is |\bXLink| which takes 3 arguments. It draws straight lines between the right edge of the previous node and the left edge of the next node. It names the link \meta{Previous Node}-\meta{Next Node}. This allows the selection of the middle of the link between to blocks for the having a return link drawn from. This macro will draw diagonal lines between nodes on different branches of a diagram. To maintain square corners, use the |\bXLinkxy| to go first horizontally, then vertically; or use |\bXLinkyx| to go first vertically and then horizontally.
+% \begin{macro}{\bXLink}\begin{macro}{\bXLinkxy}\begin{macro}{\bXLinkyx}\begin{macro}{\bXLinktyx}\begin{macro}{\bXLinktb}
+% These macros tell \stikz\ where to place links, between which blocks. The normal macro is |\bXLink| which takes 3 arguments. It draws straight lines between the right edge of the previous node and the left edge of the next node. It names the link \meta{Previous Node}-\meta{Next Node}. This allows the selection of the middle of the link between to blocks for the having a return link drawn from. This macro will draw diagonal lines between nodes on different branches of a diagram. To maintain square corners, use the |\bXLinkxy| to go first horizontally, then vertically; or use |\bXLinkyx| to go first vertically and then horizontally. To link from the top of the first block to the next block horizontally, use |\bXLinktyx| and to link from the top of the first block to the bottom of the second block, use |\bXLinktb|.
+% \changes{v2.51}{2014/12/04}{Added \texttt{bXLinktyx} and \texttt{bXLinktb} to be able to link blocks from the top of the starting block}
% \begin{macrocode}
\newcommand{\bXLink}[3][]{
\draw [bXLineStyle,auto] (#2) -- node[name=#2-#3] {#1} (#3);
@@ -828,6 +836,19 @@
node[name=#2-#3,near end,right] {#1} (#3) ;
}
% \end{macrocode}
+% This macro draws a right-angled line between two nodes, the top of the first argument and the east or west side of the second argument. \stikz\ will try to connect to the closest node. There is no label making option.
+% \begin{macrocode}
+\newcommand{\bXLinktyx}[2]{
+ \draw [bXLineStyle] (#1.north) |- (#2) ;
+}
+% \end{macrocode}
+% This macro draws a straight line between two nodes, the top of the first argument and the bottom of the second argument. It can be a diagonal line. There is no label making option.
+% \begin{macrocode}
+\newcommand{\bXLinktb}[2]{
+ \draw [bXLineStyle] (#1.north) -- (#2.south) ;
+}
+% \end{macrocode}
+% \end{macro}\end{macro}
% \begin{macro}{\bXReturn}
% This macro creates two nodes, one directly below the second argument and one directly below the third argument. Then it draws straight lines to connect them.
% \begin{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/blox/blox.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/blox/blox.sty 2021-02-26 22:21:59 UTC (rev 57948)
+++ trunk/Master/texmf-dist/tex/latex/blox/blox.sty 2021-02-26 22:22:21 UTC (rev 57949)
@@ -6,7 +6,7 @@
%%
%% blox.dtx (with options: `package')
%% This is a generated file.
-%% Copyright (C) 2014 by Ben Reish
+%% Copyright (C) 2014-2021 by Ben Reish
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3 of this license or (at your option) any later
@@ -16,7 +16,7 @@
%% LaTeX version 1999/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{blox}%
-[2014/08/20 v2.5 Just an English translation of schemabloc]
+[2021/2/22 v2.51 Just an English translation of schemabloc]
@@ -24,8 +24,8 @@
\typeout{* }
-\typeout{bloX: Just an English translation of schemabloc package.}
-\typeout{bloX Copyright (C) 2014 Ben Reish}
+\typeout{blox: Just an English translation of schemabloc package.}
+\typeout{blox Copyright (C) 2014-2021 Ben Reish}
\typeout{* }
\typeout{This program comes with ABSOLUTELY NO WARRANTY.}
\typeout{This is free software, and you are welcome to redistribute it}
@@ -139,6 +139,12 @@
\draw [bXLineStyle] (#2) -|
node[name=#2-#3,near end,right] {#1} (#3) ;
}
+\newcommand{\bXLinktyx}[2]{
+ \draw [bXLineStyle] (#1.north) |- (#2) ;
+}
+\newcommand{\bXLinktb}[2]{
+ \draw [bXLineStyle] (#1.north) -- (#2.south) ;
+}
\newcommand{\bXReturn}[4][4]{
\node [below of=#2, node distance=#1em,
minimum size=0em](return#2) {};
More information about the tex-live-commits
mailing list.