hvfloat (15mar21)

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

3 files changed, 87 insertions, 54 deletions

diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index 796f24877b7..f18e545f586 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,5 @@
 hvfloat.sty:    
+2.19  2021-03-15  - fix for vertical spacing of doubleFULLPAGE
 2.18  2021-03-12  - add support for doublepage objects
 2.17  2020-10-31  - fix for label setting of non floating objects
 2.16  2019-08-31  - fix for \hvFloat* and full page images
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index adcbeecc695..8a2b8d896dc 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
index 0896645980c..29404eaaddc 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 35 2020-10-31 07:41:00Z herbert $
+%% $Id: hvfloat.tex 54 2021-03-14 14:55:34Z herbert $
 \listfiles
 \errorcontextlines=100
 \documentclass[twoside,paper=a4]{scrartcl}
@@ -56,8 +56,8 @@
 \usepackage{hvindex}
 \usepackage[all=!htb]{hvfloat-fps}
 \usepackage[fbox,hyperref]{hvfloat}
-\captionsetup{format=plain,font=sf,labelfont=sf}
-\captionsetup[sub]{format=plain,font=sf,labelfont=sf}
+\captionsetup{format=plain,font=sf,labelfont={sf,bf}}
+\captionsetup[sub]{format=plain,font=sf,labelfont={sf,bf}}
 
 \hypersetup{urlcolor=blue, linktocpage, colorlinks=true}
 %
@@ -361,7 +361,7 @@ or \Lenv{table} environment, f.ex.:
 
 
 \normalsize
-
+\marginnote{Fig.~\ref{fig:0}}
 \hvFloat{figure}{\includegraphics{images/rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0}
 
 Code for figure \ref{fig:0}:
@@ -369,7 +369,8 @@ Code for figure \ref{fig:0}:
 \hvFloat{figure}{\includegraphics{images/rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0}
 \end{lstlisting}
 
-\Float
+
+\marginnote{Tab.~\ref{tab:0}}
 \hvFloat[capPos=top]{table}{%
 \begin{tabularx}{\textwidth}{l|l|X}
   \rmfamily Name & Type & Description\\\hline
@@ -420,7 +421,7 @@ floating environments like \Lenv{figure} or \Lenv{table}:
   {Default caption width setting, which is the natural width with respect to the current linewidth.}{fig:width0}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width0}}
 \hvFloat[floatPos=!htb]{figure}{\includegraphics{images/rose}}%
   {Default caption width setting, which is the natural width with respect to the current linewidth.}{fig:width0}
 
@@ -445,7 +446,7 @@ minus the width of the object and the space between object and caption, which is
   the separation between object and caption, and the current linewidth.}{fig:width1}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width1}}
 \hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{images/rose}}%
   {Caption right beside with a \emph{natural} width, which is given by the width of the object,
   the separation between object and caption, and the current linewidth.}{fig:width1}
@@ -467,7 +468,7 @@ is greater than 1.
    in this special case \the\linewidth. Divide it by 28.82 to get cm.}{fig:width2}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width2}}
 \hvFloat[floatPos=!htb,capWidth=0.9]{figure}{\includegraphics{images/rose}}%
   {Caption below with a width of 0.9 of the current line width (column width), which is
    in this special case \the\linewidth. Divide it by 28.82 to get cm.}{fig:width2}
@@ -489,7 +490,7 @@ If not then the width is set to the possible value between object and margin:
   by the macro to the maximal width.}{fig:width3}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width3}}
 \hvFloat[floatPos=!htb,capPos=after,capWidth=0.9]{figure}{\includegraphics[scale=1.5]{images/rose}}%
   {Caption right beside with a width setting of \texttt{0.9\textbackslash linewidth}
   which is too big for this example and therefore corrected by the macro to the maximal width.}{fig:width3}
@@ -506,7 +507,6 @@ real sense if you have a lot of identical images with respect to its widths.
   if it is a very small object.}{fig:width4}
 \end{lstlisting}
 
-\Float
 \hvFloat[floatPos=!htb,capWidth=w]{figure}{\includegraphics[width=0.5\linewidth]{images/CTAN}}%
   {Caption below with a width of the given object which may be a problem
   if it is a very small object.}{fig:width4}
@@ -523,6 +523,7 @@ real sense if you want to put a rotated caption beside the object.
   if it is a very small object.}{fig:width5}
 \end{lstlisting}
 
+\marginnote{Fig.~\ref{fig:width5}}
 \hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{images/rose}}%
   {Caption beside with a width of the given object height which may be a problem
   if it is a very small object.}{fig:width5}
