latex2e via latex-tds

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

3 files changed, 27 insertions, 74 deletions

diff --git a/Master/texmf-dist/tex/latex/base/fix-cm.sty b/Master/texmf-dist/tex/latex/base/fix-cm.sty
index 0f002b7149b..b5f3194bfaa 100644
--- a/Master/texmf-dist/tex/latex/base/fix-cm.sty
+++ b/Master/texmf-dist/tex/latex/base/fix-cm.sty
@@ -38,7 +38,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fix-cm}
-          [2014/04/27 v1.1p fixes to LaTeX]
+          [2014/05/13 v1.1q fixes to LaTeX]
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -550,71 +550,6 @@
         <10->   lasyb10
       }{}
 \endgroup
-\def\@xfloat #1[#2]{%
-  \@nodocument
-  \def \@captype {#1}%
-   \def \@fps {#2}%
-   \@onelevel@sanitize \@fps
-   \def \reserved@b {!}%
-   \ifx \reserved@b \@fps
-     \@fpsadddefault
-   \else
-     \ifx \@fps \@empty
-       \@fpsadddefault
-     \fi
-   \fi
-   \ifhmode
-     \@bsphack
-     \@floatpenalty -\@Mii
-   \else
-     \@floatpenalty-\@Miii
-   \fi
-  \ifinner
-     \@parmoderr\@floatpenalty\z@
-  \else
-    \@next\@currbox\@freelist
-      {%
-       \@tempcnta \sixt@@n
-       \expandafter \@tfor \expandafter \reserved@a
-         \expandafter :\expandafter =\@fps
-         \do
-          {%
-           \if \reserved@a h%
-             \ifodd \@tempcnta
-             \else
-               \advance \@tempcnta \@ne
-             \fi
-           \else\if \reserved@a t%
-             \@setfpsbit \tw@
-           \else\if \reserved@a b%
-             \@setfpsbit 4%
-           \else\if \reserved@a p%
-             \@setfpsbit 8%
-           \else\if \reserved@a !%
-             \ifnum \@tempcnta>15
-               \advance\@tempcnta -\sixt@@n\relax
-             \fi
-           \else
-             \@latex@error{Unknown float option `\reserved@a'}%
-             {Option `\reserved@a' ignored and `p' used.}%
-             \@setfpsbit 8%
-           \fi\fi\fi\fi\fi
-           }%
-       \@tempcntb \csname ftype@\@captype \endcsname
-       \multiply \@tempcntb \@xxxii
-       \advance \@tempcnta \@tempcntb
-       \global \count\@currbox \@tempcnta
-       }%
-    \@fltovf
-  \fi
-  \global \setbox\@currbox
-    \color@vbox
-      \normalcolor
-      \vbox \bgroup
-        \hsize\columnwidth
-        \@parboxrestore
-        \@floatboxreset
-}
 \endinput
 %%
 %% End of file `fix-cm.sty'.
diff --git a/Master/texmf-dist/tex/latex/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
index 3792117089b..4ef5e1ea7f9 100644
--- a/Master/texmf-dist/tex/latex/base/fixltx2e.sty
+++ b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
@@ -38,7 +38,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fixltx2e}
-          [2014/04/27 v1.1p fixes to LaTeX]
+          [2014/05/13 v1.1q fixes to LaTeX]
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %%   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
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