texlive[43003] Master/texmf-dist: cals (20jan17)

[commits+karl at tug.org]

Revision: 43003
          http://tug.org/svn/texlive?view=revision&revision=43003
Author:   karl
Date:     2017-01-21 02:59:18 +0100 (Sat, 21 Jan 2017)
Log Message:
-----------
cals (20jan17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/cals/README
    trunk/Master/texmf-dist/source/latex/cals/cals.dtx
    trunk/Master/texmf-dist/source/latex/cals/cell.dtx
    trunk/Master/texmf-dist/tex/latex/cals/cals.sty

Added Paths:
-----------
    trunk/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.chk
    trunk/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex

Modified: trunk/Master/texmf-dist/doc/latex/cals/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cals/README	2017-01-21 01:59:03 UTC (rev 43002)
+++ trunk/Master/texmf-dist/doc/latex/cals/README	2017-01-21 01:59:18 UTC (rev 43003)
@@ -4,7 +4,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, see below)
 by bitplant.de GmbH, a company which provides technical
@@ -36,7 +36,7 @@
   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

Added: trunk/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.chk
===================================================================
Added: trunk/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex	                        (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/cals/test/regression/test_085_allow_table_in_colspan.tex	2017-01-21 01:59:18 UTC (rev 43003)
@@ -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}

Modified: trunk/Master/texmf-dist/source/latex/cals/cals.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/cals/cals.dtx	2017-01-21 01:59:03 UTC (rev 43002)
+++ trunk/Master/texmf-dist/source/latex/cals/cals.dtx	2017-01-21 01:59:18 UTC (rev 43003)
@@ -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

Modified: trunk/Master/texmf-dist/source/latex/cals/cell.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/cals/cell.dtx	2017-01-21 01:59:03 UTC (rev 43002)
+++ trunk/Master/texmf-dist/source/latex/cals/cell.dtx	2017-01-21 01:59:18 UTC (rev 43003)
@@ -151,11 +151,11 @@
 %    \begin{macrocode}
 \newcommand\spancontent[1]{}
 \def\spancontent{%
-\let\cals at tmp=\cals at celll@end
+\let\cals at tmp@celll=\cals at celll@end
 \let\cals at cell@width=\cals at span@width
 \def\cals at celll@end{%
   \cals at width@cell at put@row%
-  \let\cals at celll@end=\cals at tmp}%
+  \let\cals at celll@end=\cals at tmp@celll}%
 \setbox0=\cals at cell{\cals at span@width}{\cals at span@height}%
 }%{Implicit content}
 %    \end{macrocode}

Modified: trunk/Master/texmf-dist/tex/latex/cals/cals.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/cals/cals.sty	2017-01-21 01:59:03 UTC (rev 43002)
+++ trunk/Master/texmf-dist/tex/latex/cals/cals.sty	2017-01-21 01:59:18 UTC (rev 43003)
@@ -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 at tmp=\cals at celll@end
+\let\cals at tmp@celll=\cals at celll@end
 \let\cals at cell@width=\cals at span@width
 \def\cals at celll@end{%
   \cals at width@cell at put@row%
-  \let\cals at celll@end=\cals at tmp}%
+  \let\cals at celll@end=\cals at tmp@celll}%
 \setbox0=\cals at cell{\cals at span@width}{\cals at span@height}%
 }%{Implicit content}