diff options
Diffstat (limited to 'Master/texmf-dist/tex')
17 files changed, 98 insertions, 87 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index a0e1c14d5cd..78505b3ff9a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -40,8 +40,8 @@ %% \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}{} \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 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 diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 4392f8d0dfb..ddfc4163f39 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -40,8 +40,8 @@ %% \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}{} \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 45d22dfea89..475f4f75e09 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -40,10 +40,10 @@ %% \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}{} -\RequirePackage{zref-savepos}[2010/04/22] +\RequirePackage{zref-savepos}[2010/04/23] \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 4fee192a7e1..224d8ca7b54 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -40,8 +40,8 @@ %% \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}{} \zref@newprop{anchor}[]{% \ltx@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 dedde01256b..0c0c2cee7d6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -40,9 +40,9 @@ %% \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}{} \zref@newlist{LastPage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty index 78095d4f77f..316e64c4492 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -40,8 +40,8 @@ %% \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}{} \RequirePackage{kvsetkeys}[2009/07/30] \newcommand*{\zref@marks@register}[3][]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index c0512275e52..903dbbe175e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -40,12 +40,12 @@ %% \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}{} -\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] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index d5babfb2e94..980090e83ea 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -40,10 +40,10 @@ %% \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}{} -\RequirePackage{zref-abspage}[2010/04/22] +\RequirePackage{zref-abspage}[2010/04/23] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} \zref@addprop{perpage}{abspage,page,pagevalue} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index dde1b56f3cc..182dc49efb1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -40,7 +40,7 @@ %% \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)]% \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 4ff928fa351..b8d2de1dad0 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -40,8 +40,8 @@ %% \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}{} \ltx@IfUndefined{pdfsavepos}{% \PackageError\ZREF@name{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index d9268b0a4b8..e82b85d4a9f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -40,11 +40,11 @@ %% \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}{} \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/04/22] +\RequirePackage{zref-abspage}[2010/04/23] \zref@newlist{thepage} \zref@addprop{thepage}{page} \AtBeginShipout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 29187976f10..766d088ffb4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -40,8 +40,8 @@ %% \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] \RequirePackage{keyval} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index e4c96af5142..d89b3969281 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -40,11 +40,11 @@ %% \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}{} -\RequirePackage{zref-abspage}[2010/04/22] -\RequirePackage{zref-lastpage}[2010/04/22] +\RequirePackage{zref-abspage}[2010/04/23] +\RequirePackage{zref-lastpage}[2010/04/23] \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 a2368e4a978..ebbffcb5136 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -40,8 +40,8 @@ %% \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}{} \newcommand*\zlabel{% \ifx\label\ltx@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index d3c4a9bc3c6..8d8d3a6c407 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -40,8 +40,8 @@ %% \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}{} \RequirePackage{keyval} \RequirePackage{kvoptions}[2010/02/22] @@ -242,7 +242,7 @@ \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 diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index 957291c4e88..1d95af22012 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -40,13 +40,13 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2010/04/22] + [2010/04/23 v2.15 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2010/04/23] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/04/22]% + \RequirePackage{zref-#1}[2010/04/23]% }% }% } |