blkarray (28feb15)

git-svn-id: svn://tug.org/texlive/trunk@36406 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 23 insertions, 8 deletions

diff --git a/Master/texmf-dist/doc/latex/blkarray/README b/Master/texmf-dist/doc/latex/blkarray/README
index 12f7ba8f7ee..17d3ecd64ff 100644
--- a/Master/texmf-dist/doc/latex/blkarray/README
+++ b/Master/texmf-dist/doc/latex/blkarray/README
@@ -1,10 +1,17 @@
-Blkarray -- extensions and modifications of tabular support
+blkarray -- extensions and modifications of tabular support
 
 This package is even less supported than any of David Carlisle's other
 packages. It was written a long time ago, and is still documented using
 the conventions of LaTeX2.09 (although it appears to work with current
-LaTeX releases).  It is unlikely that David will be able to work on
-this in the foreseeable future, which is why it is published in its
-current state.  It is not really a package for using in documents in
+LaTeX releases).
+
+In 2014 it had a minor update to work with LaTeX2e font initialisation
+and in 2015 a second update to avoid a clash with amsmath's use of box0.
+
+Apart from these couple of lines all the code dates back to 1992 and
+was more of a thought experiment than production code.
+However people seem to find uses for it.
+
+It is not really a package for using in documents in
 its present state, but if you are interested in coding tables of
 various sorts in TeX, you may be interested to experiment with it...
diff --git a/Master/texmf-dist/doc/latex/blkarray/blkarray.pdf b/Master/texmf-dist/doc/latex/blkarray/blkarray.pdf
index 12dff59d71e..3281ebe5caf 100644
--- a/Master/texmf-dist/doc/latex/blkarray/blkarray.pdf
+++ b/Master/texmf-dist/doc/latex/blkarray/blkarray.pdf
diff --git a/Master/texmf-dist/doc/latex/blkarray/blkarray.tex b/Master/texmf-dist/doc/latex/blkarray/blkarray.tex
index ff30bcf2f85..f7f8f31e63a 100644
--- a/Master/texmf-dist/doc/latex/blkarray/blkarray.tex
+++ b/Master/texmf-dist/doc/latex/blkarray/blkarray.tex
@@ -1,2 +1,2 @@
-\AtBeginDocument{\date{24 March 1999}}
+\AtBeginDocument{\date{27 February 2015}}
 \input{blkarray.sty}
diff --git a/Master/texmf-dist/tex/latex/blkarray/blkarray.sty b/Master/texmf-dist/tex/latex/blkarray/blkarray.sty
index a4b988c1327..7f2ad89ee7a 100644
--- a/Master/texmf-dist/tex/latex/blkarray/blkarray.sty
+++ b/Master/texmf-dist/tex/latex/blkarray/blkarray.sty
@@ -1,7 +1,7 @@
 %%%     blkarray.sty
 %%%
 %%% Copyright David Carlisle 1992 1999
-%%%           david@dcarlisle.demon.co.uk
+%%%           d.p.carlisle "at" gmail.com
 %%%
 %%% This file may be distributed under the terms of the LPPL.
 %%% See 00readme.txt for details.
@@ -9,6 +9,8 @@
 %%% Version 0.01 - 0.03  November 1992
 %%% Version 0.04         03 December 1992
 %%% Version 0.05         24 March 1999  (email update only)
+%%% Version 0.06         16 October 2014  Update for LaTeX2e
+%%% Version 0.07         27 February 2015  Update for amsmath
 %%%
 %%%
 %%%
@@ -608,6 +610,10 @@
 % \clearpage
 % \section{The Macros}
 %
+%    \begin{macrocode}
+\ProvidesPackage{blkarray}[2015/02/27 v0.07 Block array (dpc)]\relax
+%    \end{macrocode}
+%
 % \subsection{Some General Control Macros}
 % The macros in this section do not have the "BA" prefix, but rather the
 % "GC" prefix, other style files can repeat these definitions without
@@ -722,8 +728,9 @@
 \chardef\BA@final@box@shadow=8
 %    \end{macrocode}
 %
+% v0.07 use newbox  not 0 to avoid amsmath.
 %    \begin{macrocode}
-\chardef\BA@first@box=0
+\newbox\BA@first@box
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -789,7 +796,7 @@
 % \end{itemize}
 %
 % The first method has the advantage that the variable is normally
-% accessed within the environment, and the code to restore previos
+% accessed within the environment, and the code to restore previous
 % values is trivial. The main memory usage is in the save-stack, \TeX's
 % normal place for saving local vaues.
 %
@@ -1118,6 +1125,7 @@
   \ifmmode
     \def\BA@bdollar{$}\let\BA@edollar\BA@bdollar
   \else
+    \setbox\z@\hbox{$$}%set up math for NFSS (2014/10/16)
     \def\BA@bdollar{\bgroup}\def\BA@edollar{\egroup}%
     \let\BA@bdollar\bgroup\let\BA@edollar\egroup
   \fi