4 files changed, 89 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/mcaption/CHANGES b/Master/texmf-dist/doc/latex/mcaption/CHANGES
new file mode 100644
index 00000000000..cbbff0f38d8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/mcaption/CHANGES
@@ -0,0 +1,49 @@
+---------------
+v3.0 2009/03/13
+---------------
+New:
+  * Obey \caption and \label commands inside margincap
+      (at last!).
+  * Macro \margincapalign is deprecated (no longer
+      necessary for tabular declarations).
+  * New compatibility option `v2.2'.
+
+Incompatible changes:
+  * Environment margincap has no arguments.  A
+      compatibility option exists, that restores the old
+      syntax with caption arguments.
+  * The mcaption package requires package changepage to be
+      installed (instead of chngpage).
+  * Complete revision of the vertical alignment mechanism.
+      Paragraph-breaking might be affected (hopefully only
+      to the better).
+
+Fixed:
+  * In one-sided documents chngpage/changepage's even/odd
+      page detection was subtly broken by the mcaption
+      package.
+
+
+---------------
+v2.2 2005/09/30
+---------------
+New:
+  * New package options `bottom' and `top'.
+
+Fixed:
+  * In one-sided documents captions were put into the wrong
+      margin.
+
+
+---------------
+v2.1 2005/09/29
+---------------
+New:
+  * Works with standard classed.
+
+
+---------------
+v2.0 2005/09/26
+---------------
+New:
+  * Prepare DTX package.
diff --git a/Master/texmf-dist/doc/latex/mcaption/README b/Master/texmf-dist/doc/latex/mcaption/README
index a82ea2e3cd0..04a8697194a 100644
--- a/Master/texmf-dist/doc/latex/mcaption/README
+++ b/Master/texmf-dist/doc/latex/mcaption/README
@@ -2,13 +2,13 @@
 % http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
 % for the details of that license.
 
-package: mcaption v2.2 2005/09/30
+package: mcaption v3.0 2009/03/13
 author: Stephan Hennig (stephanhennig@arcor.de)
 
 
 Description
 This package provides a margincap environment to put figure
-or table captions in the margin. See the documentation to
+or table captions into the margin. See the documentation to
 learn more about this package.
 
 
diff --git a/Master/texmf-dist/doc/latex/mcaption/example.tex b/Master/texmf-dist/doc/latex/mcaption/example.tex
index 14b56874d4b..d7af58e0960 100644
--- a/Master/texmf-dist/doc/latex/mcaption/example.tex
+++ b/Master/texmf-dist/doc/latex/mcaption/example.tex
@@ -25,53 +25,79 @@
 \usepackage{wrapfig}
 \usepackage[top]{mcaption}
 \usepackage[
-  font={footnotesize,it},
-  labelfont=bf,
-  justification=raggedright]
+font={footnotesize,it},
+labelfont=bf,
+justification=raggedright]
 {caption}[2005/06/28]
 \usepackage[english]{babel}
 \usepackage{blindtext}
 \begin{document}
 \setlength{\margincapsep}{3\columnsep}
+
+\author{Stephan Hennig}
+\title{mcaption test file}
+\maketitle
+\listoffigures
+\listoftables
+
 \chapter{Demonstration of the mcaption package}
-\section{This is one column mode}
+\section{This is one-column mode}
 \blindtext[1]
 
 \begin{wrapfigure}{o}{5cm}
-  \begin{margincap}{A wrapfigure caption in the outer margin.}
+  \begin{margincap}
     \rule{5cm}{2cm}
+    \caption{A wrapfigure caption in the outer margin.}
+    \label{fig:wrapOneCol}
   \end{margincap}
 \end{wrapfigure}
 \blindtext[1]
 \begin{table}
-  \begin{margincap}{A table caption in the outer margin.}
+  \begin{margincap}
     \centering
-%%% Note the alignment specifier!
-    \begin{tabular}[\margincapalign]{@{}lr@{}}
+    \begin{tabular}{@{}lr@{}}
       foo & 7\\
       bar & 21 \\
       baz & 23 \\
     \end{tabular}
+    \caption{A table caption in the outer margin.}
+    \label{tab:shorttab}
   \end{margincap}
 \end{table}
 
 \twocolumn
-\section{This is two column mode}
+\section{This is two-column mode}
 \blindtext[1]
 
 \begin{wrapfigure}{o}{2cm}
-  \begin{margincap}{Another wrapfigure caption in the outer margin.
-       Note, we are in the outer column. And we're hanging!}
+  \begin{margincap}
     \rule{2cm}{1cm}
+    \caption[A hanging wrapfigure caption.]{Another wrapfigure caption
+      in the outer margin.  Note, we are in the outer column.  And we're
+      hanging!}
+    \label{fig:wrapTwoCol}
   \end{margincap}
 \end{wrapfigure}
 \blindtext[5]
 \begin{figure*}
-  \begin{margincap}{A figure caption in the outer margin.}
+  \begin{margincap}
     \centering
     \rule{10cm}{2cm}
+    \caption{A figure caption in the outer margin.}
+    \label{fig:figure*}
   \end{margincap}
 \end{figure*}
+
+Let's reference all figures and tables:
+
+\newcommand*{\pref}[1]{\ref{#1} & \pageref{#1}}
+\begin{tabular}{ll}
+  float & page\\\hline
+  figure~\pref{fig:wrapOneCol}\\
+  table~\pref{tab:shorttab}\\
+  figure~\pref{fig:wrapTwoCol}\\
+  figure~\pref{fig:figure*}\\
+\end{tabular}
 \end{document}
 \endinput
 %%
diff --git a/Master/texmf-dist/doc/latex/mcaption/mcaption.pdf b/Master/texmf-dist/doc/latex/mcaption/mcaption.pdf
index 3413c65e9bc..3aa563f0126 100644
--- a/Master/texmf-dist/doc/latex/mcaption/mcaption.pdf
+++ b/Master/texmf-dist/doc/latex/mcaption/mcaption.pdf