1 files changed, 94 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/base/fixltx2e.sty b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
index 51cab5085c9..09aa9ce1083 100644
--- a/Master/texmf-dist/tex/latex/base/fixltx2e.sty
+++ b/Master/texmf-dist/tex/latex/base/fixltx2e.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -16,12 +16,12 @@
 %% --------------------------------------------------------------
 %% 
 %% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% conditions of the LaTeX Project Public License, either version 1.3c
 %% of this license or (at your option) any later version.
 %% The latest version of this license is in
 %%    http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
 %% 
 %% This file has the LPPL maintenance status "maintained".
 %% 
@@ -38,7 +38,7 @@
 %% extension .ins) which are part of the distribution.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{fixltx2e}
-          [2004/02/13 v1.1h fixes to LaTeX]
+          [2006/03/24 v1.1n 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
@@ -355,32 +355,49 @@
           \penalty#1\relax
         \else
           \@tempskipb\lastskip
-          \advance \@tempskipb
-               \ifdim\prevdepth>\maxdepth\maxdepth\else
+          \begingroup
+            \advance \@tempskipb
+              \ifdim\prevdepth>\maxdepth\maxdepth\else
                  \ifdim \prevdepth = -\@m\p@ \z@ \else \prevdepth \fi
                \fi
+             \vskip -\@tempskipb
+             \penalty#1%
+             \vskip\@tempskipb
+          \endgroup
           \vskip -\@tempskipb
-          \penalty#1%
-          \vskip\@tempskipb
+          \vskip \@tempskipb
         \fi
       \fi
     \fi
   \else
     \@noitemerr
   \fi}
-\DeclareRobustCommand{\@fnsymbol}[1]{%
-  \ifmmode
-     \ifcase#1\or *\or\dagger\or \ddagger\or
-     \mathsection\or \mathparagraph\or \|\or **\or
-     \dagger\dagger
-      \or \ddagger\ddagger \else\@ctrerr\fi
-  \else
-     \ifcase#1\or \textasteriskcentered\or \textdagger\or
-     \textdaggerdbl\or \textsection\or \textparagraph\or
-     \textbardbl\or \textasteriskcentered\textasteriskcentered\or
-     \textdagger\textdagger\or \textdaggerdbl\textdaggerdbl
-     \else\@ctrerr\fi
-  \fi}
+\def\@fnsymbol#1{%
+   \ifcase#1\or \TextOrMath\textasteriskcentered *\or
+   \TextOrMath \textdagger \dagger\or
+   \TextOrMath \textdaggerdbl \ddagger \or
+   \TextOrMath \textsection  \mathsection\or
+   \TextOrMath \textparagraph \mathparagraph\or
+   \TextOrMath \textbardbl \|\or
+   \TextOrMath {\textasteriskcentered\textasteriskcentered}{**}\or
+   \TextOrMath {\textdagger\textdagger}{\dagger\dagger}\or
+   \TextOrMath {\textdaggerdbl\textdaggerdbl}{\ddagger\ddagger}\else
+   \@ctrerr \fi
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname eTeXversion\endcsname\relax
+\DeclareRobustCommand\TextOrMath{%
+  \ifmmode  \expandafter\@secondoftwo
+  \else     \expandafter\@firstoftwo  \fi}
+\protected@edef\TextOrMath#1#2{\TextOrMath{#1}{#2}}
+\else
+\protected\expandafter\def\csname TextOrMath\space\endcsname{%
+  \ifmmode  \expandafter\@secondoftwo
+  \else     \expandafter\@firstoftwo  \fi}
+\edef\TextOrMath#1#2{%
+  \expandafter\noexpand\csname TextOrMath\space\endcsname
+  {#1}{#2}}
+\fi
 \def\@esphack{%
   \relax
   \ifhmode
@@ -404,6 +421,61 @@
         {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
                        \eminnershape \else \itshape \fi}
 \def\eminnershape{\upshape}
+\DeclareRobustCommand*\textsubscript[1]{%
+  \@textsubscript{\selectfont#1}}
+\def\@textsubscript#1{%
+  {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}}
+\def\@DeclareMathSizes #1#2#3#4#5{%
+  \@defaultunits\dimen@ #2pt\relax\@nnil
+  \if $#3$%
+    \expandafter\let\csname S@\strip@pt\dimen@\endcsname\math@fontsfalse
+  \else
+    \@defaultunits\dimen@ii #3pt\relax\@nnil
+    \@defaultunits\@tempdima #4pt\relax\@nnil
+    \@defaultunits\@tempdimb #5pt\relax\@nnil
+    \toks@{#1}%
+    \expandafter\xdef\csname S@\strip@pt\dimen@\endcsname{%
+      \gdef\noexpand\tf@size{\strip@pt\dimen@ii}%
+      \gdef\noexpand\sf@size{\strip@pt\@tempdima}%
+      \gdef\noexpand\ssf@size{\strip@pt\@tempdimb}%
+      \the\toks@
+    }%
+  \fi
+}
+\providecommand*\MakeRobust[1]{%
+  \@ifundefined{\expandafter\@gobble\string#1}{%
+    \@latex@error{The control sequence `\string#1' is undefined!%
+      \MessageBreak There is nothing here to make robust}%
+    \@eha
+  }%
+  {%
+    \@ifundefined{\expandafter\@gobble\string#1\space}%
+    {%
+      \expandafter\let\csname
+      \expandafter\@gobble\string#1\space\endcsname=#1%
+      \edef\reserved@a{\string#1}%
+      \def\reserved@b{#1}%
+      \edef\reserved@b{\expandafter\strip@prefix\meaning\reserved@b}%
+      \edef#1{%
+        \ifx\reserved@a\reserved@b
+          \noexpand\x@protect\noexpand#1%
+        \fi
+        \noexpand\protect\expandafter\noexpand
+        \csname\expandafter\@gobble\string#1\space\endcsname}%
+    }%
+    {\@latex@info{The control sequence `\string#1' is already robust}}%
+   }%
+}
+\MakeRobust\(
+\MakeRobust\)
+\MakeRobust\[
+\MakeRobust\]
+\MakeRobust\makebox
+\MakeRobust\savebox
+\MakeRobust\framebox
+\MakeRobust\parbox
+\MakeRobust\rule
+\MakeRobust\raisebox
 \endinput
 %%
 %% End of file `fixltx2e.sty'.