latex2e via latex-tds

git-svn-id: svn://tug.org/texlive/trunk@34051 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2014-05-15 23:36:18 +0000
committer: Karl Berry <karl@freefriends.org> 2014-05-15 23:36:18 +0000
commit: dca48e0463c30cae993fc56bc2a7a85c8a5a24e4 (patch)
tree: b530e516285e18718a1b204d1cf5789849dfd22c /Master
parent: b755e65140bb4bc3a407bf1b0aea9dd78d846c8e (diff)
18 files changed, 225 insertions, 128 deletions
diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt
index f5d1ddc2bb3..79bfa351802 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -3,6 +3,12 @@ It is provided for convenience only.  It therefore makes no claims to
 completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
+
+2014-05-13    <Frank.Mittelbach@latex-project.org>
+
+	* fixltx2e.dtx: missing dostrip guard added to prevent some float
+	code ending up in fix-cm
+
 2014-04-30    David Carlisle <latex-bugs@latex-project.org>
 
 	* inputenc.dtx: Allow (x-)ascii and utf8x aliases for utf8 in xetex/luatex
diff --git a/Master/texmf-dist/doc/latex/base/fixltx2e.pdf b/Master/texmf-dist/doc/latex/base/fixltx2e.pdf
index efbddc8ef41..20233043312 100644
--- a/Master/texmf-dist/doc/latex/base/fixltx2e.pdf
+++ b/Master/texmf-dist/doc/latex/base/fixltx2e.pdf
diff --git a/Master/texmf-dist/doc/latex/latex-tds/README b/Master/texmf-dist/doc/latex/latex-tds/README
index b7ca0bffd83..3926c6dc359 100644
--- a/Master/texmf-dist/doc/latex/latex-tds/README
+++ b/Master/texmf-dist/doc/latex/latex-tds/README
@@ -3,7 +3,7 @@ README for project latex-tds
 ============================
 
 Heiko Oberdiek
-2014/05/08
+2014/05/15
 
 
 Table of Contents
@@ -46,7 +46,7 @@ navigation support using bookmarks and links).
 
 Version:
 
-    2014/05/08
+    2014/05/15
 
 Author:
 
@@ -889,5 +889,17 @@ wants to build the modules himself:
 
       □ ZIP file for CTAN upload with top level directory latex-tds.
 
+2014/05/10
+      □ Module cyrillic: Missing 00readme.txt added.
+
+2014/05/15
+      □ Module base: fix-cm updated (2014/05/13 v1.1q).
+
+      □ Module tools: tabularx updated (2014/05/13 v2.10).
+
+      □ Module tools: readme.txt renamed to 00readme.txt+.
+
+      □ Module knuth: .web files are put below TDS:web/knuth//.
+
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-Last updated 2014-05-09 00:28:37 CEST
+Last updated 2014-05-15 12:50:26 CEST
diff --git a/Master/texmf-dist/doc/latex/latex-tds/README.html b/Master/texmf-dist/doc/latex/latex-tds/README.html
index 69ed41d8c82..6a5f88caae6 100644
--- a/Master/texmf-dist/doc/latex/latex-tds/README.html
+++ b/Master/texmf-dist/doc/latex/latex-tds/README.html
@@ -730,13 +730,13 @@ asciidoc.install(2);
 /*]]>*/
 </script>
 <meta name="author" content="Heiko Oberdiek" />
-<meta name="date" content="2014-05-09" />
+<meta name="date" content="2014-05-15" />
 </head>
 <body class="article">
 <div id="header">
 <h1>README for project latex-tds</h1>
 <span id="author">Heiko Oberdiek</span><br />
-<span id="revdate">2014/05/08</span>
+<span id="revdate">2014/05/15</span>
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
@@ -758,7 +758,7 @@ Version:
 </dt>
 <dd>
 <p>
-  2014/05/08
+  2014/05/15
 </p>
 </dd>
 <dt class="hdlist1">
@@ -2715,6 +2715,45 @@ ZIP file for CTAN upload with top level directory <code>latex-tds</code>.
 </li>
 </ul></div>
 </dd>
