cals (20jan17)

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

6 files changed, 42 insertions, 9 deletions

diff --git a/Master/texmf-dist/doc/latex/cals/README b/Master/texmf-dist/doc/latex/cals/README
index c5dc5225ce4..c4815a397c4 100644
--- a/Master/texmf-dist/doc/latex/cals/README
+++ b/Master/texmf-dist/doc/latex/cals/README
@@ -4,7 +4,7 @@ The "cals" package is a set of macros to typeset multipage tables
 with repeatable headers and footers, with cells spanned over
 rows and columns. Decorations are supported: padding, background
 color, width of separation rules. The code is compatible with
-multicols and bidi.
+multicol and bidi.
 
 The work is released to public (LaTeX license, see below)
 by bitplant.de GmbH, a company which provides technical
@@ -36,7 +36,7 @@ test/
   Unit tests. See "README" inside.
 
 
-Copyright (C) 2010+ by Oleg Parashchenko <olpa uucode com>
+Copyright (C) 2010 by Oleg Parashchenko <olpa uucode com>
 
 Files from this pacjage may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.chk b/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.chk
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.chk
diff --git a/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex b/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex
new file mode 100644
index 00000000000..e786e264dbd
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex
@@ -0,0 +1,32 @@
+% Allow table in colspan
+% No warnings are expected:
+%  You can't use `\\prevdepth' in horizontal mode.
+%  Missing $ inserted.
+%  etc.
+
+\par
+\begin{calstable}
+\colwidths{{1in}{1in}{1in}{1in}}
+\brow
+\cell{normal}
+\tracingall
+
+\nullcell{ltb}
+\nullcell{rtb}
+\spancontent{
+  xxx\par
+
+  \begin{calstable}
+  \colwidths{{1in}}
+  \brow\cell{inner table}\erow
+  \end{calstable}
+}
+\par
+
+\cell{normal}
+%\tracingall
+%\par
+\erow
+\end{calstable}
+
+\end{document}
diff --git a/Master/texmf-dist/source/latex/cals/cals.dtx b/Master/texmf-dist/source/latex/cals/cals.dtx
index 0f746973249..16fc331b4aa 100644
--- a/Master/texmf-dist/source/latex/cals/cals.dtx
+++ b/Master/texmf-dist/source/latex/cals/cals.dtx
@@ -22,7 +22,7 @@
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{cals}
 %<*package>
-    [2016/11/23 CALS tables v.2.4.1]
+    [2016/11/23 CALS tables v.2.4.2]
 %</package>
 %
 %<*driver>
@@ -58,6 +58,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 %
+% \changes{v2.4.2}{2017/01/20}{Bug fixes to allow table inside straddled cell.}
 % \changes{v2.4.1}{2016/11/23}{Bug fixes for row separation lines.}
 % \changes{v2.4}{2014/11/12}{Built-in RTL (right-to-left) support.}
 % \changes{v2.2}{2013/05/27}{Hooks for bidi support.}
@@ -82,7 +83,7 @@
 % with repeatable headers and footers, with cells spanned over
 % rows and columns. Decorations are supported: padding, background
 % color, width of separation rules. The code is compatible with
-% multicols and bidi.
+% multicol and bidi.
 %
 % The work is released to public (\LaTeX{} license)
 % by \url{bitplant.de}~GmbH, a company which provides technical
diff --git a/Master/texmf-dist/source/latex/cals/cell.dtx b/Master/texmf-dist/source/latex/cals/cell.dtx
index 71ddd4177e4..3ced564b6d6 100644
--- a/Master/texmf-dist/source/latex/cals/cell.dtx
+++ b/Master/texmf-dist/source/latex/cals/cell.dtx
@@ -151,11 +151,11 @@
 %    \begin{macrocode}
 \newcommand\spancontent[1]{}
 \def\spancontent{%
-\let\cals@tmp=\cals@celll@end
+\let\cals@tmp@celll=\cals@celll@end
 \let\cals@cell@width=\cals@span@width
 \def\cals@celll@end{%
   \cals@width@cell@put@row%
-  \let\cals@celll@end=\cals@tmp}%
+  \let\cals@celll@end=\cals@tmp@celll}%
 \setbox0=\cals@cell{\cals@span@width}{\cals@span@height}%
 }%{Implicit content}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/cals/cals.sty b/Master/texmf-dist/tex/latex/cals/cals.sty
index 2931cc48d13..44eadad8ce1 100644
--- a/Master/texmf-dist/tex/latex/cals/cals.sty
+++ b/Master/texmf-dist/tex/latex/cals/cals.sty
@@ -30,7 +30,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{cals}
-    [2016/11/23 CALS tables v.2.4.1]
+    [2016/11/23 CALS tables v.2.4.2]
 
 
 
@@ -75,11 +75,11 @@
 
 \newcommand\spancontent[1]{}
 \def\spancontent{%
-\let\cals@tmp=\cals@celll@end
+\let\cals@tmp@celll=\cals@celll@end
 \let\cals@cell@width=\cals@span@width
 \def\cals@celll@end{%
   \cals@width@cell@put@row%
-  \let\cals@celll@end=\cals@tmp}%
+  \let\cals@celll@end=\cals@tmp@celll}%
 \setbox0=\cals@cell{\cals@span@width}{\cals@span@height}%
 }%{Implicit content}