1 files changed, 71 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
index 782ab0610d9..4706dc63de0 100644
--- a/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
+++ b/Master/texmf-dist/source/latex/oberdiek/pdfcolfoot.dtx
@@ -1,11 +1,12 @@
 % \iffalse meta-comment
-% 
+%
 % File: pdfcolfoot.dtx
-% Version: 2007/09/09 v1.1
-% 
-% Copyright (C) 2007 by
+% Version: 2012/01/02 v1.2
+% Info: Color stack for footnotes with pdfTeX
+%
+% Copyright (C) 2007, 2012 by
 %    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
-% 
+%
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either
 % version 1.3c of this license or (at your option) any later
@@ -15,20 +16,20 @@
 %    http://www.latex-project.org/lppl.txt
 % and version 1.3 or later is part of all distributions of
 % LaTeX version 2005/12/01 or later.
-% 
+%
 % This work has the LPPL maintenance status "maintained".
-% 
+%
 % This Current Maintainer of this work is Heiko Oberdiek.
-% 
+%
 % This work consists of the main source file pdfcolfoot.dtx
 % and the derived files
 %    pdfcolfoot.sty, pdfcolfoot.pdf, pdfcolfoot.ins, pdfcolfoot.drv,
 %    pdfcolfoot-test1.tex.
-% 
+%
 % Distribution:
 %    CTAN:macros/latex/contrib/oberdiek/pdfcolfoot.dtx
 %    CTAN:macros/latex/contrib/oberdiek/pdfcolfoot.pdf
-% 
+%
 % Unpacking:
 %    (a) If pdfcolfoot.ins is present:
 %           tex pdfcolfoot.ins
@@ -37,7 +38,7 @@
 %    (c) If you insist on using LaTeX
 %           latex \let\install=y\input{pdfcolfoot.dtx}
 %        (quote the arguments according to the demands of your shell)
-% 
+%
 % Documentation:
 %    (a) If pdfcolfoot.drv is present:
 %           latex pdfcolfoot.drv
@@ -47,14 +48,14 @@
 %    if available. Here you can specify further options, e.g.
 %    use A4 as paper format:
 %       \PassOptionsToClass{a4paper}{article}
-% 
+%
 %    Programm calls to get the documentation (example):
 %       pdflatex pdfcolfoot.dtx
 %       makeindex -s gind.ist pdfcolfoot.idx
 %       pdflatex pdfcolfoot.dtx
 %       makeindex -s gind.ist pdfcolfoot.idx
 %       pdflatex pdfcolfoot.dtx
-% 
+%
 % Installation:
 %    TDS:tex/latex/oberdiek/pdfcolfoot.sty
 %    TDS:doc/latex/oberdiek/pdfcolfoot.pdf
@@ -76,7 +77,7 @@
 \input docstrip.tex
 \Msg{************************************************************************}
 \Msg{* Installation}
-\Msg{* Package: pdfcolfoot 2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)}
+\Msg{* Package: pdfcolfoot 2012/01/02 v1.2 Color stack for footnotes with pdfTeX (HO)}
 \Msg{************************************************************************}
 
 \keepsilent
@@ -88,9 +89,9 @@
 This is a generated file.
 
 Project: pdfcolfoot
-Version: 2007/09/09 v1.1
+Version: 2012/01/02 v1.2
 
-Copyright (C) 2007 by
+Copyright (C) 2007, 2012 by
    Heiko Oberdiek <heiko.oberdiek at googlemail.com>
 
 This work may be distributed and/or modified under the
@@ -122,6 +123,10 @@ and the derived files
   \file{pdfcolfoot.sty}{\from{pdfcolfoot.dtx}{package}}%
   \usedir{doc/latex/oberdiek/test}%
   \file{pdfcolfoot-test1.tex}{\from{pdfcolfoot.dtx}{test1}}%
+  \nopreamble
+  \nopostamble
+  \usedir{source/latex/oberdiek/catalogue}%
+  \file{pdfcolfoot.xml}{\from{pdfcolfoot.dtx}{catalogue}}%
 }
 
 \catcode32=13\relax% active space
@@ -148,16 +153,16 @@ and the derived files
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{pdfcolfoot.drv}%
-  [2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)]%
+  [2012/01/02 v1.2 Color stack for footnotes with pdfTeX (HO)]%
 \documentclass{ltxdoc}
