tools (latex core) update via latex-tds (25sep09)

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

39 files changed, 159 insertions, 74 deletions

diff --git a/Master/texmf-dist/tex/latex/tools/.tex b/Master/texmf-dist/tex/latex/tools/.tex
index f9e67ba76bf..054178befb4 100644
--- a/Master/texmf-dist/tex/latex/tools/.tex
+++ b/Master/texmf-dist/tex/latex/tools/.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/afterpage.sty b/Master/texmf-dist/tex/latex/tools/afterpage.sty
index 9fa2ef2dee2..cfc4bb8d15c 100644
--- a/Master/texmf-dist/tex/latex/tools/afterpage.sty
+++ b/Master/texmf-dist/tex/latex/tools/afterpage.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/array.sty b/Master/texmf-dist/tex/latex/tools/array.sty
index 43d268bc937..583e37ee5f3 100644
--- a/Master/texmf-dist/tex/latex/tools/array.sty
+++ b/Master/texmf-dist/tex/latex/tools/array.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -34,7 +35,7 @@
 %% Copyright (C) 1989-1998 Frank Mittelbach, all rights reserved.
 \NeedsTeXFormat{LaTeX2e}[1995/06/01]
 \ProvidesPackage{array}
-         [2005/08/23 v2.4b Tabular extension package (FMi)]
+         [2008/09/09 v2.4c Tabular extension package (FMi)]
 %% \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/bm.sty b/Master/texmf-dist/tex/latex/tools/bm.sty
