oberdiek (23apr11)

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

2 files changed, 64 insertions, 36 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty
index 163a7b19252..327a476862d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/atveryend.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: atveryend
-%% Version: 2011/04/15 v1.6
+%% Version: 2011/04/23 v1.7
 %% 
 %% Copyright (C) 2009-2011 by
 %%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -80,7 +80,15 @@
 \edef\AtVeryEnd@AtEnd{\AtVeryEnd@AtEnd\noexpand\endinput}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{atveryend}%
-  [2011/04/15 v1.6 Hooks at very end of document (HO)]
+  [2011/04/23 v1.7 Hooks at very end of document (HO)]
+\def\AtVeryEnd@ifundefined#1{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname #1\endcsname\relax
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+}
 \let\AtVeryEnd@BeforeClearDocumentHook\@empty
 \let\AtVeryEnd@AfterLastShipoutHook\@empty
 \let\AtVeryEnd@AtVeryEndDocumentHook\@empty
@@ -468,38 +476,25 @@
 \AtVeryEnd@RedefEndDocument\a@enddocument % alatex.sty
 \AtVeryEnd@RedefEndDocument\enddocumentasusual % frenchle.sty
 \AtVeryEnd@RedefEndDocument\old@enddocument % uwthesis.cls
-\AtBeginDocument{%
-  \@ifpackageloaded{scrlfile}{%
-    \@ifundefined{BeforeClosingMainAux}{}{%
-      \BeforeClosingMainAux{\Call@AfterLastShipout}%
-    }%
-    \@ifundefined{AfterReadingMainAux}{}{%
-      \AfterReadingMainAux{\Call@AtVeryEndDocument}%
-    }%
-  }{}%
-  \@ifpackageloaded{etoolbox}{%
-    \@ifundefined{AfterEndDocument}{}{%
-      \AfterEndDocument{\Call@AtVeryEndDocument}%
-    }%
-  }{}%
-  \def\AtVeryEnd@document{document}%
-  \def\AtVeryEnd@RedefCheckEnd{%
-    \expandafter\def\expandafter\@checkend
-    \expandafter##\expandafter1\expandafter{%
-      \@checkend{##1}%
-      \def\AtVeryEnd@temp{##1}%
-      \ifx\AtVeryEnd@temp\AtVeryEnd@document
-        \let\AtVeryEnd@OrgClearpage\clearpage
-        \def\clearpage{%
-          \let\clearpage\AtVeryEnd@OrgClearpage
-          \Call@BeforeClearDocument
-          \clearpage
-          \Call@AfterLastShipout
-        }%
-      \fi
-    }%
-    \aftergroup\AtVeryEnd@RedefCheckEnd
+\def\AtVeryEnd@document{document}%
+\def\AtVeryEnd@RedefCheckEnd{%
+  \expandafter\def\expandafter\@checkend
+  \expandafter##\expandafter1\expandafter{%
+    \@checkend{##1}%
+    \def\AtVeryEnd@temp{##1}%
+    \ifx\AtVeryEnd@temp\AtVeryEnd@document
+      \let\AtVeryEnd@OrgClearpage\clearpage
+      \def\clearpage{%
+        \let\clearpage\AtVeryEnd@OrgClearpage
+        \Call@BeforeClearDocument
+        \clearpage
+        \Call@AfterLastShipout
+      }%
+    \fi
   }%
+  \aftergroup\AtVeryEnd@RedefCheckEnd
+}%
+\AtBeginDocument{%
   \AtEndDocument{%
     \AtVeryEnd@RedefCheckEnd
   }%
@@ -521,6 +516,21 @@
     \endgroup
   }%
 }
+\AtBeginDocument{%
+  \@ifpackageloaded{scrlfile}{%
+    \AtVeryEnd@ifundefined{BeforeClosingMainAux}{}{%
+      \BeforeClosingMainAux{\Call@AfterLastShipout}%
+    }%
+    \AtVeryEnd@ifundefined{AfterReadingMainAux}{}{%
+      \AfterReadingMainAux{\Call@AtVeryEndDocument}%
+    }%
+  }{}%
+  \@ifpackageloaded{etoolbox}{%
+    \AtVeryEnd@ifundefined{AfterEndDocument}{}{%
+      \AfterEndDocument{\Call@AtVeryEndDocument}%
+    }%
+  }{}%
+}
 \def\AtVeryEnd@temp{%
   \AtBeginDocument{%
     \let\@startlabels\startlabels
@@ -602,7 +612,7 @@
     }%
   }%
   \AtEndDocument{%
-    \@ifundefined{@startlabels}{%
+    \AtVeryEnd@ifundefined{@startlabels}{%
     }{%
       \clearpage
       \@startlabels
diff --git a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
index ba8ef1d35e2..77eb2d302d0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/luacolor.sty
@@ -9,7 +9,7 @@
 %% This is a generated file.
 %% 
 %% Project: luacolor
-%% Version: 2011/04/22 v1.5
+%% Version: 2011/04/23 v1.6
 %% 
 %% Copyright (C) 2007, 2009-2011 by
 %%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -87,7 +87,7 @@
 \edef\LuaCol@AtEnd{\LuaCol@AtEnd\noexpand\endinput}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{luacolor}%
-  [2011/04/22 v1.5 Coloring based on LuaTeX's node attributes (HO)]
+  [2011/04/23 v1.6 Coloring based on LuaTeX's node attributes (HO)]
 \RequirePackage{infwarerr}[2010/04/08]%
 \RequirePackage{ifluatex}[2010/03/01]%
 \RequirePackage{ifpdf}[2011/01/30]%
@@ -123,6 +123,24 @@
 \LuaCol@directlua{%
   require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")%
 }
+\begingroup
+  \edef\x{\LuaCol@directlua{tex.write("2011/04/23 v1.6")}}%
+  \edef\y{%
+    \LuaCol@directlua{%
+      if oberdiek.luacolor.getversion then %
+        oberdiek.luacolor.getversion()%
+      end%
+    }%
+  }%
+  \ifx\x\y
+  \else
+    \@PackageError{luacolor}{%
+      Wrong version of lua module.\MessageBreak
+      Package version: \x\MessageBreak
+      Lua module: \y
+    }\@ehc
+  \fi
+\endgroup
 \ifpdf
 \else
   \begingroup