oberdiek update (10dec09)

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

25 files changed, 163 insertions, 125 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
index af13b1f98fd..03d301c9731 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipdfm.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipdfm.def}%
-  [2009/08/13 v1.5 bookmark driver for dvipdfm (HO)]%
+  [2009/12/07 v1.7 bookmark driver for dvipdfm (HO)]%
 \newcount\BKM@id
 \BKM@id=\z@
 \def\BKM@0{000}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
index 4bd0b1beb07..c7afca77a6d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvips.def
@@ -31,13 +31,14 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvips.def}%
-  [2009/08/13 v1.5 bookmark driver for dvips (HO)]%
+  [2009/12/07 v1.7 bookmark driver for dvips (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{header=#1}%
 }
 \def\BKM@filename{\jobname.out.ps}
 \BKM@PSHeaderFile\BKM@filename
-\AtEndDocument{\BKM@pdfmark@out}
+\RequirePackage{atveryend}[2009/12/07]
+\AfterLastShipout{\BKM@pdfmark@out}
 \def\BKM@pdfmark@out{%
   \if@filesw
     \newwrite\BKM@file
@@ -277,11 +278,8 @@
   \let\BKM@entry\BKM@DO@entry
 }
 \ifBKM@atend
-  \AtBeginDocument{%
-    \AtEndDocument{%
-      \clearpage
-      \BKM@EndHook
-    }%
+  \AfterLastShipout{%
+    \BKM@EndHook
   }%
 \fi
 \endinput
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
index cf49d8fb76b..e964509ce26 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-dvipsone.def
@@ -31,13 +31,14 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-dvipsone.def}%
-  [2009/08/13 v1.5 bookmark driver for dvipsone (HO)]%
+  [2009/12/07 v1.7 bookmark driver for dvipsone (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{header=#1}%
 }
 \def\BKM@filename{\jobname.out.ps}
 \BKM@PSHeaderFile\BKM@filename
-\AtEndDocument{\BKM@pdfmark@out}
+\RequirePackage{atveryend}[2009/12/07]
+\AfterLastShipout{\BKM@pdfmark@out}
 \def\BKM@pdfmark@out{%
   \if@filesw
     \newwrite\BKM@file
@@ -277,11 +278,8 @@
   \let\BKM@entry\BKM@DO@entry
 }
 \ifBKM@atend
-  \AtBeginDocument{%
-    \AtEndDocument{%
-      \clearpage
-      \BKM@EndHook
-    }%
+  \AfterLastShipout{%
+    \BKM@EndHook
   }%
 \fi
 \endinput
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
index 2abb91e51be..0704f4a31aa 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-pdftex.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-pdftex.def}%
-  [2009/08/13 v1.5 bookmark driver for pdfTeX (HO)]%
+  [2009/12/07 v1.7 bookmark driver for pdfTeX (HO)]%
 \def\BKM@DO@entry#1#2{%
   \begingroup
     \setkeys{BKM@DO}{#1}%
@@ -233,11 +233,8 @@
   \let\BKM@entry\BKM@DO@entry
 }
 \ifBKM@atend
-  \AtBeginDocument{%
-    \AtEndDocument{%
-      \clearpage
-      \BKM@EndHook
-    }%
+  \AfterLastShipout{%
+    \BKM@EndHook
   }%
 \fi
 \endinput
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
index 60ab7856064..a5e543fd3e8 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-textures.def
@@ -31,13 +31,14 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-textures.def}%
-  [2009/08/13 v1.5 bookmark driver for textures (HO)]%
+  [2009/12/07 v1.7 bookmark driver for textures (HO)]%
 \def\BKM@PSHeaderFile#1{%
   \special{prePostScriptfile #1}%
 }
 \def\BKM@filename{\jobname.out.ps}
 \BKM@PSHeaderFile\BKM@filename
-\AtEndDocument{\BKM@pdfmark@out}
+\RequirePackage{atveryend}[2009/12/07]
+\AfterLastShipout{\BKM@pdfmark@out}
 \def\BKM@pdfmark@out{%
   \if@filesw
     \newwrite\BKM@file
@@ -277,11 +278,8 @@
   \let\BKM@entry\BKM@DO@entry
 }
 \ifBKM@atend
-  \AtBeginDocument{%
-    \AtEndDocument{%
-      \clearpage
-      \BKM@EndHook
-    }%
+  \AfterLastShipout{%
+    \BKM@EndHook
   }%
 \fi
 \endinput
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
index 07505da9991..aab23c5bfdf 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
+++ b/Master/texmf-dist/tex/latex/oberdiek/bkm-vtex.def
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{bkm-vtex.def}%
-  [2009/08/13 v1.5 bookmark driver for VTeX (HO)]%
+  [2009/12/07 v1.7 bookmark driver for VTeX (HO)]%
 \ifvtexpdf
 \else
   \PackageWarningNoLine{bookmark}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
index ef3395205c4..5499d53ed2f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/bookmark.sty
@@ -31,7 +31,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{bookmark}%
-  [2009/08/13 v1.5 PDF bookmarks (HO)]%
+  [2009/12/07 v1.7 PDF bookmarks (HO)]%
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname numexpr\endcsname\relax
   \def\BKM@CalcExpr#1#2#3#4{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
index 3cbb95ace81..40015ce7d79 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
@@ -28,7 +28,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{holtxdoc}%
-  [2009/08/07 v0.12 Private additional ltxdoc support (HO)]
+  [2009/12/02 v0.13 Private additional ltxdoc support (HO)]
 \RequirePackage[numbered]{hypdoc}
 \RequirePackage{array}
 \def\hld@info#1{%
@@ -40,18 +40,30 @@
 \newcommand*{\StartHistory}{%
   \section{History}%
 }
-\newcommand*{\HistVersion}[1]{%
-  \subsection*{%
-    \phantomsection
+\@ifpackagelater{hyperref}{2009/11/27}{%
+  \newcommand*{\HistVersion}[1]{%
+    \subsection*{[#1]}% hash-ok
     \addcontentsline{toc}{subsection}{[#1]}% hash-ok
-    [#1]% hash-ok
+    \def\HistLabel##1{%
+      \begingroup
+        \edef\@currentlabel{[#1]}% hash-ok
+        \label{##1}%
+      \endgroup
+    }%
   }%
-  \def\HistLabel##1{%
-    \begingroup
-      \edef\x{[#1]}% hash-ok
-      \let\@currentlabel\x
-      \label{##1}%
-    \endgroup
+}{%
+  \newcommand*{\HistVersion}[1]{%
+    \subsection*{%
+      \phantomsection
+      \addcontentsline{toc}{subsection}{[#1]}% hash-ok
+      [#1]% hash-ok
+    }%
+    \def\HistLabel##1{%
+      \begingroup
+        \edef\@currentlabel{[#1]}% hash-ok
+        \label{##1}%
+      \endgroup
+    }%
   }%
 }
 \newenvironment{History}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty
index bbd9ce68e6a..47c925bea6d 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2002, 2006, 2007 by
+%% Copyright (C) 2002, 2006, 2007, 2009 by
 %%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %% 
 %% This work may be distributed and/or modified under the
@@ -29,7 +29,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hypdoc}%
-  [2007/11/12 v1.6 Hyper extensions for doc.sty (HO)]%
+  [2009/12/10 v1.7 Hyper extensions for doc.sty (HO)]%
 \newif\ifHD@numbered
 \DeclareOption{numbered}{\HD@numberedtrue}
 \ProcessOptions*\relax
@@ -239,6 +239,7 @@
 \AtBeginDocument{%
   \HD@savedest@init
 }
+\RequirePackage{rerunfilecheck}[2009/12/10]
 \begingroup
   \catcode`\^^M=\active
 \@firstofone{\endgroup
@@ -253,8 +254,10 @@
       \let~\HDorg@tilde
       \catcode`\^^M=\HDorg@catcodeM\relax
       \newwrite\HD@savedest@out
+      \RerunFileCheck{\jobname.hd}{%
+        \immediate\closeout\HD@savedest@out
+      }{}%
       \immediate\openout\HD@savedest@out=\jobname.hd\relax
-      \AtEndDocument{\immediate\closeout\HD@savedest@out}%
     \else
       \let\HD@savedest@add\@gobble
     \fi
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
index c9c11f5fe84..9405aac09a7 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions-patch.sty
@@ -27,7 +27,8 @@
 %% and the derived files
 %%    kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
 %%    kvoptions-patch.sty, example-mycolorsetup.sty,
-%%    kvoptions-test1.tex, kvoptions-test2.tex.
+%%    kvoptions-test1.tex, kvoptions-test2.tex,
+%%    kvoptions-test3.tex.
 %% 
 %% No we don't need the option 'color'.
 %% With color support option 'emphcolor' will dynamically
@@ -77,7 +78,7 @@
   \noexpand\endinput
 }
 \ProvidesPackage{kvoptions-patch}%
-  [2009/08/13 v3.4 LaTeX patch for keyval options (HO)]%
+  [2009/12/08 v3.6 LaTeX patch for keyval options (HO)]%
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname eTeXversion\endcsname\relax
   \PackageWarningNoLine{kvoptions-patch}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
index 7b20a7c133b..2df72b03ac0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/kvoptions.sty
@@ -27,7 +27,8 @@
 %% and the derived files
 %%    kvoptions.sty, kvoptions.pdf, kvoptions.ins, kvoptions.drv,
 %%    kvoptions-patch.sty, example-mycolorsetup.sty,
-%%    kvoptions-test1.tex, kvoptions-test2.tex.
+%%    kvoptions-test1.tex, kvoptions-test2.tex,
+%%    kvoptions-test3.tex.
 %% 
 %% No we don't need the option 'color'.
 %% With color support option 'emphcolor' will dynamically
@@ -92,7 +93,7 @@
   \fi
 \expandafter\x\csname ver@kvoptions.sty\endcsname
 \ProvidesPackage{kvoptions}%
-  [2009/08/13 v3.4 Keyval support for LaTeX options (HO)]
+  [2009/12/08 v3.6 Keyval support for LaTeX options (HO)]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -159,7 +160,7 @@
 \DeclareOption{debugshow}{\catcode\@ne=9 }
 \DeclareOption{patch}{%
   \AtEndOfPackage{%
-    \RequirePackage{kvoptions-patch}[2009/08/13]%
+    \RequirePackage{kvoptions-patch}[2009/12/08]%
   }%
 }
 \ProcessOptions\relax
@@ -518,6 +519,41 @@
     and has no effect%
   }%
 }
+\newcommand*{\AddToKeyvalOption}{%
+  \@ifstar{%
+    \begingroup
+      \edef\x{\endgroup
+        \noexpand\KVO@AddToKeyvalOption{\KVO@family}%
+      }%
+    \x
+  }%
+  \KVO@AddToKeyvalOption
+}
+\def\KVO@AddToKeyvalOption#1#2{%
+  \@ifundefined{KV@#1@#2}{%
+    \PackageWarning{kvoptions}{%
+      Key `#2' of family `#1' does not exist.\MessageBreak
+      Ignoring \string\AddToKeyvalOption
+    }%
+    \@gobble
+  }{%
+    \edef\KVO@next{%
+      \noexpand\KVO@@AddToKeyvalOption
+      \expandafter\noexpand\csname KV@#1@#2\endcsname
+    }%
+    \afterassignment\KVO@next
+    \def\KVO@temp##1%
+  }%
+}
+\def\KVO@@AddToKeyvalOption#1{%
+  \begingroup
+    \toks@\expandafter{#1{##1}}%
+    \toks@\expandafter{\the\expandafter\toks@\KVO@temp{##1}}%
+    \edef\x{\endgroup
+      \noexpand\def\noexpand#1####1{\the\toks@}%
+    }%
+  \x
+}
 \newcommand*{\ProcessKeyvalOptions}{%
   \@ifstar{%
     \begingroup
@@ -583,19 +619,25 @@
           \@ifundefined{%
             KV@#1@\expandafter\KVO@getkey\CurrentOption=\@nil
           }{%
-            \ifx\KVO@Patch Y%
-              \@onelevel@sanitize\CurrentOption
-            \fi
-            \ifx\@unusedoptionlist\@empty
-              \global\let\@unusedoptionlist\CurrentOption
-            \else
-              \expandafter\expandafter\expandafter\gdef
-              \expandafter\expandafter\expandafter\@unusedoptionlist
-              \expandafter\expandafter\expandafter{%
-                \expandafter\@unusedoptionlist
-                \expandafter,\CurrentOption
+            \@ifundefined{KVO@default@\@currname.\@currext}{%
+              \ifx\KVO@Patch Y%
+                \@onelevel@sanitize\CurrentOption
+              \fi
+              \ifx\@unusedoptionlist\@empty
+                \global\let\@unusedoptionlist\CurrentOption
+              \else
+                \expandafter\expandafter\expandafter\gdef
+                \expandafter\expandafter\expandafter\@unusedoptionlist
+                \expandafter\expandafter\expandafter{%
+                  \expandafter\@unusedoptionlist
+                  \expandafter,\CurrentOption
+                }%
+              \fi
+            }{%
+              \toks\tw@\expandafter{%
+                \the\toks\expandafter\tw@\expandafter,\CurrentOption
               }%
-            \fi
+            }%
           }{%
             \toks@\expandafter{%
               \the\expandafter\toks@\expandafter,\CurrentOption
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
index 9e49a3060e4..181be780686 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
@@ -34,8 +34,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2009/08/07 v2.4 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{atbegshi}%
 \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
index 8c5ee1655a2..4b79e905295 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2009/08/07 v2.4 Module base for zref (HO)]%
+  [2009/12/08 v2.7 Module base for zref (HO)]%
 \def\ZREF@name{zref}
 \def\ZREF@ErrorNoLine#1#2{%
   \begingroup
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
index cfa92170825..681cc7179ef 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
@@ -34,8 +34,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2009/08/07 v2.4 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{counter}{}
 \zref@addprop\ZREF@mainlist{counter}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
index 5cd53781d8f..88568232b9b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
@@ -34,10 +34,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2009/08/07 v2.4 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-savepos}[2009/08/07]
+\RequirePackage{zref-savepos}[2009/12/08]
 \zref@require@unique
 \RequirePackage{keyval}
 \define@key{ZREF@DF}{unit}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
index 2a813f1a350..1b0e50c2f65 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
@@ -34,8 +34,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2009/08/07 v2.4 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newprop{anchor}[]{%
   \@ifundefined{@currentHref}{}{\@currentHref}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
index 791610b8e6b..830d67aa0ef 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
@@ -34,26 +34,24 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2009/08/07 v2.4 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
+\RequirePackage{atveryend}[2009/12/07]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \zref@newlist{LastPage}
-\AtBeginDocument{%
-  \AtEndDocument{%
-    \if@filesw
-      \clearpage
-      \begingroup
-        \advance\c@page\m@ne
-        \toks@\expandafter\expandafter\expandafter{%
-          \expandafter\Z@L@main
-          \Z@L@LastPage
-        }%
-        \expandafter\zref@wrapper@immediate\expandafter{%
-          \expandafter\ZREF@label\expandafter{\the\toks@}{LastPage}%
-        }%
-      \endgroup
-    \fi
-  }%
+\AfterLastShipout{%
+  \if@filesw
+    \begingroup
+      \advance\c@page\m@ne
+      \toks@\expandafter\expandafter\expandafter{%
+        \expandafter\Z@L@main
+        \Z@L@LastPage
+      }%
+      \expandafter\zref@wrapper@immediate\expandafter{%
+        \expandafter\ZREF@label\expandafter{\the\toks@}{LastPage}%
+      }%
+    \endgroup
+  \fi
 }
 \endinput
 %%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
index 18558f836ce..0b9099ef9cb 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -34,10 +34,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2009/08/07 v2.4 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2009/08/07]
+\RequirePackage{zref-abspage}[2009/12/08]
 \zref@newprop*{pagevalue}[0]{\number\c@page}
 \zref@newlist{perpage}
 \zref@addprop{perpage}{abspage}
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
index 2e46ac29043..d65e8fee8d1 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
@@ -34,7 +34,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-runs}%
-  [2009/08/07 v2.4 Module runs for zref (HO)]%
+  [2009/12/08 v2.7 Module runs for zref (HO)]%
 \providecommand*{\zruns}{0}%
 \AtBeginDocument{%
   \edef\zruns{\number\numexpr\zruns+1}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
index d72519f8f7b..2bf7beff680 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
@@ -34,8 +34,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2009/08/07 v2.4 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \begingroup
   \@ifundefined{pdfsavepos}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
index 0e7d81a42e9..ff7ae4daee9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
@@ -34,9 +34,10 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2009/08/07 v2.4 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
+\RequirePackage{gettitlestring}[2009/12/08]
 \RequirePackage{keyval}
 \let\zref@titleref@current\@empty
 \zref@newprop{title}{\zref@titleref@current}%
@@ -57,26 +58,13 @@
 \newif\ifzref@titleref@stripperiod
 \zref@titleref@stripperiodtrue
 \def\zref@titleref@setcurrent#1{%
-  \def\zref@titleref@current{#1}%
   \ifzref@titleref@expand
-    \begingroup
-      \let\label\@gobble
-      \let\index\@gobble
-      \let\glossary\@gobble
-      \let\markboth\@gobbletwo
-      \let\@mkboth\@gobbletwo
-      \let\markright\@gobble
-      \let\protect\@unexpandable@protect
-      \ZREF@titleref@hook
-      \edef\x{\endgroup
-        \noexpand\def\noexpand\zref@titleref@current{%
-          \zref@titleref@current
-        }%
-      }%
-    \x
+    \GetTitleStringExpand{#1}%
+  \else
+    \GetTitleStringNonExpand{#1}%
   \fi
   \edef\zref@titleref@current{%
-    \detokenize\expandafter{\zref@titleref@current}%
+    \detokenize\expandafter{\GetTitleStringResult}%
   }%
   \ifzref@titleref@stripperiod
     \edef\zref@titleref@current{%
@@ -85,6 +73,9 @@
     }%
   \fi
 }%
+\GetTitleStringDisableCommands{%
+  \ZREF@titleref@hook
+}
 \def\ZREF@stripperiod#1.\@empty#2\@nil{#1}%
 \define@key{ZREF@TR}{expand}[true]{%
   \csname zref@titleref@expand#1\endcsname
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
index 3cd8da3808c..032e06cc015 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
@@ -34,11 +34,11 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2009/08/07 v2.4 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2009/08/07]
-\RequirePackage{zref-lastpage}[2009/08/07]
+\RequirePackage{zref-abspage}[2009/12/08]
+\RequirePackage{zref-lastpage}[2009/12/08]
 \newcommand*{\ztotpages}{%
   \zref@extractdefault{LastPage}{abspage}{0}%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
index f5048a308b9..c06e2f54c22 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
@@ -34,8 +34,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2009/08/07 v2.4 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \newcommand*\zlabel{%
   \ifx\label\@gobble
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
index fd279a3b130..037b8c52318 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
@@ -34,8 +34,8 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2009/08/07 v2.4 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \RequirePackage{keyval}
 \zref@newprop{url}{}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
index 7bafa0b8281..b8716ac1191 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
@@ -34,13 +34,13 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2009/08/07 v2.4 New reference scheme for LaTeX2e (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+  [2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 \def\ZREF@temp#1{%
   \DeclareOption{#1}{%
     \AtEndOfPackage{%
-      \RequirePackage{zref-#1}[2009/08/07]%
+      \RequirePackage{zref-#1}[2009/12/08]%
     }%
   }%
 }