From 6858df01ea6ebb32f4be0f68e4b2e03d8713f38f Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 11 Apr 2007 23:02:14 +0000
Subject: oberdiek: accsupp, atenddvi, hycolor, iflang (11apr07)

git-svn-id: svn://tug.org/texlive/trunk@4149 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/source/latex/oberdiek/zref.dtx | 168 +++++++++++++++++------
 1 file changed, 123 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 385577518c3..c8e9c2324d9 100644
--- a/Master/texmf-dist/source/latex/oberdiek/zref.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/zref.dtx
@@ -73,7 +73,7 @@
 %
 %<*ignore>
 \begingroup
-  \def\x{LaTeX2e}
+  \def\x{LaTeX2e}%
 \expandafter\endgroup
 \ifcase 0\ifx\install y1\fi\expandafter
          \ifx\csname processbatchFile\endcsname\relax\else1\fi
@@ -84,7 +84,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: zref 2007/02/18 v1.5 New reference scheme for LaTeX2e (HO)}
+\Msg{* Package: zref 2007/04/06 v1.6 New reference scheme for LaTeX2e (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -166,16 +166,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{zref.drv}%
-  [2007/02/18 v1.5 New reference scheme for LaTeX2e (HO)]
+  [2007/04/06 v1.6 New reference scheme for LaTeX2e (HO)]%
 \documentclass{ltxdoc}
 \usepackage{holtxdoc}
 \begin{document}
-  \DocInput{zref.dtx}
+  \DocInput{zref.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{1468}
+% \CheckSum{1497}
 %
 % \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/02/18 v1.5}
+% \date{2007/04/06 v1.6}
 % \author{Heiko Oberdiek\\\xemail{oberdiek@uni-freiburg.de}}
 %
 % \maketitle
@@ -1101,8 +1101,8 @@ The width of the first column is
 the height difference of the two baselines is
   \the\dimexpr \zposy{firstcol}sp - \zposy{secondline}sp\relax:\\
 \begin{tabular}{ll}
-\zsavepos{firstcol}Hello&\zsavepos{secondcol}World\\
-\zsavepos{secondline}Second line&foobar\\
+  \zsavepos{firstcol}Hello&\zsavepos{secondcol}World\\
+  \zsavepos{secondline}Second line&foobar\\
 \end{tabular}
 
 %    \end{macrocode}
@@ -1157,13 +1157,13 @@ the height difference of the two baselines is
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref}
-  [2007/02/18 v1.5 New reference scheme for LaTeX2e (HO)]
+  [2007/04/06 v1.6 New reference scheme for LaTeX2e (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Load basic module}
 %
 %    \begin{macrocode}
-\RequirePackage{zref-base}[2007/02/18]
+\RequirePackage{zref-base}[2007/04/06]
 %    \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/02/18]%
+      \RequirePackage{zref-#1}[2007/04/06]%
     }%
   }%
 }
@@ -1238,7 +1238,7 @@ the height difference of the two baselines is
 %<*base>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-base}%
-  [2007/02/18 Module base for zref (HO)]
+  [2007/04/06 v1.6 Module base for zref (HO)]%
 %    \end{macrocode}
 %
 % \subsubsection{Utilities}
@@ -1311,7 +1311,7 @@ the height difference of the two baselines is
     }%
     \endgroup
     \endinput
-  }{}
+  }{}%
 \endgroup
 %    \end{macrocode}
 %
