4 files changed, 40 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/latex/blox/README b/Master/texmf-dist/doc/latex/blox/README
index 0133baed9d3..e8c3cff73fc 100644
--- a/Master/texmf-dist/doc/latex/blox/README
+++ b/Master/texmf-dist/doc/latex/blox/README
@@ -1,9 +1,10 @@
-The bloX package by Ben Reish
+The blox package by Ben Reish
 
 File Contents
+.blox/
 ..README
-..bloX.dtx
-..bloX.sty
+..blox.dtx
+..blox.pdf
 
 Purpose
 This package, along with tikz, will typeset block diagrams for
@@ -12,22 +13,24 @@ use with programming and control theory.
 Contributions
 This is just an English translation of the schemabloc package. 
 I did fix a couple of bugs that I found in the schemabloc 
-package so that bloX works for the MikTeX installation I have.
+package so that blox works for the MikTeX installation I have.
 
 License. 
 
-bloX: Just an English translation of the schemabloc package.
+blox: Just an English translation of the schemabloc package.
 Copyright (C) 2014  Ben Reish
 
-This program is free software: you can redistribute it and/or
-modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation, either version 3 of
-the License, or (at your option) any later version.
+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 version.
+The latest version of this license is in:
+
+http://www.latex-project.org/lppl.txt
+
+and version 1.3 or later is part of all distributions of LaTeX
+version 1999/12/01 or later.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-\ No newline at end of file
+LPPL for more details.
diff --git a/Master/texmf-dist/doc/latex/blox/bloX.pdf b/Master/texmf-dist/doc/latex/blox/blox.pdf
index 7d4bcbdbdc6..f6d2abd72c5 100644
--- a/Master/texmf-dist/doc/latex/blox/bloX.pdf
+++ b/Master/texmf-dist/doc/latex/blox/blox.pdf
diff --git a/Master/texmf-dist/source/latex/blox/bloX.dtx b/Master/texmf-dist/source/latex/blox/blox.dtx
index 9aa38525600..0accefac210 100644
--- a/Master/texmf-dist/source/latex/blox/bloX.dtx
+++ b/Master/texmf-dist/source/latex/blox/blox.dtx
@@ -5,13 +5,13 @@
 % -----------------------------------
 %
 % This file may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.2
+% conditions of the LaTeX Project Public License, either version 1.3
 % of this license or (at your option) any later version.
 % The latest version of this license is in:
 %
 % http://www.latex-project.org/lppl.txt
 %
-% and version 1.2 or later is part of all distributions of LaTeX
+% and version 1.3 or later is part of all distributions of LaTeX
 % version 1999/12/01 or later.
 % 
 % \endpreamble
@@ -19,8 +19,8 @@
 %
 % \iffalse
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{bloX}%
-%<package>[2014/08/18 v2.4 Just an English translation of schemabloc]
+%<package>\ProvidesPackage{blox}%
+%<package>[2014/08/20 v2.5 Just an English translation of schemabloc]
 %
 %<*batchfile>
 \begingroup
@@ -29,17 +29,17 @@
 %%
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
-%% version 1.2 of this license or (at your option) any later
+%% version 1.3 of this license or (at your option) any later
 %% version. The latest version of this license is in:
 %%
 %% http://www.latex-project.org/lppl.txt
 %%
-%% and version 1.2 or later is part of all distributions of
+%% and version 1.3 or later is part of all distributions of
 %% LaTeX version 1999/12/01 or later.
 %%
 \input docstrip.tex
 \keepsilent
-\usedir{tex/latex/bloX}
+\usedir{tex/latex/blox}
 \preamble
 This is a generated file.
 Copyright (C) 2014 by Ben Reish
@@ -52,15 +52,15 @@ and version 1.3 or later is part of all distributions of
 LaTeX version 1999/12/01 or later.
 \endpreamble
 \askforoverwritefalse
-\generate{\file{bloX.sty}{\from{bloX.dtx}{package}}}
+\generate{\file{blox.sty}{\from{blox.dtx}{package}}}
 \Msg{*********************************************************}
 \Msg{*}
 \Msg{* To finish the installation you have to move the}
 \Msg{* following file into a directory searched by TeX:}
 \Msg{*}
-\Msg{* \space\space bloX.sty}
+\Msg{* \space\space blox.sty}
 \Msg{*}
-\Msg{* To produce the documentation run the file bloX.dtx}
+\Msg{* To produce the documentation run the file blox.dtx}
 \Msg{* through LaTeX.}
 \Msg{*}
 \Msg{* Happy TeXing!}
@@ -69,7 +69,7 @@ LaTeX version 1999/12/01 or later.
 %</batchfile>
 %<*driver>
 \documentclass{ltxdoc}
