diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/zref.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/oberdiek/zref.dtx | 124 |
1 files changed, 75 insertions, 49 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx index e5a478e74c8..39b20839f2f 100644 --- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx +++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx @@ -84,7 +84,7 @@ \input docstrip.tex \Msg{************************************************************************} \Msg{* Installation} -\Msg{* Package: zref 2007/04/06 v1.7 New reference scheme for LaTeX2e (HO)} +\Msg{* Package: zref 2007/04/22 v1.8 New reference scheme for LaTeX2e (HO)} \Msg{************************************************************************} \keepsilent @@ -166,7 +166,7 @@ and the derived files %<*driver> \NeedsTeXFormat{LaTeX2e} \ProvidesFile{zref.drv}% - [2007/04/06 v1.7 New reference scheme for LaTeX2e (HO)]% + [2007/04/22 v1.8 New reference scheme for LaTeX2e (HO)]% \documentclass{ltxdoc} \usepackage{holtxdoc} \begin{document} @@ -175,7 +175,7 @@ and the derived files %</driver> % \fi % -% \CheckSum{1497} +% \CheckSum{1513} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -196,7 +196,7 @@ and the derived files % \GetFileInfo{zref.drv} % % \title{The \xpackage{zref} package} -% \date{2007/04/06 v1.7} +% \date{2007/04/22 v1.8} % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}} % % \maketitle @@ -1157,13 +1157,13 @@ the height difference of the two baselines is %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref} - [2007/04/06 v1.7 New reference scheme for LaTeX2e (HO)]% + [2007/04/22 v1.8 New reference scheme for LaTeX2e (HO)]% % \end{macrocode} % % \subsubsection{Load basic module} % % \begin{macrocode} -\RequirePackage{zref-base}[2007/04/06] +\RequirePackage{zref-base}[2007/04/22] % \end{macrocode} % Abort package loading if \xpackage{zref-base} could not be % loaded successfully. @@ -1178,7 +1178,7 @@ the height difference of the two baselines is \def\ZREF@temp#1{% \DeclareOption{#1}{% \AtEndOfPackage{% - \RequirePackage{zref-#1}[2007/04/06]% + \RequirePackage{zref-#1}[2007/04/22]% }% }% } @@ -1238,7 +1238,7 @@ the height difference of the two baselines is %<*base> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-base}% - [2007/04/06 v1.7 Module base for zref (HO)]% + [2007/04/22 v1.8 Module base for zref (HO)]% % \end{macrocode} % % \subsubsection{Utilities} @@ -1701,15 +1701,19 @@ the height difference of the two baselines is % the flag is set to notify \LaTeX\ and a warning is given. % \begin{macrocode} \def\zref@refused#1{% - \begingroup - \csname @safe@activestrue\endcsname - \zref@ifrefundefined{#1}{% - \protect\G@refundefinedtrue - \@latex@warning{% - Reference `#1' on page \thepage \space undefined% - }% - }{}% - \endgroup + \zref@wrapper@babel\ZREF@refused{#1}% +} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\ZREF@refused} +% \begin{macrocode} +\def\ZREF@refused#1{% + \zref@ifrefundefined{#1}{% + \protect\G@refundefinedtrue + \@latex@warning{% + Reference `#1' on page \thepage \space undefined% + }% + }{}% } % \end{macrocode} % \end{macro} @@ -1796,13 +1800,29 @@ the height difference of the two baselines is % \begin{macro}{\zref@wrapper@babel} % \begin{macrocode} \long\def\zref@wrapper@babel#1#2{% - \begingroup - \csname @safe@activestrue\endcsname - \edef\x{#2}% - \expandafter\endgroup - \expandafter\ZREF@wrapper@babel\expandafter{\x}{#1}% + \ifcsname if@safe@actives\endcsname + \expandafter\@firstofone + \else + \expandafter\@secondoftwo + \fi + {% + \if@safe@actives + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi + {% + \begingroup + \csname @safe@activestrue\endcsname + \edef\x{#2}% + \expandafter\endgroup + \expandafter\ZREF@wrapper@babel\expandafter{\x}{#1}% + }% + }{% + #1{#2}% + }% } -\def\ZREF@wrapper@babel#1#2{% +\long\def\ZREF@wrapper@babel#1#2{% #2{#1}% } % \end{macrocode} @@ -1910,8 +1930,8 @@ the height difference of the two baselines is %<*user> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-user}% - [2007/04/06 v1.7 Module user for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module user for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -1985,8 +2005,8 @@ the height difference of the two baselines is %<*abspage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-abspage}% - [2007/04/06 v1.7 Module abspage for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module abspage for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2030,8 +2050,8 @@ the height difference of the two baselines is %<*counter> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-counter}% - [2007/04/06 v1.7 Module counter for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module counter for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2067,8 +2087,8 @@ the height difference of the two baselines is %<*lastpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-lastpage}% - [2007/04/06 v1.7 Module lastpage for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module lastpage for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2101,16 +2121,16 @@ the height difference of the two baselines is %<*totpages> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-totpages}% - [2007/04/06 v1.7 Module totpages for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module totpages for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % The absolute page number of the last page is the total % page number. % \begin{macrocode} -\RequirePackage{zref-abspage}[2007/04/06] -\RequirePackage{zref-lastpage}[2007/04/06] +\RequirePackage{zref-abspage}[2007/04/22] +\RequirePackage{zref-lastpage}[2007/04/22] % \end{macrocode} % % \begin{macro}{\ztotpages} @@ -2140,8 +2160,8 @@ the height difference of the two baselines is %<*perpage> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-perpage}% - [2007/04/06 v1.7 Module perpage for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module perpage for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2153,7 +2173,7 @@ the height difference of the two baselines is % For detecting changed pages module \xoption{abspage} % is loaded. % \begin{macrocode} -\RequirePackage{zref-abspage}[2007/04/06] +\RequirePackage{zref-abspage}[2007/04/22] % \end{macrocode} % % We group the properties for the needed references @@ -2297,8 +2317,8 @@ the height difference of the two baselines is %<*titleref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-titleref}% - [2007/04/06 v1.7 Module titleref for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module titleref for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2593,8 +2613,8 @@ the height difference of the two baselines is %<*xr> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-xr}% - [2007/04/06 v1.7 Module xr for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module xr for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % \begin{macrocode} @@ -2937,8 +2957,8 @@ the height difference of the two baselines is %<*hyperref> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-hyperref}% - [2007/04/06 v1.7 Module hyperref for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module hyperref for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -2966,8 +2986,8 @@ the height difference of the two baselines is %<*savepos> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-savepos}% - [2007/04/06 v1.7 Module savepos for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module savepos for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % @@ -3072,15 +3092,15 @@ the height difference of the two baselines is %<*dotfill> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{zref-dotfill}% - [2007/04/06 v1.7 Module dotfill for zref (HO)]% -\RequirePackage{zref-base}[2007/04/06] + [2007/04/22 v1.8 Module dotfill for zref (HO)]% +\RequirePackage{zref-base}[2007/04/22] \@ifundefined{ZREF@baseok}{\endinput}{} % \end{macrocode} % % For measuring the width of \cs{zdotfill} we use the features % provided by module \xoption{savepos}. % \begin{macrocode} -\RequirePackage{zref-savepos}[2007/04/06] +\RequirePackage{zref-savepos}[2007/04/22] % \end{macrocode} % For automatically generated label names we use the unique % counter of module \xoption{base}. @@ -3369,6 +3389,12 @@ the height difference of the two baselines is % \item % Package \xpackage{atbegshi} replaces \xpackage{everyshi}. % \end{Version} +% \begin{Version}{2007/04/22 v1.8} +% \item +% \cs{zref@wrapper@babel} and \cs{zref@refused} are now expandable +% if babel is not used or \cs{if@safe@actives} is already set to true. +% (Feature request of Josselin Noirel) +% \end{Version} % \end{History} % % \PrintIndex |