diff options
author | Karl Berry <karl@freefriends.org> | 2010-04-26 00:14:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-04-26 00:14:41 +0000 |
commit | 0e583582a5df712714661b05da53cf99e99c3d79 (patch) | |
tree | 8f81c96ae544622a7d66b7312c1aeb95abbd78dc /Master/texmf-dist/source/latex/oberdiek | |
parent | 5ca9df5a4f60a37fc6f3ec2f42ebcb2fe04ad6bf (diff) |
oberdiek update (25apr10)
git-svn-id: svn://tug.org/texlive/trunk@17996 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek')
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/oberdiek.ins | 2 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/oberdiek.tex | 4 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/zref.dtx | 290 |
3 files changed, 172 insertions, 124 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins b/Master/texmf-dist/source/latex/oberdiek/oberdiek.ins index b96894248c9..c3f5ce63c6d 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 -% 2010/04/22 +% 2010/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 a4b87171592..f003cf529da 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}{2010/04/22} +\newcommand*{\Date}{2010/04/23} % Copyright (C) 2006-2010 by % Heiko Oberdiek <heiko.oberdiek at googlemail.com> @@ -334,7 +334,7 @@ [\entrysep] \entry{uniquecounter}{2009/12/18}{1.1}{Provides unlimited unique counter}% [\entrysep] -\entry{zref}{2010/04/22}{2.14}{New reference scheme for \LaTeXe{}}% +\entry{zref}{2010/04/23}{2.15}{New reference scheme for \LaTeXe{}}% \end{overview} \section{Packages} diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx index 050ffd5cf0b..ea5bc61a208 100644 --- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx @@ -103,7 +103,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: zref 2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)} +\Msg{* Package: zref 2010/04/23 v2.15 New reference scheme for LaTeX2e (HO)} \Msg{************************************************************************} \keepsilent @@ -212,7 +212,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{zref.drv}% - [2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)]% + [2010/04/23 v2.15 New reference scheme for LaTeX2e (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc}[2008/08/11] \begin{document} @@ -221,7 +221,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{2351} +% \CheckSum{2400} % % \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 @@ -242,7 +242,7 @@ and the derived files % \GetFileInfo{zref.drv} % % \title{The \xpackage{zref} package} -% \date{2010/04/22 v2.14} +% \date{2010/04/23 v2.15} % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}} % % \maketitle @@ -425,8 +425,7 @@ and the derived files % % \markexp means that the implementation of the % marked macro is expandable. \markexptwo goes a step further -% and marks the macro expandable in exact two expansion steps -% except inside \cs{zref@wrapper@unexpanded}. +% and marks the macro expandable in exact two expansion steps. % % \begin{declcs}{zref@newlist} % \M{listname} @@ -856,7 +855,7 @@ and the derived files \newcounter{foo} \renewcommand*{\thefoo}{\Alph{foo}} -\usepackage{zref-lastpage,zref-user}[2010/04/22] +\usepackage{zref-lastpage,zref-user}[2010/04/23] \makeatletter \zref@newprop{thefoo}{\thefoo} @@ -970,7 +969,7 @@ and the derived files %<<END_EXAMPLE \documentclass{book} -\usepackage{zref-nextpage}[2010/04/22] +\usepackage{zref-nextpage}[2010/04/23] \znextpagesetup {\thepage}% next page is unknown {\thepage\ (#1)}% this page is last page @@ -1457,13 +1456,13 @@ the height difference of the two baselines is %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)]% + [2010/04/23 v2.15 New reference scheme for LaTeX2e (HO)]% % \end{macrocode} % % \subsubsection{Load basic module} % % \begin{macrocode} -\RequirePackage{zref-base}[2010/04/22] +\RequirePackage{zref-base}[2010/04/23] % \end{macrocode} % Abort package loading if \xpackage{zref-base} could not be % loaded successfully. @@ -1478,7 +1477,7 @@ the height difference of the two baselines is \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/04/22]% + \RequirePackage{zref-#1}[2010/04/23]% }% }% } @@ -1538,7 +1537,7 @@ the height difference of the two baselines is %<*base> \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)]% % \end{macrocode} % % \subsubsection{Utilities} @@ -1878,41 +1877,34 @@ the height difference of the two baselines is % \end{macrocode} % \end{macro} % -% \begin{macro}{\zref@getcurrent} +% \begin{macro}{\ZREF@getcurrent} % \cs{zref@getcurrent} gets the current value for a property. % \begin{macrocode} -\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 }% } % \end{macrocode} % \end{macro} -% -% \begin{macro}{\ZREF@@unexpanded} +% \begin{macro}{\ZREF@u@getcurrent} % \begin{macrocode} -\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}% }% } % \end{macrocode} % \end{macro} +% \begin{macro}{\zref@getcurrent} +% \begin{macrocode} +\let\zref@getcurrent\ZREF@getcurrent +% \end{macrocode} +% \end{macro} % % \subsubsection{Reference generation} % @@ -2108,29 +2100,6 @@ the height difference of the two baselines is % \end{macrocode} % \end{macro} % -% \begin{macro}{\zref@extract} -% \cs{zref@extract} is an abbreviation for the case -% that the default of the property is used as default -% value. -% \begin{macrocode} -\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}% -} -% \end{macrocode} -% \end{macro} -% % \begin{macro}{\zref@ifrefcontainsprop} % \cs{zref@ifrefcontainsprop} looks, if the reference \verb|#1| % has the property \verb|#2| and calls then \verb|#3| and @@ -2160,37 +2129,105 @@ the height difference of the two baselines is % \end{macrocode} % \end{macro} % -% \begin{macro}{\zref@extractdefault} +% \begin{macro}{\zref@extract} +% \cs{zref@extract} is an abbreviation for the case +% that the default of the property is used as default +% value. +% \begin{macrocode} +\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}% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ZREF@@extract} +% \begin{macrocode} +\def\ZREF@@extract#1#2#3{% + \expandafter\expandafter\expandafter\ltx@space + \zref@extractdefault{#2}{#3}{#1}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ZREF@wu@extract} +% \begin{macrocode} +\def\ZREF@wu@extract#1#2{% + \etex@unexpanded\expandafter\expandafter\expandafter{% + \ZREF@extract{#1}{#2}% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\zref@extract} +% \begin{macrocode} +\let\zref@extract\ZREF@extract +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\ZREF@extractdefault} % The basic extracting macro is \cs{zref@extractdefault} with % the reference name in \verb|#1|, the property in \verb|#2| and % the default value in \verb|#3| in case for problems. % \begin{macrocode} -\def\zref@extractdefault#1#2#3{% +\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 }% } % \end{macrocode} % \end{macro} +% \begin{macro}{\ZREF@wu@extractdefault} +% \begin{macrocode} +\def\ZREF@wu@extractdefault#1#2#3{% + \etex@unexpanded\expandafter\expandafter\expandafter{% + \ZREF@extractdefault{#1}{#2}{#3}% + }% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\zref@extractdefault} +% \begin{macrocode} +\let\zref@extractdefault\ZREF@extractdefault +% \end{macrocode} +% \end{macro} % -% \begin{macro}{\zref@wrapper@unexpanded} +% \begin{macro}{\ZREF@wrapper@unexpanded} % \begin{macrocode} -\long\def\zref@wrapper@unexpanded#1{% - \let\ZREF@unexpanded\etex@unexpanded +\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 +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\zref@wrapper@unexpanded} +% \begin{macrocode} +\ltx@IfUndefined{etex@unexpanded}{% + \let\zref@wrapper@unexpanded\ltx@firstofone +}{% + \let\zref@wrapper@unexpanded\ZREF@wrapper@unexpanded } -\let\ZREF@unexpanded\ltx@firstofone % \end{macrocode} % \end{macro} % @@ -2340,8 +2377,8 @@ the height difference of the two baselines is %<*user> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/04/22 v2.14 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2415,8 +2452,8 @@ the height difference of the two baselines is %<*abspage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/04/22 v2.14 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2460,8 +2497,8 @@ the height difference of the two baselines is %<*counter> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/04/22 v2.14 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2497,9 +2534,9 @@ the height difference of the two baselines is %<*lastpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/04/22 v2.14 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] -\RequirePackage{zref-abspage}[2010/04/22] + [2010/04/23 v2.15 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] +\RequirePackage{zref-abspage}[2010/04/23] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} @@ -2566,14 +2603,14 @@ the height difference of the two baselines is %<*thepage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/04/22 v2.14 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % \begin{macrocode} \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/04/22] +\RequirePackage{zref-abspage}[2010/04/23] % \end{macrocode} % \begin{macrocode} \zref@newlist{thepage} @@ -2626,15 +2663,15 @@ the height difference of the two baselines is %<*nextpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/04/22 v2.14 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/04/22] -\RequirePackage{zref-thepage}[2010/04/22] -\RequirePackage{zref-lastpage}[2010/04/22] +\RequirePackage{zref-abspage}[2010/04/23] +\RequirePackage{zref-thepage}[2010/04/23] +\RequirePackage{zref-lastpage}[2010/04/23] \RequirePackage{uniquecounter}[2009/12/18] % \end{macrocode} % \begin{macrocode} @@ -2727,16 +2764,16 @@ the height difference of the two baselines is %<*totpages> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/04/22 v2.14 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % The absolute page number of the last page is the total % page number. % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/04/22] -\RequirePackage{zref-lastpage}[2010/04/22] +\RequirePackage{zref-abspage}[2010/04/23] +\RequirePackage{zref-lastpage}[2010/04/23] % \end{macrocode} % % \begin{macro}{\ztotpages} @@ -2766,8 +2803,8 @@ the height difference of the two baselines is %<*marks> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2010/04/22 v2.14 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2870,7 +2907,7 @@ the height difference of the two baselines is %<*runs> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/04/22 v2.14 Module runs for zref (HO)]% + [2010/04/23 v2.15 Module runs for zref (HO)]% % \end{macrocode} % % \begin{macro}{\zruns} @@ -2902,8 +2939,8 @@ the height difference of the two baselines is %<*perpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/04/22 v2.14 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2915,7 +2952,7 @@ the height difference of the two baselines is % For detecting changed pages module \xmodule{abspage} % is loaded. % \begin{macrocode} -\RequirePackage{zref-abspage}[2010/04/22] +\RequirePackage{zref-abspage}[2010/04/23] % \end{macrocode} % % We group the properties for the needed references @@ -3057,8 +3094,8 @@ the height difference of the two baselines is %<*titleref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/04/22 v2.14 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] % \end{macrocode} @@ -3453,8 +3490,8 @@ the height difference of the two baselines is %<*xr> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/04/22 v2.14 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % \begin{macrocode} @@ -3729,7 +3766,7 @@ the height difference of the two baselines is \ZREF@xr@externalfile }% }% - \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% + \ZREF@xr@urlcheck\ZREF@xr@tempname \ifZREF@xr@tozreflabel \@ifundefined{\ZREF@xr@refname}{% \ifZREF@xr@verbose @@ -3923,8 +3960,8 @@ the height difference of the two baselines is %<*hyperref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/04/22 v2.14 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -3952,8 +3989,8 @@ the height difference of the two baselines is %<*savepos> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/04/22 v2.14 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -4054,15 +4091,15 @@ the height difference of the two baselines is %<*dotfill> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/04/22 v2.14 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % For measuring the width of \cs{zdotfill} we use the features % provided by module \xmodule{savepos}. % \begin{macrocode} -\RequirePackage{zref-savepos}[2010/04/22] +\RequirePackage{zref-savepos}[2010/04/23] % \end{macrocode} % For automatically generated label names we use the unique % counter of module \xmodule{base}. @@ -4151,7 +4188,7 @@ the height difference of the two baselines is \NeedsTeXFormat{LaTeX2e} \nofiles \documentclass{article} -\usepackage{zref-base}[2010/04/22] +\usepackage{zref-base}[2010/04/23] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -4181,7 +4218,7 @@ the height difference of the two baselines is %<*test-base> \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{zref-base,zref-titleref}[2010/04/22] +\usepackage{zref-base,zref-titleref}[2010/04/23] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -4204,27 +4241,29 @@ the height difference of the two baselines is \makeatother \begin{document} -\section{Hello \textbf{World}} +\section{\textit{Hello} \textbf{World}} \label{sec:hello} \makeatletter -\zref@newprop{foo}[D\@empty efault]{V\@empty alue} +\zref@newprop{foo}[\@empty D\@empty efault]{\@empty V\@empty alue} \begin{qstest}{getcurrent}{getcurrent} - \Test{\zref@getcurrent{foo}}{Value}{V\noexpand\@empty alue}% + \Test{\zref@getcurrent{foo}}% + {Value}{\noexpand\@empty 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}% + \def\textit#1{[#1]}% hash-ok + \Test{\zref@extractdefault{xy}{page}{\@empty D\@empty efault}}% + {Default}{\noexpand\@empty D\noexpand\@empty efault}% + \Test{\zref@extractdefault{sec:hello}{foo}{\@empty A\@empty B}}% + {AB}{\noexpand\@empty A\noexpand\@empty B}% \Test{\zref@extract{sec:hello}{foo}}% - {Default}{D\noexpand\@empty efault}% + {Default}{\noexpand\@empty 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}}% + {[Hello] <World>}{\noexpand\textit{Hello} \noexpand\textbf{World}}% }% \end{qstest} \end{document} @@ -4237,7 +4276,7 @@ the height difference of the two baselines is %<*test-runs> \NeedsTeXFormat{LaTeX2e} \documentclass{article} -\usepackage{zref-runs}[2010/04/22] +\usepackage{zref-runs}[2010/04/23] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -4266,7 +4305,7 @@ the height difference of the two baselines is %<*test-titleref-memoir> \NeedsTeXFormat{LaTeX2e} \documentclass{memoir} -\usepackage{zref-titleref}[2010/04/22] +\usepackage{zref-titleref}[2010/04/23] \usepackage{qstest} \IncludeTests{*} \LogTests{log}{*}{*} @@ -4719,6 +4758,15 @@ the height difference of the two baselines is % are expandable in exact two steps % except inside \cs{zref@wrapper@unexpanded}. % \end{Version} +% \begin{Version}{2010/04/23 v2.15} +% \item +% \cs{zexternaldocument} fixed for property `url' when +% importing \cs{new@label} (bug found by Victor Ivrii). +% \item +% Two expansion steps also in \cs{zref@wrapper@unexpanded}. +% \item +% Nested calls of \cs{zref@wrapper@unexpanded} possible. +% \end{Version} % \end{History} % % \PrintIndex |