oberdiek update (22apr10)

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

4 files changed, 101 insertions, 6 deletions

diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-base.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-base.tex
new file mode 100644
index 00000000000..aaff43b7c4e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-base.tex
@@ -0,0 +1,92 @@
+%%
+%% This is file `zref-test-base.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% zref.dtx  (with options: `test-base')
+%% 
+%% This is a generated file.
+%% 
+%% Copyright (C) 2006-2010 by
+%%    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%% 
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%%    http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and 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 2005/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%% 
+%% This work consists of the main source file zref.dtx
+%% and the derived files
+%%    zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
+%%    zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
+%%    zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
+%%    zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%%    zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
+%%    zref-totpages.sty, zref-user.sty, zref-xr.sty,
+%%    zref-example.tex, zref-example-lastpage.tex,
+%%    zref-example-nextpage.tex, zref-test1.tex,
+%%    zref-test-base.tex, zref-test-runs.tex,
+%%    zref-test-titleref-memoir.tex.
+%% 
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{article}
+\usepackage{zref-base,zref-titleref}[2010/04/22]
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{log}{*}{*}
+
+\makeatletter
+\newcommand*{\DefExpand}[2]{%
+  \expandafter\expandafter\expandafter\def
+  \expandafter\expandafter\expandafter#1%
+  \expandafter\expandafter\expandafter{#2}%
+  \@onelevel@sanitize#1%
+}
+\newcommand*{\Test}[3]{%
+  \Expect{#2}*{#1}%
+  \zref@wrapper@unexpanded{%
+    \Expect*{#3}*{#1}%
+  }%
+  \DefExpand\x{#1}%
+  \Expect*{#3}*{\x}%
+}
+\makeatother
+
+\begin{document}
+\section{Hello \textbf{World}}
+\label{sec:hello}
+\makeatletter
+\zref@newprop{foo}[D\@empty efault]{V\@empty alue}
+\begin{qstest}{getcurrent}{getcurrent}
+  \Test{\zref@getcurrent{foo}}{Value}{V\noexpand\@empty alue}%
+  \Test{\zref@getcurrent{xy}}{}{}%
+\end{qstest}
+\begin{qstest}{extract}{extract}
+  \def\textbf#1{<#1>}%
+  \Test{\zref@extractdefault{xy}{page}{D\@empty efault}}%
+       {Default}{D\noexpand\@empty efault}%
+  \Test{\zref@extractdefault{sec:hello}{foo}{A\@empty B}}%
+       {AB}{A\noexpand\@empty B}%
+  \Test{\zref@extract{sec:hello}{foo}}%
+       {Default}{D\noexpand\@empty efault}%
+  \zref@ifrefundefined{sec:hello}{%
+  }{%
+    \Test{\zref@extract{sec:hello}{default}}{1}{1}%
+    \Test{\zref@extract{sec:hello}{title}}%
+         {Hello <World>}{Hello \noexpand\textbf{World}}%
+  }%
+\end{qstest}
+\end{document}
+\endinput
+%%
+%% End of file `zref-test-base.tex'.
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex
index 3c791c0201e..cffeab7413f 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-runs.tex
@@ -35,11 +35,12 @@
 %%    zref-totpages.sty, zref-user.sty, zref-xr.sty,
 %%    zref-example.tex, zref-example-lastpage.tex,
 %%    zref-example-nextpage.tex, zref-test1.tex,
-%%    zref-test-runs.tex, zref-test-titleref-memoir.tex.
+%%    zref-test-base.tex, zref-test-runs.tex,
+%%    zref-test-titleref-memoir.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \documentclass{article}
-\usepackage{zref-runs}[2010/04/17]
+\usepackage{zref-runs}[2010/04/22]
 \usepackage{qstest}
 \IncludeTests{*}
 \LogTests{log}{*}{*}
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex
index 744f735074e..2aeec96f5ec 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test-titleref-memoir.tex
@@ -35,11 +35,12 @@
 %%    zref-totpages.sty, zref-user.sty, zref-xr.sty,
 %%    zref-example.tex, zref-example-lastpage.tex,
 %%    zref-example-nextpage.tex, zref-test1.tex,
-%%    zref-test-runs.tex, zref-test-titleref-memoir.tex.
+%%    zref-test-base.tex, zref-test-runs.tex,
+%%    zref-test-titleref-memoir.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \documentclass{memoir}
-\usepackage{zref-titleref}[2010/04/17]
+\usepackage{zref-titleref}[2010/04/22]
 \usepackage{qstest}
 \IncludeTests{*}
 \LogTests{log}{*}{*}
diff --git a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex
index df8296c7c74..741ee852b99 100644
--- a/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex
+++ b/Master/texmf-dist/doc/latex/oberdiek/test/zref-test1.tex
@@ -35,12 +35,13 @@
 %%    zref-totpages.sty, zref-user.sty, zref-xr.sty,
 %%    zref-example.tex, zref-example-lastpage.tex,
 %%    zref-example-nextpage.tex, zref-test1.tex,
-%%    zref-test-runs.tex, zref-test-titleref-memoir.tex.
+%%    zref-test-base.tex, zref-test-runs.tex,
+%%    zref-test-titleref-memoir.tex.
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \nofiles
 \documentclass{article}
-\usepackage{zref-base}[2010/04/17]
+\usepackage{zref-base}[2010/04/22]
 \usepackage{qstest}
 \IncludeTests{*}
 \LogTests{log}{*}{*}