summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/oberdiek/zref.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-12-11 01:07:09 +0000
committerKarl Berry <karl@freefriends.org>2009-12-11 01:07:09 +0000
commitc6ddbfa56ffeb39f08fef67b1f9fc97778cd70bd (patch)
treec3312443c40388c8eeb3f515454f9a2e666c15de /Master/texmf-dist/source/latex/oberdiek/zref.dtx
parent01aade3322bbb50b565fbb94ed1bade7a0726478 (diff)
oberdiek update (10dec09)
git-svn-id: svn://tug.org/texlive/trunk@16352 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/oberdiek/zref.dtx')
-rw-r--r--Master/texmf-dist/source/latex/oberdiek/zref.dtx144
1 files changed, 74 insertions, 70 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
index 3e379094994..44d5fc19cda 100644
--- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
@@ -89,7 +89,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: zref 2009/08/07 v2.4 New reference scheme for LaTeX2e (HO)}
+\Msg{* Package: zref 2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -184,7 +184,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{zref.drv}%
- [2009/08/07 v2.4 New reference scheme for LaTeX2e (HO)]%
+ [2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2008/08/11]
\begin{document}
@@ -193,7 +193,7 @@ and the derived files
%</driver>
% \fi
%
-% \CheckSum{1697}
+% \CheckSum{1668}
%
% \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
@@ -214,7 +214,7 @@ and the derived files
% \GetFileInfo{zref.drv}
%
% \title{The \xpackage{zref} package}
-% \date{2009/08/07 v2.4}
+% \date{2009/12/08 v2.7}
% \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
%
% \maketitle
@@ -1244,13 +1244,13 @@ the height difference of the two baselines is
%<*package>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref}
- [2009/08/07 v2.4 New reference scheme for LaTeX2e (HO)]%
+ [2009/12/08 v2.7 New reference scheme for LaTeX2e (HO)]%
% \end{macrocode}
%
% \subsubsection{Load basic module}
%
% \begin{macrocode}
-\RequirePackage{zref-base}[2009/08/07]
+\RequirePackage{zref-base}[2009/12/08]
% \end{macrocode}
% Abort package loading if \xpackage{zref-base} could not be
% loaded successfully.
@@ -1265,7 +1265,7 @@ the height difference of the two baselines is
\def\ZREF@temp#1{%
\DeclareOption{#1}{%
\AtEndOfPackage{%
- \RequirePackage{zref-#1}[2009/08/07]%
+ \RequirePackage{zref-#1}[2009/12/08]%
}%
}%
}
@@ -1325,7 +1325,7 @@ the height difference of the two baselines is
%<*base>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-base}%
- [2009/08/07 v2.4 Module base for zref (HO)]%
+ [2009/12/08 v2.7 Module base for zref (HO)]%
% \end{macrocode}
%
% \subsubsection{Utilities}
@@ -2084,8 +2084,8 @@ the height difference of the two baselines is
%<*user>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-user}%
- [2009/08/07 v2.4 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2159,8 +2159,8 @@ the height difference of the two baselines is
%<*abspage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-abspage}%
- [2009/08/07 v2.4 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2204,8 +2204,8 @@ the height difference of the two baselines is
%<*counter>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-counter}%
- [2009/08/07 v2.4 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2241,8 +2241,9 @@ the height difference of the two baselines is
%<*lastpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-lastpage}%
- [2009/08/07 v2.4 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
+\RequirePackage{atveryend}[2009/12/07]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2254,22 +2255,19 @@ the height difference of the two baselines is
% the main property list are used.
% \begin{macrocode}
\zref@newlist{LastPage}
-\AtBeginDocument{%
- \AtEndDocument{%
- \if@filesw
- \clearpage
- \begingroup
- \advance\c@page\m@ne
- \toks@\expandafter\expandafter\expandafter{%
- \expandafter\Z@L@main
- \Z@L@LastPage
- }%
- \expandafter\zref@wrapper@immediate\expandafter{%
- \expandafter\ZREF@label\expandafter{\the\toks@}{LastPage}%
- }%
- \endgroup
- \fi
- }%
+\AfterLastShipout{%
+ \if@filesw
+ \begingroup
+ \advance\c@page\m@ne
+ \toks@\expandafter\expandafter\expandafter{%
+ \expandafter\Z@L@main
+ \Z@L@LastPage
+ }%
+ \expandafter\zref@wrapper@immediate\expandafter{%
+ \expandafter\ZREF@label\expandafter{\the\toks@}{LastPage}%
+ }%
+ \endgroup
+ \fi
}
% \end{macrocode}
% \begin{macrocode}
@@ -2283,16 +2281,16 @@ the height difference of the two baselines is
%<*totpages>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-totpages}%
- [2009/08/07 v2.4 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
% The absolute page number of the last page is the total
% page number.
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2009/08/07]
-\RequirePackage{zref-lastpage}[2009/08/07]
+\RequirePackage{zref-abspage}[2009/12/08]
+\RequirePackage{zref-lastpage}[2009/12/08]
% \end{macrocode}
%
% \begin{macro}{\ztotpages}
@@ -2325,7 +2323,7 @@ the height difference of the two baselines is
%<*runs>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-runs}%
- [2009/08/07 v2.4 Module runs for zref (HO)]%
+ [2009/12/08 v2.7 Module runs for zref (HO)]%
% \end{macrocode}
%
% \begin{macro}{\zruns}
@@ -2357,8 +2355,8 @@ the height difference of the two baselines is
%<*perpage>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-perpage}%
- [2009/08/07 v2.4 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -2370,7 +2368,7 @@ the height difference of the two baselines is
% For detecting changed pages module \xmodule{abspage}
% is loaded.
% \begin{macrocode}
-\RequirePackage{zref-abspage}[2009/08/07]
+\RequirePackage{zref-abspage}[2009/12/08]
% \end{macrocode}
%
% We group the properties for the needed references
@@ -2514,9 +2512,10 @@ the height difference of the two baselines is
%<*titleref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-titleref}%
- [2009/08/07 v2.4 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
+\RequirePackage{gettitlestring}[2009/12/08]
% \end{macrocode}
%
% \subsubsection{Implementation}
@@ -2617,26 +2616,13 @@ the height difference of the two baselines is
% previous switches.
% \begin{macrocode}
\def\zref@titleref@setcurrent#1{%
- \def\zref@titleref@current{#1}%
\ifzref@titleref@expand
- \begingroup
- \let\label\@gobble
- \let\index\@gobble
- \let\glossary\@gobble
- \let\markboth\@gobbletwo
- \let\@mkboth\@gobbletwo
- \let\markright\@gobble
- \let\protect\@unexpandable@protect
- \ZREF@titleref@hook
- \edef\x{\endgroup
- \noexpand\def\noexpand\zref@titleref@current{%
- \zref@titleref@current
- }%
- }%
- \x
+ \GetTitleStringExpand{#1}%
+ \else
+ \GetTitleStringNonExpand{#1}%
\fi
\edef\zref@titleref@current{%
- \detokenize\expandafter{\zref@titleref@current}%
+ \detokenize\expandafter{\GetTitleStringResult}%
}%
\ifzref@titleref@stripperiod
\edef\zref@titleref@current{%
@@ -2645,6 +2631,9 @@ the height difference of the two baselines is
}%
\fi
}%
+\GetTitleStringDisableCommands{%
+ \ZREF@titleref@hook
+}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\ZREF@stripperiod}
@@ -2841,8 +2830,8 @@ the height difference of the two baselines is
%<*xr>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-xr}%
- [2009/08/07 v2.4 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
% \begin{macrocode}
@@ -3185,8 +3174,8 @@ the height difference of the two baselines is
%<*hyperref>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-hyperref}%
- [2009/08/07 v2.4 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -3214,8 +3203,8 @@ the height difference of the two baselines is
%<*savepos>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-savepos}%
- [2009/08/07 v2.4 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
@@ -3320,15 +3309,15 @@ the height difference of the two baselines is
%<*dotfill>
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zref-dotfill}%
- [2009/08/07 v2.4 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2009/08/07]
+ [2009/12/08 v2.7 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2009/12/08]
\@ifundefined{ZREF@baseok}{\endinput}{}
% \end{macrocode}
%
% For measuring the width of \cs{zdotfill} we use the features
% provided by module \xmodule{savepos}.
% \begin{macrocode}
-\RequirePackage{zref-savepos}[2009/08/07]
+\RequirePackage{zref-savepos}[2009/12/08]
% \end{macrocode}
% For automatically generated label names we use the unique
% counter of module \xmodule{base}.
@@ -3417,7 +3406,7 @@ the height difference of the two baselines is
\NeedsTeXFormat{LaTeX2e}
\nofiles
\documentclass{article}
-\usepackage{zref-base}[2009/08/07]
+\usepackage{zref-base}[2009/12/08]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -3447,7 +3436,7 @@ the height difference of the two baselines is
%<*test-runs>
\NeedsTeXFormat{LaTeX2e}
\documentclass{article}
-\usepackage{zref-runs}[2009/08/07]
+\usepackage{zref-runs}[2009/12/08]
\usepackage{qstest}
\IncludeTests{*}
\LogTests{log}{*}{*}
@@ -3781,6 +3770,21 @@ the height difference of the two baselines is
% \item
% Module \xmodule{runs} added.
% \end{Version}
+% \begin{Version}{2009/12/06 v2.5}
+% \item
+% Module \xmodule{lastpage}: Uses package \xpackage{atveryend}.
+% \item
+% Module \xmodule{titleref}: Further commands are disabled
+% during string expansion, imported from package \xpackage{nameref}.
+% \end{Version}
+% \begin{Version}{2009/12/07 v2.6}
+% \item
+% Version date added for package \xpackage{atveryend}.
+% \end{Version}
+% \begin{Version}{2009/12/08 v2.7}
+% \item
+% Module \xmodule{titleref}: Use of package \xpackage{gettitlestring}.
+% \end{Version}
% \end{History}
%
% \PrintIndex