index b698e6a1d5f..f5a7ef35304 100644
--- a/Master/texmf-dist/tex/latex/tools/bm.sty
+++ b/Master/texmf-dist/tex/latex/tools/bm.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/calc.sty b/Master/texmf-dist/tex/latex/tools/calc.sty
index cf08c19eb48..050015dfece 100644
--- a/Master/texmf-dist/tex/latex/tools/calc.sty
+++ b/Master/texmf-dist/tex/latex/tools/calc.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -33,7 +34,7 @@
 %% File `calc.dtx'.
 %% Copyright (C) 1992--1995
 %%          Kresten Krab Thorup and Frank Jensen.
-%% Copyright (C) 1997--2005
+%% Copyright (C) 1997--2007
 %%          Kresten Krab Thorup, Frank Jensen and the LaTeX3 Project.
 %%
 %% The original authors (fj@hugin.dk and  krab@daimi.aau.dk) have
@@ -42,7 +43,7 @@
 %% the normal LaTeX bug report address.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{calc}
-          [2005/08/06 v4.2 Infix arithmetic (KKT,FJ)]
+          [2007/08/22 v4.3 Infix arithmetic (KKT,FJ)]
 \def\calc@assign@generic#1#2#3#4{\let\calc@A#1\let\calc@B#2%
     \calc@open(#4!%
     \global\calc@A\calc@B\endgroup#3\calc@B}
@@ -139,7 +140,9 @@
         \ifx#1*\let\calc@next\calc@multiplyx \else
           \ifx#1/\let\calc@next\calc@dividex \else
             \ifx#1)\let\calc@next\calc@close \else
-               \calc@error#1%
+              \ifx#1\relax\let\calc@next\calc@post@scan \else
+                \def\calc@next{\calc@error#1}%
+              \fi
             \fi
           \fi
         \fi
diff --git a/Master/texmf-dist/tex/latex/tools/dcolumn.sty b/Master/texmf-dist/tex/latex/tools/dcolumn.sty
index bac6c735765..bc57bc9888e 100644
--- a/Master/texmf-dist/tex/latex/tools/dcolumn.sty
+++ b/Master/texmf-dist/tex/latex/tools/dcolumn.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/delarray.sty b/Master/texmf-dist/tex/latex/tools/delarray.sty
index 58ab25a8cea..78d5fc82d7e 100644
--- a/Master/texmf-dist/tex/latex/tools/delarray.sty
+++ b/Master/texmf-dist/tex/latex/tools/delarray.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/e.tex b/Master/texmf-dist/tex/latex/tools/e.tex
index 3e87201abb9..9ad4e16ceb0 100644
--- a/Master/texmf-dist/tex/latex/tools/e.tex
+++ b/Master/texmf-dist/tex/latex/tools/e.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/enumerate.sty b/Master/texmf-dist/tex/latex/tools/enumerate.sty
index 3fc9859364d..2dddb1950c6 100644
--- a/Master/texmf-dist/tex/latex/tools/enumerate.sty
+++ b/Master/texmf-dist/tex/latex/tools/enumerate.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
index 7d39bcd7e29..9ba885fa962 100644
--- a/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
+++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
index 5ad1e0bbe5d..48f8cf893b0 100644
--- a/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
+++ b/Master/texmf-dist/tex/latex/tools/fontsmpl.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/ftnright.sty b/Master/texmf-dist/tex/latex/tools/ftnright.sty
index 1d3a884358f..f96de9bd895 100644
--- a/Master/texmf-dist/tex/latex/tools/ftnright.sty
+++ b/Master/texmf-dist/tex/latex/tools/ftnright.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/h.tex b/Master/texmf-dist/tex/latex/tools/h.tex
index c30e9d415aa..c3ef92f861d 100644
--- a/Master/texmf-dist/tex/latex/tools/h.tex
+++ b/Master/texmf-dist/tex/latex/tools/h.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/hhline.sty b/Master/texmf-dist/tex/latex/tools/hhline.sty
index ee0934e144a..f0c506f860f 100644
--- a/Master/texmf-dist/tex/latex/tools/hhline.sty
+++ b/Master/texmf-dist/tex/latex/tools/hhline.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/indentfirst.sty b/Master/texmf-dist/tex/latex/tools/indentfirst.sty
index c2b1e679ce0..e2bec26a6c9 100644
--- a/Master/texmf-dist/tex/latex/tools/indentfirst.sty
+++ b/Master/texmf-dist/tex/latex/tools/indentfirst.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/layout.sty b/Master/texmf-dist/tex/latex/tools/layout.sty
index 9c85bbd289b..1b541056fd1 100644
--- a/Master/texmf-dist/tex/latex/tools/layout.sty
+++ b/Master/texmf-dist/tex/latex/tools/layout.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/longtable.sty b/Master/texmf-dist/tex/latex/tools/longtable.sty
index d3bc4c54952..d0ac964ed92 100644
--- a/Master/texmf-dist/tex/latex/tools/longtable.sty
+++ b/Master/texmf-dist/tex/latex/tools/longtable.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/multicol.sty b/Master/texmf-dist/tex/latex/tools/multicol.sty
index d780d1fd569..a52e88d679b 100644
--- a/Master/texmf-dist/tex/latex/tools/multicol.sty
+++ b/Master/texmf-dist/tex/latex/tools/multicol.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -31,7 +32,7 @@
 %% given in the file `manifest.txt'.
 %% 
 %% Package `multicol' to use with LaTeX2e
-%% Copyright 1989-2005 Frank Mittelbach
+%% Copyright 1989-2007 Frank Mittelbach
 %%
 %%  In addition to the terms of LPPL any distributed version
 %%  (unchanged or modified) of multicol has to keep the statement
@@ -96,8 +97,8 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1997/12/01]
 \ProvidesPackage{multicol}
-          [2006/05/18 v1.6g  multicolumn formatting (FMi)]
-%% \CheckSum{1562}
+          [2008/12/05 v1.6h  multicolumn formatting (FMi)]
+%% \CheckSum{1560}
 %% \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
@@ -391,7 +392,7 @@
        \ifdim\dp\count@>\dimen\tw@
          \global\dimen\tw@\dp\count@ \fi
        \box\count@
-       \hss{\normalcolor\vrule
+       \hss{\columnseprulecolor\vrule
               \@width\columnseprule}\hss}%
      \ifdim\dp\mult@rightbox>\dimen\tw@
        \global\dimen\tw@\dp\mult@rightbox \fi
@@ -405,6 +406,7 @@
       Grid alignment might be broken}%
  \fi
 }
+\def\columnseprulecolor{\normalcolor}
 \def\reinsert@footnotes{\ifvoid\footins\else
          \insert\footins{}\fi}
 \def\multi@column@out{%
@@ -733,11 +735,7 @@
 
 \def\set@floatcmds{%
  \let\@dblfloat\@dbflt
- \def\end@dblfloat{\par
-   \vskip\z@
-   \@minipagefalse
-   \egroup
-   \color@endbox
+ \def\end@dblfloat{\@endfloatbox
    \@largefloatcheck
    \outer@nobreak
    \ifnum\@floatpenalty<\z@
diff --git a/Master/texmf-dist/tex/latex/tools/q.tex b/Master/texmf-dist/tex/latex/tools/q.tex
index 9971742a319..d2d0fdc6e62 100644
--- a/Master/texmf-dist/tex/latex/tools/q.tex
+++ b/Master/texmf-dist/tex/latex/tools/q.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/r.tex b/Master/texmf-dist/tex/latex/tools/r.tex
index f18893b832b..530ec27e534 100644
--- a/Master/texmf-dist/tex/latex/tools/r.tex
+++ b/Master/texmf-dist/tex/latex/tools/r.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/rawfonts.sty b/Master/texmf-dist/tex/latex/tools/rawfonts.sty
index c370c874c1d..b43cd9f30af 100644
--- a/Master/texmf-dist/tex/latex/tools/rawfonts.sty
+++ b/Master/texmf-dist/tex/latex/tools/rawfonts.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/s.tex b/Master/texmf-dist/tex/latex/tools/s.tex
index 04f6224c377..05a80909fb6 100644
--- a/Master/texmf-dist/tex/latex/tools/s.tex
+++ b/Master/texmf-dist/tex/latex/tools/s.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/showkeys.sty b/Master/texmf-dist/tex/latex/tools/showkeys.sty
index 04a6723e820..bed1206b5af 100644
--- a/Master/texmf-dist/tex/latex/tools/showkeys.sty
+++ b/Master/texmf-dist/tex/latex/tools/showkeys.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -31,10 +32,10 @@
 %% given in the file `manifest.txt'.
 %% 
 %% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
