oberdiek update (25apr10)

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

1 files changed, 56 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
index ba6218b938f..bc1287147cc 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -40,7 +40,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2010/04/22 v2.14 Module base for zref (HO)]%
+  [2010/04/23 v2.15 Module base for zref (HO)]%
 \RequirePackage{ltxcmds}[2010/03/01]
 \RequirePackage{kvsetkeys}[2010/03/01]
 \def\ZREF@name{zref}
@@ -217,31 +217,21 @@
     \expandafter\def\csname Z@C@#1\endcsname{#2}%
   }%
 }
-\def\zref@getcurrent#1{%
+\def\ZREF@getcurrent#1{%
   \romannumeral0%
   \ltx@ifundefined{Z@C@#1}{%
     \ltx@space
   }{%
-    \expandafter\expandafter\expandafter
-    \ZREF@@unexpanded\expandafter\expandafter\expandafter{%
-      \csname Z@C@#1\endcsname
-    }%
+    \expandafter\expandafter\expandafter\ltx@space
+    \csname Z@C@#1\endcsname
   }%
 }
-\def\ZREF@@unexpanded#1{%
-  \ifx\ZREF@unexpanded\ltx@firstofone
-    \expandafter\ltx@firstoftwo
-  \else
-    \expandafter\ltx@secondoftwo
-  \fi
-  {%
-    \ltx@space
-    #1%
-  }{%
-    \ltx@space
-    \ZREF@unexpanded{#1}%
+\def\ZREF@wu@getcurrent#1{%
+  \etex@unexpanded\expandafter\expandafter\expandafter{%
+    \ZREF@getcurrent{#1}%
   }%
 }
+\let\zref@getcurrent\ZREF@getcurrent
 \def\zref@label#1{%
   \zref@labelbylist{#1}\ZREF@mainlist
 }
@@ -341,21 +331,6 @@
     }%
   }{}%
 }
-\def\zref@extract#1#2{%
-  \romannumeral0%
-  \ltx@ifundefined{Z@D@#2}{%
-    \expandafter\ltx@space\zref@default
-  }{%
-    \expandafter\expandafter\expandafter\ZREF@extract
-    \expandafter\expandafter\expandafter{%
-      \csname Z@D@#2\endcsname
-    }{#1}{#2}%
-  }%
-}
-\def\ZREF@extract#1#2#3{%
-  \expandafter\expandafter\expandafter\ltx@space
-  \zref@extractdefault{#2}{#3}{#1}%
-}
 \def\zref@ifrefcontainsprop#1#2{%
   \zref@ifrefundefined{#1}{%
     \ltx@secondoftwo
@@ -377,27 +352,63 @@
   \fi
 }
 \def\ZREF@novalue{\ZREF@NOVALUE}
-\def\zref@extractdefault#1#2#3{%
+\def\ZREF@extract#1#2{%
+  \romannumeral0%
+  \ltx@ifundefined{Z@D@#2}{%
+    \expandafter\ltx@space\zref@default
+  }{%
+    \expandafter\expandafter\expandafter\ZREF@@extract
+    \expandafter\expandafter\expandafter{%
+      \csname Z@D@#2\endcsname
+    }{#1}{#2}%
+  }%
+}
+\def\ZREF@@extract#1#2#3{%
+  \expandafter\expandafter\expandafter\ltx@space
+  \zref@extractdefault{#2}{#3}{#1}%
+}
+\def\ZREF@wu@extract#1#2{%
+  \etex@unexpanded\expandafter\expandafter\expandafter{%
+    \ZREF@extract{#1}{#2}%
+  }%
+}
+\let\zref@extract\ZREF@extract
+\def\ZREF@extractdefault#1#2#3{%
   \romannumeral0%
   \zref@ifrefundefined{#1}\ltx@firstoftwo{%
     \zref@ifpropundefined{#2}\ltx@firstoftwo\ltx@secondoftwo
   }{%
-    \ZREF@@unexpanded{#3}%
+    \ltx@space
+    #3%
   }{%
-    \expandafter\expandafter\expandafter
-    \ZREF@@unexpanded\expandafter\expandafter\expandafter{%
-      \csname Z@E@#2\expandafter\expandafter\expandafter\endcsname
-      \csname Z@R@#1\expandafter\endcsname
-      \csname#2\endcsname{#3}\ZREF@nil
-    }%
+    \expandafter\expandafter\expandafter\ltx@space
+    \csname Z@E@#2\expandafter\expandafter\expandafter\endcsname
+    \csname Z@R@#1\expandafter\endcsname
+    \csname#2\endcsname{#3}\ZREF@nil
+  }%
+}
+\def\ZREF@wu@extractdefault#1#2#3{%
+  \etex@unexpanded\expandafter\expandafter\expandafter{%
+    \ZREF@extractdefault{#1}{#2}{#3}%
   }%
 }
-\long\def\zref@wrapper@unexpanded#1{%
-  \let\ZREF@unexpanded\etex@unexpanded
+\let\zref@extractdefault\ZREF@extractdefault
+\long\def\ZREF@wrapper@unexpanded#1{%
+  \let\zref@wrapper@unexpanded\ltx@firstofone
+  \let\zref@getcurrent\ZREF@wu@getcurrent
+  \let\zref@extractdefault\ZREF@wu@extractdefault
+  \let\zref@extract\ZREF@wu@extract
   #1%
-  \let\ZREF@unexpanded\ltx@firstofone
+  \let\zref@wrapper@unexpanded\ZREF@wrapper@unexpanded
+  \let\zref@getcurrent\ZREF@getcurrent
+  \let\zref@extractdefault\ZREF@extractdefault
+  \let\zref@extract\ZREF@extract
+}
+\ltx@IfUndefined{etex@unexpanded}{%
+  \let\zref@wrapper@unexpanded\ltx@firstofone
+}{%
+  \let\zref@wrapper@unexpanded\ZREF@wrapper@unexpanded
 }
-\let\ZREF@unexpanded\ltx@firstofone
 \long\def\zref@wrapper@babel#1#2{%
   \ifcsname if@safe@actives\endcsname
     \expandafter\ltx@firstofone