diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
17 files changed, 298 insertions, 138 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty index 0171a6e6ae7..4e2de272a5e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-abspage.sty @@ -35,12 +35,12 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2010/04/08 v2.10 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi}% \begingroup diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty index 9367101c343..6ff9ea65221 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-base.sty @@ -35,11 +35,11 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2010/04/08 v2.10 Module base for zref (HO)]% + [2010/04/17 v2.12 Module base for zref (HO)]% \RequirePackage{ltxcmds}[2010/03/01] \def\ZREF@name{zref} \def\ZREF@UpdatePdfTeX{Update pdfTeX.} @@ -213,6 +213,7 @@ \global\@namedef{Z@D@\ZREF@P}{#1}% \global\expandafter\let\csname Z@X@\ZREF@P\endcsname\ZREF@X \expandafter\ZREF@@@newprop\csname\ZREF@P\endcsname + \expandafter\gdef\csname Z@C@\ZREF@P\endcsname{}% \zref@setcurrent\ZREF@P } \def\ZREF@@@newprop#1{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty index dd96d69dd0f..3ad669191a2 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-counter.sty @@ -35,12 +35,12 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2010/04/08 v2.10 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@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 ec57ac6fde0..c200ecce6d5 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-dotfill.sty @@ -35,14 +35,14 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2010/04/08 v2.10 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-savepos}[2010/04/08] +\RequirePackage{zref-savepos}[2010/04/17] \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 4ac1421e9aa..c85417f994a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-hyperref.sty @@ -35,12 +35,12 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2010/04/08 v2.10 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newprop{anchor}[]{% \ltx@ifundefined{@currentHref}{}{\@currentHref}% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty index c88db209024..cac3ed6e9ec 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-lastpage.sty @@ -35,13 +35,13 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2010/04/08 v2.10 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] -\RequirePackage{zref-abspage}[2010/04/08] + [2010/04/17 v2.12 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] +\RequirePackage{zref-abspage}[2010/04/17] \RequirePackage{atveryend}[2009/12/07] \@ifundefined{ZREF@baseok}{\endinput}{} \zref@newlist{LastPage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty index a07c4a50071..663175d29bc 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-marks.sty @@ -35,12 +35,12 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-marks}% - [2010/04/08 v2.10 Module marks for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module marks for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{kvsetkeys}[2009/07/30] \newcommand*{\zref@marks@register}[3][]{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty index 35667a3bedd..0a7ec65196f 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-nextpage.sty @@ -35,16 +35,16 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-nextpage}% - [2010/04/08 v2.10 Module nextpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module nextpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/04/08] -\RequirePackage{zref-thepage}[2010/04/08] -\RequirePackage{zref-lastpage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] +\RequirePackage{zref-thepage}[2010/04/17] +\RequirePackage{zref-lastpage}[2010/04/17] \RequirePackage{uniquecounter}[2009/12/18] \UniqueCounterNew{znextpage} diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty index c7a155ee526..0de80d90357 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-perpage.sty @@ -35,14 +35,14 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2010/04/08 v2.10 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] \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 c4127fe525d..146ca1a6508 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-runs.sty @@ -35,11 +35,11 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-runs}% - [2010/04/08 v2.10 Module runs for zref (HO)]% + [2010/04/17 v2.12 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 ec9c1ab8c8c..399023da74e 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-savepos.sty @@ -35,12 +35,12 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2010/04/08 v2.10 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \ltx@IfUndefined{pdfsavepos}{% \PackageError\ZREF@name{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty index 8a8ba72354c..b8544f42fa1 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-thepage.sty @@ -35,15 +35,15 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-thepage}% - [2010/04/08 v2.10 Module thepage for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module thepage for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{atbegshi} -\RequirePackage{zref-abspage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] \zref@newlist{thepage} \zref@addprop{thepage}{page} \AtBeginShipout{% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty index b2403eda426..f715f768c7a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty @@ -35,12 +35,12 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2010/04/08 v2.10 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{gettitlestring}[2009/12/08] \RequirePackage{keyval} @@ -150,6 +150,43 @@ \ZREF@org@@ssect{#1}{#2}{#3}{#4}{#5}% }% }% + \@ifclassloaded{memoir}{% + \ltx@IfUndefined{ifheadnameref}{}{% + \def\@chapter[#1]#2{% + \ltx@IfUndefined{ch@pt@c}{% + \zref@titleref@setcurrent{#1}% + }{% + \ifx\ch@pt@c\ltx@empty + \zref@titleref@setcurrent{#2}% + \else + \def\NR@temp{#1}% + \ifx\NR@temp\ltx@empty + \expandafter\zref@titleref@setcurrent + \expandafter{\ch@pt@c}% + \else + \ifheadnameref + \zref@titleref@setcurrent{#1}% + \else + \expandafter\zref@titleref@setcurrent + \expandafter{\ch@pt@c}% + \fi + \fi + \fi + }% + \ZREF@org@@chapter[{#1}]{#2}% + }% + \ZREF@patch{M@sect}{% + \def\M@sect#1#2#3#4#5#6[#7][#8]{% + \ifheadnameref + \zref@titleref@setcurrent{#8}% + \else + \zref@titleref@setcurrent{#7}% + \fi + \ZREF@org@M@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}][{#8}]% + }% + }% + }% + }{}% \@ifclassloaded{beamer}{% \ZREF@patch{beamer@section}{% \long\def\beamer@section[#1]{% @@ -199,6 +236,29 @@ }% }% }{}% + \ZREF@patch{@opargbegintheorem}{% + \def\@opargbegintheorem#1#2#3{% + \zref@titleref@setcurrent{#3}% + \ZREF@org@@opargbegintheorem{#1}{#2}{#3}% + }% + }% + \@ifpackageloaded{amsthm}{% + \begingroup + \edef\x{macro:\string#1\string#2[\string#3]}% + \@onelevel@sanitize\x + \def\y#1->#2\@nil{#1}% + \edef\z{\expandafter\y\meaning\@begintheorem->\@nil}% + \@onelevel@sanitize\z + \expandafter\endgroup + \ifx\x\z + \ZREF@patch{@begintheorem}{% + \def\@begintheorem#1#2[#3]{% + \zref@titleref@setcurrent{#3}% + \ZREF@org@@begintheorem{#1}{#2}[{#3}]% + }% + }% + \fi + }{}% } \endinput %% diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty index 2670629d327..1c4609a6fd4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-totpages.sty @@ -35,15 +35,15 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2010/04/08 v2.10 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} -\RequirePackage{zref-abspage}[2010/04/08] -\RequirePackage{zref-lastpage}[2010/04/08] +\RequirePackage{zref-abspage}[2010/04/17] +\RequirePackage{zref-lastpage}[2010/04/17] \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 708cfed82b5..978bbc106f3 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-user.sty @@ -35,12 +35,12 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2010/04/08 v2.10 Module user for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module user for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \newcommand*\zlabel{% \ifx\label\ltx@gobble diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 1fde34c1017..946ba4b5a4a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -35,21 +35,46 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/04/08 v2.10 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} +\RequirePackage{kvoptions}[2010/02/22] \zref@newprop{url}{}% \zref@newprop{externaldocument}{}% \providecommand*{\zref@xr@ext}{% \ltx@ifundefined{XR@ext}{pdf}{\XR@ext}% }% \newif\ifZREF@xr@zreflabel +\SetupKeyvalOptions{% + family=ZREF@XR,% + prefix=ZREF@xr@% +} +\DeclareBoolOption[true]{tozreflabel} +\DeclareBoolOption[false]{toltxlabel} +\DeclareBoolOption{verbose} +\define@key{ZREF@XR}{ext}{% + \def\zref@xr@{#1}% +} +\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}{}% + }{}% \begingroup \csname @safe@actives@true\endcsname \makeatletter @@ -86,15 +111,30 @@ Label \ifZREF@xr@zreflabel (zref) \fi import from `\ZREF@xr@file'% }% \def\ZREF@xr@found{0}% - \def\ZREF@xr@ignored{0}% + \def\ZREF@xr@ignored@empty{0}% + \def\ZREF@xr@ignored@zref{0}% + \def\ZREF@xr@ignored@ltx{0}% \ZREF@xr@processfile \closein\@inputcheck \begingroup \let\on@line\@empty \PackageInfo{zref-xr}{% - Statistics for `\ZREF@xr@file': % - \ZREF@xr@found\space found, % - \ZREF@xr@ignored\space ignored% + Statistics for `\ZREF@xr@file':\MessageBreak + \ZREF@xr@found\space + \ifZREF@xr@zreflabel zref\else LaTeX\fi\space + label(s) found% + \ifnum\ZREF@xr@ignored@empty>0 % + ,\MessageBreak + \ZREF@xr@ignored@empty\space empty label(s) ignored% + \fi + \ifnum\ZREF@xr@ignored@zref>0 % + ,\MessageBreak + \ZREF@xr@ignored@zref\space doublicated zref label(s) ignored% + \fi + \ifnum\ZREF@xr@ignored@ltx>0 % + ,\MessageBreak + \ZREF@xr@ignored@ltx\space doublicated latex label(s) ignored% + \fi }% \endgroup \fi @@ -110,7 +150,7 @@ \expandafter\ZREF@xr@processline\ZREF@xr@line..\ZREF@nil \ifeof\@inputcheck \else - \expandafter\ZREF@xr@procesfile + \expandafter\ZREF@xr@processfile \fi }% \long\def\ZREF@xr@processline#1#2#3\ZREF@nil{% @@ -131,76 +171,146 @@ {\filename@area\the\toks@}% }% \fi - \ifeof\@inputcheck - \else - \expandafter\ZREF@xr@processfile - \fi }% \def\ZREF@xr@process@zreflabel\zref@newlabel#1#2#3\ZREF@nil{% - \def\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% + \edef\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% \edef\ZREF@xr@found{\the\numexpr\ZREF@xr@found+1\relax}% \def\x{#2}% - \@ifundefined{\ZREF@xr@refname}{% - \let\ZREF@xr@list\x - \ifx\ZREF@xr@list\@empty - \PackageWarningNoLine{zref-xr}{% - Label `#1' without properties ignored\MessageBreak - in file `\ZREF@xr@file'% + \edef\ZREF@xr@tempname{$temp$}% + \edef\ZREF@xr@temprefname{Z@R@\ZREF@xr@tempname}% + \let\ZREF@xr@list\x + \ifx\ZREF@xr@list\@empty + \PackageWarningNoLine{zref-xr}{% + Label `#1' without properties ignored\MessageBreak + in file `\ZREF@xr@file'% + }% + \edef\ZREF@xr@ignored@empty{% + \the\numexpr\ZREF@xr@ignored@empty+1\relax + }% + \else + \expandafter\ZREF@xr@checklist\x\ZREF@nil + \expandafter\let\csname\ZREF@xr@temprefname\endcsname\x + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\expandafter\endcsname + \expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile }% - \edef\ZREF@xr@ignored{\the\numexpr\ZREF@xr@ignored+1\relax}% - \else - \expandafter\ZREF@xr@checklist\x\ZREF@nil - \expandafter\global\expandafter\let - \csname \ZREF@xr@refname\endcsname\x - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% - \expandafter\externaldocument\expandafter{% - \ZREF@xr@externalfile - }% + }% + \ZREF@xr@urlcheck\ZREF@xr@tempname + \ifZREF@xr@tozreflabel + \@ifundefined{\ZREF@xr@refname}{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to zref label `\ZREF@xr@tempname#1'% + }% + \fi + \global\expandafter + \let\csname\ZREF@xr@refname\expandafter\endcsname + \csname\ZREF@xr@temprefname\endcsname + }{% + \ZREF@xr@zref@ignorewarning{\ZREF@xr@prefix#1}% }% \fi - \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% - }{% - \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}% - }% + \ifZREF@xr@toltxlabel + \ZREF@xr@tolabel{\ZREF@xr@tempname}{\ZREF@xr@prefix#1}% + \fi + \fi }% \def\ZREF@xr@process@label\newlabel#1#2#3[#4]#5\ZREF@nil{% \def\ZREF@xr@refname{Z@R@\ZREF@xr@prefix#1}% \edef\ZREF@xr@found{\the\numexpr\ZREF@xr@found+1\relax}% \def\x{#2}% - \@ifundefined{\ZREF@xr@refname}{% - \expandafter\ZREF@xr@scanparams - \csname\ZREF@xr@refname\expandafter\endcsname - \x{}{}{}{}{}\ZREF@nil - \ifx\\#4\\% - \else - % ntheorem knows an optional argument at the end of \newlabel - \zref@ifpropundefined{theotype}{% - \zref@newprop{theotype}{}% - }{}% - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\endcsname{\theotype{#4}}% - \fi - \expandafter\g@addto@macro - \csname\ZREF@xr@refname\expandafter\endcsname\expandafter{% - \expandafter\externaldocument\expandafter{% - \ZREF@xr@externalfile - }% + \edef\ZREF@xr@tempname{$temp$}% + \edef\ZREF@xr@temprefname{Z@R@\ZREF@xr@tempname}% + \expandafter\ZREF@xr@scanparams + \csname\ZREF@xr@temprefname\expandafter\endcsname + \x{}{}{}{}{}\ZREF@nil + \ifx\\#4\\% + \else + % ntheorem knows an optional argument at the end of \newlabel + \zref@ifpropundefined{theotype}{% + \zref@newprop{theotype}{}% + }{}% + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\endcsname{\theotype{#4}}% + \fi + \expandafter\ltx@LocalAppendToMacro + \csname\ZREF@xr@temprefname\expandafter\endcsname\expandafter{% + \expandafter\externaldocument\expandafter{% + \ZREF@xr@externalfile }% - \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% - }{% - \ZREF@xr@ignorewarning{\ZREF@xr@prefix#1}% }% + \ZREF@xr@urlcheck{\ZREF@xr@prefix#1}% + \ifZREF@xr@tozreflabel + \@ifundefined{\ZREF@xr@refname}{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to zref label `\ZREF@xr@prefix#1'% + }% + \fi + \global\expandafter + \let\csname\ZREF@xr@refname\expandafter\endcsname + \csname\ZREF@xr@temprefname\endcsname + }{% + \ZREF@xr@zref@ignorewarning{\ZREF@xr@prefix#1}% + }% + \fi + \ifZREF@xr@toltxlabel + \ZREF@xr@tolabel{\ZREF@xr@tempname}{\ZREF@xr@prefix#1}% + \fi } \def\ZREF@xr@zref@newlabel{\zref@newlabel}% \def\ZREF@xr@newlabel{\newlabel}% \def\ZREF@xr@@input{\@input}% -\def\ZREF@xr@ignorewarning#1{% +\def\ZREF@xr@relax{\relax}% +\def\ZREF@xr@tolabel#1#2{% + \ifZREF@xr@verbose + \PackageInfo{zref-xr}{% + Import to LaTeX label `#2'% + }% + \fi + \expandafter\xdef\csname r@#2\endcsname{% + {% + \ltx@ifundefined{M@TitleReference}{% + \ltx@ifundefined{TR@TitleReference}{% + \zref@extractdefault{#1}{default}{}% + }{% + \noexpand\TR@TitleReference + {\zref@extractdefault{#1}{default}{}}% + {\zref@extractdefault{#1}{title}{}}% + }% + }{% + \noexpand\M@TitleReference + {\zref@extractdefault{#1}{default}{}}% + {\zref@extractdefault{#1}{title}{}}% + }% + }% + {\zref@extractdefault{#1}{page}{}}% + \ltx@ifpackageloaded{nameref}{% + {\zref@extractdefault{#1}{title}{}}% + {\zref@extractdefault{#1}{anchor}{}}% + {\zref@extractdefault{#1}{url}{}}% + }{}% + }% +} +\def\ZREF@xr@zref@ignorewarning#1{% + \PackageWarningNoLine{zref-xr}{% + Zref label `#1' is already in use\MessageBreak + in file `\ZREF@xr@file'% + }% + \edef\ZREF@xr@ignored@empty{% + \the\numexpr\ZREF@xr@ignored+1% + }% +}% +\def\ZREF@xr@ltx@ignorewarning#1{% \PackageWarningNoLine{zref-xr}{% - Label `#1' is already in use\MessageBreak + LaTeX label `#1' is already in use\MessageBreak in file `\ZREF@xr@file'% }% - \edef\ZREF@xr@ignored{\the\numexpr\ZREF@xr@ignored+1\relax}% + \edef\ZREF@xr@ignored@ltx{% + \the\numexpr\ZREF@xr@ignored@ltx+1% + }% }% \def\ZREF@xr@checklist#1#2#3\ZREF@nil{% \ifx\@undefined#1\relax @@ -208,58 +318,52 @@ \fi \ifx\\#3\\% \else - \@ReturnAfterFi{% + \ltx@ReturnAfterFi{% \ZREF@xr@checklist#3\ZREF@nil }% \fi }% -\long\def\@ReturnAfterFi#1\fi{\fi#1}% \def\ZREF@xr@checkkey#1#2\@nil{% \zref@ifpropundefined{#2}{% \zref@newprop{#2}{}% }{}% }% \def\ZREF@xr@scanparams#1#2#3#4#5#6#7\ZREF@nil{% - \global\let#1\@empty + \let#1\@empty \ZREF@foundfalse \ZREF@xr@scantitleref#1#2\TR@TitleReference{}{}\ZREF@nil \ifZREF@found \else - \g@addto@macro#1{\default{#2}}% + \ltx@LocalAppendToMacro#1{\default{#2}}% \fi % page - \g@addto@macro#1{\page{#3}}% + \ltx@LocalAppendToMacro#1{\page{#3}}% % nameref title \ifZREF@found \else \ifx\\#4\\% \else - \zref@ifpropundefined{title}{% - \zref@newprop{title}{}% - }{}% - \g@addto@macro#1{\title{#4}}% + \def\ZREF@xr@temp{#4}% + \ifx\ZREF@xr@temp\ZREF@xr@relax + \else + \ltx@LocalAppendToMacro#1{\title{#4}}% + \fi \fi \fi % anchor \ifx\\#5\\% \else - \zref@ifpropundefined{anchor}{% - \zref@newprop{anchor}{}% - }{}% - \g@addto@macro#1{\anchor{#5}}% + \ltx@LocalAppendToMacro#1{\anchor{#5}}% \fi \ifx\\#6\\% \else - \zref@ifpropundefined{url}{% - \zref@newprop{url}{}% - }{}% - \g@addto@macro#1{\url{#6}}% + \ltx@LocalAppendToMacro#1{\url{#6}}% \fi }% \def\ZREF@xr@scantitleref#1#2\TR@TitleReference#3#4#5\ZREF@nil{% \ifx\\#5\\% \else - \g@addto@macro#1{% + \ltx@LocalAppendToMacro#1{% \default{#3}% \title{#4}% }% @@ -270,7 +374,8 @@ \zref@ifrefcontainsprop{#1}{anchor}{% \zref@ifrefcontainsprop{#1}{url}{% }{% - \expandafter\g@addto@macro\csname Z@R@#1\expandafter\endcsname + \expandafter + \ltx@LocalAppendToMacro\csname Z@R@#1\expandafter\endcsname \expandafter{% \expandafter\url\expandafter{\ZREF@xr@url}% }% @@ -278,12 +383,6 @@ }{% }% }% -\define@key{ZREF@XR}{ext}{% - \def\zref@xr@ext{#1}% -}% -\newcommand*{\zxrsetup}{% - \setkeys{ZREF@XR}% -}% \endinput %% %% End of file `zref-xr.sty'. diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref.sty b/Master/texmf-dist/tex/latex/oberdiek/zref.sty index 5a5eb83051e..4548e50a71a 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref.sty @@ -35,17 +35,17 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex. +%% zref-test-runs.tex, zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2010/04/08 v2.10 New reference scheme for LaTeX2e (HO)]% -\RequirePackage{zref-base}[2010/04/08] + [2010/04/17 v2.12 New reference scheme for LaTeX2e (HO)]% +\RequirePackage{zref-base}[2010/04/17] \@ifundefined{ZREF@baseok}{\endinput}{} \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2010/04/08]% + \RequirePackage{zref-#1}[2010/04/17]% }% }% } |