caption 3.1a (16sep07)

git-svn-id: svn://tug.org/texlive/trunk@4959 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 56 insertions, 20 deletions

diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
index 3d0d700d8df..997a967888c 100644
--- a/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption-deu.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/caption-deu.tex b/Master/texmf-dist/doc/latex/caption/caption-deu.tex
index c4f06dc4566..7ae2462b8ec 100644
--- a/Master/texmf-dist/doc/latex/caption/caption-deu.tex
+++ b/Master/texmf-dist/doc/latex/caption/caption-deu.tex
@@ -23,7 +23,7 @@
 % caption-eng.tex, and caption-rus.tex.
 % 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-deu.tex}[2007/09/03 v3.1 Das caption-Paket]
+\ProvidesFile{caption-deu.tex}[2007/09/16 v3.1a Das caption-Paket]
 \hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up.
 %\errorcontextlines=3
 
@@ -819,6 +819,7 @@ vorbelegt.)
 
 Man vergleiche:
 \begin{Example}
+  \captionsetup{position=b}
   \begin{minipage}[c]{.5\linewidth}%
 %   \captionsetup{aboveskip=0pt}%
     \captionof{table}{Eine Tabelle}%
@@ -855,7 +856,7 @@ F"ugt man nun ein |\captionsetup{position=top}| in die linke Tabelle vor dem
 Unterschrift stimmige Abst"ande:
 \begin{Example}
   \begin{minipage}[c]{.5\linewidth}%
-    \captionsetup{position=top}%
+    \captionsetup{position=t}%
     \captionof{table}{Eine Tabelle}%
     \centering\begin{tabular}{ll}%
       A & B \\%
@@ -867,6 +868,7 @@ Unterschrift stimmige Abst"ande:
       A & B \\%
       C & D \\%
     \end{tabular}%
+    \captionsetup{position=b}
     \captionof{table}{Eine Tabelle}%
   \end{minipage}%
 \end{Example}
@@ -1674,7 +1676,7 @@ nicht mehr optimal platziert werden.
 
 Außerdem ist zu beachten, daß dann |\captionsetup{type=|\meta{Type}|}|
 keinen Hyperlink"=Anker mehr setzt, dies muß dann stattdessen mit
