oberdiek (23apr11)

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

5 files changed, 183 insertions, 85 deletions

diff --git a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx
index e5cf0e2515c..1479518f2be 100644
--- a/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/atveryend.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 % 
 % File: atveryend.dtx
-% Version: 2011/04/15 v1.6
+% Version: 2011/04/23 v1.7
 % 
 % Copyright (C) 2009-2011 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -76,7 +76,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: atveryend 2011/04/15 v1.6 Hooks at very end of document (HO)}
+\Msg{* Package: atveryend 2011/04/23 v1.7 Hooks at very end of document (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -88,7 +88,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>
@@ -148,7 +148,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{atveryend.drv}%
-  [2011/04/15 v1.6 Hooks at very end of document (HO)]%
+  [2011/04/23 v1.7 Hooks at very end of document (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/02/04]
 \begin{document}
@@ -157,7 +157,7 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{1065}
+% \CheckSum{1084}
 %
 % \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
@@ -178,7 +178,7 @@ and the derived files
 % \GetFileInfo{atveryend.drv}
 %
 % \title{The \xpackage{atveryend} package}
-% \date{2011/04/15 v1.6}
+% \date{2011/04/23 v1.7}
 % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
@@ -334,9 +334,24 @@ and the derived files
 %    \begin{macrocode}
 \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)]
 %    \end{macrocode}
 %
+% \subsection{Tools}
+%
+%    \begin{macro}{\AtVeryEnd@ifundefined}
+%    \begin{macrocode}
+\def\AtVeryEnd@ifundefined#1{%
+  \begingroup\expandafter\expandafter\expandafter\endgroup
+  \expandafter\ifx\csname #1\endcsname\relax
+    \expandafter\@firstoftwo
+  \else
+    \expandafter\@secondoftwo
+  \fi
+}
+%    \end{macrocode}
+%    \end{macro}
+%
 % \subsection{Hooks}
 %
 %    \begin{macro}{\AtVeryEnd@BeforeClearDocumentHook}
@@ -879,53 +894,28 @@ and the derived files
 \AtVeryEnd@RedefEndDocument\old@enddocument % uwthesis.cls
 %    \end{macrocode}
 %
-% \subsection{Using hooks of other packages}
-%
-% \subsubsection{Package \xpackage{scrlfile}}
-%
-%    \begin{macrocode}
-\AtBeginDocument{%
-  \@ifpackageloaded{scrlfile}{%
-    \@ifundefined{BeforeClosingMainAux}{}{%
-      \BeforeClosingMainAux{\Call@AfterLastShipout}%
-    }%
-    \@ifundefined{AfterReadingMainAux}{}{%
-      \AfterReadingMainAux{\Call@AtVeryEndDocument}%
-    }%
-  }{}%
-%    \end{macrocode}
-%
-% \subsubsection{Package \xpackage{etoolbox}}
-%
-%    \begin{macrocode}
-  \@ifpackageloaded{etoolbox}{%
-    \@ifundefined{AfterEndDocument}{}{%
-      \AfterEndDocument{\Call@AtVeryEndDocument}%
-    }%
-  }{}%
-%    \end{macrocode}
-%
 % \subsection{Hack into \cs{enddocument}}
 %
 %    \begin{macrocode}
-  \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
   }%
@@ -952,6 +942,35 @@ and the derived files
 }
 %    \end{macrocode}
 %
+% \subsection{Using hooks of other packages}
+%
+% \subsubsection{Package \xpackage{scrlfile}}
+%
+%    \begin{macrocode}
+\AtBeginDocument{%
+  \@ifpackageloaded{scrlfile}{%
+    \AtVeryEnd@ifundefined{BeforeClosingMainAux}{}{%
+      \BeforeClosingMainAux{\Call@AfterLastShipout}%
+    }%
+    \AtVeryEnd@ifundefined{AfterReadingMainAux}{}{%
+      \AfterReadingMainAux{\Call@AtVeryEndDocument}%
+    }%
+  }{}%
+%    \end{macrocode}
+%
+% \subsubsection{Package \xpackage{etoolbox}}
+%
+%    \begin{macrocode}
+  \@ifpackageloaded{etoolbox}{%
+    \AtVeryEnd@ifundefined{AfterEndDocument}{}{%
+      \AfterEndDocument{\Call@AtVeryEndDocument}%
+    }%
+  }{}%
+%    \end{macrocode}
+%    \begin{macrocode}
+}
+%    \end{macrocode}
+%
 % \subsection{Class \xclass{letter}}
 %
 %    The class \xclass{letter} and some similar classes
