summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-04-23 00:33:14 +0000
committerKarl Berry <karl@freefriends.org>2010-04-23 00:33:14 +0000
commitc0e1259ef738f3dc6e27246d797cf81a05836f97 (patch)
tree0b8a4267bd51f86fbf251d565d110e018e00dea6 /Master/texmf-dist/tex/latex
parent7ec0cd0175d99a635a9298554e4fb6f0e56599d1 (diff)
oberdiek update (22apr10)
git-svn-id: svn://tug.org/texlive/trunk@17966 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-base.sty149
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty13
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty13
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty5
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty20
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty11
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-user.sty7
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty41
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref.sty9
17 files changed, 183 insertions, 147 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
index 4e2de272a5e..a0e1c14d5cd 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
@@ -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}
\ProvidesPackage{zref-abspage}%
- [2010/04/17 v2.12 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 6ff9ea65221..ba6218b938f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -35,24 +35,25 @@
%% 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}
\ProvidesPackage{zref-base}%
- [2010/04/17 v2.12 Module base for zref (HO)]%
+ [2010/04/22 v2.14 Module base for zref (HO)]%
\RequirePackage{ltxcmds}[2010/03/01]
+\RequirePackage{kvsetkeys}[2010/03/01]
\def\ZREF@name{zref}
\def\ZREF@UpdatePdfTeX{Update pdfTeX.}
\newif\ifZREF@found
\def\ZREF@patch#1{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1\endcsname\relax
- \expandafter\ltx@gobble
- \else
+ \ltx@IfUndefined{#1}{%
+ \ltx@gobble
+ }{%
\expandafter\let\csname ZREF@org@#1\expandafter\endcsname
\csname #1\endcsname
- \expandafter\ltx@firstofone
- \fi
+ \ltx@firstofone
+ }%
}
\ltx@IfUndefined{eTeXversion}{%
\PackageError\ZREF@name{%
@@ -96,11 +97,7 @@
}%
}
\def\zref@iflistundefined#1{%
- \expandafter\ifx\csname Z@L@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@L@#1}%
}
\def\zref@listexists#1{%
\zref@iflistundefined{#1}{%
@@ -110,7 +107,11 @@
}%
}
\def\zref@iflistcontainsprop#1{%
- \expandafter\ZREF@iflistcontainsprop\csname Z@L@#1\endcsname
+ \zref@iflistundefined{#1}{%
+ \expandafter\ltx@secondoftwo\@gobble
+ }{%
+ \expandafter\ZREF@iflistcontainsprop\csname Z@L@#1\endcsname
+ }%
}
\def\ZREF@iflistcontainsprop#1#2{%
\begingroup
@@ -142,51 +143,43 @@
}
\def\zref@addprop#1#2{%
\zref@listexists{#1}{%
- \zref@propexists{#2}{%
- \zref@iflistcontainsprop{#1}{#2}{%
- \PackageWarning\ZREF@name{%
- Property `#2' is already in list `#1'%
+ \comma@parse{#2}{%
+ \zref@propexists\comma@entry{%
+ \zref@iflistcontainsprop{#1}\comma@entry{%
+ \PackageWarning\ZREF@name{%
+ Property `\comma@entry' is already in list `#1'%
+ }%
+ }{%
+ \edef\comma@entry{\comma@entry}%
+ \expandafter\g@addto@macro\csname Z@L@#1\expandafter\endcsname
+ \expandafter{\expandafter{\comma@entry}}%
}%
- }{%
- \edef\ZREF@temp{#2}%
- \expandafter\g@addto@macro\csname Z@L@#1\expandafter\endcsname
- \expandafter{\expandafter{\ZREF@temp}}%
}%
+ \ltx@gobble
}%
}%
}
\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'%
+ \comma@parse{#2}{%
+ \zref@propexists\comma@entry{%
+ \zref@iflistcontainsprop{#1}\comma@entry{%
+ \PackageWarning\ZREF@name{%
+ Property `\comma@entry' is already in list `#1'%
+ }%
+ }{%
+ \edef\comma@entry{\comma@entry}%
+ \expandafter\ltx@LocalAppendToMacro
+ \csname Z@L@#1\expandafter\endcsname
+ \expandafter{\expandafter{\comma@entry}}%
}%
- }{%
- \expandafter\ZREF@l@addto@macro\csname Z@L@#1\endcsname{{#2}}%
}%
+ \ltx@gobble
}%
}%
}
-\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\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@E@#1}%
}
\def\zref@propexists#1{%
\zref@ifpropundefined{#1}{%
@@ -219,11 +212,35 @@
\def\ZREF@@@newprop#1{%
\expandafter\gdef\csname Z@E@\ZREF@P\endcsname##1#1##2##3\ZREF@nil{##2}%
}
-\def\zref@setcurrent#1{%
- \expandafter\def\csname Z@C@#1\endcsname
+\def\zref@setcurrent#1#2{%
+ \zref@propexists{#1}{%
+ \expandafter\def\csname Z@C@#1\endcsname{#2}%
+ }%
}
\def\zref@getcurrent#1{%
- \csname Z@C@#1\endcsname
+ \romannumeral0%
+ \ltx@ifundefined{Z@C@#1}{%
+ \ltx@space
+ }{%
+ \expandafter\expandafter\expandafter
+ \ZREF@@unexpanded\expandafter\expandafter\expandafter{%
+ \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@label#1{%
\zref@labelbylist{#1}\ZREF@mainlist
@@ -304,11 +321,7 @@
}%
}
\def\zref@ifrefundefined#1{%
- \expandafter\ifx\csname Z@R@#1\endcsname\relax
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@secondoftwo
- \fi
+ \ltx@ifundefined{Z@R@#1}%
}
\newcommand*{\zifrefundefined}[1]{%
\zref@wrapper@babel\ZREF@ifrefundefined{#1}%
@@ -329,12 +342,18 @@
}{}%
}
\def\zref@extract#1#2{%
- \expandafter\expandafter\expandafter\ZREF@extract
- \expandafter\expandafter\expandafter{%
- \csname Z@D@#2\endcsname
- }{#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{%
@@ -359,11 +378,14 @@
}
\def\ZREF@novalue{\ZREF@NOVALUE}
\def\zref@extractdefault#1#2#3{%
- \zref@ifrefundefined{#1}{%
- \ZREF@unexpanded{#3}%
+ \romannumeral0%
+ \zref@ifrefundefined{#1}\ltx@firstoftwo{%
+ \zref@ifpropundefined{#2}\ltx@firstoftwo\ltx@secondoftwo
}{%
- \expandafter\expandafter\expandafter\ZREF@unexpanded
- \expandafter\expandafter\expandafter{%
+ \ZREF@@unexpanded{#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
@@ -431,8 +453,7 @@
\zref@newlist\ZREF@mainlist
\zref@newprop{default}{\@currentlabel}
\zref@newprop*{page}{\thepage}
-\zref@addprop\ZREF@mainlist{default}
-\zref@addprop\ZREF@mainlist{page}
+\zref@addprop\ZREF@mainlist{default,page}
\let\ZREF@baseok\@empty
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
index 3ad669191a2..4392f8d0dfb 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
@@ -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}
\ProvidesPackage{zref-counter}%
- [2010/04/17 v2.12 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 c200ecce6d5..45d22dfea89 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
@@ -35,14 +35,15 @@
%% 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}
\ProvidesPackage{zref-dotfill}%
- [2010/04/17 v2.12 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-savepos}[2010/04/17]
+\RequirePackage{zref-savepos}[2010/04/22]
\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 c85417f994a..4fee192a7e1 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
@@ -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}
\ProvidesPackage{zref-hyperref}%
- [2010/04/17 v2.12 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 cac3ed6e9ec..dedde01256b 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
@@ -35,13 +35,14 @@
%% 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}
\ProvidesPackage{zref-lastpage}%
- [2010/04/17 v2.12 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
-\RequirePackage{zref-abspage}[2010/04/17]
+ [2010/04/22 v2.14 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
+\RequirePackage{zref-abspage}[2010/04/22]
\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 663175d29bc..78095d4f77f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
@@ -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}
\ProvidesPackage{zref-marks}%
- [2010/04/17 v2.12 Module marks for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module marks for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 0a7ec65196f..c0512275e52 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
@@ -35,16 +35,17 @@
%% 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}
\ProvidesPackage{zref-nextpage}%
- [2010/04/17 v2.12 Module nextpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module nextpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/17]
-\RequirePackage{zref-thepage}[2010/04/17]
-\RequirePackage{zref-lastpage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
+\RequirePackage{zref-thepage}[2010/04/22]
+\RequirePackage{zref-lastpage}[2010/04/22]
\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 0de80d90357..d5babfb2e94 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -35,19 +35,18 @@
%% 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}
\ProvidesPackage{zref-perpage}%
- [2010/04/17 v2.12 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
\zref@newprop*{pagevalue}[0]{\number\c@page}
\zref@newlist{perpage}
-\zref@addprop{perpage}{abspage}
-\zref@addprop{perpage}{page}
-\zref@addprop{perpage}{pagevalue}
+\zref@addprop{perpage}{abspage,page,pagevalue}
\newcounter{zpage}
\zref@require@unique
\let\ZREF@org@stepcounter\stepcounter
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
index 146ca1a6508..dde1b56f3cc 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
@@ -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}
\ProvidesPackage{zref-runs}%
- [2010/04/17 v2.12 Module runs for zref (HO)]%
+ [2010/04/22 v2.14 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 399023da74e..4ff928fa351 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
@@ -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}
\ProvidesPackage{zref-savepos}%
- [2010/04/17 v2.12 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\ltx@IfUndefined{pdfsavepos}{%
\PackageError\ZREF@name{%
@@ -52,23 +53,22 @@
\RequirePackage{ifpdf}
\ifpdf
\else
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname pdftexversion\endcsname\relax
- \else
+ \ltx@IfUndefined{pdftexversion}{%
+ }{%
\ifnum\pdftexversion<140 %
\PackageError\ZREF@name{%
- \string\pdfsavepos\space is not supported in DVI mode\MessageBreak
+ \string\pdfsavepos\space is not supported in DVI mode%
+ \MessageBreak
of this pdfTeX version%
}\ZREF@UpdatePdfTeX
\expandafter\expandafter\expandafter\endinput
\fi
- \fi
+ }%
\fi
\zref@newlist{savepos}
\zref@newprop*{posx}[0]{\the\pdflastxpos}
\zref@newprop*{posy}[0]{\the\pdflastypos}
-\zref@addprop{savepos}{posx}
-\zref@addprop{savepos}{posy}
+\zref@addprop{savepos}{posx,posy}
\def\zsavepos#1{%
\@bsphack
\if@filesw
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
index b8544f42fa1..d9268b0a4b8 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
@@ -35,15 +35,16 @@
%% 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}
\ProvidesPackage{zref-thepage}%
- [2010/04/17 v2.12 Module thepage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module thepage for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\RequirePackage{atbegshi}
-\RequirePackage{zref-abspage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
\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 f715f768c7a..29187976f10 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
@@ -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}
\ProvidesPackage{zref-titleref}%
- [2010/04/17 v2.12 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 1c4609a6fd4..e4c96af5142 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
@@ -35,15 +35,16 @@
%% 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}
\ProvidesPackage{zref-totpages}%
- [2010/04/17 v2.12 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
-\RequirePackage{zref-abspage}[2010/04/17]
-\RequirePackage{zref-lastpage}[2010/04/17]
+\RequirePackage{zref-abspage}[2010/04/22]
+\RequirePackage{zref-lastpage}[2010/04/22]
\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 978bbc106f3..a2368e4a978 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
@@ -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}
\ProvidesPackage{zref-user}%
- [2010/04/17 v2.12 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@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 946ba4b5a4a..d3c4a9bc3c6 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
@@ -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}
\ProvidesPackage{zref-xr}%
- [2010/04/17 v2.12 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\RequirePackage{keyval}
\RequirePackage{kvoptions}[2010/02/22]
@@ -270,28 +271,30 @@
Import to LaTeX label `#2'%
}%
\fi
- \expandafter\xdef\csname r@#2\endcsname{%
- {%
- \ltx@ifundefined{M@TitleReference}{%
- \ltx@ifundefined{TR@TitleReference}{%
- \zref@extractdefault{#1}{default}{}%
+ \zref@wrapper@unexpanded{%
+ \expandafter\xdef\csname r@#2\endcsname{%
+ {%
+ \ltx@ifundefined{M@TitleReference}{%
+ \ltx@ifundefined{TR@TitleReference}{%
+ \zref@extractdefault{#1}{default}{}%
+ }{%
+ \noexpand\TR@TitleReference
+ {\zref@extractdefault{#1}{default}{}}%
+ {\zref@extractdefault{#1}{title}{}}%
+ }%
}{%
- \noexpand\TR@TitleReference
+ \noexpand\M@TitleReference
{\zref@extractdefault{#1}{default}{}}%
{\zref@extractdefault{#1}{title}{}}%
}%
- }{%
- \noexpand\M@TitleReference
- {\zref@extractdefault{#1}{default}{}}%
- {\zref@extractdefault{#1}{title}{}}%
}%
+ {\zref@extractdefault{#1}{page}{}}%
+ \ltx@ifpackageloaded{nameref}{%
+ {\zref@extractdefault{#1}{title}{}}%
+ {\zref@extractdefault{#1}{anchor}{}}%
+ {\zref@extractdefault{#1}{url}{}}%
+ }{}%
}%
- {\zref@extractdefault{#1}{page}{}}%
- \ltx@ifpackageloaded{nameref}{%
- {\zref@extractdefault{#1}{title}{}}%
- {\zref@extractdefault{#1}{anchor}{}}%
- {\zref@extractdefault{#1}{url}{}}%
- }{}%
}%
}
\def\ZREF@xr@zref@ignorewarning#1{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
index 4548e50a71a..957291c4e88 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
@@ -35,17 +35,18 @@
%% 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}
\ProvidesPackage{zref}
- [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]%
-\RequirePackage{zref-base}[2010/04/17]
+ [2010/04/22 v2.14 New reference scheme for LaTeX2e (HO)]%
+\RequirePackage{zref-base}[2010/04/22]
\@ifundefined{ZREF@baseok}{\endinput}{}
\def\ZREF@temp#1{%
\DeclareOption{#1}{%
\AtEndOfPackage{%
- \RequirePackage{zref-#1}[2010/04/17]%
+ \RequirePackage{zref-#1}[2010/04/22]%
}%
}%
}