+<dt class="hdlist1">
+2014/05/10
+</dt>
+<dd>
+<div class="ulist"><ul>
+<li>
+<p>
+Module cyrillic: Missing <code>00readme.txt</code> added.
+</p>
+</li>
+</ul></div>
+</dd>
+<dt class="hdlist1">
+2014/05/15
+</dt>
+<dd>
+<div class="ulist"><ul>
+<li>
+<p>
+Module base: <code>fix-cm</code> updated (2014/05/13 v1.1q).
+</p>
+</li>
+<li>
+<p>
+Module tools: <code>tabularx</code> updated (2014/05/13 v2.10).
+</p>
+</li>
+<li>
+<p>
+Module tools: <code>readme.txt</code> renamed to <code>00readme.txt</code>+.
+</p>
+</li>
+<li>
+<p>
+Module knuth: <code>.web</code> files are put below <code>TDS:web/knuth//</code>.
+</p>
+</li>
+</ul></div>
+</dd>
 </dl></div>
 </div>
 </div>
@@ -2722,7 +2761,7 @@ ZIP file for CTAN upload with top level directory <code>latex-tds</code>.
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-05-09 00:28:37 CEST
+Last updated 2014-05-15 12:50:26 CEST
 </div>
 </div>
 </body>
diff --git a/Master/texmf-dist/doc/latex/latex-tds/README.pdf b/Master/texmf-dist/doc/latex/latex-tds/README.pdf
index 93258ea1cf3..8bed9e0dc1e 100644
--- a/Master/texmf-dist/doc/latex/latex-tds/README.pdf
+++ b/Master/texmf-dist/doc/latex/latex-tds/README.pdf
diff --git a/Master/texmf-dist/doc/latex/tools/readme.txt b/Master/texmf-dist/doc/latex/tools/00readme.txt
index 791bf798154..791bf798154 100644
--- a/Master/texmf-dist/doc/latex/tools/readme.txt
+++ b/Master/texmf-dist/doc/latex/tools/00readme.txt
diff --git a/Master/texmf-dist/doc/latex/tools/changes.txt b/Master/texmf-dist/doc/latex/tools/changes.txt
index de820ffcabb..be2740ff79f 100644
--- a/Master/texmf-dist/doc/latex/tools/changes.txt
+++ b/Master/texmf-dist/doc/latex/tools/changes.txt
@@ -5,6 +5,15 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2014-05-14  David Carlisle  <latex-bugs@latex-project.org>
+
+	* readme.txt: rename to 00readme.txt.
+
+2014-05-13  David Carlisle  <latex-bugs@latex-project.org>
+
+	* tabularx.dtx: If \endtabularx not found, act as if it was at the start of
+	the end code.
+
 2014-04-24    David Carlisle  <david.carlisle@latex-project.org>
 
 	* showkeys.dtx: modify \cite redefinition so {} in the optional argument
diff --git a/Master/texmf-dist/doc/latex/tools/tabularx.pdf b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
index 69a0c58d5c7..d121bb7e069 100644
--- a/Master/texmf-dist/doc/latex/tools/tabularx.pdf
+++ b/Master/texmf-dist/doc/latex/tools/tabularx.pdf
diff --git a/Master/texmf-dist/source/latex/base/fixltx2e.dtx b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
index c67813a566a..1d2c30f70ac 100644
--- a/Master/texmf-dist/source/latex/base/fixltx2e.dtx
+++ b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
@@ -38,7 +38,7 @@
 %<driver>\ProvidesFile{fixltx2e.drv}
 % \fi
 %         \ProvidesFile{fixltx2e.dtx}
-          [2014/04/27 v1.1p fixes to LaTeX]
+          [2014/05/13 v1.1q fixes to LaTeX]
 %
 % \iffalse
 %<*driver>
@@ -2161,7 +2161,12 @@
 % |\clearpage|). This change gives an error message for undefined
 % options.
 %
+%    \begin{macrocode}
+%<*fixltx2e>
+%    \end{macrocode}
+%
 % \changes{v1.1n}{2013/12/13}{Check float optional argument.}
+% \changes{v1.1q}{2014/05/13}{Fix DocStrip guards.}
 %    \begin{macrocode}
 \def\@xfloat #1[#2]{%
   \@nodocument
@@ -2235,6 +2240,10 @@
         \@floatboxreset
 }
 %    \end{macrocode}
