From ff02932b3376f298f236f229b8feb9a20ac71cc3 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Thu, 2 Oct 2008 23:04:08 +0000 Subject: oberdiek update git-svn-id: svn://tug.org/texlive/trunk@10833 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/oberdiek/zref-abspage.sty | 7 ++-- Master/texmf-dist/tex/latex/oberdiek/zref-base.sty | 41 ++++++++++++++++++++-- .../texmf-dist/tex/latex/oberdiek/zref-counter.sty | 7 ++-- .../texmf-dist/tex/latex/oberdiek/zref-dotfill.sty | 9 ++--- .../tex/latex/oberdiek/zref-hyperref.sty | 7 ++-- .../tex/latex/oberdiek/zref-lastpage.sty | 16 ++++++--- .../texmf-dist/tex/latex/oberdiek/zref-perpage.sty | 9 ++--- .../texmf-dist/tex/latex/oberdiek/zref-savepos.sty | 7 ++-- .../tex/latex/oberdiek/zref-titleref.sty | 7 ++-- .../tex/latex/oberdiek/zref-totpages.sty | 11 +++--- Master/texmf-dist/tex/latex/oberdiek/zref-user.sty | 7 ++-- Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty | 7 ++-- Master/texmf-dist/tex/latex/oberdiek/zref.sty | 9 ++--- 13 files changed, 100 insertions(+), 44 deletions(-) (limited to 'Master/texmf-dist/tex/latex/oberdiek') diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 73adc7729ec..109d72d6156 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -28,12 +28,13 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2008/09/21 v2.2 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@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 7ac3d034f4d..7fc366adf6d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -28,11 +28,12 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2008/09/21 v2.2 Module base for zref (HO)]% + [2008/10/01 v2.3 Module base for zref (HO)]% \def\ZREF@name{zref} \def\ZREF@ErrorNoLine#1#2{% \begingroup @@ -131,6 +132,16 @@ \expandafter\@secondoftwo \fi } +\def\zref@listforloop#1#2{% + \expandafter\expandafter\expandafter\@tfor + \expandafter\expandafter\expandafter\zref@prop + \expandafter\expandafter\expandafter:% + \expandafter\expandafter\expandafter=% + \csname Z@L@#1\endcsname + \do{% + #2\zref@prop + }% +} \def\zref@addprop#1#2{% \zref@listexists{#1}{% \zref@propexists{#2}{% @@ -144,6 +155,32 @@ }% }% } +\def\zref@localaddprop#1#2{% + \zref@listexists{#1}{% + \zref@propexists{#2}{% + \zref@iflistcontainsprop{#1}{#2}{% + \PackageWarning\ZREF@name{% + Property `#2' is already in list `#1'% + }% + }{% + \expandafter\ZREF@l@addto@macro\csname Z@L@#1\endcsname{{#2}}% + }% + }% + }% +} +\ifetex@unexpanded + \def\ZREF@l@addto@macro#1#2{% + \global\let\ZREF@gtemp#1% + \g@addto@macro\ZREF@gtemp{#2}% + \let#1\ZREF@gtemp + }% +\else + \def\ZREF@l@addto@macro#1#2{% + \edef#1{% + \etex@unexpanded\expandafter{#1#2}% + }% + }% +\fi \def\zref@ifpropundefined#1{% \expandafter\ifx\csname Z@E@#1\endcsname\relax \expandafter\@firstoftwo diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index bc40a54aaf6..7d6e504d4f2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -28,12 +28,13 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2008/09/21 v2.2 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@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 04a8905778b..44755df6f07 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -28,14 +28,15 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2008/09/21 v2.2 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2008/09/21] +\RequirePackage{zref-savepos}[2008/10/01] \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 fd1da19efb3..6000bee806e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -28,12 +28,13 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2008/09/21 v2.2 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@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 6e219a1c0d1..90bb4ec773a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -28,20 +28,28 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2008/09/21 v2.2 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@ifundefined{ZREF@baseok}{\endinput}{} +\zref@newlist{LastPage} \AtBeginDocument{% \AtEndDocument{% \if@filesw \clearpage \begingroup \advance\c@page\m@ne - \zref@wrapper@immediate{\zref@label{LastPage}}% + \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 }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index a6929804602..ad98d01acba 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -28,14 +28,15 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2008/09/21 v2.2 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2008/09/21] +\RequirePackage{zref-abspage}[2008/10/01] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} \zref@addprop{perpage}{abspage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty index 68ff2c163d8..d141f91b325 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -28,12 +28,13 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2008/09/21 v2.2 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@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 e318644a892..36cde9a4bb0 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -28,12 +28,13 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2008/09/21 v2.2 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \let\zref@titleref@current\@empty diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index e55edd7602c..a156503f450 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -28,15 +28,16 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2008/09/21 v2.2 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2008/09/21] -\RequirePackage{zref-lastpage}[2008/09/21] +\RequirePackage{zref-abspage}[2008/10/01] +\RequirePackage{zref-lastpage}[2008/10/01] \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 06d2d0b4272..425f3214107 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -28,12 +28,13 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2008/09/21 v2.2 Module user for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module user for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@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 b10db99201e..077b3cff47f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -28,12 +28,13 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2008/09/21 v2.2 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@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 61e77e1b960..cc7ecb10049 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -28,17 +28,18 @@ %% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty, %% zref-hyperref.sty, zref-lastpage.sty, zref-perpage.sty, %% zref-savepos.sty, zref-titleref.sty, zref-totpages.sty, -%% zref-user.sty, zref-xr.sty, zref-example.tex. +%% zref-user.sty, zref-xr.sty, zref-example.tex, +%% zref-example-lastpage.tex, zref-test1.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2008/09/21 v2.2 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2008/09/21] + [2008/10/01 v2.3 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2008/10/01] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2008/09/21]% + \RequirePackage{zref-#1}[2008/10/01]% }% }% } -- cgit v1.2.3