-|\capstart|(welches vom \package{hypcap}"=Paket angeboten wird) geschehen.
+|\capstart| (welches vom \package{hypcap}"=Paket angeboten wird) geschehen.
 
 \subsection{listings}
 \label{listings}
@@ -2188,6 +2190,8 @@ Option            & Kurzbeschreibung & Abschnitt \\
 |figureposition|\preambleoption & gibt einen Hinweis auf die Position & \ref{skips} \\
 |font|            & wählt den Zeichensatz & \ref{fonts} \\
 |format|          & wählt das Format & \ref{formats} \\
+|FPlist|          & wohin soll der Listeneintrag einer FPfigure zeigen? & \ref{fltpage} \\
+|FPref|           & wohin soll ein |\ref| einer FPfigure zeigen? & \ref{fltpage} \\
 |hangindent|      & setzt den "`hängenden"' Einzug & \ref{margins} \\
 |hypcap|          & wählt das "`hypcap"' Feature aus & \ref{hyperref} \\
 |hypcapspace|     & setzt den Abstand über einem Hyperlink & \ref{hyperref} \\
@@ -2223,11 +2227,11 @@ Option            & Kurzbeschreibung & Abschnitt \\
 \end{longtable}
 \footnotetext[1]{Diese Optionen stehen nur in dem Dokumentenvorspann (Preamble)
                  zur Verfügung.}
-\nopagebreak
-{\small\emph{Hinweis:} Veraltete, aber emulierte Optionen sind hier nicht gelistet.
- Eine Auflistung dieser Optionen ist in\\
- \hspace*{1em}\Ref{caption1} und\\
- \hspace*{1em}\Ref{caption2} zu finden.}
+\nopagebreak\parbox[t]{\linewidth}{\small\emph{Hinweis:}
+  Veraltete Optionen sind hier nicht gelistet,
+  diese sind in\\
+  \hspace*{1em}\Ref{caption1} und\\
+  \hspace*{1em}\Ref{caption2} zu finden.}
 
 \pagebreak[4]
 \subsection{Warnungen}
@@ -2601,6 +2605,20 @@ Option            & Kurzbeschreibung & Abschnitt \\
 \fi
 
 \Message
+  |The option `labelsep=|\meta{name}|' does not work|\\
+  |with `format=hang'.|\\
+{\color{black}\hspace{1.5em}-- oder --}\\
+  |The option `labelsep=|\meta{name}|' does not work|\\
+  |with \setcaphanging (which is set by default).|
+\Description
+  Ein Bezeichnungstrenner, der ein |\\| Kommando enthält, kann
+  nicht mit einem Format kombiniert werden, welches "`hängende"'
+  Beschriftungen liefert.
+  Bitte wählen Sie einen anderen Trenner oder ein anderes
+  Beschriftungsformat aus.
+  \par\See{\Ref{formats} bzw.~\Ref{KOMA}}
+
+\Message
   |The package option `caption=false' is obsolete.|\\
   |Please pass this option to the subfig package instead|\\
   |and do *not* load the caption package anymore.|
@@ -2682,7 +2700,7 @@ Option            & Kurzbeschreibung & Abschnitt \\
   |You can't use the caption package option|\\
   |  `tableposition=|\meta{position}|'|\\
   |and use the |\meta{package}| package, too.|\\
-  {\color{black}\hspace{1.5em}-or-}\\
+{\color{black}\hspace{1.5em}-- oder --}\\
   |You can't use the global option|\\
   |  `tablecaptionabove'|\\
   |and use the |\meta{package}| package, too.|
@@ -2769,9 +2787,10 @@ Uwe Siart,
 Sang-Heon Shim,
 Henrik Lundell,
 David Byers,
-William Asquith
-und
+William Asquith,
 Prof.~Dr.~Dirk Hoffmann
+und
+Frank Martini
 f"ur ihre Hilfe beim stetigen Verbessern dieses Paketes bedanken.
 
 % --------------------------------------------------------------------------- %
diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
index 04b1557a86b..15526524aee 100644
--- a/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption-eng.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/caption-eng.tex b/Master/texmf-dist/doc/latex/caption/caption-eng.tex
index ca513786f49..18295b190ca 100644
--- a/Master/texmf-dist/doc/latex/caption/caption-eng.tex
+++ b/Master/texmf-dist/doc/latex/caption/caption-eng.tex
@@ -23,7 +23,7 @@
 % caption-eng.tex, and caption-rus.tex.
 % 
 \NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesFile{caption-eng.tex}[2007/09/03 v3.1 The caption package]
+\ProvidesFile{caption-eng.tex}[2007/09/16 v3.1a The caption package]
 \hbadness=9999 \newcount\hbadness \hfuzz=20pt % Make TeX shut up.
 %\errorcontextlines=3
 
@@ -268,7 +268,7 @@ the other captions remain untouched.
 \label{formats}
 
 \DescribeMacro{format=}
-A figure or table caption mainly consits of three parts: the caption label,
+A figure or table caption mainly consists of three parts: the caption label,
 which says if this object is a `Figure' or `Table' and what number is
 associated with it, the caption text itself, which is normally a short
 description of contents, and the caption separator which separates the text
@@ -803,6 +803,7 @@ figure or table itself. (Remember: |\belowcaptionskip| is usually set to |0pt|.)
 
 Please compare the spacing in these small tables:
 \begin{Example}
+  \captionsetup{position=b}
   \begin{minipage}[c]{.5\linewidth}
 %   \captionsetup{aboveskip=0pt}%
     \captionof{table}{A table}
@@ -838,7 +839,7 @@ So adding an extra |\captionsetup{position=top}| to the left example
 table gives you proper spacing around both captions:
 \begin{Example}
   \begin{minipage}[c]{.5\linewidth}
-    \captionsetup{position=top}
+    \captionsetup{position=t}
     \captionof{table}{A table}
     \centering\begin{tabular}{ll}
       A & B \\
@@ -850,6 +851,7 @@ table gives you proper spacing around both captions:
       A & B \\
       C & D \\
     \end{tabular}
+    \captionsetup{position=b}
     \captionof{table}{A table}
   \end{minipage}
 \end{Example}
@@ -1969,6 +1971,8 @@ Option & Short description & Section \\
 |figureposition|\preambleoption & gives a hint about the figure caption position & \ref{skips} \\
 |font|            & sets the font & \ref{fonts} \\
 |format|          & sets the format & \ref{formats} \\
+|FPlist|          & to where the list entry of a FPfigure should link? & \ref{fltpage} \\
+|FPref|           & to where a |\ref| to a FPfigure should link? & \ref{fltpage} \\
 |hangindent|      & sets the hang indention & \ref{margins} \\
 |hypcap|          & select `hypcap' feature & \ref{hyperref} \\
 |hypcapspace|     & sets the distance between hyperlink \& contents & \ref{hyperref} \\
@@ -2004,10 +2008,10 @@ Option & Short description & Section \\
 \end{longtable}
 \footnotetext[1]{These options are only available in the preamble of the document.}
 
-\nopagebreak
-{\small\emph{Note:} Obsolete options are not listed here. See\\
- \hspace*{1em}\Ref{caption1} and\\
- \hspace*{1em}\Ref{caption2} for a list of these options.}
+\nopagebreak\parbox[t]{\linewidth}{\small\emph{Note:}
+  Obsolete options are not listed here. See\\
+  \hspace*{1em}\Ref{caption1} and\\
+  \hspace*{1em}\Ref{caption2} for a list of these options.}
 
 \pagebreak[4]
 \subsection{Warnings}
@@ -2357,6 +2361,18 @@ Option & Short description & Section \\
 \fi
 
 \Message
+  |The option `labelsep=|\meta{name}|' does not work|\\
+  |with `format=hang'.|\\
+{\color{black}\hspace{1.5em}-or-}\\
+  |The option `labelsep=|\meta{name}|' does not work|\\
+  |with \setcaphanging (which is set by default).|
+\Description
+  A caption label separator which contains a newline command (|\\|)
+  does not work with a hanging caption format.
+  Please select another caption format or another caption label seperator.
+  \par\See{\Ref{formats} resp.~\Ref{KOMA}}
+
+\Message
   |The package option `caption=false' is obsolete.|\\
   |Please pass this option to the subfig package instead|\\
   |and do *not* load the caption package anymore.|
@@ -2437,7 +2453,7 @@ Option & Short description & Section \\
   |You can't use the caption package option|\\
   |  `tableposition=|\meta{position}|'|\\
   |and use the |\meta{package}| package, too.|\\
-  {\color{black}\hspace{1.5em}-or-}\\
+{\color{black}\hspace{1.5em}-or-}\\
   |You can't use the global option|\\
   |  `tablecaptionabove'|\\
   |and use the |\meta{package}| package, too.|
@@ -2506,8 +2522,9 @@ Sang-Heon Shim,
 Henrik Lundell,
 David Byers,
 William Asquith,
-and
 Prof.~Dr.~Dirk Hoffmann,
+and
+Frank Martini
 who all helped to make this package a better one.
 
 % --------------------------------------------------------------------------- %
diff --git a/Master/texmf-dist/doc/latex/caption/caption.pdf b/Master/texmf-dist/doc/latex/caption/caption.pdf
index 3977586333f..35443f2375d 100644
--- a/Master/texmf-dist/doc/latex/caption/caption.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption.pdf
diff --git a/Master/texmf-dist/doc/latex/caption/caption2.pdf b/Master/texmf-dist/doc/latex/caption/caption2.pdf
index a5f59885e63..b147a061142 100644
--- a/Master/texmf-dist/doc/latex/caption/caption2.pdf
+++ b/Master/texmf-dist/doc/latex/caption/caption2.pdf