diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
17 files changed, 400 insertions, 166 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty index 4b58542c916..679b6b82f08 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/hypdoc.sty @@ -31,10 +31,11 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdoc}% - [2010/02/03 v1.8 Hyper extensions for doc.sty (HO)]% + [2010/03/26 v1.9 Hyper extensions for doc.sty (HO)]% \newif\ifHD@numbered \DeclareOption{numbered}{\HD@numberedtrue} \ProcessOptions*\relax +\RequirePackage{atveryend}[2010/03/24] \RequirePackage{doc} \ifx\numexpr\@undefined \RequirePackage{calc}% @@ -456,10 +457,13 @@ }% \HDorg@wrglossary{#1\encapchar\encapchar\@nil}% } -\AtEndDocument{% +\AfterLastShipout{% \if@filesw \immediate\write\@auxout{% - \noexpand\HD@SetMacroIndent{\number\value{CodelineNo}}% + \string\providecommand\string\HD@SetMacroIndent[1]{}% + }% + \immediate\write\@auxout{% + \string\HD@SetMacroIndent{\number\value{CodelineNo}}% }% \fi } diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 34801f984bb..8c6fc3ebd8d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,21 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2009/12/08 v2.7 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi}% \begingroup - \let\@addtoreset\@gobbletwo + \let\@addtoreset\ltx@gobbletwo \newcounter{abspage}% \endgroup \setcounter{abspage}{0}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index d9002083971..73f6f08b3cf 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,15 +29,17 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2009/12/08 v2.7 Module base for zref (HO)]% + [2010/03/26 v2.8 Module base for zref (HO)]% +\RequirePackage{ltxcmds}[2009/12/12] \def\ZREF@name{zref} \def\ZREF@ErrorNoLine#1#2{% \begingroup @@ -50,25 +52,22 @@ \def\ZREF@patch#1{% \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname #1\endcsname\relax - \expandafter\@gobble + \expandafter\ltx@gobble \else \expandafter\let\csname ZREF@org@#1\expandafter\endcsname \csname #1\endcsname - \expandafter\@firstofone + \expandafter\ltx@firstofone \fi } -\begingroup - \@ifundefined{eTeXversion}{% - \ZREF@ErrorNoLine{% - Missing support for eTeX; package is abandoned% - }{% - Use a TeX compiler that support eTeX and enable eTeX % - in the format.% - }% - \endgroup - \endinput - }{}% -\endgroup +\ltx@IfUndefined{eTeXversion}{% + \ZREF@ErrorNoLine{% + Missing support for eTeX; package is abandoned% + }{% + Use a TeX compiler that support eTeX and enable eTeX % + in the format.% + }% + \endinput +}{}% \RequirePackage{etexcmds}[2007/09/09] \ifetex@unexpanded \else @@ -103,9 +102,9 @@ } \def\zref@iflistundefined#1{% \expandafter\ifx\csname Z@L@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } \def\zref@listexists#1{% @@ -131,9 +130,9 @@ }% \expandafter\endgroup \ifZREF@found - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } \def\zref@listforloop#1#2{% @@ -187,9 +186,9 @@ \fi \def\zref@ifpropundefined#1{% \expandafter\ifx\csname Z@E@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } \def\zref@propexists#1{% @@ -308,11 +307,18 @@ } \def\zref@ifrefundefined#1{% \expandafter\ifx\csname Z@R@#1\endcsname\relax - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi } +\newcommand*{\zifrefundefined}[1]{% + \zref@wrapper@babel\ZREF@ifrefundefined{#1}% +} +\def\ZREF@ifrefundefined#1{% + \zref@refused{#1}% + \zref@ifrefundefined{#1}% +} \def\zref@refused#1{% \zref@wrapper@babel\ZREF@refused{#1}% } @@ -335,7 +341,7 @@ } \def\zref@ifrefcontainsprop#1#2{% \zref@ifrefundefined{#1}{% - \@secondoftwo + \ltx@secondoftwo }{% \expandafter\ZREF@ifrefcontainsprop \csname Z@E@#2\expandafter\endcsname @@ -348,9 +354,9 @@ \def\ZREF@ifrefcontainsprop#1#2#3{% \expandafter\ifx\expandafter\ZREF@novalue #1#3#2\ZREF@novalue\ZREF@nil\@empty - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi } \def\ZREF@novalue{\ZREF@NOVALUE} @@ -369,20 +375,20 @@ \long\def\zref@wrapper@unexpanded#1{% \let\ZREF@unexpanded\etex@unexpanded #1% - \let\ZREF@unexpanded\@firstofone + \let\ZREF@unexpanded\ltx@firstofone } -\let\ZREF@unexpanded\@firstofone +\let\ZREF@unexpanded\ltx@firstofone \long\def\zref@wrapper@babel#1#2{% \ifcsname if@safe@actives\endcsname - \expandafter\@firstofone + \expandafter\ltx@firstofone \else - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \fi {% \if@safe@actives - \expandafter\@secondoftwo + \expandafter\ltx@secondoftwo \else - \expandafter\@firstoftwo + \expandafter\ltx@firstoftwo \fi {% \begingroup @@ -401,7 +407,7 @@ \def\zref@require@unique{% \@ifundefined{c@zref@unique}{% \begingroup - \let\@addtoreset\@gobbletwo + \let\@addtoreset\ltx@gobbletwo \newcounter{zref@unique}% \endgroup \renewcommand*{\thezref@unique}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index 8c8a4531c6c..e1e157138ec 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,16 +29,17 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2009/12/08 v2.7 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@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 eb3d3806af3..d1285c9de64 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,18 +29,19 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2009/12/08 v2.7 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2009/12/08] +\RequirePackage{zref-savepos}[2010/03/26] \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 07828fa9dbc..483d4e6e589 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,19 +29,20 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2009/12/08 v2.7 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{anchor}[]{% - \@ifundefined{@currentHref}{}{\@currentHref}% + \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 c3a249cff33..9499cc12f6a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,16 +29,18 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2009/12/08 v2.7 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\RequirePackage{zref-abspage}[2010/03/26] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newlist{LastPage} @@ -56,6 +58,22 @@ \endgroup \fi } +\def\zref@iflastpage#1{% + \ifnum\zref@extractdefault{#1}{abspage}{-1}=% + \zref@extractdefault{LastPage}{abspage}{-2} % + \expandafter\ltx@firstoftwo + \else + \expandafter\ltx@secondoftwo + \fi +} +\newcommand*{\ziflastpage}{% + \zref@wrapper@babel\ZREF@iflastpage +} +\def\ZREF@iflastpage#1{% + \zref@refused{LastPage}% + \zref@refused{#1}% + \zref@iflastpage{#1}% +} \endinput %% %% End of file `zref-lastpage.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty new file mode 100644 index 00000000000..b556d838c92 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -0,0 +1,127 @@ +%% +%% This is file `zref-nextpage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `nextpage') +%% +%% 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-counter.sty, zref-dotfill.sty, +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-nextpage}% + [2010/03/26 v2.8 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\@ifundefined{ZREF@baseok}{\endinput}{} +\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-thepage}[2010/03/26] +\RequirePackage{zref-lastpage}[2010/03/26] +\RequirePackage{uniquecounter}[2009/12/18] +\UniqueCounterNew{znextpage} + +\newcommand*{\znextpagesetup}{% + \afterassignment\ZREF@np@setup@i + \def\ZREF@np@call@unknown##1% +} +\def\ZREF@np@setup@i{% + \afterassignment\ZREF@np@setup@ii + \def\ZREF@np@call@nonext##1% +} +\def\ZREF@np@setup@ii{% + \def\ZREF@np@call@next##1% +} +\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}% +} +\newcommand*{\znonextpagename}{} +\newcommand*{\zunknownnextpagename}{\Z@D@page} +\def\ZREF@nextpage#1{% + \begingroup + \def\ZREF@refname@this{zref@np#1}% + \zref@labelbyprops\ZREF@refname@this{abspage}% + \chardef\ZREF@call=0 % unknown + \ZREF@ifrefundefined\ZREF@refname@this{% + }{% + \edef\ZREF@pagenum@this{% + \zref@extractdefault\ZREF@refname@this{abspage}{0}% + }% + \edef\ZREF@refname@next{% + \zref@thepage@name{% + \the\numexpr\ZREF@pagenum@this+1% + }% + }% + \ifnum\ZREF@pagenum@this>0 % + \ZREF@ifrefundefined{LastPage}{% + \zref@ifrefundefined\ZREF@refname@next{% + }{% + \chardef\ZREF@call=2 % next page + }% + }{% + \edef\ZREF@pagenum@last{% + \zref@extractdefault{LastPage}{abspage}{0}% + }% + \ifnum\ZREF@pagenum@this<\ZREF@pagenum@last\ltx@space + \ZREF@ifrefundefined\ZREF@refname@next{% + }{% + \chardef\ZREF@call=2 % next page + }% + \else + \ifnum\ZREF@pagenum@this=\ZREF@pagenum@this\ltx@space + \chardef\ZREF@call=1 % no next page + \fi + \fi + }% + \fi + }% + \edef\x{% + \endgroup + \ifcase\ZREF@call + \noexpand\ZREF@np@call@unknown{% + \noexpand\zunknownnextpagename + }% + \or + \noexpand\ZREF@np@call@nonext{% + \noexpand\znonextpagename + }% + \else + \noexpand\ZREF@np@call@next{% + \noexpand\zref@extract{\ZREF@refname@next}{page}% + }% + \fi + }% + \x +} +\endinput +%% +%% End of file `zref-nextpage.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index eb5f8543a5d..eb71e521af3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,18 +29,19 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2009/12/08 v2.7 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2009/12/08] +\RequirePackage{zref-abspage}[2010/03/26] \zref@newprop*{pagevalue}[0]{\number\c@page} \zref@newlist{perpage} \zref@addprop{perpage}{abspage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty index 818c5fb4846..0fe67466965 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,15 +29,16 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2009/12/08 v2.7 Module runs for zref (HO)]% + [2010/03/26 v2.8 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 a1708bfdb87..fd55e1d592b 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,27 +29,25 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2009/12/08 v2.7 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\begingroup - \@ifundefined{pdfsavepos}{% - \ZREF@ErrorNoLine{% - \string\pdfsavepos\space is not supported.\MessageBreak - It is provided by pdfTeX (1.40) or XeTeX% - }\ZREF@UpdatePdfTeX - \endgroup - \endinput - }{}% -\endgroup +\ltx@IfUndefined{pdfsavepos}{% + \ZREF@ErrorNoLine{% + \string\pdfsavepos\space is not supported.\MessageBreak + It is provided by pdfTeX (1.40) or XeTeX% + }\ZREF@UpdatePdfTeX + \endinput +}{}% \RequirePackage{ifpdf} \ifpdf \else diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty new file mode 100644 index 00000000000..b32709f9a28 --- /dev/null +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -0,0 +1,70 @@ +%% +%% This is file `zref-thepage.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% zref.dtx (with options: `thepage') +%% +%% 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-counter.sty, zref-dotfill.sty, +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{zref-thepage}% + [2010/03/26 v2.8 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] +\@ifundefined{ZREF@baseok}{\endinput}{} +\RequirePackage{atbegshi} +\RequirePackage{zref-abspage}[2010/03/26] +\zref@newlist{thepage} +\zref@addprop{thepage}{page} +\AtBeginShipout{% + \zref@wrapper@immediate{% + \zref@labelbylist{thepage\the\value{abspage}}{thepage}% + }% +} +\ltx@IfUndefined{numexpr}{% + \def\zref@thepage@name#1{thepage\number#1}% +}{% + \def\zref@thepage@name#1{thepage\the\numexpr#1}% +} +\def\zref@thepage#1{% + \zref@extract{\zref@thepage@name{#1}}{page}% +}% +\def\zref@thepage@refused#1{% + \zref@refused{\zref@thepage@name{#1}}% +}% +\newcommand*{\zthepage}[1]{% + \zref@thepage@refused{#1}% + \zref@thepage{#1}% +} +\endinput +%% +%% End of file `zref-thepage.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index 7d84650a779..20ea3adcdca 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,16 +29,17 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2009/12/08 v2.7 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] \RequirePackage{keyval} @@ -101,7 +102,7 @@ \def\ZREF@titleref#1{% \begingroup \zref@refused{#1}% - \let\label\@gobble + \let\label\ltx@gobble \zref@extract{#1}{title}% \endgroup }% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 62393cc94c3..460af656c15 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,19 +29,20 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2009/12/08 v2.7 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2009/12/08] -\RequirePackage{zref-lastpage}[2009/12/08] +\RequirePackage{zref-abspage}[2010/03/26] +\RequirePackage{zref-lastpage}[2010/03/26] \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 62693f19903..3c0130cc545 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,20 +29,21 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2009/12/08 v2.7 Module user for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \newcommand*\zlabel{% - \ifx\label\@gobble - \expandafter\@gobble + \ifx\label\ltx@gobble + \expandafter\ltx@gobble \else \expandafter\zref@wrapper@babel\expandafter\zref@label \fi diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 6086e6bb38f..edc7467aff6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,21 +29,22 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2009/12/08 v2.7 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \zref@newprop{url}{}% \providecommand*{\zref@xr@ext}{% - \@ifundefined{XR@ext}{pdf}{\XR@ext}% + \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}% }% \newif\ifZREF@xr@zreflabel \newcommand*{\zexternaldocument}{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index 749263bece0..15d9b45047d 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2006-2009 by +%% Copyright (C) 2006-2010 by %% Heiko Oberdiek <heiko.oberdiek at googlemail.com> %% %% This work may be distributed and/or modified under the @@ -29,21 +29,22 @@ %% 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-perpage.sty, -%% zref-runs.sty, zref-savepos.sty, zref-titleref.sty, -%% zref-totpages.sty, zref-user.sty, zref-xr.sty, -%% zref-example.tex, zref-example-lastpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-hyperref.sty, zref-lastpage.sty, zref-nextpage.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-runs.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2009/12/08] + [2010/03/26 v2.8 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2010/03/26] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2009/12/08]% + \RequirePackage{zref-#1}[2010/03/26]% }% }% } |