From f0c1f4cdb9fad83f293fd91d194538425f9f7633 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 17 Jun 2007 23:22:07 +0000
Subject: oberdiek update (15jun07)

git-svn-id: svn://tug.org/texlive/trunk@4458 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/oberdiek/zref.dtx | 165 ++++++++++++++++-------
 1 file changed, 120 insertions(+), 45 deletions(-)

(limited to 'Master/texmf-dist/source/latex/oberdiek/zref.dtx')

diff --git a/Master/texmf-dist/source/latex/oberdiek/zref.dtx b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
index e2a04d2c7b8..a9dd20cc4b5 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/05/06 v2.0 New reference scheme for LaTeX2e (HO)}
+\Msg{* Package: zref 2007/05/28 v2.1 New reference scheme for LaTeX2e (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -166,7 +166,7 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{zref.drv}%
-  [2007/05/06 v2.0 New reference scheme for LaTeX2e (HO)]%
+  [2007/05/28 v2.1 New reference scheme for LaTeX2e (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
@@ -175,7 +175,7 @@ and the derived files
 %</driver>
 % \fi
 %
-% \CheckSum{1537}
+% \CheckSum{1551}
 %
 % \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/05/06 v2.0}
+% \date{2007/05/28 v2.1}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -1121,8 +1121,8 @@ the height difference of the two baselines is
 \ChapterStart{dotfill}{Test for dotfill feature}
 \newcommand*{\dftest}[1]{%
   #1&
-  [\makebox[#1]{\dotfill}]&
-  [\makebox[#1]{\zdotfill}]\\
+  [\makebox[{#1}]{\dotfill}]&
+  [\makebox[{#1}]{\zdotfill}]\\
 }
 \begin{tabular}{rll}
 & [\verb|\dotfill|] & [\verb|\zdotfill|]\\
@@ -1157,13 +1157,13 @@ the height difference of the two baselines is
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2007/05/06 v2.0 New reference scheme for LaTeX2e (HO)]%
+  [2007/05/28 v2.1 New reference scheme for LaTeX2e (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Load basic module}
 %
 %    \begin{macrocode}
-\RequirePackage{zref-base}[2007/05/06]
+\RequirePackage{zref-base}[2007/05/28]
 %    \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/05/06]%
+      \RequirePackage{zref-#1}[2007/05/28]%
     }%
   }%
 }
@@ -1238,7 +1238,7 @@ the height difference of the two baselines is
 %<*base>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2007/05/06 v2.0 Module base for zref (HO)]%
+  [2007/05/28 v2.1 Module base for zref (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Utilities}
@@ -1946,8 +1946,8 @@ the height difference of the two baselines is
 %<*user>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2007/05/06 v2.0 Module user for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2021,8 +2021,8 @@ the height difference of the two baselines is
 %<*abspage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2007/05/06 v2.0 Module abspage for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2066,8 +2066,8 @@ the height difference of the two baselines is
 %<*counter>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2007/05/06 v2.0 Module counter for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2103,8 +2103,8 @@ the height difference of the two baselines is
 %<*lastpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2007/05/06 v2.0 Module lastpage for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2137,16 +2137,16 @@ the height difference of the two baselines is
 %<*totpages>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2007/05/06 v2.0 Module totpages for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@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/05/06]
-\RequirePackage{zref-lastpage}[2007/05/06]
+\RequirePackage{zref-abspage}[2007/05/28]
+\RequirePackage{zref-lastpage}[2007/05/28]
 %    \end{macrocode}
 %
 %    \begin{macro}{\ztotpages}
@@ -2176,8 +2176,8 @@ the height difference of the two baselines is
 %<*perpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2007/05/06 v2.0 Module perpage for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2189,7 +2189,7 @@ the height difference of the two baselines is
 %    For detecting changed pages module \xoption{abspage}
 %    is loaded.
 %    \begin{macrocode}
-\RequirePackage{zref-abspage}[2007/05/06]
+\RequirePackage{zref-abspage}[2007/05/28]
 %    \end{macrocode}
 %
 %    We group the properties for the needed references
@@ -2333,8 +2333,8 @@ the height difference of the two baselines is
 %<*titleref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2007/05/06 v2.0 Module titleref for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2610,7 +2610,7 @@ the height difference of the two baselines is
   \@ifpackageloaded{titlesec}{%
     \ZREF@patch{ttl@sect@i}{%
       \def\ttl@sect@i#1#2[#3]#4{%
-        \zref@titlesec@setcurrent{#4}%
+        \zref@titleref@setcurrent{#4}%
         \ZREF@org@ttl@sect@i{#1}{#2}[{#3}]{#4}%
       }%
     }%
@@ -2619,19 +2619,36 @@ the height difference of the two baselines is
 %
 %    Package \xpackage{longtable}: some support for its \cs{caption}.
 %    However \cs{label} inside the caption is not supported.
-%
 %    \begin{macrocode}
   \@ifpackageloaded{longtable}{%
     \ZREF@patch{LT@c@ption}{%
       \def\LT@c@ption#1[#2]#3{%
         \ZREF@org@LT@c@ption{#1}[{#2}]{#3}%
-        \zref@titlesec@setcurrent{#2}%
+        \zref@titleref@setcurrent{#2}%
+      }%
+    }%
+  }{}%
+%    \end{macrocode}
+%
+%    Package \xpackage{listings}: support for its caption.
+%    \begin{macrocode}
+  \@ifpackageloaded{listings}{%
+    \ZREF@patch{lst@MakeCaption}{%
+      \def\lst@MakeCaption{%
+        \ifx\lst@label\@empty
+        \else
+          \expandafter\zref@titleref@setcurrent\expandafter{%
+            \lst@@caption
+          }%
+        \fi
+        \ZREF@org@lst@MakeCaption
       }%
     }%
   }{}%
 }
 %    \end{macrocode}
 %
+%
 %    \begin{macrocode}
 %</titleref>
 %    \end{macrocode}
@@ -2643,8 +2660,8 @@ the height difference of the two baselines is
 %<*xr>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2007/05/06 v2.0 Module xr for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -2987,8 +3004,8 @@ the height difference of the two baselines is
 %<*hyperref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2007/05/06 v2.0 Module hyperref for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -3016,8 +3033,8 @@ the height difference of the two baselines is
 %<*savepos>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2007/05/06 v2.0 Module savepos for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -3122,15 +3139,15 @@ the height difference of the two baselines is
 %<*dotfill>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2007/05/06 v2.0 Module dotfill for zref (HO)]%
-\RequirePackage{zref-base}[2007/05/06]
+  [2007/05/28 v2.1 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2007/05/28]
 \@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/05/06]
+\RequirePackage{zref-savepos}[2007/05/28]
 %    \end{macrocode}
 %    For automatically generated label names we use the unique
 %    counter of module \xoption{base}.
@@ -3263,8 +3280,8 @@ the height difference of the two baselines is
 % the different directories in your installation TDS tree
 % (also known as \xfile{texmf} tree):
 % \begin{quote}
-% \sbox0{^^A
-% \begin{tabular}{@{}>{\ttfamily}l@{$\quad\rightarrow\quad$}>{\ttfamily}l@{}}
+% \def\t{^^A
+% \begin{tabular}{@{}>{\ttfamily}l@{ $\rightarrow$ }>{\ttfamily}l@{}}
 %   zref.sty & tex/latex/oberdiek/zref.sty\\
 %   zref-base.sty & tex/latex/oberdiek/zref-base.sty\\
 %   zref-abspage.sty & tex/latex/oberdiek/zref-abspage.sty\\
@@ -3282,11 +3299,62 @@ the height difference of the two baselines is
 %   zref-example.tex & doc/latex/oberdiek/zref-example.tex\\
 %   zref.dtx & source/latex/oberdiek/zref.dtx\\
 % \end{tabular}^^A
-% }%
+% }^^A
+% \sbox0{\t}^^A
 % \ifdim\wd0>\linewidth
-%   \mbox{}\nobreak\hskip0pt minus\leftmargin
-%   \usebox0
-%   \nobreak\hskip0pt minus\rightmargin
+%   \begingroup
+%     \advance\linewidth by\leftmargin
+%     \advance\linewidth by\rightmargin
+%   \edef\x{\endgroup
+%     \def\noexpand\lw{\the\linewidth}^^A
+%   }\x
+%   \def\lwbox{^^A
+%     \leavevmode
+%     \hbox to \linewidth{^^A
+%       \kern-\leftmargin\relax
+%       \hss
+%       \usebox0
+%       \hss
+%       \kern-\rightmargin\relax
+%     }^^A
+%   }^^A
+%   \ifdim\wd0>\lw
+%     \sbox0{\small\t}^^A
+%     \ifdim\wd0>\linewidth
+%       \ifdim\wd0>\lw
+%         \sbox0{\footnotesize\t}^^A
+%         \ifdim\wd0>\linewidth
+%           \ifdim\wd0>\lw
+%             \sbox0{\scriptsize\t}^^A
+%             \ifdim\wd0>\linewidth
+%               \ifdim\wd0>\lw
+%                 \sbox0{\tiny\t}^^A
+%                 \ifdim\wd0>\linewidth
+%                   \lwbox
+%                 \else
+%                   \usebox0
+%                 \fi
+%               \else
+%                 \lwbox
+%               \fi
+%             \else
+%               \usebox0
+%             \fi
+%           \else
+%             \lwbox
+%           \fi
+%         \else
+%           \usebox0
+%         \fi
+%       \else
+%         \lwbox
+%       \fi  
+%     \else
+%       \usebox0
+%     \fi
+%   \else
+%     \lwbox
+%   \fi
 % \else
 %   \usebox0
 % \fi
@@ -3435,6 +3503,13 @@ the height difference of the two baselines is
 %   \item
 %     Uses package \xpackage{etexcmds} for accessing \eTeX's \cs{unexpanded}.
 %   \end{Version}
+%   \begin{Version}{2007/05/28 v2.1}
+%   \item
+%     Module titleref supports caption of package \xpackage{listings}.
+%   \item
+%     Fixes in module titleref for support of packages \xpackage{titlesec}
+%     and \xpackage{longtable}.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
-- 
cgit v1.2.3

