summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/cals
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-21 01:59:18 +0000
committerKarl Berry <karl@freefriends.org>2017-01-21 01:59:18 +0000
commit1f91e5e8095526720dbccd221c96f5ec44ffaa23 (patch)
treebc6134889b1cceb545f7dbb35c26ef0dda803f00 /Master/texmf-dist/source/latex/cals
parentc1cd940d224dfc49f9435216b113d208d0fa363d (diff)
cals (20jan17)
git-svn-id: svn://tug.org/texlive/trunk@43003 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/cals')
-rw-r--r--Master/texmf-dist/source/latex/cals/cals.dtx5
-rw-r--r--Master/texmf-dist/source/latex/cals/cell.dtx4
2 files changed, 5 insertions, 4 deletions
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}