-%% File: showkeys.dtx Copyright (C) 2006 David Carlisle, LaTeX3 Project
+%% File: showkeys.dtx Copyright (C) 2006-2007 David Carlisle, LaTeX3 Project
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{showkeys}
-          [2006/01/09 v3.13 Show cite and label keys (DPC)]
+          [2007/08/07 v3.15 Show cite and label keys (DPC, MH)]
 \DeclareOption{notref}{\let\SK@ref\@empty}
 \DeclareOption{notcite}{\let\SK@cite\@empty}
 \let\SK@refcolor\relax
@@ -45,7 +46,9 @@
   \definecolor{labelkey}{gray}{.75}%
   \def\SK@refcolor{\color{refkey}}%
   \def\SK@labelcolor{\color{labelkey}}}}
-\DeclareOption{final}{\endinput}
+\DeclareOption{final}{%
+  \providecommand*\showkeyslabelformat[1]{}%
+  \endinput}
 \DeclareOption{draft}{}
 \ProcessOptions
 \let\SK@label\label
@@ -61,7 +64,7 @@
 \def\@bibitem#1{%
   \SK@bibitem{#1}\SK@\SK@@label{#1}\ignorespaces}
 \def\@lbibitem[#1]#2{%
-  \SK@lbibitem[#1]{#2}\SK@\SK@@label{#2}\ignorespaces}
+  \SK@lbibitem[{#1}]{#2}\SK@\SK@@label{#2}\ignorespaces}
 \def\SK@#1#2{%
   \protected@edef\@tempa{#2}%
   \expandafter#1\meaning\@tempa\SK@}
@@ -85,7 +88,7 @@
         \ifvoid\z@
           \llap{\SK@lab\SK@lab@relax\kern\marginparsep}%
         \else
-          \hbox{\box\z@\kern\marginparsep\SK@labx}%
+          \hbox{\box\z@\rlap{\kern\marginparsep\SK@labx}}%
         \fi
         \vskip\skip@
       \else
@@ -201,7 +204,7 @@
   \@ifpackageloaded{varioref}{%
     \SK@def\@@vpageref#1[#2]#3{{%
       \let\label\SK@label
-      \SK@@@vpageref#1[#2]{#3}}}%
+      \SK@@@vpageref{#1}[{#2}]{#3}}}%
     \def\vr@f#1{%
       \leavevmode\unskip\vref@space
       \ref{#1}%
@@ -215,7 +218,7 @@
   \@ifpackageloaded{varioref}{%
     \SK@def\@@vpageref#1[#2]#3{{%
       \let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
-      \leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref#1[#2]{#3}}}%
+      \leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref{#1}[{#2}]{#3}}}%
     \def\vr@f#1{%
       \leavevmode\unskip\vref@space
       \ref{#1}%
@@ -229,7 +232,7 @@
       \expandafter\let\expandafter
          \SK@HAR@bi\csname\string\harvarditem\endcsname
       \expandafter\def\csname\string\harvarditem\endcsname[#1]#2#3#4{%
-        \SK@HAR@bi[#1]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
+        \SK@HAR@bi[{#1}]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
   \fi}
 \else
 \AtBeginDocument{%
@@ -249,17 +252,17 @@
       \expandafter\let\expandafter
          \SK@HAR@bi\csname\string\harvarditem\endcsname
       \expandafter\def\csname\string\harvarditem\endcsname[#1]#2#3#4{%
-        \SK@HAR@bi[#1]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
+        \SK@HAR@bi[{#1}]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
   \fi}
 \def\SK@citea#1#2{%
   \SK@\SK@@ref{#2}\SK@cite#1{#2}}
 \fi
 \def\SK@@ref#1>#2\SK@{%
-  \leavevmode\vbox to\z@{%
+  {\@inlabelfalse\leavevmode\vbox to\z@{%
     \vss
     \SK@refcolor
     \rlap{\vrule\raise .75em%
-       \hbox{\underbar{\normalfont\footnotesize\ttfamily#2}}}}}
+       \hbox{\underbar{\normalfont\footnotesize\ttfamily#2}}}}}}
 \endinput
 %%
 %% End of file `showkeys.sty'.
diff --git a/Master/texmf-dist/tex/latex/tools/somedefs.sty b/Master/texmf-dist/tex/latex/tools/somedefs.sty
index 2f2b552bc3e..66af3d1b942 100644
--- a/Master/texmf-dist/tex/latex/tools/somedefs.sty
+++ b/Master/texmf-dist/tex/latex/tools/somedefs.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/tabularx.sty b/Master/texmf-dist/tex/latex/tools/tabularx.sty
index b309bc4fdb7..611addc07db 100644
--- a/Master/texmf-dist/tex/latex/tools/tabularx.sty
+++ b/Master/texmf-dist/tex/latex/tools/tabularx.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thb.sty b/Master/texmf-dist/tex/latex/tools/thb.sty
index 77c17fc14f9..78eea384212 100644
--- a/Master/texmf-dist/tex/latex/tools/thb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thb.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thc.sty b/Master/texmf-dist/tex/latex/tools/thc.sty
index a15cc57274b..8a2726055c3 100644
--- a/Master/texmf-dist/tex/latex/tools/thc.sty
+++ b/Master/texmf-dist/tex/latex/tools/thc.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thcb.sty b/Master/texmf-dist/tex/latex/tools/thcb.sty
index 25730a131bf..0d91ac94c6a 100644
--- a/Master/texmf-dist/tex/latex/tools/thcb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thcb.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/theorem.sty b/Master/texmf-dist/tex/latex/tools/theorem.sty
index f83e3f06e40..23898e71e58 100644
--- a/Master/texmf-dist/tex/latex/tools/theorem.sty
+++ b/Master/texmf-dist/tex/latex/tools/theorem.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thm.sty b/Master/texmf-dist/tex/latex/tools/thm.sty
index 90cf6267a3e..94e6934a9b0 100644
--- a/Master/texmf-dist/tex/latex/tools/thm.sty
+++ b/Master/texmf-dist/tex/latex/tools/thm.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thmb.sty b/Master/texmf-dist/tex/latex/tools/thmb.sty
index ab2476a97fc..5562d945ce4 100644
--- a/Master/texmf-dist/tex/latex/tools/thmb.sty
+++ b/Master/texmf-dist/tex/latex/tools/thmb.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/thp.sty b/Master/texmf-dist/tex/latex/tools/thp.sty
index 689cc561953..354d949f52b 100644
--- a/Master/texmf-dist/tex/latex/tools/thp.sty
+++ b/Master/texmf-dist/tex/latex/tools/thp.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/trace.sty b/Master/texmf-dist/tex/latex/tools/trace.sty
index 2f31a8df31f..3db9b0c59a5 100644
--- a/Master/texmf-dist/tex/latex/tools/trace.sty
+++ b/Master/texmf-dist/tex/latex/tools/trace.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -31,7 +32,7 @@
 %% given in the file `manifest.txt'.
 %% 
 %%
-%% $Id: trace.dtx,v 3.2 2003/06/29 14:44:49 mittelba Exp $
+%% $Id: trace.dtx 5291 2003-06-29 14:44:49Z mittelba $
 %%
 %% (C) Copyright 1999-2001 Frank Mittelbach
 %% All rights reserved.
diff --git a/Master/texmf-dist/tex/latex/tools/varioref.sty b/Master/texmf-dist/tex/latex/tools/varioref.sty
index d9ee0320799..824d01f2574 100644
--- a/Master/texmf-dist/tex/latex/tools/varioref.sty
+++ b/Master/texmf-dist/tex/latex/tools/varioref.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -31,7 +32,7 @@
 %% given in the file `manifest.txt'.
 %% 
 %% Package varioref to use with LaTeX2e
-%% Copyright (C) 1992-2006  Frank Mittelbach, all rights reserved.
+%% Copyright (C) 1992-2009  Frank Mittelbach, all rights reserved.
 %%
 %% For additions or updates to the language options please contact
 %% the author at
@@ -42,7 +43,7 @@
 %%
 \NeedsTeXFormat{LaTeX2e}[1995/05/16]
 \ProvidesPackage{varioref}
-    [2006/05/13 v1.4p package for extended references (FMi)]
+    [2009/09/13 v1.4w package for extended references (FMi)]
 %% \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
@@ -170,7 +171,7 @@
     \def\reftextlabelrange#1#2{\ref{#1}--\ref{#2}}%
   }}
 \DeclareOption{brazil}
-  {\vref@addto\extrabrazil{%
+  {\vref@addto\extrasbrazil{%
     \def\reftextfaceafter {na \reftextvario{p\'agina oposta}{pr\'oxima
                            p\'agina}}%
     \def\reftextfacebefore{na p\'agina \reftextvario{oposta}{anterior}}%
@@ -198,6 +199,35 @@
     \def\reftextlabelrange#1#2{\vref@stringwarning\reflabelpagerange
                                \ref{#1} to~\ref{#2}}%
   }}
+\DeclareOption{bulgarian}%
+ {\vref@addto\extrasbulgarian{%
+   \def\reftextfaceafter{\cyrn\cyra\
+         \reftextvario{\cyrs\cyrery\cyrs\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
+                      {\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}
+         \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+   \def\reftextfacebefore{\cyrn\cyra\
+         \reftextvario{\cyrs\cyrery\cyrs\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
+                      {\cyrp\cyrr\cyre\cyrd\cyrn\cyra\cyrt\cyra}
+         \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+   \def\reftextafter{\cyrn\cyra\
+         \reftextvario{\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}%
+                      {\cyrs\cyrl\cyre\cyrd\cyrv\cyra\cyrshch\cyra\cyrt\cyra}
+         \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+   \def\reftextbefore{\cyrn\cyra\
+         \reftextvario{\cyrp\cyrr\cyre\cyrd\cyrn\cyra\cyrt\cyra}%
+                      {\cyrp\cyrr\cyre\cyrd\cyri\cyrsh\cyrn\cyra\cyrt\cyra}
+         \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+   \def\reftextcurrent{\cyrn\cyra\
+         \reftextvario{\cyrt\cyra\cyrz\cyri}%
+                      {\cyrt\cyre\cyrk\cyru\cyrshch\cyra\cyrt\cyra}
+         \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra}%
+   \def\reftextfaraway#1{\cyrn\cyra\ \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyra
+                         ~\pageref{#1}}%
+   \def\reftextpagerange#1#2{\cyrn\cyra\
+                        \cyrs\cyrt\cyrr\cyra\cyrn\cyri\cyrc\cyri
+                        ~\pageref{#1}--\pageref{#2}}%
+   \def\reftextlabelrange#1#2{\ref{#1} \cyrd\cyro~\ref{#2}}%
+ }}
 \DeclareOption{catalan}
   {\vref@addto\extrascatalan{%
     \def\reftextfaceafter {a la p\`agina seg\"uent}%
@@ -362,6 +392,21 @@
                           \pageref{#1}---\pageref{#2}}%
     \def\reftextlabelrange#1#2{\ref{#1} ws\nobreakspace\ref{#2}}%
   }}
+\DeclareOption{icelandic}
+  {\vref@addto\extrasicelandic{%
+    \def\reftextfaceafter {\'{a} \reftextvario{n{\ae}stu}%
+                                              {n{\ae}stu} s\'{i}{\dh}u}%
+    \def\reftextfacebefore{\'{a} \reftextvario{fyrri}%
+                                              {fyrri} s\'{i}{\dh}u}%
+    \def\reftextafter     {\'{a} \reftextvario{n{\ae}stu}%
+                                              {n{\ae}stu} s\'{i}{\dh}u}%
+    \def\reftextbefore    {\'{a} \reftextvario{fyrri}{fyrri} s\'{i}{\dh}u}%
+    \def\reftextcurrent   {\'{a} \reftextvario{{\th}essari}%
+                                              {{\th}essari} s\'{i}{\dh}u}%
+    \def\reftextfaraway#1{\'{a} s\'{i}{\dh}u~\pageref{#1}}%
+    \def\reftextpagerange#1#2{\'{a} s\'{i}{\dh}um~\pageref{#1}--\pageref{#2}}%
+    \def\reftextlabelrange#1#2{\ref{#1} til~\ref{#2}}%
+  }}
 \DeclareOption{italian}
   {\vref@addto\extrasitalian{%
     \def\reftextfaceafter {\reftextvario{a fronte}%
@@ -372,7 +417,7 @@
                            {successiva}}%
     \def\reftextbefore    {nella pagina precedente}%
     \def\reftextcurrent   {in questa pagina}%
-    \def\reftextfaraway#1{nella pagina~\pageref{#1}}%
+    \def\reftextfaraway#1{a pagina~\pageref{#1}}%
     \def\reftextpagerange#1#2{nelle pagine~\pageref{#1}--\pageref{#2}}%
     \def\reftextlabelrange#1#2{da~\ref{#1} a~\ref{#2}}%
   }}
@@ -438,7 +483,7 @@
     \def\reftextlabelrange#1#2{od~\ref{#1} do~\ref{#2}}%
   }}
 \DeclareOption{portuges}
-  {\vref@addto\extraportuges{%
+  {\vref@addto\extrasportuges{%
     \def\reftextfaceafter {na \reftextvario{p\'agina ao lado}{pr\'oxima
                            p\'agina}}%
     \def\reftextfacebefore{na p\'agina \reftextvario{ao lado}{anterior}}%
@@ -454,7 +499,8 @@
   {\vref@addto\extrasromanian{%
     \def\reftextfaceafter {pe pagina \reftextvario{opus\u{a}}{urm\u{a}toarei}}%
     \def\reftextfacebefore{pe pagina \reftextvario{opus\u{a}}{precedentei}}%
-    \def\reftextafter     {pe pagina \reftextvario{dup\u{a}}{urm\u{a}toarea}}%
+    \def\reftextafter     {\reftextvario{pe pagina urm\u{a}toare}%
+                                        {pe urm\u{a}toarea pagin\u{a}}}%
     \def\reftextbefore    {pe pagina \reftextvario{dinaintea}{
                            precedentei}}%
     \def\reftextcurrent   {pe aceast\u{a} pagin\u{a}}%
@@ -682,7 +728,7 @@
 \def\fullref#1{\ref{#1} \reftextfaraway{#1}}
 \def\vref@pagenum#1#2{%
   \@ifundefined{r@#2}{\@namedef{r@#2}{{??}{??}}}{}%
-  \edef#1{\expandafter\expandafter\expandafter
+  \protected@edef#1{\expandafter\expandafter\expandafter
                 \@cdr\csname r@#2\endcsname
                 \@nil}%
 }
@@ -696,7 +742,7 @@
   \vrefpagenum\@tempa{#2}%
   \vrefpagenum\@tempb{#3}%
   \ifx\@tempa\@tempb
-    \vpageref*[#1]{#2}%
+    \vpageref*[{#1}]{#2}%
   \else
     \reftextpagerange{#2}{#3}%
   \fi
@@ -705,14 +751,14 @@
   \vrefpagenum\@tempa{#2}%
   \vrefpagenum\@tempb{#3}%
   \ifx\@tempa\@tempb
-    \vpageref[#1]{#2}%
+    \vpageref[{#1}]{#2}%
   \else
     \reftextpagerange{#2}{#3}%
   \fi
 }
 \newcommand\vpagerefrange{\@ifstar\@svpagerefrange\@vpagerefrange}
 \newcommand\vrefrange[3][\reftextcurrent]
-  {\reftextlabelrange{#2}{#3} \vpagerefrange[#1]{#2}{#3}}
+  {\reftextlabelrange{#2}{#3} \vpagerefrange[{#1}]{#2}{#3}}
 \def\refstepcounter#1{\stepcounter{#1}%
     \protected@edef\@currentlabel
        {\csname p@#1\expandafter\endcsname\csname the#1\endcsname}%
diff --git a/Master/texmf-dist/tex/latex/tools/verbatim.sty b/Master/texmf-dist/tex/latex/tools/verbatim.sty
index ee388e26679..3a49901e615 100644
--- a/Master/texmf-dist/tex/latex/tools/verbatim.sty
+++ b/Master/texmf-dist/tex/latex/tools/verbatim.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/verbtest.tex b/Master/texmf-dist/tex/latex/tools/verbtest.tex
index d2000aa7736..ae0142da63d 100644
--- a/Master/texmf-dist/tex/latex/tools/verbtest.tex
+++ b/Master/texmf-dist/tex/latex/tools/verbtest.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/x.tex b/Master/texmf-dist/tex/latex/tools/x.tex
index 030a2e1f8a6..31408bf740f 100644
--- a/Master/texmf-dist/tex/latex/tools/x.tex
+++ b/Master/texmf-dist/tex/latex/tools/x.tex
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/xr.sty b/Master/texmf-dist/tex/latex/tools/xr.sty
index b8a7f44235c..869a5ec1492 100644
--- a/Master/texmf-dist/tex/latex/tools/xr.sty
+++ b/Master/texmf-dist/tex/latex/tools/xr.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
diff --git a/Master/texmf-dist/tex/latex/tools/xspace.sty b/Master/texmf-dist/tex/latex/tools/xspace.sty
index b71da9dc935..30628e2eb70 100644
--- a/Master/texmf-dist/tex/latex/tools/xspace.sty
+++ b/Master/texmf-dist/tex/latex/tools/xspace.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %%