latex, fix-cm doc-only (6jul14)

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

5 files changed, 13 insertions, 4 deletions

diff --git a/Master/texmf-dist/doc/latex/base/changes.txt b/Master/texmf-dist/doc/latex/base/changes.txt
index 79bfa351802..2f395cc5866 100644
--- a/Master/texmf-dist/doc/latex/base/changes.txt
+++ b/Master/texmf-dist/doc/latex/base/changes.txt
@@ -4,6 +4,10 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 =======================================================================
 
+2014-06-10  David Carlisle  <latex-bugs@latex-project.org>
+
+	* fixltx2e.dtx: add missing \fi reported by Ulrike Fischer
+
 2014-05-13    <Frank.Mittelbach@latex-project.org>
 
 	* fixltx2e.dtx: missing dostrip guard added to prevent some float
diff --git a/Master/texmf-dist/doc/latex/base/fixltx2e.pdf b/Master/texmf-dist/doc/latex/base/fixltx2e.pdf
index 20233043312..cad63280456 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/source/latex/base/fixltx2e.dtx b/Master/texmf-dist/source/latex/base/fixltx2e.dtx
index 1d2c30f70ac..b6ed3420cb3 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/05/13 v1.1q fixes to LaTeX]
+          [2014/06/10 v1.1r fixes to LaTeX]
 %
 % \iffalse
 %<*driver>
@@ -54,7 +54,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1213}
+% \CheckSum{1214}
 %
 %% \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
@@ -891,6 +891,10 @@
       \else
         \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack
       \fi
+%    \end{macrocode}
+% \changes{v1.1r}{2014/06/10}{missing \cs{fi} added}
+%    \begin{macrocode}
+    \fi
   \else
     \end@float
   \fi
diff --git a/Master/texmf-dist/tex/latex/base/fix-cm.sty b/Master/texmf-dist/tex/latex/base/fix-cm.sty
index b5f3194bfaa..f6d5f14b304 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/05/13 v1.1q fixes to LaTeX]
+          [2014/06/10 v1.1r 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/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
index 4ef5e1ea7f9..6d7cd859cee 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/05/13 v1.1q fixes to LaTeX]
+          [2014/06/10 v1.1r 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
@@ -108,6 +108,7 @@
       \else
         \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack
       \fi
+    \fi
   \else
     \end@float
   \fi