+%
+%    \begin{macrocode}
+%</fixltx2e>
+%    \end{macrocode}
 % \Finale
 %
 \endinput
diff --git a/Master/texmf-dist/source/latex/base/ltnews21.pdf b/Master/texmf-dist/source/latex/base/ltnews21.pdf
deleted file mode 100644
index bee4e272153..00000000000
--- a/Master/texmf-dist/source/latex/base/ltnews21.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/source/latex/base/ltnews21.tex b/Master/texmf-dist/source/latex/base/ltnews21.tex
index 89aa353db84..635aa890d55 100644
--- a/Master/texmf-dist/source/latex/base/ltnews21.tex
+++ b/Master/texmf-dist/source/latex/base/ltnews21.tex
@@ -66,9 +66,8 @@ here). In addition several packages in the \textsf{base} and
 \textsf{required} areas have been updated as detailed below.
 
 
-This has been done
-in accordance with the philosophy
-of minimising problems in both forwards and backwards compatibility, so most of
+This has been done in accordance with the philosophy of minimising
+problems in both forwards and backwards compatibility, so most of
 these changes should not be noticed by the regular \LaTeX\ user.
 
 References in the text below of the form ``graphics/3873'' are to
@@ -82,14 +81,13 @@ at:\\ \url{http://latex-project.org/cgi-bin/ltxbugs2html}
 
 
 
-There are a number of bugs and faulty design decisions in
-\LaTeXe{} that should have been corrected long ago in the kernel code.
-However, such corrections cannot be done
-as this would break
-backwards compatibility in the following sense. A large number of
-documents exist by now that have worked around the bug or have even made
-use of a particular misfeature.  Thus changing the kernel code would
-break too many existing documents.
+There are a number of bugs and faulty design decisions in \LaTeXe{}
+that should have been corrected long ago in the kernel code.  However,
+such corrections cannot be done as this would break backwards
+compatibility in the following sense. A large number of documents
+exist by now that have worked around the bug or have even made use of
+a particular misfeature.  Thus changing the kernel code would break
+too many existing documents.
 
 The corrections for these types of bug have therefore been collected together
 in a package that can be loaded only when needed; its name is \textsf{fixltx2e}.
@@ -105,7 +103,7 @@ For this release we made the following changes to this package:
    single and double-column floats (as they are placed independently
    of each other). This was corrected in \textsf{fixltx2e} a few years ago
    but the fix was not perfect as one situation using
-   \verb=\enlargethispage= generated low-level \TeX{} error.
+   \verb=\enlargethispage= generated a low-level \TeX{} error.
    This behaviour of the package is now improved.
 \end{itemize}
 
@@ -115,7 +113,7 @@ For this release we made the following changes to this package:
 \paragraph{New \textsf{fltrace} package}
 
 For years the file \texttt{ltoutput.dtx} contained some hidden code to
-trace the detailed behavior of the float placement algorithm of
+trace the detailed behaviour of the float placement algorithm of
 \LaTeX. Prompted by questions on StackExchange we now extract this
 code into a new \textsf{fltrace} package. To see the float algorithm
 in action (or to understand why it decides to place all your floats at
@@ -140,13 +138,16 @@ using the Unicode-based TeX engines \hologo{LuaTeX} and \hologo{XeTeX}
 producing strange errors as these engines natively deal with UTF-8
 characters.
 
-If a document stored in an 8bit encoding is processed by \hologo{pdfTeX}, it needs the \textsf{inputenc} package to work correctly. However, if such a document is processed unchanged by \hologo{LuaTeX} or \hologo{XeTeX}, then accented characters may silently get dropped from the output.
+If a document stored in an 8bit encoding is processed by
+\hologo{pdfTeX}, it needs the \textsf{inputenc} package to work
+correctly. However, if such a document is processed unchanged by
+\hologo{LuaTeX} or \hologo{XeTeX}, then accented characters may
+silently get dropped from the output.
 
-The package has been modified so that if used with \hologo{LuaTeX}
-or \hologo{XeTeX}, then it just issues a warning if \texttt{utf8}
-or \texttt{ascii}
-is specified,
-and stops with an error for any other encoding requested.
+The package has been modified so that if used with \hologo{LuaTeX} or
+\hologo{XeTeX}, then it just issues a warning if \texttt{utf8} or
+\texttt{ascii} is specified, and stops with an error for any other
+encoding requested.
 
 
 
@@ -222,10 +223,10 @@ to the \textsf{graphics} version some years ago. See graphics/4296.
 \paragraph{\textsf{keyval} updates}
 
 All parsing used in the \textsf{keyval} package has been changed
-to allow \verb|\par| (and blank lines) in values. Also only
-one rather than two levels of brace groups are now stripped from the
-value in a construct such as \verb|key={{{value}}}|. See
-graphics/3446.
+to allow \verb|\par| (and blank lines) in values.
+(A second change, to parsing of brace groups
+in a construct such as \texttt{key=\{\{\{value\}\}\}}, was reverted in v1.15.)
+See graphics/3446.
 
 
 
@@ -239,7 +240,7 @@ implements a new programming language that has for a while now been
 used by some writers of \LaTeXe\ packages.  This code has recently
 also been made available for use on top of plain \TeX\ or {Context},
 largely to support generic packages that are supposed to work with
-different flavors of \TeX.  These uses in no way affect authors of
+different flavours of \TeX.  These uses in no way affect authors of
 \LaTeX\ documents and such \LaTeXe\ packages will continue to work as
 advertised by their authors with standard \LaTeX.
 
diff --git a/Master/texmf-dist/source/latex/base/manual.err b/Master/texmf-dist/source/latex/base/manual.err
index 084ae599f2d..b06bba047a4 100644
--- a/Master/texmf-dist/source/latex/base/manual.err
+++ b/Master/texmf-dist/source/latex/base/manual.err
@@ -19,13 +19,13 @@
 \def\ypmd{%                                                       %
 %                                                                 %
 %                                                                 %
-  Last modified on Mon 22 Aug 2005 at  1:21:28 UT by lamport        %
+  Last modified on Wed 18 Jan 2006 at 13:17:43 PST by lamport      %
   endypmd}                                                        %
 %                                                                 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \newcommand{\moddate}{\expandafter\xpmd\ypmd}                     %
 \def\xpmd Last modified                                           %
-on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#3 #2 #8}                %
+on #1 #2 #3 #4 at #5:#6:#7 #8 by #9 endypmd{#2 #3 #4}                %
 \newcommand{\prdate}{\noindent\fbox{\Large\moddate}}              %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -335,7 +335,7 @@ at which point all unprocessed figures and tables are allowed a
 \end{quote}
 \reportedby{Paul Stanford}{9 Oct 2004}
 
-\subsection*{Errors in All Printings}
+\subsection*{Error Corrected in the Twenty-Second Printing}
 
 \erratum{page 253, column 2, lines $-5$ and $-6$}
 
diff --git a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
index 968481f9067..c752b274ba8 100644
--- a/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
+++ b/Master/texmf-dist/source/latex/latex-tds/README.asciidoc
@@ -1,7 +1,7 @@
 README for project latex-tds
 ============================
 :author:        Heiko Oberdiek
-:revdate:       2014/05/08
+:revdate:       2014/05/15
 :lang:          en
 :toc:
 :numbered:
@@ -678,3 +678,10 @@ History
   * Update of base and graphics.
   * +README.html+ with Unix line ends.
   * ZIP file for CTAN upload with top level directory +latex-tds+.
+2014/05/10::
+  * Module cyrillic: Missing ++00readme.txt++ added.
+2014/05/15::
+  * Module base: +fix-cm+ updated (2014/05/13 v1.1q).
+  * Module tools: +tabularx+ updated (2014/05/13 v2.10).
+  * Module tools: +readme.txt+ renamed to +00readme.txt++.
+  * Module knuth: +.web+ files are put below +TDS:web/knuth//+.
diff --git a/Master/texmf-dist/source/latex/latex-tds/build.pl b/Master/texmf-dist/source/latex/latex-tds/build.pl
index d1dbf8fe08e..b75bcea778b 100755
--- a/Master/texmf-dist/source/latex/latex-tds/build.pl
+++ b/Master/texmf-dist/source/latex/latex-tds/build.pl
@@ -4,8 +4,8 @@ $^W=1;
 
 my $prj     = 'latex-tds';
 my $file    = 'build.pl';
-my $version = '1.185';
-my $date    = '2014-05-08';
+my $version = '1.188';
+my $date    = '2014-05-15';
 my $author  = 'Heiko Oberdiek';
 my $copyright = "Copyright 2006-2014 $author";
 chomp(my $license = <<"END_LICENSE");
@@ -586,6 +586,15 @@ section('Install source');
         install "texmf/source/$dir", @list;
         cd $cwd;
     }
+    sub install_web_knuth ($@) {
+        my $pkg = 'knuth';
+        my $dir = shift;
+        my @list = @_;
+        $modules{$pkg} or return 1;
+        cd "$dir_build/$pkg";
+        install "texmf/web/$pkg/$dir", @list;
+        cd $cwd;
+    }
     sub install_source ($@) {
         my $pkg = shift;
         my @list = @_;
@@ -629,30 +638,34 @@ section('Install source');
         tds.sed
         tds.tex
     ]);