-\usepackage{holtxdoc}[2011/02/04]
+\usepackage{holtxdoc}[2011/11/22]
 \begin{document}
   \DocInput{pdfcolfoot.dtx}%
 \end{document}
 %</driver>
 % \fi
 %
-% \CheckSum{238}
+% \CheckSum{240}
 %
 % \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
@@ -178,7 +183,7 @@ and the derived files
 % \GetFileInfo{pdfcolfoot.drv}
 %
 % \title{The \xpackage{pdfcolfoot} package}
-% \date{2007/09/09 v1.1}
+% \date{2012/01/02 v1.2}
 % \author{Heiko Oberdiek\\\xemail{heiko.oberdiek at googlemail.com}}
 %
 % \maketitle
@@ -277,7 +282,7 @@ and the derived files
 %<*package>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{pdfcolfoot}%
-  [2007/09/09 v1.1 pdfTeX's color stack for footnotes (HO)]%
+  [2012/01/02 v1.2 Color stack for footnotes with pdfTeX (HO)]%
 %    \end{macrocode}
 %
 % \subsection{Load package \xpackage{pdfcol}}
@@ -449,6 +454,7 @@ and the derived files
 %    \begin{macrocode}
   \pdfcolfoot@patch\mem@makecol
   \pdfcolfoot@patch\mem@makecolbf
+  \pdfcolfoot@patch\m@mopfootnote
 %    \end{macrocode}
 %    Class \xclass{revtex4}:
 %    \begin{macrocode}
@@ -507,7 +513,7 @@ and the derived files
   \pdfcompresslevel=0 %
 \fi
 \documentclass[12pt,a5paper]{article}
-\usepackage{pdfcolfoot}[2007/09/09]
+\usepackage{pdfcolfoot}[2012/01/02]
 \dimen\footins=\baselineskip % for testing
 \begin{document}
   Black\footnote{Black \textcolor{blue}{Blue\\Blue} Black} %
@@ -698,13 +704,49 @@ and the derived files
 %\end{verbatim}
 % \end{quote}
 %
+% \section{Catalogue}
+%
+% The following XML file can be used as source for the
+% \href{http://mirror.ctan.org/help/Catalogue/catalogue.html}{\TeX\ Catalogue}.
+% The elements \texttt{caption} and \texttt{description} are imported
+% from the original XML file from the Catalogue.
+% The name of the XML file in the Catalogue is \xfile{pdfcolfoot.xml}.
+%    \begin{macrocode}
+%<*catalogue>
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE entry SYSTEM 'catalogue.dtd'>
+<entry datestamp='$Date$' modifier='$Author$' id='pdfcolfoot'>
+  <name>pdfcolfoot</name>
+  <caption>Separate color stack for footnotes with pdfTeX.</caption>
+  <authorref id='auth:oberdiek'/>
+  <copyright owner='Heiko Oberdiek' year='2007,2012'/>
+  <license type='lppl1.3'/>
+  <version number='1.2'/>
+  <description>
+    Since version 1.40 <xref refid='pdftex'>pdfTeX</xref> supports
+    several colour stacks. This package uses a separate colour stack
+    for footnotes that can break across pages.
+    <p/>
+    The package is part of the <xref refid='oberdiek'>oberdiek</xref>
+    bundle.
+  </description>
+  <documentation details='Package documentation'
+      href='ctan:/macros/latex/contrib/oberdiek/pdfcolfoot.pdf'/>
+  <ctan file='true' path='/macros/latex/contrib/oberdiek/pdfcolfoot.dtx'/>
+  <miktex location='oberdiek'/>
+  <texlive location='oberdiek'/>
+  <install path='/macros/latex/contrib/oberdiek/oberdiek.tds.zip'/>
+</entry>
+%</catalogue>
+%    \end{macrocode}
+%
 % \begin{thebibliography}{9}
-% 
+%
 % \bibitem{pdfcol}
 %   Heiko Oberdiek: \textit{The \xpackage{pdfcol} package};
 %   2007/09/09;\\
 %   \CTAN{macros/latex/contrib/oberdiek/pdfcol.pdf}.
-% 
+%
 % \end{thebibliography}
 %
 % \begin{History}
@@ -718,6 +760,11 @@ and the derived files
 %   \item
 %     Test file added.
 %   \end{Version}
+%   \begin{Version}{2012/01/02 v1.2}
+%   \item
+%     Support updated for memoir 2011/03/06 v3.6j.
+%     (Thanks Bob for the bug report.)
+%   \end{Version}
 % \end{History}
 %
 % \PrintIndex