latex2e 2014/05/01 (via latex-tds)

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

1 files changed, 19 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty
index 611addc07db..95ecd8ae9bf 100644
--- a/Master/texmf-dist/tex/latex/tools/tabularx.sty
+++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty
@@ -8,8 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-%% 2006 2008 2009
+%% Copyright 1993-2014
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -31,10 +30,10 @@
 %% The list of all files belonging to the LaTeX `Tools Bundle' is
 %% given in the file `manifest.txt'.
 %% 
-%% File: tabularx.dtx Copyright (C) 1991-1999 David Carlisle
+%% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 David Carlisle
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tabularx}
-          [1999/01/07 v2.07 `tabularx' package (DPC)]
+          [2014/04/22 v2.09 `tabularx' package (DPC)]
 \DeclareOption{infoshow}{\AtEndOfPackage\tracingtabularx}
 \DeclareOption{debugshow}{\AtEndOfPackage\tracingtabularx}
 \ProcessOptions
@@ -61,8 +60,13 @@
   \ifx\@tempa\TX@\expandafter\TX@endtabularx
   \else\toks@\expandafter
     {\the\toks@\end{#1}}\expandafter\TX@get@body\fi}
+\long\def\TX@find@endtabularxa#1\endtabularx#2\TX@find@endtabularxa{%
+  \toks@\expandafter{\the\toks@#1}}
+\long\def\TX@find@endtabularxb#1\endtabularx#2\TX@find@endtabularxb{#2}
 \def\TX@{tabularx}
 \def\TX@endtabularx{%
+   \expandafter\expandafter\expandafter
+     \TX@find@endtabularxa\csname end\TX@\endcsname\TX@find@endtabularxa
   \expandafter\TX@newcol\expandafter{\tabularxcolumn{\TX@col@width}}%
   \let\verb\TX@verb
   \def\@elt##1{\global\value{##1}\the\value{##1}\relax}%
@@ -86,9 +90,16 @@
     \csname endtabular*\endcsname}%
   \global\TX@ftn\expandafter{\expandafter}\the\TX@ftn
   \ifnum0=`{\fi}%
-  \expandafter\end\expandafter{\TX@}}
+  \expandafter\TX@find@endtabularxb\romannumeral-`X%
+  \expandafter\end\expandafter{\TX@}\TX@find@endtabularxb}
 \def\TX@arith{%
   \TX@false
+  \@tempdimb\maxdimen
+  \divide\@tempdimb\TX@cols
+  \ifdim\TX@col@width>\@tempdimb
+    \TX@typeout@{Don't exceed \maxdimen}%
+    \wd\@tempboxa\maxdimen
+  \fi
   \ifdim\TX@old@table=\wd\@tempboxa
     \TX@col@width\TX@old@col
     \TX@typeout@{Reached minimum width, backing up.}%
@@ -149,7 +160,9 @@
   \ifnum#1<\@m\space\fi
   \ifnum#1<\@M\space\fi
   #1.#2#3#4#5#6#7#8\space\space}
-\def\arraybackslash{\let\\\@arraycr}
+\ifx\arraybackslash\@undefined
+\def\arraybackslash{\let\\\tabularnewline}
+\fi
 \def\tracingtabularx{%
   \def\TX@typeout{\PackageWarningNoLine{tabularx}}%
   \def\TX@typeout@##1{\typeout{(tabularx) ##1}}}