@@ -547,6 +548,7 @@ Code for figure \ref{fig:1}:
   {fig:1}
 \end{lstlisting}
 
+\marginnote{Fig.~\ref{fig:1}}
 \Float[capPos=right]
 \hvFloat%
   [floatPos=htb,
@@ -575,7 +577,7 @@ Code for figure \ref{fig:2}:
    of \texttt{capWidth=h}, which is the height of the object.}{fig:2}
 \end{lstlisting}
 
-\Float[capAngle=90]
+\marginnote{Fig.~\ref{fig:2}}
 \hvFloat%
   [floatPos=htb,
    capPos=left,
@@ -610,8 +612,7 @@ Code for figure \ref{fig:3}:
 	 of the image and a rotation of the caption and the object.}{fig:3}
 \end{lstlisting}
 
-
-\Float
+\marginnote{Fig.~\ref{fig:3}}
 \hvFloat[%
 	capWidth=h,% of \columnwidth
 	capPos=after,
@@ -640,7 +641,7 @@ Code for figure~\ref{fig:20}:
 	an odd page.}{fig:20}
 \end{lstlisting}
 
-\Float[capPos=inner]
+\marginnote{Fig.~\ref{fig:20}}
 \hvFloat[capPos=inner]{figure}{\includegraphics{images/rose}}%
 	[Centered Caption on the inner side]{%
 	Caption set with the parameter setting \texttt{capPos=inner}, which will be
@@ -666,7 +667,7 @@ even \fi page. We now set a pagebreak at the end of the second image to see if i
 	an odd page.}{fig:20b}
 \end{lstlisting}
 
-\Float[capPos=outer]
+\marginnote{Fig.~\ref{fig:20b}}
 \hvFloat[capPos=outer]{figure}{\includegraphics{images/rose}}%
 	[Centered Caption on the inner side]{%
 	Caption set with the parameter setting \texttt{capPos=outer}, which will be
@@ -675,8 +676,7 @@ even \fi page. We now set a pagebreak at the end of the second image to see if i
 
 
 
-
-\Float
+\marginnote{Fig.~\ref{fig:21}}
 \hvFloat[%
 	capWidth=0.5,% of \columnwidth
 	capPos=outer,
@@ -709,7 +709,7 @@ Code for figure \ref{fig:22}:
    width of \texttt{0.5\textbackslash columnwidth} and \texttt{capPos=outer} }{fig:22}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:22}}
 \hvFloat[%
 	capWidth=0.5,% of \columnwidth
 	capPos=inner,
@@ -745,7 +745,7 @@ The code for figure \ref{fig:4}:
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:4}}
 \hvFloat[%
 	floatPos=htb,%
 	capWidth=0.25,%
@@ -766,7 +766,7 @@ The code for figure \ref{fig:5}:
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:5}}
 \hvFloat[%
 	floatPos=htb,%
 	capWidth=0.25,%
@@ -785,7 +785,7 @@ The code for figure \ref{fig:6}:
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:6}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=right,%
@@ -807,7 +807,7 @@ in a minipage, the reason why it will be local to the current image..
 ]{figure}{\frame{\includegraphics{images/rose}}}{\blindtext}{fig:66}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:66}}
 \hvFloat[%
   capPos=right,
   capFormat={labelsep=newline,justification=RaggedRight,font={small,it},labelfont=bf}
@@ -837,7 +837,7 @@ The code for figure \ref{fig:7}:
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:7}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=right,%
@@ -853,7 +853,7 @@ The code for figure \ref{fig:7}:
 The same with \Lkeyset{capPos=left}:
 
 
-\Float[capPos=left]
+\marginnote{Fig.~\ref{fig:700}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=left,%
@@ -879,7 +879,7 @@ The code for figure \ref{fig:8}:
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:8}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=before,%
@@ -908,7 +908,7 @@ The code for figure \ref{fig:70}:
 the option \texttt{wide}.}{fig:70}
 \end{lstlisting}
 