-\usepackage{bloX}
+\usepackage{blox}
 \usepackage[colorlinks=true,urlcolor=blue,linkcolor=black,%
 	citecolor=orange,pdfborder={0 0 0},%pdfpagemode=FullScreen,
 	pdfdisplaydoctitle=true%
@@ -79,7 +79,7 @@ LaTeX version 1999/12/01 or later.
 \CodelineIndex
 \RecordChanges
 \begin{document}
-\DocInput{bloX.dtx}
+\DocInput{blox.dtx}
 \end{document}
 %</driver>
 % \fi
@@ -106,18 +106,19 @@ LaTeX version 1999/12/01 or later.
 % \changes{v1.0}{2014/01/01}{Initial version}
 % \changes{v2.0}{2014/08/01}{Fixed the chain mechanism to work with my implementation of tikz}
 %
-% \newcommand{\blox}{\textsf{bloX}}
+% \newcommand{\blox}{\textsf{blox}}
 % \newcommand{\stikz}{\textsf{tikz}}
+% \changes{v2.5}{2014/08/20}{Changed the name to \blox\ instead of \textsf{bloX} at CTAN's suggestion.}
 %
 % \newcommand{\verbatimfont}[1]{\renewcommand{\MacroFont}{\ttfamily#1}}
 % \newcommand{\vrbfnt}{\verbatimfont{\fontsize{6pt}{8pt}\selectfont}}
 %
-% \GetFileInfo{bloX.sty}
+% \GetFileInfo{blox.sty}
 %
 % \DoNotIndex{\#,\$,\%,\&,\@,\\,\{,\},\^,\_,\~,\ ,\@ne,\advance,\begingroup,\catcode,\closein,\closeout,\day,\def,\edef,\else,\empty,\endgroup,\newcommand,\draw,\newtoks,\ProvidesPackage,\RequirePackage,\node,\let,\global,\foreach}
 %
-% \title{The \textsf{bloX} package\thanks{This document
-% corresponds to \textsf{bloX}~\fileversion,
+% \title{The \textsf{blox} package\thanks{This document
+% corresponds to \textsf{blox}~\fileversion,
 % dated \filedate.}}
 % \author{Ben Reish \\ \texttt{ben.reish@alumni.oc.edu}}
 %
@@ -126,7 +127,7 @@ LaTeX version 1999/12/01 or later.
 % \maketitle
 %
 % \begin{abstract}
-% The \textsf{bloX} package is an English translation of the French \textsf{schemabloc} package for making block diagrams in \LaTeX2e.  Also, I fixed the chain feature to auto-create a linear linked chain of blocks from a list which did not work on my implementation of \textsf{tikz} and \textsf{schemabloc}.  
+% The \textsf{blox} package is an English translation of the French \textsf{schemabloc} package for making block diagrams in \LaTeX2e.  Also, I fixed the chain feature to auto-create a linear linked chain of blocks from a list which did not work on my implementation of \textsf{tikz} and \textsf{schemabloc}.  
 % \end{abstract}
 %
 % \section{Introduction}
@@ -169,7 +170,7 @@ LaTeX version 1999/12/01 or later.
 % \section{Usage}
 % The idea is to create a \textsf{tikzpicture} environment then place your block diagram commands inside it.  The order is a bit weird.  You must create both endpoints to a connecting line prior to making the line (see Fig. \ref{fig:helps}).    So, instead of saying `make block, make link, make block', you have to say `make block, make block, make connecting link.'  This is an effect of \stikz\ not being a what-you-see-is-what-you-get graphics drawing program.  It will help you to create a rought draft of your block diagram with pen and ink prior to trying to create it with this package.  
 %
-% \textsf{bloX} is designed to be linear.  It begins at an input and builds the diagram to the right of the previous item one item at a time.  If multiple paths are needed, besides the normal feedback path like that shown in Fig. \ref{fig:simpdia}, special commands must be used to translate up or down to a new path.  
+% \blox\ is designed to be linear.  It begins at an input and builds the diagram to the right of the previous item one item at a time.  If multiple paths are needed, besides the normal feedback path like that shown in Fig. \ref{fig:simpdia}, special commands must be used to translate up or down to a new path.  
 %
 % \begin{figure}
 % \begin{minipage}{.6\textwidth}
diff --git a/Master/texmf-dist/tex/latex/blox/bloX.sty b/Master/texmf-dist/tex/latex/blox/blox.sty
index e5d17208eb6..b0782ba4131 100644
--- a/Master/texmf-dist/tex/latex/blox/bloX.sty
+++ b/Master/texmf-dist/tex/latex/blox/blox.sty
@@ -1,10 +1,10 @@
 %%
-%% This is file `bloX.sty',
+%% This is file `blox.sty',
 %% generated with the docstrip utility.
 %%
 %% The original source files were:
 %%
-%% bloX.dtx  (with options: `package')
+%% blox.dtx  (with options: `package')
 %% This is a generated file.
 %% Copyright (C) 2014 by Ben Reish
 %% This file may be distributed and/or modified under the
@@ -15,8 +15,8 @@
 %% and version 1.3 or later is part of all distributions of
 %% LaTeX version 1999/12/01 or later.
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{bloX}%
-[2014/08/18 v2.4 Just an English translation of schemabloc]
+\ProvidesPackage{blox}%
+[2014/08/20 v2.5 Just an English translation of schemabloc]
 
 
 
@@ -244,4 +244,4 @@ label=85:$#6$,bXStyleSum] (#2) {};
 }
 \endinput
 %%
-%% End of file `bloX.sty'.
+%% End of file `blox.sty'.