1 files changed, 25 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty
index 95ecd8ae9bf..382a9d7d729 100644
--- a/Master/texmf-dist/tex/latex/tools/tabularx.sty
+++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty
@@ -33,7 +33,7 @@
 %% File: tabularx.dtx Copyright (C) 1991-1999 2012 2014 David Carlisle
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{tabularx}
-          [2014/04/22 v2.09 `tabularx' package (DPC)]
+          [2014/05/13 v2.10 `tabularx' package (DPC)]
 \DeclareOption{infoshow}{\AtEndOfPackage\tracingtabularx}
 \DeclareOption{debugshow}{\AtEndOfPackage\tracingtabularx}
 \ProcessOptions
@@ -60,13 +60,28 @@
   \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}
+\long\def\TX@find@endtabularxa
+       #1\endtabularx#2\endtabularx#3\TX@find@endtabularxa{%
+  \ifx\TX@#2\else
+  \toks@\expandafter{\the\toks@#1}%
+  \fi}
+\long\def\TX@find@endtabularxb
+       #1\endtabularx#2\endtabularx#3\TX@find@endtabularxb{%
+  \ifx\TX@#2%
+    \expandafter\@firstoftwo
+  \else
+     \expandafter\@secondoftwo
+  \fi
+  {#1}{#2}}
+\def\TX@find@endtabularxbb{%
+  \expandafter\expandafter\expandafter
+  \TX@find@endtabularxb
+}
 \def\TX@{tabularx}
 \def\TX@endtabularx{%
    \expandafter\expandafter\expandafter
-     \TX@find@endtabularxa\csname end\TX@\endcsname\TX@find@endtabularxa
+     \TX@find@endtabularxa\csname end\TX@\endcsname
+     \endtabularx\TX@\endtabularx\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}%
@@ -90,8 +105,11 @@
     \csname endtabular*\endcsname}%
   \global\TX@ftn\expandafter{\expandafter}\the\TX@ftn
   \ifnum0=`{\fi}%
-  \expandafter\TX@find@endtabularxb\romannumeral-`X%
-  \expandafter\end\expandafter{\TX@}\TX@find@endtabularxb}
+   \expandafter\expandafter\expandafter
+   \TX@find@endtabularxbb
+    \expandafter\end\expandafter{\TX@}%
+    \endtabularx\TX@\endtabularx\TX@find@endtabularxb
+}
 \def\TX@arith{%
   \TX@false
   \@tempdimb\maxdimen