summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty')
-rw-r--r--Master/texmf-dist/tex/latex/oberdiek/zref-titleref.sty44
1 files changed, 27 insertions, 17 deletions
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