-    install_generic_source('knuth', 'knuth/texware', qw[
+    install_web_knuth('texware', qw[
         dvitype.web
         pltotf.web
         pooltype.web
         tftopl.web
     ]);
-    install_generic_source('knuth', 'knuth/mfware', qw[
+    install_web_knuth('mfware', qw[
         gftodvi.web
         gftype.web
         gftopk.web
         mft.web
     ]);
-    install_generic_source('knuth', 'knuth/etc', qw[
+    install_web_knuth('etc', qw[
         vptovf.web
         vftovp.web
     ]);
-    install_generic_source('knuth', 'knuth/web', qw[
+    install_web_knuth('web', qw[
         tangle.web
         weave.web
+    ]);
+    install_generic_source('knuth', 'knuth/web', qw[
         webman.tex
     ]);
-    install_generic_source('knuth', 'knuth/tex', qw[
+    install_web_knuth('tex', qw[
         glue.web
         tex.web
+    ]);
+    install_generic_source('knuth', 'knuth/tex', qw[
         trip.fot
         tripin.log
         trip.log
@@ -662,8 +675,10 @@ section('Install source');
         trip.tex
         trip.typ
     ]);
-    install_generic_source('knuth', 'knuth/mf', qw[
+    install_web_knuth('mf', qw[
         mf.web
+    ]);
+    install_generic_source('knuth', 'knuth/mf', qw[
         trap.fot
         trapin.log
         trap.log
@@ -826,8 +841,22 @@ section('TDS cleanup');
 ### Install TDS/tex, TDS/doc files
 section('Install tex doc');
 {
+    sub check_readme ($) {
+        my $module = shift;
+        # my $readme = $module eq 'tools' ? 'readme.txt' : '00readme.txt';
+        my $readme = '00readme.txt'; # since LaTeX revision 307
+        if (-f "README" and not -f $readme) {
+            run("$prg_cp README $readme");
+        }
+        -f $readme or
+                die "!!! Errror($module): Missing readme!\n";
+        -f "readme.txt" and -f "00readme.txt" and
+                die "!!! Error($module): Duplicate readme!\n";
+    }
+
     if ($modules{'base'}) {
         cd "$dir_build/base";
+        check_readme 'base';
         install 'texmf/doc/latex/base', qw[
             00readme.txt
             autoload.txt
@@ -858,16 +887,18 @@ section('Install tex doc');
 
     if ($modules{'tools'}) {
         cd "$dir_build/tools";
+        check_readme 'tools';
         install 'texmf/doc/latex/tools', qw[
             changes.txt
             manifest.txt
-            readme.txt
+            00readme.txt
         ];
         cd $cwd;
     }
 
     if ($modules{'graphics'}) {
         cd "$dir_build/graphics";
+        check_readme 'graphics';
         install('texmf/doc/latex/graphics',
             '*.txt'
         );
@@ -879,6 +910,7 @@ section('Install tex doc');
 
     if ($modules{'cyrillic'}) {
         cd "$dir_build/cyrillic";
+        check_readme 'cyrillic';
         install('texmf/doc/latex/cyrillic',
             '*.txt'
         );
diff --git a/Master/texmf-dist/source/latex/tools/tabularx.dtx b/Master/texmf-dist/source/latex/tools/tabularx.dtx
index 960a8345958..3752a31dd86 100644
--- a/Master/texmf-dist/source/latex/tools/tabularx.dtx
+++ b/Master/texmf-dist/source/latex/tools/tabularx.dtx
@@ -31,7 +31,7 @@
 %<driver> \ProvidesFile{tabularx.drv}
 % \fi
 %         \ProvidesFile{tabularx.dtx}
-          [2014/04/22 v2.09 `tabularx' package (DPC)]
+          [2014/05/13 v2.10 `tabularx' package (DPC)]
 % \iffalse
 %<*driver>
 \documentclass{ltxdoc}
@@ -66,7 +66,7 @@
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 %
-% \CheckSum{500}
+% \CheckSum{527}
 %
 % \GetFileInfo{tabularx.dtx}
 % \title{The \textsf{tabularx} package\thanks{This file
@@ -391,17 +391,40 @@
 %
 % \begin{macro}{\TX@find@endtabularxa}
 % \changes{v2.09}{2014/04/22}{macro added}
+% \changes{v2.10}{2014/05/13}{macro modified to test for missing `\cs{endtabularx}}
 % split up the end code, and extract the part that lives in the table body.
 %    \begin{macrocode}
-\long\def\TX@find@endtabularxa#1\endtabularx#2\TX@find@endtabularxa{%
-  \toks@\expandafter{\the\toks@#1}}
+\long\def\TX@find@endtabularxa
+       #1\endtabularx#2\endtabularx#3\TX@find@endtabularxa{%
+  \ifx\TX@#2\else
+  \toks@\expandafter{\the\toks@#1}%
+  \fi}
 %    \end{macrocode}
 % \end{macro}
-% \begin{macro}{\TX@find@endtabularxa}
+% \begin{macro}{\TX@find@endtabularxb}
 % \changes{v2.09}{2014/04/22}{macro added}
+% \changes{v2.10}{2014/05/13}{macro modified to test for missing \cs{endtabularx}}
 % split up the end code, and extract the part that lives outside the table body.
 %    \begin{macrocode}
-\long\def\TX@find@endtabularxb#1\endtabularx#2\TX@find@endtabularxb{#2}
+\long\def\TX@find@endtabularxb
+       #1\endtabularx#2\endtabularx#3\TX@find@endtabularxb{%
+  \ifx\TX@#2%
+    \expandafter\@firstoftwo
+  \else
+     \expandafter\@secondoftwo
+  \fi
+  {#1}{#2}}
+%    \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\TX@find@endtabularxbb}
+% \changes{v2.10}{2014/05/13}{macro added}
+% Helper to avoid needing 15 consecutive "expandafter"
+%    \begin{macrocode}
+\def\TX@find@endtabularxbb{%
+  \expandafter\expandafter\expandafter
+  \TX@find@endtabularxb
+}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -434,9 +457,11 @@
 \def\TX@endtabularx{%
 %    \end{macrocode}
 % \changes{v2.09}{2014/04/22}{call to \cs{TX@find@endtabularxa} added}
+% \changes{v2.10}{2014/05/13}{macro modified to test for missing \cs{endtabularx}}
 %    \begin{macrocode}
    \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
 %    \end{macrocode}
 % Define the {\ttfamily X} column, with an internal version of the
 % "\newcolumntype" command. The "\expandafter" commands enable
@@ -529,9 +554,13 @@
   \ifnum0=`{\fi}%
 %    \end{macrocode}
 % \changes{v2.09}{2014/04/22}{call to \cs{TX@find@endtabularxb} added}
+% \changes{v2.10}{2014/05/13}{macro modified to test for missing \cs{endtabularx}}
 %    \begin{macrocode}
-  \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
+}
 %    \end{macrocode}
 % \end{macro}
 %
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
author	Karl Berry <karl@freefriends.org>	2014-05-15 23:36:18 +0000
committer	Karl Berry <karl@freefriends.org>	2014-05-15 23:36:18 +0000
commit	dca48e0463c30cae993fc56bc2a7a85c8a5a24e4 (patch)
tree	b530e516285e18718a1b204d1cf5789849dfd22c /Master
parent	b755e65140bb4bc3a407bf1b0aea9dd78d846c8e (diff)