-%\Float
+\marginnote{Fig.~\ref{fig:70}}
 \hvFloat[%
 	wide,
 	capPos=right,%
@@ -933,7 +933,7 @@ The code for figure \ref{fig:80}:
 \end{lstlisting}
 
 
-%\Float
+\marginnote{Fig.~\ref{fig:80}}
 \hvFloat[wide,
 	capPos=left,%
 	capVPos=top,%
@@ -955,8 +955,7 @@ Caption at top and inner beside the float and object position right and
 the option \texttt{wide}.}{fig:81}
 \end{lstlisting}
 
-%\Float[capPos=outer]
-
+\marginnote{Fig.~\ref{fig:81}}
 \hvFloat[wide,
 	capPos=inner,
 	capVPos=top,
@@ -980,8 +979,8 @@ Caption at top inner beside the float and object position right and
 the option \texttt{wide}.}{fig:811}
 \end{lstlisting}
 
-%\Float[capPos=outer]
 
+\marginnote{Fig.~\ref{fig:811}}
 \hvFloat[wide,
 	capPos=inner,
 	capVPos=top,
@@ -1005,6 +1004,7 @@ the option \texttt{wide}.}{fig:812}
 %\Float[capPos=outer]
 
 \begingroup
+\marginnote{Fig.~\ref{fig:812}}
 \captionsetup{justification=RaggedRight}
 \hvFloat[wide,
 	capPos=outer,
@@ -1071,7 +1071,7 @@ Code for figure \ref{fig:9}:
 The float can also be put to the left or to the right  (above/below in landscape) 
 with the \Lkeyset{objectPos=l} parameter
 
-\Float[landscape]
+\marginnote{Fig.~\ref{fig:9}}
 \hvFloat[%
 	floatPos=p,
 	capPos=bottom,
@@ -1100,7 +1100,7 @@ The code for figure \ref{fig:10}:
         degrees.\blindtext}{fig:10}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:10}}
 \hvFloat[%
 	floatPos=p,%
 	capWidth=h,%
@@ -1142,9 +1142,9 @@ Some nonsense text before the following \emph{non floating} object.
 Some nonsense text after the preceding  \emph{non floating} object.
 \end{lstlisting}
 
-\Float
 Some nonsense text before the following \emph{non floating} object.
 
+\marginnote{Fig.~\ref{fig:11}}
 \hvFloat[%
 	nonFloat,%
 	capWidth=0.25,%
@@ -1218,6 +1218,7 @@ The code for table \ref{table:1} and \ref{table:2} is:
 
 \hvblindtext
 
+\marginnote{Tab.~\ref{table:2}}
 \hvFloat[%
   floatPos=hb,
   useOBox=true,
@@ -1229,7 +1230,7 @@ The code for table \ref{table:1} and \ref{table:2} is:
 
 In this case leave the third parameter empty.
 
-\Float
+\marginnote{Tab.~\ref{table:1}}
 \hvFloat[%
   floatPos=!hb,
   capPos=top,
@@ -1237,7 +1238,7 @@ In this case leave the third parameter empty.
 
 
 
-\Float
+\marginnote{Tab.~\ref{table:2}}
 \hvFloat[%
 	floatPos=!htb,%
 	useOBox=true,%
@@ -1270,7 +1271,7 @@ The code for figure \ref{fig:text}:
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:text}}
 \hvFloat[%
 	onlyText=true,%
 	capAngle=90,%
@@ -2443,7 +2444,6 @@ should be true (see listing).
 
 %\index{capPos@\texttt {capPos} (keyword)|)}
 
-
 \section{Doublepage objects -- images and/or tabulars}
 If an image or a tabular or any other object is too big for one page, it can be split over two pages (left -- right).
 It is obvious that this makes only sense for twoside documents.
@@ -2454,21 +2454,20 @@ There are three optional arguments:
 The user has to scale the image to be sure that the object will not be greater than \verb|2\paperwidth-4\margin|. The caption can be rotated
 on the right side of the right object part or under the right part.
 
-
 \item[\Lkeyword{doublePAGE}] A splitted object with or without a caption on top of a double page, beginning at the left side
 of the paper area and top of the text area.
 The user has to scale the image to be sure that the object will not be greater than \verb|2\paperwidth|. The caption can only be
 under the right part of the object. The will be \emph{no additional text} on the double page.
 
-\item[\Lkeyword{doubleFULLPAGE}] A splitted object with or without a caption on top of a double page, beginning at the
-left top paper edge and filling the complete double page.
+\item[\Lkeyword{doubleFULLPAGE}] A splitted object with or without a caption on the right or below of a double page. The object can 
+fill the complete double page.
 The user has to scale the image to be sure that the object will not be greater than \verb|2\paperwidth|. A caption will be
-rotated and written \emph{over} the object. The user has to take care for a correct text color.
+rotated and written \emph{over} the object, or if possible, at the right. The user has to take care for a correct text color.
 \end{description}
 
 \subsection{\Lkeyword{doubleFULLPAGE}}
 The scaling of the image is leave to the user. If the proportion of the object doesn't fit 2*paperwidth/paperheight,
-then there can be a white part on the right or bottom of the object. A pagenumber will not be printed. You'll
+then there can be a white part on the top or bottom of the object. A pagenumber will not be printed. In this documentation you'll
 find a marginnote where the following full doublepage image is defined. It appears on the the next following
 even page and  following text will be placed \emph{before} the object.
 
@@ -2479,7 +2478,7 @@ even page and  following text will be placed \emph{before} the object.
 
 \hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
   {figure}%
-  {\includegraphics[angle=90,width=2\paperwidth]{images/raphi}}%
+  {\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}%
   [Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
    Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2492,10 +2491,10 @@ even page and  following text will be placed \emph{before} the object.
 \end{lstlisting}
 
 \Blindtext
-\marginnote{doubleFULLPAGE0}
+\marginnote{Fig.~\ref{fig:doubleFULLPAGE0}}
  \hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
   {figure}%
-  {\includegraphics[angle=90,width=2\paperwidth]{images/raphi}}%
+  {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}%
   [Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
    Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2508,6 +2507,39 @@ even page and  following text will be placed \emph{before} the object.
 
 \Blindtext
 
+
+\begin{lstlisting}
+\Blindtext 
+
+ \hvFloat[doubleFULLPAGE,capPos=r]%
+  {figure}%
+  {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+  {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
+   Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
+   Papierrand. Auf den Seiten wird kein weiterer Text
+   platziert. Für das LOF wird dabei eine Kurzform berücksichtigt. Parameter
+   ist \texttt{doubleFULLPAGE}}%
+  {fig:doubleFULLPAGE1}
+
+\Blindtext \Blindtext
+\end{lstlisting}
+
+\marginnote{Fig.~\ref{fig:doubleFULLPAGE1}}
+
+ \hvFloat[doubleFULLPAGE,capPos=r]%
+  {figure}%
+  {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+  {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
+   Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
+   Papierrand. Auf den Seiten wird kein weiterer Text
+   platziert. Für das LOF wird dabei eine Kurzform berücksichtigt. Parameter
+   ist \texttt{doubleFULLPAGE}}%
+  {fig:doubleFULLPAGE1}
+
+\Blindtext \Blindtext
+
+
+
 \subsection{\Lkeyword{doublePAGE}}
 With this option the object also starts at the left paper margin but on the top of the text area.
 There will be pagenumbers and a caption can be rotated on the right of the object or under it.
@@ -2517,7 +2549,7 @@ There will be pagenumbers and a caption can be rotated on the right of the objec
 
 \hvFloat[doublePAGE]%
   {figure}%
-  {\includegraphics[width=2\paperwidth]{images/felsen-wasser}}%
+  {\includegraphics[width=2\paperwidth]{images/seiser}}%
   [Eine doppelseitige Abbildung mit Caption unterhalb der rechten Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb der rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2529,12 +2561,12 @@ There will be pagenumbers and a caption can be rotated on the right of the objec
 \Blindtext
 \end{lstlisting}
 
-\Blindtext
+\blindtext
 
-\marginnote{doublePAGE0}
+\marginnote{Fig. \ref{fig:doublePAGE0}}
 \hvFloat[doublePAGE]%
   {figure}%
-  {\includegraphics[width=2\paperwidth]{images/felsen-wasser}}%
+  {\includegraphics[width=2\paperwidth]{images/seiser}}%
   [Eine doppelseitige Abbildung mit Caption unterhalb der rechten Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb der rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2556,7 +2588,7 @@ and the rest of the text area is filled with text.
 
 \hvFloat[doublePage,capWidth=n,capPos=r]%
   {figure}%
-  {\includegraphics[width=2\textwidth]{images/felsen-wasser-small}}%
+  {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
   [Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb des rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2570,10 +2602,10 @@ and the rest of the text area is filled with text.
 
 \Blindtext
 
-\marginnote{doublePage0}
+\marginnote{Fig. \ref{fig:doublePage0}}
 \hvFloat[doublePage,capWidth=n,capPos=r]%
   {figure}%
-  {\includegraphics[width=2\textwidth]{images/felsen-wasser-small}}%
+  {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
   [Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb des rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2584,7 +2616,7 @@ and the rest of the text area is filled with text.
 
 \Blindtext
 
-
+\hvblindtext
 
 \subsection{Tabulars}
 
@@ -2640,7 +2672,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15
 
 \Blindtext
 
-\marginpar{doublePage1}
+\marginpar{Tab.~\ref{tab:doublePage3}}
 \global\savebox\hvOBox{%
 \begin{tabular}{l*{18}r} \toprule
  & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976}