@@ -1816,7 +1816,10 @@ the height difference of the two baselines is
 %    \begin{macrocode}
 \def\zref@require@unique{%
   \@ifundefined{c@zref@unique}{%
-    \newcounter{zref@unique}%
+    \begingroup
+      \let\@addtoreset\@gobbletwo
+      \newcounter{zref@unique}%
+    \endgroup
 %    \end{macrocode}
 %    \end{macro}
 %
@@ -1907,8 +1910,8 @@ the height difference of the two baselines is
 %<*user>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-user}%
-  [2007/02/18 v1.5 Module user for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module user for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -1982,8 +1985,8 @@ the height difference of the two baselines is
 %<*abspage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-abspage}%
-  [2007/02/18 v1.5 Module abspage for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module abspage for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -1992,7 +1995,15 @@ the height difference of the two baselines is
 %    These are recorded by the help of package \xpackage{everyshi}.
 %    \begin{macrocode}
 \RequirePackage{everyshi}%
-\newcounter{abspage}%
+%    \end{macrocode}
+%    The counter \verb|abspage| must not go in the clear list
+%    of \verb|@ckpt| that is used to set counters in
+%    \xfile{.aux} files of included \TeX\ files.
+%    \begin{macrocode}
+\begingroup
+  \let\@addtoreset\@gobbletwo
+  \newcounter{abspage}%
+\endgroup
 \setcounter{abspage}{0}%
 \EveryShipout{%
   \stepcounter{abspage}%
@@ -2019,8 +2030,8 @@ the height difference of the two baselines is
 %<*counter>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-counter}%
-  [2007/02/18 v1.5 Module counter for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module counter for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2056,8 +2067,8 @@ the height difference of the two baselines is
 %<*lastpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-lastpage}%
-  [2007/02/18 v1.5 Module lastpage for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module lastpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2090,16 +2101,16 @@ the height difference of the two baselines is
 %<*totpages>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-totpages}%
-  [2007/02/18 v1.5 Module totpages for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module totpages for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@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/02/18]
-\RequirePackage{zref-lastpage}[2007/02/18]
+\RequirePackage{zref-abspage}[2007/04/06]
+\RequirePackage{zref-lastpage}[2007/04/06]
 %    \end{macrocode}
 %
 %    \begin{macro}{\ztotpages}
@@ -2129,8 +2140,8 @@ the height difference of the two baselines is
 %<*perpage>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-perpage}%
-  [2007/02/18 v1.5 Module perpage for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module perpage for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2142,7 +2153,7 @@ the height difference of the two baselines is
 %    For detecting changed pages module \xoption{abspage}
 %    is loaded.
 %    \begin{macrocode}
-\RequirePackage{zref-abspage}[2007/02/18]
+\RequirePackage{zref-abspage}[2007/04/06]
 %    \end{macrocode}
 %
 %    We group the properties for the needed references
@@ -2286,8 +2297,8 @@ the height difference of the two baselines is
 %<*titleref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-titleref}%
-  [2007/02/18 v1.5 Module titleref for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module titleref for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2534,6 +2545,30 @@ the height difference of the two baselines is
   }%
 %    \end{macrocode}
 %
+%    Class \xpackage{beamer}.
+%    \begin{macrocode}
+  \@ifclassloaded{beamer}{%
+    \ZREF@patch{beamer@section}{%
+      \long\def\beamer@section[#1]{%
+        \zref@titleref@setcurrent{#1}%
+        \ZREF@org@beamer@section[{#1}]%
+      }%
+    }%
+    \ZREF@patch{beamer@subsection}{%
+      \long\def\beamer@subsection[#1]{%
+        \zref@titleref@setcurrent{#1}%
+        \ZREF@org@beamer@subsection[{#1}]%
+      }%
+    }%
+    \ZREF@patch{beamer@subsubsection}{%
+      \long\def\beamer@subsubsection[#1]{%
+        \zref@titleref@setcurrent{#1}%
+        \ZREF@org@beamer@subsubsection[{#1}]%
+      }%
+    }%
+  }{}%
+%    \end{macrocode}
+%
 %    Package \xpackage{titlesec}.
 %    \begin{macrocode}
   \@ifpackageloaded{titlesec}{%
@@ -2558,8 +2593,8 @@ the height difference of the two baselines is
 %<*xr>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-xr}%
-  [2007/02/18 v1.5 Module xr for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module xr for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %    \begin{macrocode}
@@ -2664,7 +2699,7 @@ the height difference of the two baselines is
     \begingroup
       \let\on@line\@empty
       \PackageInfo{zref/xr}{%
-        Statistics for `\ZREF@xr@file':
+        Statistics for `\ZREF@xr@file': %
         \ZREF@xr@found\space found, %
         \ZREF@xr@ignored\space ignored%
       }%
@@ -2902,8 +2937,8 @@ the height difference of the two baselines is
 %<*hyperref>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-hyperref}%
-  [2007/02/18 v1.5 Module hyperref for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module hyperref for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -2931,8 +2966,8 @@ the height difference of the two baselines is
 %<*savepos>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-savepos}%
-  [2007/02/18 v1.5 Module savepos for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module savepos for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@ifundefined{ZREF@baseok}{\endinput}{}
 %    \end{macrocode}
 %
@@ -3037,15 +3072,15 @@ the height difference of the two baselines is
 %<*dotfill>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{zref-dotfill}%
-  [2007/02/18 v1.5 Module dotfill for zref (HO)]
-\RequirePackage{zref-base}[2007/02/18]
+  [2007/04/06 v1.6 Module dotfill for zref (HO)]%
+\RequirePackage{zref-base}[2007/04/06]
 \@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/02/18]
+\RequirePackage{zref-savepos}[2007/04/06]
 %    \end{macrocode}
 %    For automatically generated label names we use the unique
 %    counter of module \xoption{base}.
@@ -3126,13 +3161,47 @@ the height difference of the two baselines is
 %    \end{macrocode}
 % \section{Installation}
 %
-% \paragraph{CTAN.} This package is available on
+% \subsection{Download}
+%
+% \paragraph{Package.} This package is available on
 % CTAN\footnote{\url{ftp://ftp.ctan.org/tex-archive/}}:
 % \begin{description}
 % \item[\CTAN{macros/latex/contrib/oberdiek/zref.dtx}] The source file.
 % \item[\CTAN{macros/latex/contrib/oberdiek/zref.pdf}] Documentation.
 % \end{description}
 %
+%
+% \paragraph{Bundle.} All the packages of the bundle `oberdiek'
+% are also available in a TDS compliant ZIP archive. There
+% the packages are already unpacked and the documentation files
+% are generated. The files and directories obey the TDS standard.
+% \begin{description}
+% \item[\CTAN{macros/latex/contrib/oberdiek/oberdiek-tds.zip}]
+% \end{description}
+%
+% \subsection{Bundle installation}
+%
+% \paragraph{Unpacking.} Unpack the \xfile{oberdiek-tds.zip} in the
+% TDS tree (also known as \xfile{texmf} tree) of your choice.
+% Example (linux):
+% \begin{quote}
+%   |unzip oberdiek-tds.zip -d ~/texmf|
+% \end{quote}
+%
+% \paragraph{Script installation.}
+% Check the directory \xfile{TDS:scripts/oberdiek/} for
+% scripts that need further installation steps.
+% Package \xpackage{attachfile2} comes with the Perl script
+% \xfile{pdfatfi.pl} that should be installed in such a way
+% that it can be called as \texttt{pdfatfi}.
+% Example (linux):
+% \begin{quote}
+%   |chmod +x scripts/oberdiek/pdfatfi.pl|\\
+%   |cp scripts/oberdiek/pdfatfi.pl /usr/local/bin/|
+% \end{quote}
+%
+% \subsection{Package installation}
+%
 % \paragraph{Unpacking.} The \xfile{.dtx} file is a self-extracting
 % \docstrip\ archive. The files are extracted by running the
 % \xfile{.dtx} through \plainTeX:
@@ -3176,8 +3245,10 @@ the height difference of the two baselines is
 % TDS installing feature, then some files can already be in the right
 % place, see the documentation of \docstrip.
 %
-% \paragraph{Refresh file databases.} If your \TeX~distribution
-% (\teTeX, \mikTeX, \dots) rely on file databases, you must refresh
+% \subsection{Refresh file name databases}
+%
+% If your \TeX~distribution
+% (\teTeX, \mikTeX, \dots) relies on file name databases, you must refresh
 % these. For example, \teTeX\ users run \verb|texhash| or
 % \verb|mktexlsr|.
 %
@@ -3289,6 +3360,13 @@ the height difference of the two baselines is
 %   \item
 %     Modul savepos also supports Xe\TeX.
 %   \end{Version}
+%   \begin{Version}{2007/04/06 v1.6}
+%   \item
+%     Fix in modul abspage and base: Now counter |abspage| and |zref@unique|
+%     are not remembered by \cs{include}.
+%   \item
+%     Beamer support for module titleref.
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex
-- 
cgit v1.2.3

