summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-04 17:35:01 +0000
committerKarl Berry <karl@freefriends.org>2010-05-04 17:35:01 +0000
commit3cd7d680d047db2f439ccba96948f1ceaa6d973f (patch)
tree99414f003d20290deb6c11806bde6685c1eb9b25 /Master/texmf-dist/tex
parent67c3a09c0f5d7fcf6bff5cfbc686a0c247d0e744 (diff)
oberdiek update (3may10)
git-svn-id: svn://tug.org/texlive/trunk@18100 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/catchfile.sty35
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex89
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex3
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/hologo.sty24
-rw-r--r--Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty57
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty2
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty4
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty16
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty59
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-base.sty211
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty16
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty63
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty24
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty22
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty24
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty28
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty205
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty206
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty43
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty9
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty33
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty28
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty44
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty20
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-user.sty28
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty164
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref.sty21
28 files changed, 1178 insertions, 302 deletions
diff --git a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
index 4706c3f9349..e98547785c6 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/catchfile.sty
@@ -94,7 +94,7 @@
\fi
\expandafter\x\csname ver@catchfile.sty\endcsname
\ProvidesPackage{catchfile}%
- [2010/04/08 v1.4 Catches the contents of a file (HO)]
+ [2010/04/28 v1.5 Catches the contents of a file (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -128,8 +128,10 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input infwarerr.sty\relax
+ \input ltxcmds.sty\relax
\else
\RequirePackage{infwarerr}[2007/09/09]%
+ \RequirePackage{ltxcmds}[2010/03/09]%
\fi
\begingroup
\escapechar=92\relax
@@ -219,6 +221,11 @@
File `#2' not found%
}\@ehc
}
+\ltx@IfUndefined{RequirePackage}{%
+ \input etexcmds.sty\relax
+}{%
+ \RequirePackage{etexcmds}[2010/01/28]%
+}
\long\def\CatchFileEdef#1#2#3{%
\CatchFile@CheckFileExists{#2}%
\ifx\CatchFile@File\relax
@@ -240,12 +247,30 @@
\begingroup
\everyeof\expandafter{%
\CatchFile@EOF
+ \expandafter\CatchFile@Finish
\noexpand
}%
- \expandafter\long\expandafter\def\expandafter\CatchFile@Do
- \expandafter##\expandafter1\CatchFile@EOF{%
- \endgroup
- \def#1{##1}%
+ \ltx@ifundefined{etex@unexpanded}{%
+ \expandafter\long\expandafter\def\expandafter\CatchFile@Do
+ \expandafter##\expandafter1\CatchFile@EOF{%
+ \toks\ltx@zero{##1}%
+ \xdef\CatchFile@gtemp{\the\toks\ltx@zero}%
+ \def\CatchFile@Finish{%
+ \endgroup
+ \let#1\CatchFile@gtemp
+ \global\let\CatchFile@gtemp\ltx@undefined
+ }%
+ }%
+ }{%
+ \expandafter\long\expandafter\def\expandafter\CatchFile@Do
+ \expandafter##\expandafter1\CatchFile@EOF{%
+ \edef\CatchFile@Finish{%
+ \endgroup
+ \etex@unexpanded{%
+ \edef#1{\etex@unexpanded{##1}}%
+ }%
+ }%
+ }%
}%
#3%
\expandafter\expandafter\expandafter\CatchFile@Do
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex
new file mode 100644
index 00000000000..78e23862846
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/oberdiek/hologo-test-spacefactor.tex
@@ -0,0 +1,89 @@
+%%
+%% This is file `hologo-test-spacefactor.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% hologo.dtx (with options: `test-spacefactor')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2010 by
+%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% The Base Interpreter refers to any `TeX-Format',
+%% because some files are installed in TDS:tex/generic//.
+%%
+%% This work consists of the main source file hologo.dtx
+%% and the derived files
+%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex,
+%% hologo-test-spacefactor.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\documentclass{article}
+\usepackage{hologo}[2010/04/24]
+\usepackage{kvsetkeys}
+\usepackage{qstest}
+\IncludeTests{*}
+\LogTests{log}{*}{*}
+\begin{document}
+\begin{qstest}{spacefactor}{spacefactor}
+\newcommand*{\Test}[1]{%
+ \sbox0{%
+ \hologo{#1}%
+ \Expect*{1000 (#1)}*{\the\spacefactor\space(#1)}%
+ }%
+}%
+\makeatletter
+\kv@parse@normalized{%
+ AmSLaTeX,%
+ AmSTeX,%
+ eTeX,%
+ LaTeX,%
+ LaTeX2e,%
+ LaTeX3,%
+ LaTeXe,%
+ LuaLaTeX,%
+ LuaTeX,%
+ pdfTeX,%
+ pdfLaTeX,%
+ plainTeX=,%
+ plainTeX={variant=space},%
+ plainTeX={variant=hyphen},%
+ plainTeX={variant=runtogether},%
+ TeX,%
+ VTeX,%
+ XeLaTeX,%
+ XeTeX,%
+}{%
+ \begingroup
+ \let\@logo=\kv@key
+ \ifx\kv@value\relax
+ \else
+ \expandafter\hologoLogoSetup\expandafter\@logo\expandafter{%
+ \kv@value
+ }%
+ \fi
+ \Test\@logo
+ \endgroup
+ \@gobbletwo
+}
+\end{qstest}
+\end{document}
+\endinput
+%%
+%% End of file `hologo-test-spacefactor.tex'.
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex
index c3eeffed29f..9413b288492 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex
+++ b/Master/texmf-dist/tex/generic/oberdiek/hologo-test1.tex
@@ -30,7 +30,8 @@
%%
%% This work consists of the main source file hologo.dtx
%% and the derived files
-%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex.
+%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex,
+%% hologo-test-spacefactor.tex.
%%
\catcode`\{=1 %
\catcode`\}=2 %
diff --git a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
index c9b95fa5cf8..00d8dadd553 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/hologo.sty
@@ -30,7 +30,8 @@
%%
%% This work consists of the main source file hologo.dtx
%% and the derived files
-%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex.
+%% hologo.sty, hologo.pdf, hologo.ins, hologo.drv, hologo-test1.tex,
+%% hologo-test-spacefactor.tex.
%%
\begingroup
\catcode44 12 % ,
@@ -92,7 +93,7 @@
\fi
\expandafter\x\csname ver@hologo.sty\endcsname
\ProvidesPackage{hologo}%
- [2010/04/16 v1.1 Logo collection (HO)]
+ [2010/04/24 v1.2 Logo collection (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -443,8 +444,11 @@
\setbox\ltx@zero\hbox{#1\kern0pt#2}%
\advance\HOLOGO@TempDimen by -\wd\ltx@zero
}
+\def\HOLOGO@SpaceFactor{%
+ \spacefactor1000 %
+}
\def\HoLogo@TeX#1{%
- T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000 %
+ T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\HOLOGO@SpaceFactor
}
\def\HoLogo@plainTeX@space#1{%
\HOLOGO@mbox{#1{p}{P}lain}\HOLOGO@space\hologo{TeX}%
@@ -504,6 +508,14 @@
}
\expandafter\let\csname HoLogo@LaTeX2e\endcsname\HoLogo@LaTeXe
\expandafter\let\csname HoLogoBkm@LaTeX2e\endcsname\HoLogoBkm@LaTeXe
+\expandafter\def\csname HoLogo@LaTeX3\endcsname#1{%
+ \hologo{LaTeX}%
+ 3%
+}
+\expandafter\def\csname HoLogoBkm@LaTeX3\endcsname#1{%
+ \hologo{LaTeX}%
+ 3%
+}
\def\HoLogo@eTeX#1{%
\ltx@mbox{%
\hbox{%
@@ -551,7 +563,6 @@
\kern-.15em\relax
\hologo{TeX}%
}
-\def\HoLogoBkm@XeTeX#1{XeTeX}
\def\HoLogo@XeLaTeX#1{%
\hologo{Xe}%
\hologo{LaTeX}%
@@ -566,6 +577,11 @@
#1{p}{P}df\hologo{LaTeX}%
}%
}
+\def\HoLogo@VTeX#1{%
+ \HOLOGO@mbox{%
+ V\hologo{TeX}%
+ }%
+}
\def\HoLogo@AmS#1{%
\begingroup
\usefont{OMS}{cmsy}{m}{n}%
diff --git a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
index 325a483fbf4..6df197f2554 100644
--- a/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+++ b/Master/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
@@ -31,7 +31,7 @@
%% This work consists of the main source file ltxcmds.dtx
%% and the derived files
%% ltxcmds.sty, ltxcmds.pdf, ltxcmds.ins, ltxcmds.drv,
-%% ltxcmds-test1.tex.
+%% ltxcmds-test1.tex, ltxcmds-test-gobble.tex.
%%
\begingroup
\catcode44 12 % ,
@@ -93,7 +93,7 @@
\fi
\expandafter\x\csname ver@ltxcmds.sty\endcsname
\ProvidesPackage{ltxcmds}%
- [2010/04/16 v1.6 LaTeX kernel commands for general use (HO)]
+ [2010/04/26 v1.7 LaTeX kernel commands for general use (HO)]
\begingroup
\catcode123 1 % {
\catcode125 2 % }
@@ -133,22 +133,65 @@
\chardef\ltx@zero=0 %
\chardef\ltx@one=1 %
\chardef\ltx@two=2 %
+\chardef\ltx@active=13 %
\chardef\ltx@cclv=255 %
\long\def\ltx@gobble#1{}
\long\def\ltx@gobbletwo#1#2{}
\long\def\ltx@gobblethree#1#2#3{}
\long\def\ltx@gobblefour#1#2#3#4{}
+\def\ltx@GobbleNum#1{%
+ \romannumeral
+ \csname ltx@zero%
+ \expandafter\LTXcmds@GobbleNum
+ \romannumeral\expandafter\ltx@firstofone
+ \expandafter{\LTXcmds@num#1}000{m\endcsname}%
+}
+\def\LTXcmds@GobbleNum#1{%
+ \csname LTXcmds@G#1\LTXcmds@GobbleNum
+}
+\long\def\LTXcmds@Gm#1{%
+ \endcsname
+}
\long\def\ltx@firstofone#1{#1}
\long\def\ltx@firstoftwo#1#2{#1}
\long\def\ltx@secondoftwo#1#2{#2}
\long\def\ltx@car#1#2\@nil{#1}
\long\def\ltx@cdr#1#2\@nil{#2}
+\long\def\ltx@carzero#1\@nil{}%
+\long\def\ltx@cdrzero#1\@nil{#1}%
+
\long\def\ltx@cartwo#1#2#3\@nil{#1#2}
\long\def\ltx@cdrtwo#1#2#3\@nil{#3}
\long\def\ltx@carthree#1#2#3#4\@nil{#1#2#3}
\long\def\ltx@cdrthree#1#2#3#4\@nil{#4}
\long\def\ltx@carfour#1#2#3#4#5\@nil{#1#2#3#4}
\long\def\ltx@cdrfour#1#2#3#4#5\@nil{#5}
+\def\ltx@CarNum#1{%
+ \romannumeral
+ \csname LTXcmds@CarNumFinish%
+ \expandafter\LTXcmds@CarNum
+ \romannumeral\expandafter\ltx@firstofone
+ \expandafter{\LTXcmds@num#1}000{x\endcsname}%
+}
+\def\LTXcmds@CarNum#1{%
+ \csname LTXcmds@C#1\LTXcmds@CarNum
+}
+\long\def\LTXcmds@Cm#1#2{%
+ \endcsname{#1#2}%
+}
+\def\LTXcmds@Cx#1{%
+ \endcsname{}%
+}
+\long\def\LTXcmds@CarNumFinish#1#2\@nil{%
+ \ltx@zero
+ #1%
+}
+\def\ltx@CdrNum#1{%
+ \romannumeral0%
+ \expandafter\expandafter\expandafter\LTXcmds@CdrNum
+ \ltx@GobbleNum{#1}%
+}
+\long\def\LTXcmds@CdrNum#1\@nil{ #1}%
\long\def\ltx@ReturnAfterFi#1\fi{\fi#1}
\long\def\ltx@ReturnAfterElseFi#1\else#2\fi{\fi#1}
\def\ltx@empty{}
@@ -163,6 +206,11 @@
\lowercase{\endgroup
\def\ltx@backslashchar{0}%
}
+\begingroup
+ \lccode`0=`\#\relax
+\lowercase{\endgroup
+ \def\ltx@hashchar{0}%
+}
\def\ltx@newif#1{%
\begingroup
\escapechar=-1 %
@@ -398,6 +446,11 @@
\ltx@leavevmode
\hbox
}
+\ltx@IfUndefined{numexpr}{%
+ \let\LTXcmds@num\number
+}{%
+ \let\LTXcmds@num\numexpr
+}
\LTXcmds@AtEnd
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
index 9638ab878a6..27721ad5b31 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Copyright (C) 2001, 2006-2010 by
-%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 5dc2c955516..40fdf757eef 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
@@ -9,7 +9,7 @@
%% This is a generated file.
%%
%% Copyright (C) 2001, 2006-2010 by
-%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%% Heiko Oberdiek <oberdiek@uni-freiburg.de>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
index 3209c2b98fb..fe9d8817314 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/holtxdoc.sty
@@ -31,13 +31,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{holtxdoc}%
- [2010/04/18 v0.18 Private additional ltxdoc support (HO)]
+ [2010/04/24 v0.19 Private additional ltxdoc support (HO)]
\PassOptionsToPackage{pdfencoding=auto}{hyperref}
\RequirePackage[numbered]{hypdoc}[2010/03/26]
\RequirePackage{hyperref}[2010/03/30]
\RequirePackage{pdftexcmds}[2010/04/01]
\RequirePackage{ltxcmds}[2010/03/09]
-\RequirePackage{hologo}[2010/04/08]
+\RequirePackage{hologo}[2010/04/24]
\RequirePackage{array}
\def\hld@info#1{%
\PackageInfo{holtxdoc}{#1\@gobble}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
index 78505b3ff9a..eb9c4536056 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,9 +41,12 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspage}%
- [2010/04/23 v2.15 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\RequirePackage{atbegshi}%
\begingroup
\let\@addtoreset\ltx@gobbletwo
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty
new file mode 100644
index 00000000000..58e78fb7455
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspos.sty
@@ -0,0 +1,59 @@
+%%
+%% This is file `zref-abspos.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% zref.dtx (with options: `abspos')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2006-2010 by
+%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% This work consists of the main source file zref.dtx
+%% and the derived files
+%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
+%% 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-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{zref-abspos}%
+ [2010/05/01 v2.17 Module abspos for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-savepos}[2010/05/01]
+\ifx\ZREF@savepos@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-pagelayout}[2010/05/01]
+\zref@addprop{savepos}{abspage}
+\endinput
+%%
+%% End of file `zref-abspos.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
index bc1287147cc..4ddad0871e9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,10 +41,28 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-base}%
- [2010/04/23 v2.15 Module base for zref (HO)]%
+ [2010/05/01 v2.17 Module base for zref (HO)]%
\RequirePackage{ltxcmds}[2010/03/01]
+\RequirePackage{infwarerr}[2010/04/08]
\RequirePackage{kvsetkeys}[2010/03/01]
\def\ZREF@name{zref}
+\ltx@IfUndefined{protected}{%
+ \RequirePackage{makerobust}[2006/03/18]%
+ \def\ZREF@Robust#1#2{%
+ \def\ZREF@temp{\MakeRobustcommand#2}%
+ \afterassignment\ZREF@temp
+ #1#2%
+ }%
+}{%
+ \def\ZREF@Robust#1{%
+ \protected#1%
+ }%
+}
+\def\ZREF@IfDefinable#1#2#3{%
+ \@ifdefinable{#1}{%
+ \ZREF@Robust{#2}#1#3%
+ }%
+}
\def\ZREF@UpdatePdfTeX{Update pdfTeX.}
\newif\ifZREF@found
\def\ZREF@patch#1{%
@@ -81,14 +100,15 @@
\AddLineBeginAux{%
\string\providecommand\string\zref@newlabel[2]{}%
}
-\def\zref@newlabel{%
- \@newl@bel{Z@R}%
+\def\ZREF@RefPrefix{Z@R}
+\ZREF@Robust\edef\zref@newlabel{%
+ \noexpand\@newl@bel{\ZREF@RefPrefix}%
}
-\def\zref@newlist#1{%
+\ZREF@Robust\def\zref@newlist#1{%
\zref@iflistundefined{#1}{%
\@ifdefinable{Z@L@#1}{%
- \global\expandafter\let\csname Z@L@#1\endcsname\@empty
- \PackageInfo{zref}{New property list: #1}%
+ \global\expandafter\let\csname Z@L@#1\endcsname\ltx@empty
+ \PackageInfo\ZREF@name{New property list: #1}%
}%
}{%
\PackageError\ZREF@name{%
@@ -99,49 +119,45 @@
\def\zref@iflistundefined#1{%
\ltx@ifundefined{Z@L@#1}%
}
-\def\zref@listexists#1{%
+\ZREF@Robust\def\zref@listexists#1{%
\zref@iflistundefined{#1}{%
\PackageError\ZREF@name{%
Property list `#1' does not exist%
}\@ehc
}%
}
-\def\zref@iflistcontainsprop#1{%
+\ZREF@Robust\def\zref@iflistcontainsprop#1#2{%
\zref@iflistundefined{#1}{%
- \expandafter\ltx@secondoftwo\@gobble
+ \ltx@secondoftwo
}{%
- \expandafter\ZREF@iflistcontainsprop\csname Z@L@#1\endcsname
+ \begingroup\expandafter\endgroup
+ \expandafter\in@
+ \csname#2\expandafter\expandafter\expandafter\endcsname
+ \expandafter\expandafter\expandafter{\csname Z@L@#1\endcsname}%
+ \csname ltx@\ifin@ first\else second\fi oftwo\endcsname
}%
}
-\def\ZREF@iflistcontainsprop#1#2{%
- \begingroup
- \ZREF@foundfalse
- \edef\y{#2}%
- \expandafter\@tfor\expandafter\x
- \expandafter:\expandafter=#1\do{%
- \edef\x{\x}%
- \ifx\x\y
- \ZREF@foundtrue
- \fi
- }%
- \expandafter\endgroup
- \ifZREF@found
- \expandafter\ltx@firstoftwo
- \else
- \expandafter\ltx@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
+ \zref@listexists{#1}{%
+ \expandafter\expandafter\expandafter\@tfor
+ \expandafter\expandafter\expandafter\zref@prop
+ \expandafter\expandafter\expandafter:%
+ \expandafter\expandafter\expandafter=%
+ \csname Z@L@#1\endcsname
+ \do{%
+ \begingroup
+ \escapechar=-1 %
+ \edef\x{\endgroup
+ \def\noexpand\zref@prop{%
+ \expandafter\string\zref@prop
+ }%
+ }%
+ \x
+ #2\zref@prop
+ }%
}%
}
-\def\zref@addprop#1#2{%
+\ZREF@Robust\def\zref@addprop#1#2{%
\zref@listexists{#1}{%
\comma@parse{#2}{%
\zref@propexists\comma@entry{%
@@ -150,16 +166,17 @@
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}}%
+ \begingroup\expandafter\endgroup
+ \expandafter\g@addto@macro
+ \csname Z@L@#1\expandafter\endcsname
+ \expandafter{\csname\comma@entry\endcsname}%
}%
}%
\ltx@gobble
}%
}%
}
-\def\zref@localaddprop#1#2{%
+\ZREF@Robust\def\zref@localaddprop#1#2{%
\zref@listexists{#1}{%
\comma@parse{#2}{%
\zref@propexists\comma@entry{%
@@ -168,10 +185,10 @@
Property `\comma@entry' is already in list `#1'%
}%
}{%
- \edef\comma@entry{\comma@entry}%
+ \begingroup\expandafter\endgroup
\expandafter\ltx@LocalAppendToMacro
\csname Z@L@#1\expandafter\endcsname
- \expandafter{\expandafter{\comma@entry}}%
+ \expandafter{\csname\comma@entry\endcsname}%
}%
}%
\ltx@gobble
@@ -181,38 +198,66 @@
\def\zref@ifpropundefined#1{%
\ltx@ifundefined{Z@E@#1}%
}
-\def\zref@propexists#1{%
+\ZREF@Robust\def\zref@propexists#1{%
\zref@ifpropundefined{#1}{%
\PackageError\ZREF@name{%
Property `#1' does not exist%
}\@ehc
}%
}
-\def\zref@newprop{%
+\ZREF@Robust\def\zref@newprop{%
\@ifstar{%
\let\ZREF@X\noexpand
\ZREF@newprop
}{%
- \let\ZREF@X\@empty
+ \let\ZREF@X\ltx@empty
\ZREF@newprop
}%
}
\def\ZREF@newprop#1{%
- \PackageInfo{zref}{New property: #1}%
- \def\ZREF@P{#1}%
+ \edef\ZREF@P{#1}%
+ \@onelevel@sanitize\ZREF@P
+ \begingroup
+ \ifx\ZREF@P\ZREF@par
+ \@PackageError\ZREF@name{%
+ Invalid property name `\ZREF@P'%
+ }{%
+ The property name `par' is not allowed %
+ because of internal reasons.%
+ \MessageBreak
+ \@ehc
+ }%
+ \def\ZREF@@newprop[##1]##2{\endgroup}%
+ \else
+ \zref@ifpropundefined\ZREF@P{%
+ \endgroup
+ \PackageInfo\ZREF@name{%
+ New property: \ZREF@P
+ }%
+ }{%
+ \@PackageError\ZREF@name{%
+ Property `\ZREF@P' already exists%
+ }\@ehc
+ \def\ZREF@@newprop[##1]##2{\endgroup}%
+ }%
+ \fi
\@ifnextchar[\ZREF@@newprop{\ZREF@@newprop[\zref@default]}%
}
+\def\ZREF@par{par}
+\@onelevel@sanitize\ZREF@par
\def\ZREF@@newprop[#1]{%
\global\@namedef{Z@D@\ZREF@P}{#1}%
\global\expandafter\let\csname Z@X@\ZREF@P\endcsname\ZREF@X
+ \begingroup\expandafter\endgroup
\expandafter\ZREF@@@newprop\csname\ZREF@P\endcsname
\expandafter\gdef\csname Z@C@\ZREF@P\endcsname{}%
\zref@setcurrent\ZREF@P
}
\def\ZREF@@@newprop#1{%
- \expandafter\gdef\csname Z@E@\ZREF@P\endcsname##1#1##2##3\ZREF@nil{##2}%
+ \expandafter
+ \gdef\csname Z@E@\ZREF@P\endcsname##1#1##2##3\ZREF@nil{##2}%
}
-\def\zref@setcurrent#1#2{%
+\ZREF@Robust\def\zref@setcurrent#1#2{%
\zref@propexists{#1}{%
\expandafter\def\csname Z@C@#1\endcsname{#2}%
}%
@@ -232,10 +277,10 @@
}%
}
\let\zref@getcurrent\ZREF@getcurrent
-\def\zref@label#1{%
+\ZREF@Robust\def\zref@label#1{%
\zref@labelbylist{#1}\ZREF@mainlist
}
-\def\zref@labelbylist#1#2{%
+\ZREF@Robust\def\zref@labelbylist#1#2{%
\@bsphack
\zref@listexists{#2}{%
\expandafter\expandafter\expandafter\ZREF@label
@@ -245,28 +290,28 @@
}%
\@esphack
}
-\def\zref@labelbyprops#1#2{%
+\ZREF@Robust\def\zref@labelbyprops#1#2{%
\@bsphack
\begingroup
- \edef\l{#2}%
\toks@{}%
- \@for\x:=#2\do{%
- \zref@ifpropundefined{\x}{%
+ \comma@parse{#2}{%
+ \zref@ifpropundefined\comma@entry{%
\PackageWarning\ZREF@name{%
- Property `\x' is not known%
+ Property `\comma@entry' is not known%
}%
}{%
- \toks@\expandafter\expandafter\expandafter{%
- \expandafter\the\expandafter\toks@\expandafter{\x}%
+ \toks@\expandafter{%
+ \the\expandafter\toks@\csname\comma@entry\endcsname
}%
}%
+ \ltx@gobble
}%
\expandafter\endgroup
\expandafter\ZREF@label\expandafter{\the\toks@}{#1}%
\@esphack
}
\newif\ifZREF@immediate
-\long\def\zref@wrapper@immediate#1{%
+\ZREF@Robust{\long\def}\zref@wrapper@immediate#1{%
\begingroup
\ZREF@immediatetrue
\let\ZREF@org@write\write
@@ -284,17 +329,31 @@
\ifZREF@immediate
\let\thepage\ZREF@org@thepage
\fi
- \let\ZREF@temp\@empty
+ \let\ZREF@temp\ltx@empty
\@tfor\ZREF@P:=#1\do{%
+ \begingroup
+ \escapechar=-1 %
+ \edef\x{\endgroup
+ \def\noexpand\ZREF@P{%
+ \expandafter\string\ZREF@P
+ }%
+ }%
+ \x
\expandafter\ifx
- \csname\ifZREF@immediate relax\else Z@X@\ZREF@P\fi\endcsname
+ \csname
+ \ifZREF@immediate
+ relax%
+ \else
+ Z@X@\ZREF@P%
+ \fi
+ \endcsname
\noexpand
\expandafter\let\csname Z@C@\ZREF@P\endcsname\relax
\fi
\toks@\expandafter{\ZREF@temp}%
\edef\ZREF@temp{%
\the\toks@
- \expandafter\string\csname\ZREF@P\endcsname{%
+ \ltx@backslashchar\ZREF@P{%
\expandafter\noexpand\csname Z@C@\ZREF@P\endcsname
}%
}%
@@ -313,14 +372,16 @@
\def\zref@ifrefundefined#1{%
\ltx@ifundefined{Z@R@#1}%
}
-\newcommand*{\zifrefundefined}[1]{%
- \zref@wrapper@babel\ZREF@ifrefundefined{#1}%
+\ZREF@IfDefinable\zifrefundefined\def{%
+ #1{%
+ \zref@wrapper@babel\ZREF@ifrefundefined{#1}%
+ }%
}
\def\ZREF@ifrefundefined#1{%
\zref@refused{#1}%
\zref@ifrefundefined{#1}%
}
-\def\zref@refused#1{%
+\ZREF@Robust\def\zref@refused#1{%
\zref@wrapper@babel\ZREF@refused{#1}%
}
\def\ZREF@refused#1{%
@@ -345,7 +406,7 @@
}
\def\ZREF@ifrefcontainsprop#1#2#3{%
\expandafter\ifx\expandafter\ZREF@novalue
- #1#3#2\ZREF@novalue\ZREF@nil\@empty
+ #1#3#2\ZREF@novalue\ZREF@nil\ltx@empty
\expandafter\ltx@secondoftwo
\else
\expandafter\ltx@firstoftwo
@@ -393,7 +454,7 @@
}%
}
\let\zref@extractdefault\ZREF@extractdefault
-\long\def\ZREF@wrapper@unexpanded#1{%
+\ZREF@Robust{\long\def}\ZREF@wrapper@unexpanded#1{%
\let\zref@wrapper@unexpanded\ltx@firstofone
\let\zref@getcurrent\ZREF@wu@getcurrent
\let\zref@extractdefault\ZREF@wu@extractdefault
@@ -409,7 +470,7 @@
}{%
\let\zref@wrapper@unexpanded\ZREF@wrapper@unexpanded
}
-\long\def\zref@wrapper@babel#1#2{%
+\ZREF@Robust{\long\def}\zref@wrapper@babel#1#2{%
\ifcsname if@safe@actives\endcsname
\expandafter\ltx@firstofone
\else
@@ -435,7 +496,7 @@
\long\def\ZREF@wrapper@babel#1#2{%
#2{#1}%
}
-\def\zref@require@unique{%
+\ZREF@Robust\def\zref@require@unique{%
\@ifundefined{c@zref@unique}{%
\begingroup
\let\@addtoreset\ltx@gobbletwo
@@ -451,13 +512,13 @@
}{%
\def\ZREF@number#1{\the\numexpr#1}%
}
-\def\zref@setdefault#1{%
+\ZREF@Robust\def\zref@setdefault#1{%
\def\zref@default{#1}%
}
\zref@setdefault{%
\nfss@text{\reset@font\bfseries ??}%
}
-\def\zref@setmainlist#1{%
+\ZREF@Robust\def\zref@setmainlist#1{%
\def\ZREF@mainlist{#1}%
}
\zref@setmainlist{main}
@@ -465,7 +526,7 @@
\zref@newprop{default}{\@currentlabel}
\zref@newprop*{page}{\thepage}
\zref@addprop\ZREF@mainlist{default,page}
-\let\ZREF@baseok\@empty
+\let\ZREF@base@ok=Y
\endinput
%%
%% End of file `zref-base.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
index ddfc4163f39..8cac67f2bc4 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,9 +41,12 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-counter}%
- [2010/04/23 v2.15 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\zref@newprop{counter}{}
\zref@addprop\ZREF@mainlist{counter}
\AtBeginDocument{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
index 475f4f75e09..be6d516bc9f 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,10 +41,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-dotfill}%
- [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/23]
+ [2010/05/01 v2.17 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-savepos}[2010/05/01]
\zref@require@unique
\RequirePackage{keyval}
\define@key{ZREF@DF}{unit}{%
@@ -59,28 +63,31 @@
\providecommand\ZREF@df@unit{.44em}
\providecommand\ZREF@df@dot{.}
\newcommand*{\zdotfillsetup}{\setkeys{ZREF@DF}}
-\newcommand*{\zdotfill}{%
- \leavevmode
- \global\advance\c@zref@unique\@ne
- \begingroup
- \def\ZREF@temp{zref@\number\c@zref@unique}%
- \pdfsavepos
- \zref@labelbyprops{\thezref@unique L}{posx}%
- \setlength{\dimen@}{\ZREF@df@unit}%
- \zref@ifrefundefined{\thezref@unique R}{%
- \ZREF@dotfill
- }{%
- \ifnum\numexpr\zposx{\thezref@unique R}-\zposx{\thezref@unique L}\relax
- <\dimexpr\ZREF@df@min\dimen@\relax
- \hfill
- \else
+\ZREF@IfDefinable\zdotfill\def{%
+ {%
+ \leavevmode
+ \global\advance\c@zref@unique\ltx@one
+ \begingroup
+ \def\ZREF@temp{zref@\number\c@zref@unique}%
+ \pdfsavepos
+ \zref@labelbyprops{\thezref@unique L}{posx}%
+ \setlength{\dimen@}{\ZREF@df@unit}%
+ \zref@ifrefundefined{\thezref@unique R}{%
\ZREF@dotfill
- \fi
- }%
- \pdfsavepos
- \zref@labelbyprops{\thezref@unique R}{posx}%
- \endgroup
- \kern\z@
+ }{%
+ \ifnum\numexpr\zposx{\thezref@unique R}%
+ -\zposx{\thezref@unique L}\relax
+ <\dimexpr\ZREF@df@min\dimen@\relax
+ \hfill
+ \else
+ \ZREF@dotfill
+ \fi
+ }%
+ \pdfsavepos
+ \zref@labelbyprops{\thezref@unique R}{posx}%
+ \endgroup
+ \kern\z@
+ }%
}
\def\ZREF@dotfill{%
\cleaders\hb@xt@\dimen@{\hss\ZREF@df@dot\hss}\hfill
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
index 224d8ca7b54..38f106cea3a 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,12 +41,17 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-hyperref}%
- [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}%
-}%
+ [2010/05/01 v2.17 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\ltx@ifpackageloaded{zref-xr}{}{%
+ \zref@newprop{anchor}[]{%
+ \ltx@ifundefined{@currentHref}{}{\@currentHref}%
+ }%
+}
\zref@addprop\ZREF@mainlist{anchor}%
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
index 0c0c2cee7d6..c4820c2b996 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,11 +41,14 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-lastpage}%
- [2010/04/23 v2.15 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\RequirePackage{zref-abspage}[2010/04/23]
+ [2010/05/01 v2.17 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\RequirePackage{zref-abspage}[2010/05/01]
\RequirePackage{atveryend}[2009/12/07]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\zref@newlist{LastPage}
\AfterLastShipout{%
\if@filesw
@@ -68,8 +72,8 @@
\expandafter\ltx@secondoftwo
\fi
}
-\newcommand*{\ziflastpage}{%
- \zref@wrapper@babel\ZREF@iflastpage
+\ZREF@IfDefinable\ziflastpage\def{%
+ {\zref@wrapper@babel\ZREF@iflastpage}%
}
\def\ZREF@iflastpage#1{%
\zref@refused{LastPage}%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
index 316e64c4492..913adbaffb9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,9 +41,12 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-marks}%
- [2010/04/23 v2.15 Module marks for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module marks for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\RequirePackage{kvsetkeys}[2009/07/30]
\newcommand*{\zref@marks@register}[3][]{%
\edef\ZREF@TempName{#1}%
@@ -69,16 +73,16 @@
\ifx\kv@value\relax
\def\kv@value{top,first,bot}%
\fi
- \edef\ZREF@temp{\expandafter\@car\kv@key X\@nil}%
+ \edef\ZREF@temp{\expandafter\ltx@car\kv@key X\@nil}%
\ifx\ZREF@temp\ZREF@STAR
- \edef\kv@key{\expandafter\@cdr\kv@key\@nil}%
+ \edef\kv@key{\expandafter\ltx@cdr\kv@key\@nil}%
\zref@newlist\kv@key
\fi
\expandafter\comma@parse\expandafter{\kv@value}{%
\ifcase0\ifx\comma@entry\ZREF@NAME@top 1\else
\ifx\comma@entry\ZREF@NAME@first 1\else
\ifx\comma@entry\ZREF@NAME@bot 1\fi\fi\fi\ltx@space
- \PackageWarning\ZREF@name{%
+ \PackageWarning{zref-marks}{%
Use `top', `first' or `bot' for the list values%
\MessageBreak
in the third argument of \string\zref@marks@register.%
@@ -119,7 +123,7 @@
\x
\fi
}{%
- \PackageWarning\ZREF@name{%
+ \PackageWarning{zref-marks}{%
\string\zref@marks@register\ltx@space does not generate the%
\MessageBreak
new property `#1\ZREF@TempName', because\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
index 903dbbe175e..8e8ef707587 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,12 +41,15 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-nextpage}%
- [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/23]
-\RequirePackage{zref-thepage}[2010/04/23]
-\RequirePackage{zref-lastpage}[2010/04/23]
+ [2010/05/01 v2.17 Module nextpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-abspage}[2010/05/01]
+\RequirePackage{zref-thepage}[2010/05/01]
+\RequirePackage{zref-lastpage}[2010/05/01]
\RequirePackage{uniquecounter}[2009/12/18]
\UniqueCounterNew{znextpage}
@@ -63,9 +67,9 @@
\def\ZREF@np@call@unknown#1{#1}
\def\ZREF@np@call@nonext#1{#1}
\def\ZREF@np@call@next#1{#1}
-\newcommand*{\znextpage}{%
- \UniqueCounterCall{znextpage}{\ZREF@nextpage}%
-}
+\ZREF@IfDefinable\znextpage\def{%
+ {\UniqueCounterCall{znextpage}{\ZREF@nextpage}}%
+}%
\newcommand*{\znonextpagename}{}
\newcommand*{\zunknownnextpagename}{\Z@D@page}
\def\ZREF@nextpage#1{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty
new file mode 100644
index 00000000000..03c9352f3b5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pageattr.sty
@@ -0,0 +1,205 @@
+%%
+%% This is file `zref-pageattr.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% zref.dtx (with options: `pageattr')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2006-2010 by
+%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% This work consists of the main source file zref.dtx
+%% and the derived files
+%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
+%% 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-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{zref-pageattr}%
+ [2010/05/01 v2.17 Module pageattr for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{ifluatex}[2010/03/01]
+\ifluatex
+ \ifnum\luatexversion<39 %
+ \else
+ \begingroup
+ \escapechar=-1 %
+ \def\ZREF@temp#1{%
+ \ltx@IfUndefined{\string#1}{%
+ \let#1\ltx@undefined
+ \directlua{%
+ if tex.enableprimitives then %
+ tex.enableprimitives('', {'\string#1'})%
+ end%
+ }%
+ \ltx@ifundefined{\string#1}{%
+ }{%
+ \global#1=#1%
+ \@PackageInfoNoLine{zref-pageattr}{%
+ \string#1 enabled%
+ }%
+ }%
+ }{}%
+ }%
+ \ZREF@temp\pdfpageattr
+ \ZREF@temp\pdfpagesattr
+ \endgroup
+ \fi
+\fi
+\let\ZREF@temp=N%
+\ltx@IfUndefined{pdfpageattr}{%
+ \@PackageInfoNoLine{zref-pageattr}{%
+ \string\pdfpageattr\space is not available%
+ }%
+ \def\zref@pdfpageattr#1{}%
+ \def\zref@pdfpageattr@used#1{}%
+}{%
+ \RequirePackage{zref-thepage}[2010/05/01]%
+ \zref@newprop*{pdfpageattr}[]{\zref@hex{\the\pdfpageattr}}%
+ \zref@addprop{thepage}{pdfpageattr}%
+ \let\ZREF@temp=Y%
+}
+\ltx@IfUndefined{pdfpagesattr}{%
+ \@PackageInfoNoLine{zref-pageattr}{%
+ \string\pdfpagesattr\space is not available%
+ }%
+ \def\zref@pdfpagesattr{}%
+ \def\zref@pdfpagesattr@used{}%
+}{%
+ \RequirePackage{zref-lastpage}[2010/05/01]%
+ \zref@newprop*{pdfpagesattr}[]{\zref@hex{\the\pdfpagesattr}}%
+ \zref@addprop{LastPage}{pdfpagesattr}%
+ \let\ZREF@temp=Y%
+}%
+\ifx\ZREF@temp N%
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-abspage}[2010/05/01]
+\RequirePackage{atveryend}[2010/03/24]
+\RequirePackage{pdftexcmds}[2010/04/01]
+\let\ZREF@temp=Y%
+\ltx@IfUndefined{pdf@escapehex}{\let\ZREF@temp=N}{}
+\ltx@IfUndefined{pdf@unescapehex}{\let\ZREF@temp=N}{}
+\ifx\ZREF@temp N%
+ \let\zref@hex\ltx@firstofone
+ \let\zref@unhex\ltx@firstofone
+\else
+ \let\zref@hex\pdf@escapehex
+ \let\zref@unhex\pdf@unescapehex
+\fi
+\ltx@newif\ifZREF@pa@list
+\ZREF@IfDefinable\zlistpageattr\def{%
+ {\ZREF@pa@listtrue}%
+}
+\def\ZREF@pa@AfterLastShipout{%
+ \ifZREF@pa@list
+ \edef\ZREF@page@max{\the\value{abspage}}%
+ \ltx@ifundefined{ZREF@org@testdef}{%
+ \let\ZREF@org@testdef\@testdef
+ \def\@testdef##1##2##3{%
+ \ZREF@org@testdef{##1}{##2}{##3}%
+ \def\ZREF@temp{##1}%
+ \ifx\ZREF@temp\ZREF@RefPrefix
+ \expandafter\xdef\csname##1@##2\endcsname{##3}%
+ \fi
+ }%
+ }{}%
+ \AtVeryEndDocument{\ZREF@pa@AtVeryEnd}%
+ \fi
+}
+\ltx@IfUndefined{pdfpageattr}{%
+ \def\ZREF@pa@AtVeryEnd{}%
+}{%
+ \def\ZREF@pa@AtVeryEnd{%
+ \begingroup
+ \toks@{List of \ltx@backslashchar pdfpageattr:\MessageBreak}%
+ \count@=1 %
+ \ZREF@pa@ListPage
+ \edef\x{\endgroup
+ \noexpand\@PackageInfoNoLine{zref-pageattr}{%
+ \the\toks@
+ }%
+ }%
+ \x
+ }%
+\def\zref@pageattr#1{%
+ \zref@unhex{%
+ \zref@extract{thepage\ZREF@number#1}{pdfpageattr}%
+ }%
+}
+\ZREF@Robust\def\zref@pageattr@used#1{%
+ \zref@refused{thepage\ZREF@number#1}%
+}
+ \def\ZREF@pa@ListPage{%
+ \edef\x{%
+ \toks@={%
+ \the\toks@
+ Page \the\count@:%
+ \noexpand\MessageBreak
+ \zref@ifrefundefined{thepage\the\count@}{}{%
+ <<\zref@pdfpageattr\count@>>%
+ \noexpand\MessageBreak
+ }%
+ }%
+ }\x
+ \ifnum\ZREF@page@max>\count@
+ \advance\count@ by\ltx@one
+ \else
+ \expandafter\ltx@gobble
+ \fi
+ \ZREF@pa@ListPage
+ }%
+}
+\ltx@IfUndefined{pdfpagesattr}{%
+}{%
+ \def\zref@pdfpagesattr{%
+ \zref@unhex{%
+ \zref@extract{LastPage}{pdfpagesattr}%
+ }%
+ }%
+ \ZREF@Robust\def\zref@pdfpagesattr@used{%
+ \zref@refused{LastPage}%
+ }%
+ \ltx@LocalAppendToMacro\ZREF@pa@AtVeryEnd{%
+ \@PackageInfoNoLine{zref-pageattr}{%
+ \ltx@backslashchar pdfpagesattr:\MessageBreak
+ <<\zref@pdfpagesattr>>%
+ \MessageBreak
+ }%
+ }%
+}
+\AfterLastShipout{%
+ \ZREF@pa@AfterLastShipout
+}
+\endinput
+%%
+%% End of file `zref-pageattr.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty
new file mode 100644
index 00000000000..e92c9cfa012
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-pagelayout.sty
@@ -0,0 +1,206 @@
+%%
+%% This is file `zref-pagelayout.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% zref.dtx (with options: `pagelayout')
+%%
+%% This is a generated file.
+%%
+%% Copyright (C) 2006-2010 by
+%% Heiko Oberdiek <heiko.oberdiek at googlemail.com>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3c of this license or (at your option) any later
+%% version. This version of this license is in
+%% http://www.latex-project.org/lppl/lppl-1-3c.txt
+%% and the latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Heiko Oberdiek.
+%%
+%% This work consists of the main source file zref.dtx
+%% and the derived files
+%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
+%% 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-base.tex, zref-test-runs.tex,
+%% zref-test-titleref-memoir.tex.
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{zref-pagelayout}%
+ [2010/05/01 v2.17 Module pagelayout for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-thepage}[2010/05/01]
+\RequirePackage{ifluatex}[2010/03/01]
+\RequirePackage{atveryend}[2010/03/24]
+\ifluatex
+ \ifnum\luatexversion<39 %
+ \else
+ \begingroup
+ \escapechar=-1 %
+ \def\ZREF@temp#1{%
+ \ltx@IfUndefined{\string#1}{%
+ \let#1\ltx@undefined
+ \directlua{%
+ if tex.enableprimitives then %
+ tex.enableprimitives('', {'\string#1'})%
+ end%
+ }%
+ \ltx@ifundefined{\string#1}{%
+ }{%
+ \global#1=#1%
+ \@PackageInfoNoLine{zref-pagelayout}{%
+ \string#1 enabled%
+ }%
+ }%
+ }{}%
+ }%
+ \ZREF@temp\pdfpagewidth
+ \ZREF@temp\pdfpageheight
+ \ZREF@temp\pdfhorigin
+ \ZREF@temp\pdfvorigin
+ \endgroup
+ \fi
+\fi
+\def\ZREF@temp#1{%
+ \begingroup
+ \escapechar=-1 %
+ \ltx@ifundefined{\string#1}{\endgroup}{%
+ \edef\x{%
+ \endgroup
+ \noexpand\zref@newprop*{\string#1}%
+ [\number\noexpand#1]% hash-ok
+ {\number\noexpand#1}%
+ \noexpand\zref@addprop{thepage}{\string#1}%
+ }%
+ \x
+ }%
+}
+\ZREF@temp\mag
+\ZREF@temp\paperwidth
+\ZREF@temp\paperheight
+\ZREF@temp\stockwidth
+\ZREF@temp\stockheight
+\ZREF@temp\pdfpagewidth
+\ZREF@temp\pdfpageheight
+\ZREF@temp\pdfhorigin
+\ZREF@temp\pdfvorigin
+\ZREF@temp\hoffset
+\ZREF@temp\voffset
+\ZREF@temp\topmargin
+\ZREF@temp\oddsidemargin
+\ZREF@temp\evensidemargin
+\ZREF@temp\textwidth
+\ZREF@temp\textheight
+\ZREF@temp\headheight
+\ZREF@temp\headsep
+\ZREF@temp\footskip
+\ZREF@temp\marginparwidth
+\ZREF@temp\marginparsep
+\ZREF@temp\columnwidth
+\ZREF@temp\columnsep
+\ltx@newif\ifZREF@pl@list
+\ZREF@IfDefinable\zlistpagelayout\def{%
+ {\ZREF@pl@listtrue}%
+}
+\def\ZREF@pl@AfterLastShipout{%
+ \ifZREF@pl@list
+ \edef\ZREF@page@max{\the\value{abspage}}%
+ \ltx@ifundefined{ZREF@org@testdef}{%
+ \let\ZREF@org@testdef\@testdef
+ \def\@testdef##1##2##3{%
+ \ZREF@org@testdef{##1}{##2}{##3}%
+ \def\ZREF@temp{##1}%
+ \ifx\ZREF@temp\ZREF@RefPrefix
+ \expandafter\xdef\csname##1@##2\endcsname{##3}%
+ \fi
+ }%
+ }{}%
+ \AtVeryEndDocument{\ZREF@pl@AtVeryEnd}%
+ \fi
+}
+\def\ZREF@pl@AtVeryEnd{%
+ \begingroup
+ \toks@{Page layout parameters:\MessageBreak}%
+ \count@=1 %
+ \ZREF@pl@ListPage
+ \edef\x{\endgroup
+ \noexpand\@PackageInfoNoLine{zref-pagelayout}{\the\toks@}%
+ }%
+ \x
+}
+\def\ZREF@pl@ListPage{%
+ \edef\x{%
+ \toks@={%
+ \the\toks@
+ Page \the\count@:\noexpand\MessageBreak
+ \zref@ifrefundefined{thepage\the\count@}{}{%
+ \ltx@space\ltx@space mag = %
+ \zref@extract{thepage\the\count@}{mag}%
+ \noexpand\MessageBreak
+ \ZREF@pl@ListEntry{paperwidth}%
+ \ZREF@pl@ListEntry{paperheight}%
+ \ZREF@pl@ListEntry{stockwidth}%
+ \ZREF@pl@ListEntry{stockheight}%
+ \ZREF@pl@ListEntry{pdfpagewidth}%
+ \ZREF@pl@ListEntry{pdfpageheight}%
+ \ZREF@pl@ListEntry{pdfhorigin}%
+ \ZREF@pl@ListEntry{pdfvorigin}%
+ \ZREF@pl@ListEntry{hoffset}%
+ \ZREF@pl@ListEntry{voffset}%
+ \ZREF@pl@ListEntry{topmargin}%
+ \ZREF@pl@ListEntry{oddsidemargin}%
+ \ZREF@pl@ListEntry{evensidemargin}%
+ \ZREF@pl@ListEntry{textwidth}%
+ \ZREF@pl@ListEntry{textheight}%
+ \ZREF@pl@ListEntry{headheight}%
+ \ZREF@pl@ListEntry{headsep}%
+ \ZREF@pl@ListEntry{footskip}%
+ \ZREF@pl@ListEntry{marginparwidth}%
+ \ZREF@pl@ListEntry{marginparsep}%
+ \ZREF@pl@ListEntry{columnwidth}%
+ \ZREF@pl@ListEntry{columnsep}%
+ }%
+ }%
+ }\x
+ \ifnum\ZREF@page@max>\count@
+ \advance\count@ by\ltx@one
+ \else
+ \expandafter\ltx@gobble
+ \fi
+ \ZREF@pl@ListPage
+}
+\def\ZREF@pl@ListEntry#1{%
+ \zref@ifpropundefined{#1}{%
+ }{%
+ \zref@ifrefcontainsprop{thepage\the\count@}{#1}{%
+ \ltx@space\ltx@space#1 = %
+ \zref@extract{thepage\the\count@}{#1}sp = %
+ \the\dimexpr\zref@extract{thepage\the\count@}{#1}sp\relax
+ \noexpand\MessageBreak
+ }{}%
+ }%
+}
+\AfterLastShipout{%
+ \ZREF@pl@AfterLastShipout
+}
+\endinput
+%%
+%% End of file `zref-pagelayout.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
index 980090e83ea..4971af69c66 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,10 +41,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-perpage}%
- [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/23]
+ [2010/05/01 v2.17 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-abspage}[2010/05/01]
\zref@newprop*{pagevalue}[0]{\number\c@page}
\zref@newlist{perpage}
\zref@addprop{perpage}{abspage,page,pagevalue}
@@ -56,8 +60,10 @@
\fi
\ZREF@org@stepcounter{#1}%
}
-\newcommand*{\zmakeperpage}{%
- \@ifnextchar[\ZREF@makeperpage@opt{\ZREF@@makeperpage[\z@]}%
+\ZREF@IfDefinable\zmakeperpage\def{%
+ {%
+ \@ifnextchar[\ZREF@makeperpage@opt{\ZREF@@makeperpage[\ltx@zero]}%
+ }%
}
\def\ZREF@makeperpage@opt[#1]{%
\begingroup
@@ -80,18 +86,22 @@
}%
}
\def\ZREF@@perpage@step#1#2{%
- \global\advance\c@zref@unique\@ne
+ \global\advance\c@zref@unique\ltx@one
\begingroup
- \expandafter\zref@labelbylist\expandafter{\thezref@unique}{perpage}%
+ \expandafter
+ \zref@labelbylist\expandafter{\thezref@unique}{perpage}%
\zref@ifrefundefined\thezref@unique{%
\global\c@zpage=\c@page
\global\let\thezpage\thepage
- \expandafter\xdef\csname ZREF@abspage@#1\endcsname{\number\c@abspage}%
+ \expandafter\xdef\csname ZREF@abspage@#1\endcsname{%
+ \number\c@abspage
+ }%
}{%
\global\c@zpage=\zref@extract\thezref@unique{pagevalue}\relax
\xdef\thezpage{\noexpand\zref@extract{\thezref@unique}{page}}%
\expandafter\xdef\csname ZREF@abspage@#1\endcsname{%
- \zref@extractdefault\thezref@unique{abspage}{\number\c@abspage}%
+ \zref@extractdefault\thezref@unique
+ {abspage}{\number\c@abspage}%
}%
}%
\expandafter\ifx\csname ZREF@abspage@#1\expandafter\endcsname
@@ -104,8 +114,11 @@
\fi
\endgroup
}
-\newcommand*{\zunmakeperpage}[1]{%
- \global\expandafter\let\csname ZREF@perpage@#1\endcsname\@undefined
+\ZREF@IfDefinable\zunmakeperpage\def{%
+ #1{%
+ \global\expandafter
+ \let\csname ZREF@perpage@#1\endcsname\@undefined
+ }%
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
index 182dc49efb1..abfd3be94be 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-runs}%
- [2010/04/23 v2.15 Module runs for zref (HO)]%
+ [2010/05/01 v2.17 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 b8d2de1dad0..1216f0e6cf9 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,9 +41,12 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-savepos}%
- [2010/04/23 v2.15 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\ltx@IfUndefined{pdfsavepos}{%
\PackageError\ZREF@name{%
\string\pdfsavepos\space is not supported.\MessageBreak
@@ -69,13 +73,15 @@
\zref@newprop*{posx}[0]{\the\pdflastxpos}
\zref@newprop*{posy}[0]{\the\pdflastypos}
\zref@addprop{savepos}{posx,posy}
-\def\zsavepos#1{%
- \@bsphack
- \if@filesw
- \pdfsavepos
- \zref@labelbylist{#1}{savepos}%
- \fi
- \@esphack
+\ZREF@IfDefinable\zsavepos\def{%
+ #1{%
+ \@bsphack
+ \if@filesw
+ \pdfsavepos
+ \zref@labelbylist{#1}{savepos}%
+ \fi
+ \@esphack
+ }%
}
\newcommand*{\zposx}[1]{%
\zref@extract{#1}{posx}%
@@ -83,6 +89,7 @@
\newcommand*{\zposy}[1]{%
\zref@extract{#1}{posy}%
}%
+\let\ZREF@savepos@ok=Y
\endinput
%%
%% End of file `zref-savepos.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
index e82b85d4a9f..f61c704f942 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,11 +41,14 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-thepage}%
- [2010/04/23 v2.15 Module thepage for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module thepage for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\RequirePackage{atbegshi}
-\RequirePackage{zref-abspage}[2010/04/23]
+\RequirePackage{zref-abspage}[2010/05/01]
\zref@newlist{thepage}
\zref@addprop{thepage}{page}
\AtBeginShipout{%
@@ -60,12 +64,14 @@
\def\zref@thepage#1{%
\zref@extract{\zref@thepage@name{#1}}{page}%
}%
-\def\zref@thepage@refused#1{%
+\ZREF@Robust\def\zref@thepage@refused#1{%
\zref@refused{\zref@thepage@name{#1}}%
}%
-\newcommand*{\zthepage}[1]{%
- \zref@thepage@refused{#1}%
- \zref@thepage{#1}%
+\ZREF@IfDefinable\zthepage\def{%
+ #1{%
+ \zref@thepage@refused{#1}%
+ \zref@thepage{#1}%
+ }%
}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
index 766d088ffb4..2b4aed81388 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,17 +41,20 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-titleref}%
- [2010/04/23 v2.15 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\RequirePackage{gettitlestring}[2009/12/08]
\RequirePackage{keyval}
-\let\zref@titleref@current\@empty
+\let\zref@titleref@current\ltx@empty
\zref@newprop{title}{\zref@titleref@current}%
\zref@addprop\ZREF@mainlist{title}%
\newif\ifzref@titleref@expand
-\let\ZREF@titleref@hook\@empty
-\def\zref@titleref@cleanup#1{%
+\let\ZREF@titleref@hook\ltx@empty
+\ZREF@Robust\def\zref@titleref@cleanup#1{%
\begingroup
\toks@\expandafter{%
\ZREF@titleref@hook
@@ -63,7 +67,7 @@
}%
\newif\ifzref@titleref@stripperiod
\zref@titleref@stripperiodtrue
-\def\zref@titleref@setcurrent#1{%
+\ZREF@Robust\def\zref@titleref@setcurrent#1{%
\ifzref@titleref@expand
\GetTitleStringExpand{#1}%
\else
@@ -75,14 +79,14 @@
\ifzref@titleref@stripperiod
\edef\zref@titleref@current{%
\expandafter\ZREF@stripperiod\zref@titleref@current
- \@empty.\@empty\@nil
+ \ltx@empty.\ltx@empty\@nil
}%
\fi
}%
\GetTitleStringDisableCommands{%
\ZREF@titleref@hook
}
-\def\ZREF@stripperiod#1.\@empty#2\@nil{#1}%
+\def\ZREF@stripperiod#1.\ltx@empty#2\@nil{#1}%
\define@key{ZREF@TR}{expand}[true]{%
\csname zref@titleref@expand#1\endcsname
}%
@@ -95,11 +99,11 @@
\define@key{ZREF@TR}{title}{%
\def\zref@titleref@current{#1}%
}%
-\newcommand*{\ztitlerefsetup}{%
- \setkeys{ZREF@TR}%
+\ZREF@IfDefinable\ztitlerefsetup\def{%
+ {\setkeys{ZREF@TR}}%
}%
-\newcommand*{\ztitleref}{%
- \zref@wrapper@babel\ZREF@titleref
+\ZREF@IfDefinable\ztitleref\def{%
+ {\zref@wrapper@babel\ZREF@titleref}%
}%
\def\ZREF@titleref#1{%
\begingroup
@@ -151,6 +155,12 @@
\ZREF@org@@ssect{#1}{#2}{#3}{#4}{#5}%
}%
}%
+ \ZREF@patch{descriptionlabel}{%
+ \def\descriptionlabel#1{%
+ \zref@titleref@setcurrent{#1}%
+ \ZREF@org@descriptionlabel{#1}%
+ }%
+ }%
\@ifclassloaded{memoir}{%
\ltx@IfUndefined{ifheadnameref}{}{%
\def\@chapter[#1]#2{%
@@ -227,7 +237,7 @@
\@ifpackageloaded{listings}{%
\ZREF@patch{lst@MakeCaption}{%
\def\lst@MakeCaption{%
- \ifx\lst@label\@empty
+ \ifx\lst@label\ltx@empty
\else
\expandafter\zref@titleref@setcurrent\expandafter{%
\lst@@caption
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
index d89b3969281..8759cc82790 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,11 +41,14 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-totpages}%
- [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/23]
-\RequirePackage{zref-lastpage}[2010/04/23]
+ [2010/05/01 v2.17 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
+\RequirePackage{zref-abspage}[2010/05/01]
+\RequirePackage{zref-lastpage}[2010/05/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 ebbffcb5136..600dc10fbf0 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,9 +41,12 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-user}%
- [2010/04/23 v2.15 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\newcommand*\zlabel{%
\ifx\label\ltx@gobble
\expandafter\ltx@gobble
@@ -50,7 +54,7 @@
\expandafter\zref@wrapper@babel\expandafter\zref@label
\fi
}%
-\newcommand*{\zref}[2][default]{%
+\newcommand*{\zref}[2][default]{% robust because of optional argument
\zref@propexists{#1}{%
\zref@wrapper@babel\ZREF@zref{#2}{#1}%
}%
@@ -59,10 +63,12 @@
\zref@refused{#1}%
\zref@extract{#1}%
}%
-\newcommand*\zpageref{%
- \zref[page]%
-}%
-\newcommand*{\zrefused}{\zref@refused}%
+\ZREF@IfDefinable\zpageref\def{%
+ {\zref[page]}%
+}
+\ZREF@IfDefinable\zrefused\def{%
+ {\zref@refused}%
+}
\endinput
%%
%% End of file `zref-user.sty'.
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
index 8d8d3a6c407..468ae836c32 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,13 +41,37 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-xr}%
- [2010/04/23 v2.15 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\ifx\ZREF@base@ok Y%
+\else
+ \expandafter\endinput
+\fi
\RequirePackage{keyval}
\RequirePackage{kvoptions}[2010/02/22]
\zref@newprop{url}{}%
+\zref@newprop{urluse}{}%
\zref@newprop{externaldocument}{}%
+\def\ZREF@xr@NewPropAnchor{%
+ \ltx@ifpackageloaded{zref-hyper}{%
+ }{%
+ \zref@newprop{anchor}{%
+ \ltx@ifundefined{@currentHref}{}{\@currentHref}%
+ }%
+ }%
+ \global\let\ZREF@xr@NewPropAnchor\relax
+}
+\def\ZREF@xr@NewPropTitle{%
+ \ltx@ifpackageloaded{zref-title}{%
+ }{%
+ \zref@newprop{title}{}%
+ }%
+ \global\let\ZREF@xr@NewPropTitle\relax
+}
+\def\ZREF@xr@NewPropTheotype{%
+ \zref@newprop{theotype}{}%
+ \global\let\ZREF@xr@NewPropTheotype
+}
\providecommand*{\zref@xr@ext}{%
\ltx@ifundefined{XR@ext}{pdf}{\XR@ext}%
}%
@@ -61,35 +86,57 @@
\define@key{ZREF@XR}{ext}{%
\def\zref@xr@{#1}%
}
+\DeclareBoolOption[false]{urluse}
\newcommand*{\zxrsetup}{%
\setkeys{ZREF@XR}%
}%
-\newcommand*{\zexternaldocument}{%
- \zref@ifpropundefined{title}{%
- \zref@newprop{title}{}%
- }{}%
- \zref@ifpropundefined{anchor}{%
- \zref@newprop{anchor}{%
- \ltx@ifundefined{@currentHref}{}{\@currentHref}%
- }%
- }{}%
- \zref@ifpropundefined{url}{%
- \zref@newprop{url}{}%
- }{}%
+\newcount\ZREF@xr@URL
+\ZREF@xr@URL=\ltx@zero
+\def\ZREF@xr@AddURL#1{%
\begingroup
- \csname @safe@actives@true\endcsname
- \makeatletter
- \@ifstar{%
- \ZREF@xr@zreflabelfalse
- \@testopt\ZREF@xr@externaldocument{}%
- }{%
- \ZREF@xr@zreflabeltrue
- \@testopt\ZREF@xr@externaldocument{}%
+ \def\ZREF@temp{#1}%
+ \count@=\ltx@one
+ \ZREF@xr@@AddUrl
+ \endgroup
+}
+\def\ZREF@xr@@AddUrl{%
+ \ifnum\count@>\ZREF@xr@URL
+ \global\advance\ZREF@xr@URL by\ltx@one
+ \xdef\ZREF@xr@theURL{\romannumeral\ZREF@xr@URL}%
+ \global\expandafter\let
+ \csname Z@U@\ZREF@xr@theURL\endcsname\ZREF@temp
+ \@PackageInfo{zref-xr}{%
+ \ltx@backslashchar Z@U@\ZREF@xr@theURL:\MessageBreak
+ \ZREF@temp\MessageBreak
}%
+ \else
+ \expandafter
+ \ifx\csname Z@U@\romannumeral\count@\endcsname\ZREF@temp
+ \xdef\ZREF@xr@theURL{\romannumeral\count@}%
+ \else
+ \expandafter\expandafter\expandafter\ZREF@xr@@AddUrl
+ \fi
+ \fi
+}
+\ZREF@IfDefinable\zexternaldocument\def{%
+ {%
+ \ZREF@xr@NewPropAnchor
+ \ZREF@xr@NewPropTitle
+ \begingroup
+ \csname @safe@actives@true\endcsname
+ \makeatletter
+ \@ifstar{%
+ \ZREF@xr@zreflabelfalse
+ \@testopt\ZREF@xr@externaldocument{}%
+ }{%
+ \ZREF@xr@zreflabeltrue
+ \@testopt\ZREF@xr@externaldocument{}%
+ }%
+ }%
}%
\def\ZREF@xr@externaldocument[#1]#2{%
\def\ZREF@xr@prefix{#1}%
- \let\ZREF@xr@filelist\@empty
+ \let\ZREF@xr@filelist\ltx@empty
\edef\ZREF@xr@externalfile{#2}%
\edef\ZREF@xr@file{\ZREF@xr@externalfile.aux}%
\filename@parse{#2}%
@@ -97,6 +144,11 @@
}%
\def\ZREF@xr@graburl[#1]{%
\edef\ZREF@xr@url{#1}%
+ \ifZREF@xr@urluse
+ \expandafter\ZREF@xr@AddURL\expandafter{\ZREF@xr@url}%
+ \expandafter\def\expandafter\ZREF@xr@url
+ \expandafter{\csname Z@U@\ZREF@xr@theURL\endcsname}%
+ \fi
\ZREF@xr@checkfile
\endgroup
}%
@@ -109,7 +161,8 @@
}%
\else
\PackageInfo{zref-xr}{%
- Label \ifZREF@xr@zreflabel (zref) \fi import from `\ZREF@xr@file'%
+ Label \ifZREF@xr@zreflabel (zref) \fi
+ import from `\ZREF@xr@file'%
}%
\def\ZREF@xr@found{0}%
\def\ZREF@xr@ignored@empty{0}%
@@ -118,7 +171,7 @@
\ZREF@xr@processfile
\closein\@inputcheck
\begingroup
- \let\on@line\@empty
+ \let\on@line\ltx@empty
\PackageInfo{zref-xr}{%
Statistics for `\ZREF@xr@file':\MessageBreak
\ZREF@xr@found\space
@@ -130,19 +183,25 @@
\fi
\ifnum\ZREF@xr@ignored@zref>0 %
,\MessageBreak
- \ZREF@xr@ignored@zref\space doublicated zref label(s) ignored%
+ \ZREF@xr@ignored@zref\space
+ duplicated zref label(s) ignored%
\fi
\ifnum\ZREF@xr@ignored@ltx>0 %
,\MessageBreak
- \ZREF@xr@ignored@ltx\space doublicated latex label(s) ignored%
+ \ZREF@xr@ignored@ltx\space
+ duplicated latex label(s) ignored%
\fi
}%
\endgroup
\fi
- \ifx\ZREF@xr@filelist\@empty
+ \ifx\ZREF@xr@filelist\ltx@empty
\else
- \edef\ZREF@xr@file{\expandafter\@car\ZREF@xr@filelist\@nil}%
- \edef\ZREF@xr@filelist{\expandafter\@cdr\ZREF@xr@filelist\@nil}%
+ \edef\ZREF@xr@file{%
+ \expandafter\ltx@car\ZREF@xr@filelist\@nil
+ }%
+ \edef\ZREF@xr@filelist{%
+ \expandafter\ltx@cdr\ZREF@xr@filelist\ltx@empty\@nil
+ }%
\expandafter\ZREF@xr@checkfile
\fi
}%
@@ -159,11 +218,13 @@
\toks@{#2}%
\ifZREF@xr@zreflabel
\ifx\x\ZREF@xr@zref@newlabel
- \expandafter\ZREF@xr@process@zreflabel\ZREF@xr@line...\ZREF@nil
+ \expandafter
+ \ZREF@xr@process@zreflabel\ZREF@xr@line...\ZREF@nil
\fi
\else
\ifx\x\ZREF@xr@newlabel
- \expandafter\ZREF@xr@process@label\ZREF@xr@line...[]\ZREF@nil
+ \expandafter
+ \ZREF@xr@process@label\ZREF@xr@line...[]\ZREF@nil
\fi
\fi
\ifx\x\ZREF@xr@@input
@@ -180,7 +241,7 @@
\edef\ZREF@xr@tempname{$temp$}%
\edef\ZREF@xr@temprefname{Z@R@\ZREF@xr@tempname}%
\let\ZREF@xr@list\x
- \ifx\ZREF@xr@list\@empty
+ \ifx\ZREF@xr@list\ltx@empty
\PackageWarningNoLine{zref-xr}{%
Label `#1' without properties ignored\MessageBreak
in file `\ZREF@xr@file'%
@@ -230,14 +291,12 @@
\ifx\\#4\\%
\else
% ntheorem knows an optional argument at the end of \newlabel
- \zref@ifpropundefined{theotype}{%
- \zref@newprop{theotype}{}%
- }{}%
+ \ZREF@xr@NewPropTheotype
\expandafter\ltx@LocalAppendToMacro
\csname\ZREF@xr@temprefname\endcsname{\theotype{#4}}%
\fi
\expandafter\ltx@LocalAppendToMacro
- \csname\ZREF@xr@temprefname\expandafter\endcsname\expandafter{%
+ \csname\ZREF@xr@temprefname\expandafter\endcsname\expandafter{%
\expandafter\externaldocument\expandafter{%
\ZREF@xr@externalfile
}%
@@ -292,7 +351,11 @@
\ltx@ifpackageloaded{nameref}{%
{\zref@extractdefault{#1}{title}{}}%
{\zref@extractdefault{#1}{anchor}{}}%
- {\zref@extractdefault{#1}{url}{}}%
+ \zref@ifrefcontainsprop{#1}{urluse}{%
+ {\zref@extractdefault{#1}{urluse}{}}%
+ }{%
+ {\zref@extractdefault{#1}{url}{}}%
+ }%
}{}%
}%
}%
@@ -332,7 +395,7 @@
}{}%
}%
\def\ZREF@xr@scanparams#1#2#3#4#5#6#7\ZREF@nil{%
- \let#1\@empty
+ \let#1\ltx@empty
\ZREF@foundfalse
\ZREF@xr@scantitleref#1#2\TR@TitleReference{}{}\ZREF@nil
\ifZREF@found
@@ -360,7 +423,17 @@
\fi
\ifx\\#6\\%
\else
- \ltx@LocalAppendToMacro#1{\url{#6}}%
+ \ifZREF@xr@urluse
+ \ZREF@xr@AddURL{#6}%
+ \expandafter\ltx@LocalAppendToMacro\expandafter#1%
+ \expandafter{%
+ \expandafter\urluse\expandafter{%
+ \csname Z@U@\ZREF@xr@theURL\endcsname
+ }%
+ }%
+ \else
+ \ltx@LocalAppendToMacro#1{\url{#6}}%
+ \fi
\fi
}%
\def\ZREF@xr@scantitleref#1#2\TR@TitleReference#3#4#5\ZREF@nil{%
@@ -380,7 +453,8 @@
\expandafter
\ltx@LocalAppendToMacro\csname Z@R@#1\expandafter\endcsname
\expandafter{%
- \expandafter\url\expandafter{\ZREF@xr@url}%
+ \csname url\ifZREF@xr@urluse use\fi
+ \expandafter\endcsname\expandafter{\ZREF@xr@url}%
}%
}%
}{%
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
index 1d95af22012..cdc2a903d59 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty
@@ -28,9 +28,10 @@
%% This work consists of the main source file zref.dtx
%% and the derived files
%% zref.sty, zref.pdf, zref.ins, zref.drv, zref-base.sty,
-%% zref-abspage.sty, zref-counter.sty, zref-dotfill.sty,
-%% zref-hyperref.sty, zref-lastpage.sty, zref-marks.sty,
-%% zref-nextpage.sty, zref-perpage.sty, zref-runs.sty,
+%% zref-abspage.sty, zref-abspos.sty, zref-counter.sty,
+%% zref-dotfill.sty, zref-hyperref.sty, zref-lastpage.sty,
+%% zref-marks.sty, zref-nextpage.sty, zref-pageattr.sty,
+%% zref-pagelayout.sty, zref-perpage.sty, zref-runs.sty,
%% zref-savepos.sty, zref-thepage.sty, zref-titleref.sty,
%% zref-totpages.sty, zref-user.sty, zref-xr.sty,
%% zref-example.tex, zref-example-lastpage.tex,
@@ -40,13 +41,13 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref}
- [2010/04/23 v2.15 New reference scheme for LaTeX2e (HO)]%
-\RequirePackage{zref-base}[2010/04/23]
-\@ifundefined{ZREF@baseok}{\endinput}{}
+ [2010/05/01 v2.17 New reference scheme for LaTeX2e (HO)]%
+\RequirePackage{zref-base}[2010/05/01]
+\@ifundefined{ZREF@base@ok}{\endinput}{}
\def\ZREF@temp#1{%
\DeclareOption{#1}{%
\AtEndOfPackage{%
- \RequirePackage{zref-#1}[2010/04/23]%
+ \RequirePackage{zref-#1}[2010/05/01]%
}%
}%
}
@@ -55,8 +56,14 @@
\ZREF@temp{dotfill}
\ZREF@temp{hyperref}
\ZREF@temp{lastpage}
+\ZREF@temp{marks}
+\ZREF@temp{nextpage}
+\ZREF@temp{pageattr}
+\ZREF@temp{pagelayout}
\ZREF@temp{perpage}
+\ZREF@temp{runs}
\ZREF@temp{savepos}
+\ZREF@temp{thepage}
\ZREF@temp{titleref}
\ZREF@temp{totpages}
\ZREF@temp{user}