diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty index 946ba4b5a4a..d3c4a9bc3c6 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty +++ b/Master/texmf-dist/tex/latex/oberdiek/zref-xr.sty @@ -35,12 +35,13 @@ %% zref-totpages.sty, zref-user.sty, zref-xr.sty, %% zref-example.tex, zref-example-lastpage.tex, %% zref-example-nextpage.tex, zref-test1.tex, -%% zref-test-runs.tex, zref-test-titleref-memoir.tex. +%% zref-test-base.tex, zref-test-runs.tex, +%% zref-test-titleref-memoir.tex. %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2010/04/17 v2.12 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2010/04/17] + [2010/04/22 v2.14 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2010/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} \RequirePackage{keyval} \RequirePackage{kvoptions}[2010/02/22] @@ -270,28 +271,30 @@ Import to LaTeX label `#2'% }% \fi - \expandafter\xdef\csname r@#2\endcsname{% - {% - \ltx@ifundefined{M@TitleReference}{% - \ltx@ifundefined{TR@TitleReference}{% - \zref@extractdefault{#1}{default}{}% + \zref@wrapper@unexpanded{% + \expandafter\xdef\csname r@#2\endcsname{% + {% + \ltx@ifundefined{M@TitleReference}{% + \ltx@ifundefined{TR@TitleReference}{% + \zref@extractdefault{#1}{default}{}% + }{% + \noexpand\TR@TitleReference + {\zref@extractdefault{#1}{default}{}}% + {\zref@extractdefault{#1}{title}{}}% + }% }{% - \noexpand\TR@TitleReference + \noexpand\M@TitleReference {\zref@extractdefault{#1}{default}{}}% {\zref@extractdefault{#1}{title}{}}% }% - }{% - \noexpand\M@TitleReference - {\zref@extractdefault{#1}{default}{}}% - {\zref@extractdefault{#1}{title}{}}% }% + {\zref@extractdefault{#1}{page}{}}% + \ltx@ifpackageloaded{nameref}{% + {\zref@extractdefault{#1}{title}{}}% + {\zref@extractdefault{#1}{anchor}{}}% + {\zref@extractdefault{#1}{url}{}}% + }{}% }% - {\zref@extractdefault{#1}{page}{}}% - \ltx@ifpackageloaded{nameref}{% - {\zref@extractdefault{#1}{title}{}}% - {\zref@extractdefault{#1}{anchor}{}}% - {\zref@extractdefault{#1}{url}{}}% - }{}% }% } \def\ZREF@xr@zref@ignorewarning#1{% |