@@ -1043,7 +1062,7 @@ and the derived files
     }%
   }%
   \AtEndDocument{%
-    \@ifundefined{@startlabels}{%
+    \AtVeryEnd@ifundefined{@startlabels}{%
     }{%
       \clearpage
       \@startlabels
@@ -1448,6 +1467,12 @@ and the derived files
 %   \item
 %     \cs{Call@AtEndAfterFileList} and \cs{Call@AtVeryVeryEnd} added.
 %   \end{Version}
+%   \begin{Version}{2011/04/23 v1.7}
+%   \item
+%     Some fix for \cs{AtVeryEnd@RedefCheckEnd}
+%     to avoid error because of undefined control sequence
+%     in some circumstances (thanks to D.P. Story for bug report).
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx b/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx
index f0da815c82d..bccdae405c9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/hobsub.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 % 
 % File: hobsub.dtx
-% Version: 2011/04/18 v1.3
+% Version: 2011/04/23 v1.4
 % 
 % Copyright (C) 2011 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -81,7 +81,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: hobsub 2011/04/18 v1.3 Subsetting bundle oberdiek (HO)}
+\Msg{* Package: hobsub 2011/04/23 v1.4 Subsetting bundle oberdiek (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -93,7 +93,7 @@
 This is a generated file.
 
 Project: hobsub
-Version: 2011/04/18 v1.3
+Version: 2011/04/23 v1.4
 
 Copyright (C) 2011 by
    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -280,7 +280,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{hobsub.drv}%
-  [2011/04/18 v1.3 Subsetting bundle oberdiek (HO)]%
+  [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/02/04]
 \usepackage{array}
@@ -314,7 +314,7 @@ and the derived files
 % \GetFileInfo{hobsub.drv}
 %
 % \title{The \xpackage{hobsub} package}
-% \date{2011/04/18 v1.3}
+% \date{2011/04/23 v1.4}
 % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
@@ -337,7 +337,7 @@ and the derived files
 %   \TableEntry{\xpackage{kvsetkeys}}{}{2011/04/07 v1.13}^^A
 %   \TableEntry{\xpackage{kvdefinekeys}}{}{2011/04/07 v1.3}^^A
 %   \TableEntry{\xpackage{luatex-loader}}{}{2010/03/09 v0.4}^^A
-%   \TableEntry{\xpackage{pdftexcmds}}{\xpackage{ifluatex}, \xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}, \xpackage{luatex-loader}}{2011/04/16 v0.15}^^A
+%   \TableEntry{\xpackage{pdftexcmds}}{\xpackage{ifluatex}, \xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}, \xpackage{luatex-loader}}{2011/04/22 v0.16}^^A
 %   \TableEntry{\xpackage{pdfescape}}{\xpackage{ltxcmds}, \xpackage{pdftexcmds}}{2011/04/04 v1.12}^^A
 %   \TableEntry{\xpackage{bigintcalc}}{\xpackage{pdftexcmds}}{2011/01/30 v1.2}^^A
 %   \TableEntry{\xpackage{bitset}}{\xpackage{bigintcalc}, \xpackage{infwarerr}, \xpackage{intcalc}}{2011/01/30 v1.1}^^A
@@ -347,7 +347,7 @@ and the derived files
 %   \TableEntry{\xpackage{letltxmacro}}{}{2010/09/02 v1.4}^^A
 %   \TableEntry{\xpackage{hopatch}}{}{2011/01/30 v1.0}^^A
 %   \TableEntry{\xpackage{xcolor-patch}}{}{2011/01/30 v1.7}^^A
-%   \TableEntry{\xpackage{atveryend}}{}{2011/04/15 v1.6}^^A
+%   \TableEntry{\xpackage{atveryend}}{}{2011/04/23 v1.7}^^A
 %   \TableEntry{\xpackage{atbegshi}}{\xpackage{ifpdf}, \xpackage{infwarerr}, \xpackage{ltxcmds}}{2011/01/30 v1.15}^^A
 %   \TableEntry{\xpackage{refcount}}{\xpackage{infwarerr}, \xpackage{ltxcmds}}{2010/12/01 v3.2}^^A
 %   \TableEntry{\xpackage{hycolor}}{\xpackage{xcolor-patch}}{2011/01/30 v1.7}^^A
@@ -524,7 +524,7 @@ and the derived files
 % using \xpackage{hobsub}:
 % \begin{quote}
 %   \dots\\
-%   |\RequirePackage{hobsub}[2011/04/18]|\\
+%   |\RequirePackage{hobsub}[2011/04/23]|\\
 %   \dots\\
 %   |\hobsub@StartPackage{foo1}|\\
 %   \textit{\dots\unskip\ package code of \xfile{foo1.sty} \dots}\\
@@ -627,7 +627,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@hobsub.sty\endcsname
 \ProvidesPackage{hobsub}%
-  [2011/04/18 v1.3 Subsetting bundle oberdiek (HO)]%
+  [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 %</package>
@@ -709,7 +709,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@hobsub-generic.sty\endcsname
 \ProvidesPackage{hobsub-generic}%
-  [2011/04/18 v1.3 Bundle oberdiek, subset generic (HO)]%
+  [2011/04/23 v1.4 Bundle oberdiek, subset generic (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 %</generic>
@@ -791,7 +791,7 @@ and the derived files
   \fi
 \expandafter\x\csname ver@hobsub-hyperref.sty\endcsname
 \ProvidesPackage{hobsub-hyperref}%
-  [2011/04/18 v1.3 Bundle oberdiek, subset hyperref (HO)]%
+  [2011/04/23 v1.4 Bundle oberdiek, subset hyperref (HO)]%
 %    \end{macrocode}
 %    \begin{macrocode}
 %</hyperref>
@@ -855,7 +855,7 @@ and the derived files
 %    \begin{macrocode}
 %<*hyperref>
 \NeedsTeXFormat{LaTeX2e}
-\RequirePackage{hobsub-generic}[2011/04/18]
+\RequirePackage{hobsub-generic}[2011/04/23]
 %</hyperref>
 %    \end{macrocode}
 %
@@ -1006,11 +1006,11 @@ and the derived files
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname ProvidesPackage\endcsname\relax
   \immediate\write-1{%
-    Package: hobsub 2011/04/18 v1.3 Subsetting bundle oberdiek (HO)%
+    Package: hobsub 2011/04/23 v1.4 Subsetting bundle oberdiek (HO)%
   }%
 \else
   \ProvidesPackage{hobsub}%
-  [2011/04/18 v1.3 Subsetting bundle oberdiek (HO)]%
+  [2011/04/23 v1.4 Subsetting bundle oberdiek (HO)]%
 \fi
 %</preamble>
 %    \end{macrocode}
@@ -1386,6 +1386,10 @@ and the derived files
 %   \item
 %     Package updates.
 %   \end{Version}
+%   \begin{Version}{2011/04/23 v1.4}
+%   \item
+%     Package updates.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
index 8ba6eaa1f0d..c714e3cc79e 100644
--- a/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/luacolor.dtx
@@ -1,7 +1,7 @@
 % \iffalse meta-comment
 % 
 % File: luacolor.dtx
-% 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>
@@ -84,7 +84,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: luacolor 2011/04/22 v1.5 Coloring based on LuaTeX's node attributes (HO)}
+\Msg{* Package: luacolor 2011/04/23 v1.6 Coloring based on LuaTeX's node attributes (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -96,7 +96,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>
@@ -178,17 +178,22 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luacolor.drv}%
-  [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)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}[2011/02/04]
 \usepackage{paralist}
+\makeatletter
+\g@addto@macro\MakePrivateLetters{%
+  \@makeother\_%
+}
+\makeatother
 \begin{document}
   \DocInput{luacolor.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{454}
+% \CheckSum{473}
 %
 % \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
@@ -209,7 +214,7 @@ and the derived files
 % \GetFileInfo{luacolor.drv}
 %
 % \title{The \xpackage{luacolor} package}
-% \date{2011/04/22 v1.5}
+% \date{2011/04/23 v1.6}
 % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
@@ -351,7 +356,7 @@ and the derived files
 %    \begin{macrocode}
 \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)]
 %    \end{macrocode}
 %
 % \subsection{Check for \LuaTeX}
@@ -404,12 +409,37 @@ and the derived files
 \fi%
 %    \end{macrocode}
 %
-% \subsection{Find driver}
+% \subsection{Load module and check version}
 %
 %    \begin{macrocode}
 \LuaCol@directlua{%
   require("oberdiek.luacolor\ifnum\luatexversion<65 -pre065\fi")%
 }
+%    \end{macrocode}
+%    \begin{macrocode}
+\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
+%    \end{macrocode}
+%
+% \subsection{Find driver}
+%
+%    \begin{macrocode}
 \ifpdf
 \else
   \begingroup
@@ -560,6 +590,13 @@ and the derived files
 %    \begin{macrocode}
 module("oberdiek.luacolor", package.seeall)
 %    \end{macrocode}
+%    \begin{macro}{getversion()}
+%    \begin{macrocode}
+function getversion()
+  tex.write("2011/04/23 v1.6")
+end
+%    \end{macrocode}
+%    \end{macro}
 %
 % \subsubsection{Driver detection}
 %
@@ -589,6 +626,7 @@ local patterns = {
   ["^ps::"]              = "pctexps",
 }
 %    \end{macrocode}
+%    \begin{macro}{info()}
 %    \begin{macrocode}
 local function info(msg, term)
   local target = "log"
@@ -599,6 +637,8 @@ local function info(msg, term)
   texio.write_nl(target, "")
 end
 %    \end{macrocode}
+%    \end{macro}
+%    \begin{macro}{dvidetect()}
 %    \begin{macrocode}
 function dvidetect()
   local v = tex.box[0]
@@ -621,6 +661,7 @@ function dvidetect()
   info("Missing \\special", true)
 end
 %    \end{macrocode}
+%    \end{macro}
 %
 % \subsubsection{Color strings}
 %
@@ -628,6 +669,9 @@ end
 local map = {
   n = 0,
 }
+%    \end{macrocode}
+%    \begin{macro}{get()}
+%    \begin{macrocode}
 function get(color)
   local n = map[color]
   if not n then
@@ -639,15 +683,18 @@ function get(color)
   tex.write("" .. n)
 end
 %    \end{macrocode}
+%    \end{macro}
 %
 % \subsubsection{Attribute register}
 %
+%    \begin{macro}{setattribute()}
 %    \begin{macrocode}
 local attribute
 function setattribute(attr)
   attribute = attr
 end
 %    \end{macrocode}
+%    \end{macro}
 %
 % \subsubsection{Whatsit insertion}
 %
@@ -678,6 +725,9 @@ local node_types = {
       end
     end,
 }
+%    \end{macrocode}
+%    \begin{macro}{get_type()}
+%    \begin{macrocode}
 local function get_type(n)
   local ret = node_types[n.id]
   if type(ret) == 'table' then
@@ -688,13 +738,17 @@ local function get_type(n)
   end
   return ret
 end
+%    \end{macrocode}
+%    \end{macro}
+%    \begin{macrocode}
 local mode = 2 -- luatex.pdfliteral.direct
 local WHATSIT = node.id("whatsit")
 local SPECIAL = 3
 local PDFLITERAL = 8
-local DRY_FALSE = 0
-local DRY_TRUE = 1
+local DRY_FALSE = false
+local DRY_TRUE = true
 %    \end{macrocode}
+%    \begin{macro}{traverse()}
 %    \begin{macrocode}
 local function traverse(list, color, dry)
   if not list then
@@ -711,13 +765,16 @@ local function traverse(list, color, dry)
 %<debug>texio.write_nl("  node: " .. node.type(n.id))
     local t = get_type(n)
     if t == LIST then
-      color = traverse(n, color, DRY_FALSE)
+      color = traverse(n, color, dry)
     elseif t == LIST_LEADERS then
       local color_after = traverse(n.leader, color, DRY_TRUE)
       if color == color_after then
-        traverse(n.leader, color, DRY_FALSE)
+        traverse(n.leader, color, DRY_FALSE or dry)
       else
-        traverse(n.leader, '', DRY_FALSE)
+        traverse(n.leader, '', DRY_FALSE or dry)
+% The color status is unknown here, because the leader box
+% will or will not be set.
+        color = ''
       end
     elseif t == COLOR then
       local v = node.has_attribute(n, attribute)
@@ -759,7 +816,9 @@ local function traverse(list, color, dry)
   return color
 end
 %    \end{macrocode}
+%    \end{macro}
 %
+%    \begin{macro}{process()}
 %    \begin{macrocode}
 function process(box)
   local color = ""
@@ -767,6 +826,7 @@ function process(box)
   traverse(list, color, DRY_FALSE)
 end
 %    \end{macrocode}
+%    \end{macro}
 %
 %    \begin{macrocode}
 %</lua>
@@ -898,7 +958,7 @@ end
   \pdfoutput=0 %
 \fi
 \documentclass{minimal}
-\usepackage{luacolor}[2011/04/22]
+\usepackage{luacolor}[2011/04/23]
 \csname @@end\endcsname
 \end
 %</test2>
@@ -910,7 +970,7 @@ end
 %    \end{macrocode}
 %    \begin{macrocode}
 \documentclass{minimal}
-\usepackage{luacolor}[2011/04/22]
+\usepackage{luacolor}[2011/04/23]
 \usepackage{qstest}
 \IncludeTests{*}
 \LogTests{log}{*}{*}
@@ -1155,6 +1215,15 @@ end
 %     removed for the version after \hologo{LuaTeX} 0.65, because
 %     bug was fixed in 0.27. (Thanks Manuel P\'egouri\'e-Gonnard.)
 %   \end{Version}
+%   \begin{Version}{2011/04/23 v1.6}
+%   \item
+%     Bug fix for nested leader boxes.
+%   \item
+%     Bug fix for leader boxes that change color, but
+%     are not set because of missing place.
+%   \item
+%     Version check for Lua module added.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
index 120324fe9da..c802b20d750 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins
@@ -1,5 +1,5 @@
 % oberdiek.ins
-% 2011/04/22
+% 2011/04/23
 %
 % Copyright (C) 1999, 2001, 2006 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
index 89f18af6728..d6fc4cb4fba 100644
--- a/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
+++ b/Master/texmf-dist/source/latex/oberdiek/oberdiek.tex
@@ -6,7 +6,7 @@
 \newcommand*{\Subject}{CTAN:\CTANdir}
 \newcommand*{\Author}{Heiko Oberdiek}
 \newcommand*{\Email}{heiko.oberdiek at googlemail.com}
-\newcommand*{\Date}{2011/04/22}
+\newcommand*{\Date}{2011/04/23}
 
 % Copyright (C) 2006-2011 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
@@ -178,7 +178,7 @@
 [\entrysep]
 \entry{attachfile2}{2010/09/27}{2.6}{attach files into PDF}%
 [\entrysep]
-\entry{atveryend}{2011/04/15}{1.6}{Hooks at very end of document}%
+\entry{atveryend}{2011/04/23}{1.7}{Hooks at very end of document}%
 [\entrysep]
 \entry{auxhook}{2011/03/04}{1.3}{Hooks for auxiliary files}%
 [\entrysep]
@@ -220,7 +220,7 @@
 [\entrysep]
 \entry{grffile}{2010/12/09}{1.13}{Extended file name support for graphics}%
 [\entrysep]
-\entry{hobsub}{2011/04/18}{1.3}{Subsetting bundle oberdiek}%
+\entry{hobsub}{2011/04/23}{1.4}{Subsetting bundle oberdiek}%
 [\entrysep]
 \entry{hologo}{2011/04/21}{1.5}{Logo collection}%
 [\entrysep]
@@ -270,7 +270,7 @@
 [\entrysep]
 \entry{ltxcmds}{2011/04/18}{1.20}{\LaTeX{} kernel commands for general use}%
 [\entrysep]
-\entry{luacolor}{2011/04/22}{1.5}{Coloring based on LuaTeX's node attributes}%
+\entry{luacolor}{2011/04/23}{1.6}{Coloring based on LuaTeX's node attributes}%
 [\entrysep]
 \entry{luatex}{2010/03/09}{0.4}{LuaTeX basic definition package}%
 [\entrysep]