texlive[50507] Master/texmf-dist: hvfloat (21mar19)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 21 21:48:01 CET 2019
Revision: 50507
http://tug.org/svn/texlive?view=revision&revision=50507
Author: karl
Date: 2019-03-21 21:48:00 +0100 (Thu, 21 Mar 2019)
Log Message:
-----------
hvfloat (21mar19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2019-03-21 20:47:41 UTC (rev 50506)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2019-03-21 20:48:00 UTC (rev 50507)
@@ -1,5 +1,7 @@
hvfloat.sty:
-2.0 2019-03-14 - added support for wide floats, inner/outer captions,
+2.10 2019-03-21 - added support for multi float pages
+ - added support for subfloat pages
+2.00 2019-03-14 - added support for wide floats, inner/outer captions,
fullpage objects for one- or twocolumn mode.
1.2b 2017-12-22 - added option all for hvfloat-fps
1.2a 2017-09-16 - new package for global float setting
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2019-03-21 20:47:41 UTC (rev 50506)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2019-03-21 20:48:00 UTC (rev 50507)
@@ -1,5 +1,5 @@
-%% $Id: hvfloat.tex 964 2019-03-14 11:37:36Z herbert $
-\listfiles
+%% $Id: hvfloat.tex 988 2019-03-20 21:34:05Z herbert $
+%\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4]{scrartcl}
\usepackage{fontspec}
@@ -32,6 +32,7 @@
%
\usepackage{graphicx}
+\usepackage{placeins}
\usepackage{xcolor}
\usepackage{url}
\usepackage{booktabs,xltabular}
@@ -49,8 +50,9 @@
\usepackage{hvindex}
\usepackage[all=!htb]{hvfloat-fps}
\usepackage[fbox,hyperref]{hvfloat}
-\let\hvVersion\fileversion
+\def\hvVersion{2.10}
\captionsetup{format=plain,font=sf,labelfont=sf}
+\captionsetup[sub]{format=plain,font=sf,labelfont=sf}
\hypersetup{urlcolor=blue, linktocpage, colorlinks=true}
@@ -218,10 +220,12 @@
\begin{BDef}
\Lcs{hvset}\Largb{key=value list}\\
\Lcs{setDefaults}\\
-\Lcs{hvFloat}\OptArgs\Largb{float type}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label}
+\Lcs{hvFloat}\OptArg*{*}\OptArgs\OptArg*{+}\Largb{float type}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label}
\end{BDef}
+The optional \OptArg*{+} is explained in section~\vref{sec:multifloats}.
+
\Lcs{hvSet} allows the global setting of keywords and \Lcs{setDefaults} sets all keywords to
its default value as shown in Table~\vref{tab:options}.
@@ -248,12 +252,10 @@
the not existing table~\ref{dummy} is no problem.
{\small\begin{verbatim}
-[...] It is no problem to use the \verb|\tabcaption| command to
-place a caption anywhere, like here in an inlined mode:
-\tabcaption[The Caption without sense ...]{A Caption without any
-sense and any object}\label{dummy} A label can be put inside the
-argument or after the command in the usual way, so that a
-reference to the not existing table~\ref{dummy} is no problem.
+[...] It is no problem to use the \verb|\tabcaption| command to place a caption anywhere,
+like here in an inlined mode: \tabcaption[The Caption without sense ...]{A Caption without any
+sense and any object}\label{dummy} A label can be put inside the argument or after the command
+in the usual way, so that a reference to the not existing table~\ref{dummy} is no problem.
\end{verbatim}}
@@ -282,7 +284,7 @@
\Lkeyword{capAngle} & 0 & The value for the angle if the caption should be rotated. Counted anti clockwise.\\
\Lkeyword{capPos} & b& The position of the caption relative to the object. Possible values
- are (\textbf{l})eft|(\textbf{b})ottom|(\textbf{t})op|(\textbf{r})ight|(\textbf{e})ven|o(\textbf{d})d. The
+ are (\textbf{l})eft|(\textbf{L})EFT|(\textbf{b})ottom|(\textbf{t})op|(\textbf{r})ight|(\textbf{R})IGHT|(\textbf{e})ven|o(\textbf{d})d. The
last two are only valid for the option \texttt{fullpage}.\\
\Lkeyword{capVPos}& c& This is only important for \texttt{capPos=l|r}. Only in this case the
@@ -294,11 +296,7 @@
\Lkeyword{floatCapSep} & 5 & The additional width between the object and a left or right placed caption. The default unit is \texttt{pt}.\\
-\Lkeyword{fullpage} & false & Put the caption on the bottom of the preceding or following page and the object alone a page.\\
-\Lkeyword{separatorLine} & true & Put a line with a predefined width of 0.4pt between
- the text and the caption. Only valid for the keyword \Lkeyword{fullpage}.\\
-
\Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \texttt{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\
\Lkeyword{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counters are increased as usual and can be referenced.\\
@@ -698,7 +696,6 @@
and figure~\ref{fig:21} for \emph{outer} on the left side.
-
\section{Vertical Position of the Caption}
The caption can be placed beside the object in the positions
\begin{verbatim}
@@ -789,6 +786,7 @@
]{figure}{\includegraphics{rose}}{%
Caption at top right beside the float and object position left}{fig:7}
+\blindtext
The code for figure \ref{fig:8}:
@@ -812,6 +810,9 @@
]{figure}{\includegraphics{rose}}{%
Caption at top left beside the float and object position right}{fig:8}
+\blindtext
+
+
\section{Wide floats}
With the optional argument \Lkeyword{wide} the width of the defined marginpar is
@@ -843,7 +844,9 @@
Caption at top right beside the float and object position left and
the option \texttt{wide}.}{fig:70}
+\blindtext
+
The code for figure \ref{fig:80}:
\begin{lstlisting}
\hvFloat[wide,
@@ -867,16 +870,53 @@
For a twosided document it will place the object always in the margin.
+\blindtext
-%\Float
+\begin{lstlisting}
\hvFloat[wide,
- capPos=r,
+ capPos=i,
capVPos=t,
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
-Caption at top right beside the float and object position right and
+Caption at top and inner beside the float and object position right and
the option \texttt{wide}.}{fig:81}
+\end{lstlisting}
+%\Float[capPos=o]
+\hvFloat[wide,
+ capPos=i,
+ capVPos=t,
+]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+
+Now we set the same image with the same setting on the next page. The caption will
+change its side due to the setting \Lkeyset{capPos=o}.
+
+\blindtext
+
+
+
+\begin{lstlisting}
+\hvFloat[wide,
+ capPos=i,
+ capVPos=t,
+]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+\end{lstlisting}
+
+%\Float[capPos=o]
+
+\hvFloat[wide,
+ capPos=i,
+ capVPos=t,
+]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+
+
+
\section{Full Page Width in Landscape Mode}
If you do not want to load the package \Lpack{lscape} (or \Lpack{pdflscape}) you can use the \Lkeyset{floatPos=p}
@@ -889,25 +929,28 @@
capPos=b,
rotAngle=90,
objectPos=c
-]{figure}{\includegraphics[width=0.9\textheight]{CTAN}}{%
- Caption at top right beside the float and object position right}{fig:9}
+]{figure}{\includegraphics[width=0.9\textheight]{CTAN}}%
+ [Object and Caption in landscape mode]{%
+ Caption and object in landscape mode. \blindtext}{fig:9}
\end{lstlisting}
The float can also be put to the left or to the right (above/below in landscape)
with the \Lkeyset{objectPos=l} parameter
-\Float
+\Float[landscape]
\hvFloat[%
- floatPos=p,%
+ floatPos=p,
capPos=b,
- rotAngle=90,%
- objectPos=c%
-]{figure}{\includegraphics[width=\textheight]{CTAN}}{%
- Caption at top and together with the object rotated}{fig:9}
+ rotAngle=90,
+ objectPos=c
+]{figure}{\includegraphics[width=0.9\textheight]{CTAN}}%
+ [Object and Caption in landscape mode]{%
+ Caption and object in landscape mode. \blindtext}{fig:9}
\Blindtext
+
The code for figure \ref{fig:10}:
\begin{lstlisting}
\hvFloat[%
@@ -918,8 +961,9 @@
capAngle=-90,
objectPos=l
]{figure}{\includegraphics[width=\textheight]{CTAN}}%
- [Rotated Caption]{%
- Caption right beside the float and object position left. The caption rotated by $-90$ degrees}{fig:10}
+ [Rotated Caption in Landscape]{%
+ Caption right beside the float and object position left. The caption rotated by $-90$
+ degrees.\blindtext}{fig:10}
\end{lstlisting}
\Float
@@ -931,12 +975,17 @@
capAngle=-90,%
objectPos=l%
]{figure}{\includegraphics[width=\textheight]{CTAN}}%
- [Rotated Caption]{%
- Caption right beside the float and object position left. The caption rotated by $-90$ degrees}{fig:10}
+ [Rotated Caption in Landscape]{%
+ Caption right beside the float and object position left. The caption rotated by $-90$ degrees.
+ \blindtext}{fig:10}
+
+
\Blindtext
+
+
\section{The \Lkeyword{nonFloat} Option}
Sometimes it is better to put a ``float'' in a specific position of the page. This is possible
with the \Lpack{nonfloat} package and the keyword \Lkeyword{nonFloat}.
@@ -948,9 +997,10 @@
capPos=r,
capVPos=b,
objectPos=c,
-]{figure}{\includegraphics{rose}}%
+ objectFrame,
+]{figure}{\includegraphics[scale=1.5]{rose}}%
[Nonfloat Captions]{%
- Caption of a "nonfloat" Object, using the \texttt{nonfloat} Package}{fig:11}
+ Caption of a ``nonfloat'' Object, using the \texttt{nonfloat} Package}{fig:11}
\end{lstlisting}
\Float
@@ -960,9 +1010,10 @@
capPos=r,%
capVPos=b,%
objectPos=c,%
-]{figure}{\includegraphics{rose}}%
+ objectFrame,
+]{figure}{\includegraphics[scale=1.5]{rose}}%
[Nonfloat Captions]{%
- Caption of a "nonfloat" Object, using the \texttt{nonfloat} Package}{fig:11}
+ Caption of a ``nonfloat'' Object, using the \texttt{nonfloat} Package}{fig:11}
\bigskip
The image \ref{fig:11} is exactly placed where the command \Lcs{hvFloat} appears.
@@ -979,6 +1030,7 @@
+
\section{Tabulars as Objects}\label{sec:tables}
The object has to be passed as an parameter to the \Lcs{hvFloat} macro. This is no
problem with images but maybe with tables, so it is easier to use the box \Lcs{hvOBox}
@@ -1036,6 +1088,8 @@
capPos=t,
useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1}
+
+
\Float
\hvFloat[%
floatPos=!htb,%
@@ -1061,7 +1115,7 @@
capPos=r,
capVPos=t,
capWidth=h]{}{\includegraphics{rose}}%
- ["\texttt{onlyText}" Caption]{%
+ [``\texttt{onlyText}'' Caption]{%
Demonstration of the \texttt{onlyText} Parameter, which makes it
possible to put some text beside a floating object without getting
a starting \texttt{Figure:} or \texttt{Table:}}{fig:text}
@@ -1075,14 +1129,15 @@
capPos=r,%
capVPos=t,%
capWidth=h]{}{\includegraphics{rose}}%
- ["\texttt{onlyText}" Caption]{%
+ [``\texttt{onlyText}'' Caption]{%
Demonstration of the \texttt{onlyText} Parameter, which makes it
possible to put some text beside a floating object without getting
a starting \texttt{Figure:} or \texttt{Table:}}{fig:text}
+\blindtext
+\blindtext
-
\section{Environment \texttt{hvFloatEnv}}\label{sec:env}
With the environment \Lenv{hvFloatEnv} one can place an object exactly on that position where the
@@ -1110,6 +1165,8 @@
The environment has an optional argument for setting the line width which is preset to \Ldim{textwidth}.
The object is always centered.
+
+\begin{lstlisting}
\begin{hvFloatEnv}[0.5\textwidth]
\captionof{table}{A caption for a nice table}
\begin{tabular}{@{} l c r @{}}\hline
@@ -1117,8 +1174,9 @@
L & C & R \\\hline
\end{tabular}
\end{hvFloatEnv}
+\end{lstlisting}
-\begin{lstlisting}
+
\begin{hvFloatEnv}[0.5\textwidth]
\captionof{table}{A caption for a nice table}
\begin{tabular}{@{} l c r @{}}\hline
@@ -1126,23 +1184,55 @@
L & C & R \\\hline
\end{tabular}
\end{hvFloatEnv}
-\end{lstlisting}
+\bigskip
+\blindtext
+\blindtext
+
+
\section{Full page objects in onecolumn mode}
+For an image or table which needs the whole space of a page the caption can be
+printed at the bottom of the preceeding or following page. It is possible in
+oneside and twoside mode, but makes only real sense in the twoside mode.
+
+
\subsection{Using the textarea}
+
+
+The setting \Lkeyset{capPos=e} (even) or \Lkeyset{capPos=d} (odd) page for
+a document in \Index{twocolumn} mode makes no real sense. For a twosided document a
+setting like \Lkeyset{capPos=i} for inner or \Lkeyset{capPos=o} for outer
+margin makes more sense.
+
+
For an image or table which needs the whole space of a page the caption can be
printed at the bottom of the preceeding or following page. It is possible in
-oneside and twoside mode, nbut makes only real sense in the twoside mode.
+oneside and twoside mode, but makes only real sense in the twoside mode.
Without any additional argument the caption is set first and the object on the follwing page:
+
+
+
+
+
+\subsubsection{Using the default or \Lkeyset{capPos=l}}
+
+Without any additional argument the caption is set first (left) at the bottom of the current page
+and the object on the following page. This is the same setting like \Lkeyset{capPos=l}.
+For the \Loption{twoside} option it makes more sense to use the setting \Lkeyset{capPos=LEFT}
+
+
+
+
\begin{lstlisting}
\hvFloat[fullpage]%
{figure}%
{\includegraphics[fullpage]{frose}}%
% {\includegraphics[width=\linewidth,height=\textheight,keepaspectratio=false]{rose}}%
- [A float which needs the complete page width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
@@ -1150,52 +1240,112 @@
-\Float
+
+
+\iffalse
+\Float[default]
\hvFloat[fullpage]%
{figure}%
{\includegraphics[fullpage]{frose}}%
- [A float which needs the complete page width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
+\fi
+%Figure~\vref{fig:fullpage0} shows the behaviour if only the optional argument \Lkeyword{fullpage}
+%is used.
+With this setting the caption is always placed \textit{before} the following object.
+This maybe sufficient for a \Index{oneside} document but not the best solution if
+this document is printed on a duplex machine. In such a case
+it may make sense to have the captions always on an even (left) page, even though the
+socument is typeset in a oneside mode. Figure~\vref{fig:fullpage1-LEFT} shows the output
+vor a oneside document with a setting \Lkeyset{capPos=L}.
-Figure~\vref{fig:fullpage0} shows the behaviour if only the optional argument Lkeyword{fullpage}
-is used. With this default setting the caption is always placed \textit{before} the following object. Depending to the
+Depending to the
used documentclass it can be a problem, if the caption should be placed on the first page.
In such a case use one of the other setting.
Table~\vref{tab:fullpage} shows the valid optional arguments for a full page floating object.
+
+
+
\begin{table}
\caption{Valid optional arguments for a full page object.}\label{tab:fullpage}
\centering
\begin{tabularx}{\linewidth}{>{\small\ttfamily}l|>{\small\ttfamily}l|X}\toprule
\rmfamily Name & \rmfamily Type & Description\\\midrule
- fullpage & true|false & places an object on an own page \\
- capPos & l|r|e|d & caption on l)eft (before object), r)ight (after object), e)ven or od)d page\\
- separatorLine & length & the length of the separation line between text and caption.
- With setting 0pt no line is used.\\
+\Lkeyword{fullpage} & true|false & Put the caption on the bottom of the preceding or following page and the object alone a page.\\
+
+\Lkeyword{multiFloat} & true|false & For multiple objects with captions for every object. See section~\vref{sec:multifloats}.\\
+
+\Lkeyword{subFloat} & true|false & For multiple objects with one main and more subcaptions. See section~\vref{sec:subfloats}.\\
+
+\Lkeyword{separatorLine} & true & Put a line with a predefined width of 0.4pt between
+ the text and the caption. Only valid for the keyword \Lkeyword{fullpage}.\\
+\Lkeyword{capPos} & l|L|r|R|e|d & caption on l)eft, L)EFT (before object), r)ight, R)IGHT (after object), e)ven or od)d page\\
\bottomrule
\end{tabularx}%
\end{table}
-In the following we use some blind text to show the other setting for full page objects.
-Such text has no meaning here.
-%\Blindtext
-\blindtext
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/default1s1c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/default1s1c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/default1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/default1s1c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/default1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/default1s1c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/default1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/default1s1c}}
+\caption{Output of \texttt{default1s1c} (pages 2--9)}\label{fig:fullpage0}
+
+
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/LEFT1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/LEFT1s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/LEFT1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/LEFT1s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/LEFT1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/LEFT1s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/LEFT1s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/LEFT1s1c}}
+\caption{Output of \texttt{LEFT1s1c} (pages 4--11)}\label{fig:fullpage1-LEFT}
+\end{figure}
+
+\begin{figure}[!htb]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/default2s1c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/default2s1c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/default2s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/default2s1c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/default2s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/default2s1c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/default2s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/default2s1c}}
+\caption{Output of \texttt{default2s1c} (twoside pages 2--9)}\label{fig:fullpage1}
+\end{figure}
+
+
+\FloatBarrier
+
+
+
\subsubsection{Using \Lkeyset{capPos=r}}
-The caption will be printed right which is the same as \textit{after} the full page object.
+The\marginpar{\raggedleft!!!} caption will be printed right side which is the same as \textit{after} the full page object.
+The object appers immediately on the next page and the caption of the next following page at the bottom. There
+is no check for an even or odd page. This behaviour makes only sense for a oneside document.
-
\begin{lstlisting}
\hvFloat[fullpage, capPos=r]%
{figure}%
- {\includegraphics[fullpage]{rose}}%
+ {\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption of a ``fullpage'' object, which follows on the next page.
This can be an even or odd page. And some more text whch has no
@@ -1203,94 +1353,245 @@
{fig:fullpage1}
\end{lstlisting}
+
+\iffalse
\Float[capPos=r]
\hvFloat[fullpage, capPos=r]%
{figure}%
- {\includegraphics[fullpage]{rose}}%
+ {\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
{A Caption of a ``fullpage'' object, which follows on the next page.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage1}
+\fi
-\Blindtext\Blindtext
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/right1s1c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/right1s1c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/right1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/right1s1c}}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/right1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/right1s1c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/right1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/right1s1c}}
+\caption{Output of \texttt{right1s1c} (pages 2--9)}\label{right1s1c}
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/RIGHT1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/RIGHT1s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/RIGHT1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/RIGHT1s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/RIGHT1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/RIGHT1s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/RIGHT1s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/RIGHT1s1c}}
+\caption{Output of \texttt{RIGHT1s1c} (pages 4--11)}\label{RIGHT1s1c}
+\end{figure}
+
+
+\begin{figure}[!htb]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/right2s1c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/right2s1c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/right2s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/right2s1c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/right2s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/right2s1c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/right2s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/right2s1c}}
+\caption{Output of \texttt{right2s1c} (twoside pages 2--9)}\label{right2s1c}
+\end{figure}
+
+
+\FloatBarrier
+
+
+
+
\subsubsection{Using \Lkeyset{capPos=e} --- caption on an even page}
-The caption will be printed on an even page, the object can appear before
-or after this caption.
+With \Lkeyset{capPos=e} the caption will be printed on an even (left) page,
+the object will always be on an odd (right) page.
+This option makes only real sense for The \Loption{twoside} mode!
\begin{lstlisting}
\hvFloat[fullpage, capPos=e]%
{figure}%
- {\includegraphics[fullpage]{rose}}%
- [A float which needs the complete page width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}
+ {\includegraphics[fullpage]{frose}}%
+ [A float whith a caption on an even page (left)]%
+ {A caption on an even (left) page of a ``fullpage'' object.. \blindtext}
{fig:fullpage3}
\end{lstlisting}
+\iffalse
\Float[capPos=e]
\hvFloat[fullpage, capPos=e]%
{figure}%
- {\includegraphics[fullpage]{rose}}%
- [A float which needs the complete page width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float whith a caption on an even page (left)]%
+ {A caption on an even (left) page of a ``fullpage'' object.. \blindtext}
{fig:fullpage3}
+\fi
-\Blindtext
-\Blindtext
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/even1s1c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/even1s1c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/even1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/even1s1c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/even1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/even1s1c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/even1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/even1s1c}}
+\caption{Output of \texttt{even1s1c} (pages 2--9)}\label{fig:fullpage6}
+
+
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/even2s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/even2s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/even2s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/even2s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/even2s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/even2s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/even2s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/even2s1c}}
+\caption{Output of \texttt{even2s1c} (pages 4--11)}\label{fig:fullpage8}
+
+\end{figure}
+
+
+\FloatBarrier
+
+
\subsubsection{Using \Lkeyset{capPos=d} --- caption on an odd page}
-The caption will be printed on an odd page, the object can appear before
-or after this caption.
+With \Lkeyset{capPos=d} the caption will be printed on an odd (right) page, the object will always be on an even (left) page,
+which is before the caption.
+This option makes only sense for The \Loption{twoside} mode!
\begin{lstlisting}
\hvFloat[fullpage, capPos=d]%
{figure}%
- {\includegraphics[fullpage]{rose}}%
+ {\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
+ {A Caption on an odd page of a ``fullpage'' object, which follows on the next page.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage2}
\end{lstlisting}
+
+
+\iffalse
\Float[capPos=d]
\hvFloat[fullpage, capPos=d]%
{figure}%
- {\includegraphics[fullpage]{rose}}%
+ {\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
+ {A Caption on an odd page of a ``fullpage'' object, which follows on the next page.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage2}
-\Blindtext\Blindtext\Blindtext
+\fi
+\begin{figure}
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/odd1s1c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/odd1s1c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/odd1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/odd1s1c}}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/odd1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/odd1s1c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/odd1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/odd1s1c}}
+\caption{Output of \texttt{odd1s1c} (pages 2--9)}\label{fig:fullpage10}
+\end{figure}
+
+
+
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/odd1s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/odd1s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}}
+\caption{Output of \texttt{odd1s2c} (pages 2--9)}\label{fig:fullpage11}
+%\end{figure}
+
+
+%\begin{figure}
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/odd2s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/odd2s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/odd2s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/odd2s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/odd2s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/odd2s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd2s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/odd2s1c}}
+\caption{Output of \texttt{odd2s1c} (pages 4--11)}\label{fig:fullpage12}
+\end{figure}
+
+
+\begin{figure}
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/odd2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/odd2s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}}
+\caption{Output of \texttt{odd2s2c} (pages 2--9)}\label{fig:fullpage13}
+\end{figure}
+
+
+
+\FloatBarrier
+
+
+\subsubsection{Using \Lkeyset{capPos=i} or \Lkeyset{capPos=o}--- caption on the inner or outer side}
+
+These settings make no sense in \Index{onecolumn} mode.
+
+
\subsection{Using the paper size}
With the macro \Lcs{IncludeGraphics}, which has the same syntax as the well-known \Lcs{includegraphics},
the width and height of the object are set to the paper dimensions \Ldim{paperwidth} and
-\Ldim{paperheight}.
+\Ldim{paperheight}. It can be used in one- and twosolumn mode!
+\begin{lstlisting}
+\Float[fullpage]
+\hvFloat[fullpage,capPos=l]{figure}%
+ {\IncludeGraphics{frose}}%
+ [A float which needs the complete paper width and height.]%
+ {A Caption of a ``fullpage'' object, which follows on the next page.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage4}
+\end{lstlisting}
-\Blindtext
-
-\Float[capPos=d]
-\hvFloat[fullpage, capPos=d]{figure}%
+\iffalse
+\Float[fullpage]
+\hvFloat[fullpage,capPos=l]{figure}%
{\IncludeGraphics{frose}}%
[A float which needs the complete paper width and height.]%
{A Caption of a ``fullpage'' object, which follows on the next page.
@@ -1297,28 +1598,257 @@
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage4}
+\fi
-\Blindtext
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
+\frame{\includegraphics[page=3,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
+\frame{\includegraphics[page=4,width=0.32\linewidth]{examples/paper-default1s1c}}
+
+\frame{\includegraphics[page=5,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.32\linewidth]{examples/paper-default1s1c}}
+
+\frame{\includegraphics[page=8,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.32\linewidth]{examples/paper-default1s1c}}
+\caption{Output of \texttt{paper-default1s1c} (pages 2--10)}\label{fig:fullpage14}
+\end{figure}
+
+
+\FloatBarrier
+
+
+
+\subsection{Multifloats}\label{sec:multifloats}
+Multifloats is the name for more than one image and/or tabular in \emph{one} floating
+environment. Every image and/or tabular has its own caption, which is different to
+a subcaption. The syntax for multiple floats is
+
+\begin{BDef}
+\Lcs{hvFloat}\OptArgs&+\Largb{float type}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label}\\
+&+\Largb{float type}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label}\\
+&+\ldots\\
+&+\Largb{float type}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label}
+\end{BDef}
+
+The + symbol defines an additional Object which will be part of the same floating environment.
+It's up too the user to be sure that one page or one column can hold all defined objects.
+Every object gets its own caption which is the reason why figures and tabulars and \ldots\
+can be mixed:
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img:demo0}%
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
+ L & R & C & P\\
+ left & right & center & Text with possible linebreaks\\
+ \multicolumn{4}{c}{Multicolumn over all columns}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo1}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo2}
+\end{lstlisting}
+
+\iffalse
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img:demo0}%
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
+ L & R & C & P\\
+ left & right & center & Text with possible linebreaks\\
+ \multicolumn{4}{c}{Multicolumn over all columns}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo1}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption D of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo2}
+\fi
+
+\begin{figure}[p]
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/multi-default1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/multi-default1s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/multi-default1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/multi-default1s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/multi-default1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-default1s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/multi-default1s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/multi-default1s1c}}
+\caption{Output of \texttt{multi-default1s1c} (pages 4--11)}\label{multi-default1s1c}
+
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/multi-right1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/multi-right1s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/multi-right1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/multi-right1s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/multi-right1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-right1s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/multi-right1s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/multi-right1s1c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}}
+\caption{Output of \texttt{multi-right1s1c} (pages 4--11)}\label{multi-right1s1c}
+\end{figure}
+
+
+
+
+
+The page with the objects has no additional informations it holds only the figures and/or tabulars.
+If you want it like subfigures or subtabulars then go to section~\vref{sec:subfloats}. The setting
+\Lcs{captionsetup}\Largb{\Lkeyset{singlelinecheck=false}} is needed if you want the captions always
+left aligned.
+
+
+\FloatBarrier
+
+
+\section{Subfloat page}\label{sec:subfloats}
+A subfloat page can have only one type of floats which will have one main caption and
+individual subcaptions. The syntax is similiar to the one for a multifloat page:
+
+
+\begin{BDef}
+\Lcs{hvFloat}\OptArgs&+\Largb{float type}\Largb{<empty>}\OptArg{short caption}\Largb{long caption}\Largb{label}\\
+&+\Largb{<empty>}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label}\\
+&+\ldots\\
+&+\Largb{<empty>}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label}
+\end{BDef}
+
+Some arguments are ignored for a subfloat, one can leave them empty. The first line defines only the type and the main caption,
+the object entry is ignored! All aditional lines will have the same float type, the reason why the
+float type entry is ignored.
+
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+\end{lstlisting}
+
+
+The keyword \Lkeyword{subFloat} defines the images or tabulars as subfloats.
+The package \Lpack{subcaption} is loaded by default and should be activated with
+\Lcs{captionsetup}\Largs{sub}\Largs{\Lkeyword{singlelinecheck}}.
+
+
+\iffalse
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+\fi
+
+\begin{figure}[p]
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/sub-default1s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/sub-default1s1c}}
+\caption{Output of \texttt{sub-default1s1c} (pages 4--11)}\label{sub-default1s1c}
+
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-right1s1c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-right1s1c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-right1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/sub-right1s1c}}
+
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/sub-right1s1c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/sub-right1s1c}}\hfill
+\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/sub-right1s1c}}\hfill
+\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/sub-right1s1c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}}
+\caption{Output of \texttt{sub-right1s1c} (pages 4--11)}\label{sub-right1s1c}
+\end{figure}
+
+
+
+\FloatBarrier
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\twocolumn[\section{Full page objects in twocolumn mode}]
+%\twocolumn[
+\section{Full page objects in twocolumn mode}%]
-The setting \Lkeyset{capPos=e} (even) or \Lkeyset{capPos=d} (odd) page for
-a document in twocolumn mode makes no real sense. For a twosided document a
-setting like \Lkeyset{capPos=i} for inner or \Lkeyset{capPos=o} for outer
-margin makes more sense.
+\subsection{Default setting}
+For the \Index{twocolumn} mode the caption can be in the left (first) or right (second) column.
+With the default which is equivalent to the setting \Lkeyset{capPos=l}, the caption is always placed \emph{before}
+the object. This can be the first or the second column.
+With \Lkeyset{capPos=L} it is possible to get the caption in the twocolumn mode always in
+the left (first) column (see figure~\vref{LEFT2s2c})
-\subsection{Using the textarea}
-For an image or table which needs the whole space of a page the caption can be
-printed at the bottom of the preceeding or following page. It is possible in
-oneside and twoside mode, nbut makes only real sense in the twoside mode.
-Without any additional argument the caption is set first and the object on the follwing page:
\begin{lstlisting}
\hvFloat[fullpage]{figure}%
@@ -1332,7 +1862,7 @@
\end{lstlisting}
-
+\iffalse
\Float[default]
\hvFloat[fullpage]{figure}%
{\includegraphics[width=\columnwidth,height=0.9\textheight]{frose}}%
@@ -1342,48 +1872,59 @@
text whch has no real meaning because it fills only the space for a long
caption.}%
{fig:fullpage0-2}
+\fi
-Figure~\vref{fig:fullpage0-2} shows the behaviour if only the optional argument \Lkeyword{fullpage}
-is used. With this default setting the caption is always placed \textit{before} the following object. Depending to the
-used documentclass it can be a problem, if the caption should be placed on the first page.
+\begin{figure}[!htb]
+%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/default2s2c}}\hfill
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/default2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/default2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/default2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/default2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/default2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/default2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/default2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/default2s2c}}
+\caption{Output of \texttt{default2s2c} (pages 2--9)}\label{default2s2c}
+\end{figure}
+
+
+%Figure~\vref{fig:fullpage0-2} shows the behaviour if only the optional argument \Lkeyword{fullpage}
+%in twocolumn mode is used. With this default setting the caption is always placed \textit{before} the following object.
+Depending to the
+used documentclass it can be a problem, if the caption should be placed on the first page of the whole document.
In such a case use one of the other setting.
Table~\vref{tab:fullpage} shows the valid optional arguments for a full page floating object.
In the following we use some blind text to show the other setting for full page objects.
Such text has no meaning here.
-\Blindtext
-\begin{lstlisting}
-\hvFloat[fullpage]{figure}%
- {\includegraphics[fullpage]{frose}}%
- [A second float which needs the complete column width and height.]%
- {A Caption of a second ``fullpage'' object, which follows on the next column.
- This is always the right column on an even or odd page. And some more
- text whch has no real meaning because it fills only the space for a long
- caption.}%
- {fig:fullpage0-222}
-\end{lstlisting}
+\begin{figure}%[p]
+%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/LEFT2s2c}}\hfill
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/LEFT2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/LEFT2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/LEFT2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/LEFT2s2c}}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/LEFT2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/LEFT2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/LEFT2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/LEFT2s2c}}
+\caption{Output of \texttt{LEFT2s2c} (pages 2--9)}\label{LEFT2s2c}
+\end{figure}
-\Float[default]
-\hvFloat[fullpage]{figure}%
- {\includegraphics[fullpage]{frose}}%
- [A second float which needs the complete column width and height.]%
- {A Caption of a second ``fullpage'' object, which follows on the next column.
- This is always the right column on an even or odd page. And some more
- text whch has no real meaning because it fills only the space for a long
- caption.}%
- {fig:fullpage0-222}
+\FloatBarrier
-\Blindtext
\subsubsection{Using \Lkeyset{capPos=r}}
-The caption will be printed right which is the same as \textit{after} the full page object.
+The caption will be printed always right of the object which is the same as \textit{after} the full page object.
+With \Lkeyset{capPos=R} it is possible to get the caption in the twocolumn mode always in
+the right (second) column (see figure~\vref{RIGHT2s2c})
\begin{lstlisting}
\hvFloat[fullpage, capPos=r]{figure}%
@@ -1396,6 +1937,8 @@
{fig:fullpage1-2}
\end{lstlisting}
+
+\iffalse
\Float[capPos=r]
\hvFloat[fullpage, capPos=r]{figure}%
{\includegraphics[fullpage]{rose}}%
@@ -1405,34 +1948,131 @@
text whch has no real meaning because it fills only the space for a long
caption.}%
{fig:fullpage1-2}
+\fi
-\Blindtext
-\begin{lstlisting}
-\hvFloat[fullpage, capPos=r]{figure}%
- {\includegraphics[fullpage]{rose}}%
- [A float which needs the complete column width and height.]%
- {A Caption of a ``fullpage'' object, which is on the left column.
- This is always the right column on an even or odd page. And some more
- text whch has no real meaning because it fills only the space for a long
- caption.}%
- {fig:fullpage1-2b}
-\end{lstlisting}
+\begin{figure}[p]
+%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/right2s2c}}\hfill
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/right2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/right2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/right2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/right2s2c}}
-\Float[capPos=r]
-\hvFloat[fullpage, capPos=r]{figure}%
- {\includegraphics[fullpage]{rose}}%
- [A float which needs the complete column width and height.]%
- {A Caption of a ``fullpage'' object, which is on the left column.
- This is always the right column on an even or odd page. And some more
- text whch has no real meaning because it fills only the space for a long
- caption.}%
- {fig:fullpage1-2b}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/right2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/right2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/right2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/right2s2c}}
+\caption{Output of \texttt{right2s2c} (pages 2--9)}\label{right2s2c}
+%\end{figure}
-\Blindtext
+%\begin{figure}%[p]
+%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/RIGHT2s2c}}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/RIGHT2s2c}}
+\caption{Output of \texttt{RIGHT2s2c} (pages 2--9)}\label{RIGHT2s2c}
+\end{figure}
+
+\FloatBarrier
+
+
+
+
+\subsubsection{Using \Lkeyset{capPos=e} --- caption on an even page}
+
+There can be a problem if there is not enough space on the bottom of the
+even page. Then the caption will be on the next page which is an odd one.
+In such a case use a manually \Lcs{clearpage} or wait for an update
+of \Lpack{hvfloat}.
+
+
+\iffalse
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/even1s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/even1s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/even1s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/even1s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/even1s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/even1s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/even1s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/even1s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/even1s2c}}
+\caption{Output of \texttt{even1s2c} (pages 2--9)}\label{even1s2c}
+\fi
+
+\begin{figure}
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/even2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/even2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/even2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/even2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/even2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/even2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/even2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/even2s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/even1s2c}}
+\caption{Output of \texttt{even2s2c} (pages 2--9)}\label{even2s2c}
+\end{figure}
+
+%\FloatBarrier
+
+
+\clearpage
+
+
+\subsubsection{Using \Lkeyset{capPos=d} --- caption on an odd page}
+
+There can be a problem if there is not enough space on the bottom of the
+even page. Then the caption will be on the next page which is an odd one.
+In such a case use a manually \Lcs{clearpage} or wait for an update
+of \Lpack{hvfloat}.
+
+
+\iffalse
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/odd1s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/odd1s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/odd1s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}}
+\caption{Output of \texttt{odd1s2c} (pages 2--9)}\label{odd1sc2}
+\fi
+
+\begin{figure}
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/odd2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/odd2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/odd2s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}}
+\caption{Output of \texttt{odd2s2c} (pages 2--9)}\label{odd2s2c}
+\end{figure}
+
+
+
+
+%\FloatBarrier
+\clearpage
+
+
\subsubsection{Using \Lkeyset{capPos=i} --- caption in the inner column}
The caption will be printed in the right column for an even page and
@@ -1447,6 +2087,7 @@
real meaning because it fills only the space for a long caption.}{fig:fullpage3-2}
\end{lstlisting}
+\iffalse
\Float[capPos=i]
\hvFloat[fullpage,capPos=i]{figure}%
{\includegraphics[fullpage]{rose}}%
@@ -1455,29 +2096,40 @@
right column.
This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}{fig:fullpage3-2}
+\fi
-\Blindtext
-\blindtext
-\begin{lstlisting}
-\hvFloat[fullpage, capPos=i]{figure}%
- {\includegraphics[fullpage]{rose}}%
- [A second float which needs the complete column width and height.]%
- {A Caption of a second ``fullpage'' object, which follows on the left or right column.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}{fig:fullpage3-22}
-\end{lstlisting}
+\begin{figure}
+%\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/inner1s2c}}\hfill
+%\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/inner1s2c}}\hfill
+%\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/inner1s2c}}\hfill
+%\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/inner1s2c}}
-\Float[capPos=i]
-\hvFloat[fullpage,capPos=i]{figure}%
- {\includegraphics[fullpage]{rose}}%
- [A second float which needs the complete column width and height.]%
- {A Caption of a second ``fullpage'' object, which follows on the left or right column.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}{fig:fullpage3-22}
+%\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/inner1s2c}}\hfill
+%\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/inner1s2c}}\hfill
+%\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/inner1s2c}}\hfill
+%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/inner1s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/inner1s2c}}
+%\caption{Output of \texttt{inner1s2c} (pages 2--9)}\label{inner1s2c}
-\Blindtext
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/inner2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/inner2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/inner2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/inner2s2c}}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/inner2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/inner2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/inner2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/inner2s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/inner1s2c}}
+\caption{Output of \texttt{inner2s2c} (pages 2--9)}\label{inner2s2c}
+\end{figure}
+
+
+%\FloatBarrier
+\clearpage
+
+
\subsubsection{Using \Lkeyset{capPos=o} --- caption on the outer column}
The caption will be printed on the left column an odd page, the object can appear before
@@ -1484,9 +2136,6 @@
or after this caption.
-
-
-
\begin{lstlisting}
\hvFloat[fullpage, capPos=o]{figure}%
{\includegraphics[fullpage]{rose}}%
@@ -1496,6 +2145,7 @@
real meaning because it fills only the space for a long caption.}{fig:fullpage2-2a}
\end{lstlisting}
+\iffalse
\Float[capPos=o]
\hvFloat[fullpage, capPos=o]{figure}%
{\includegraphics[fullpage]{rose}}%
@@ -1503,29 +2153,45 @@
{A Caption of a ``fullpage'' object, which has the caption position in the
outer page. This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}{fig:fullpage2-2a}
+\fi
-\Blindtext
-\begin{verbatim}
-\hvFloat[fullpage, capPos=o]{figure}%
- {\includegraphics[fullpage]{rose}}%
- [Again a float which needs the complete page width and height with \texttt{capPos=o}.]%
- {Again a caption of a ``fullpage'' object, which has the caption position in the
- outer page. This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}{fig:22a}
-\end{verbatim}
-\Float[capPos=o]
-\hvFloat[fullpage, capPos=o]{figure}%
- {\includegraphics[fullpage]{rose}}%
- [Again a float which needs the complete page width and height with \texttt{capPos=o}.]%
- {Again a caption of a ``fullpage'' object, which has the caption position in the
- outer page. This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}{fig:22a}
-\Blindtext
-\Blindtext
+\begin{figure}
+%\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/outer1s2c}}\hfill
+%\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/outer1s2c}}\hfill
+%\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/outer1s2c}}\hfill
+%\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/outer1s2c}}
+%
+%\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/outer1s2c}}\hfill
+%\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/outer1s2c}}\hfill
+%\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/outer1s2c}}\hfill
+%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/outer1s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/outer1s2c}}
+%\caption{Output of \texttt{outer1s2c} (pages 2--9)}\label{outer1s2c}
+
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/outer2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/outer2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/outer2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/outer2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/outer2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/outer2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/outer2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/outer2s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/outer1s2c}}
+\caption{Output of \texttt{outer2s2c} (pages 2--9)}\label{outer2s2c}
+\end{figure}
+
+
+\FloatBarrier
+
+
+\clearpage
+
+
\subsection{Using full page in twocolumn mode}
With the star version of \Lcs{hvfloat} The object ist placed over both columns, the whole page.
@@ -1533,60 +2199,275 @@
\begin{lstlisting}
-\hvFloat*[fullpage, capPos=o]{figure}%
+\hvFloat*[fullpage, capPos=i]{figure}%
{\includegraphics[FullPage]{rose}}%
- [Again a float which needs the complete page width and height with \texttt{capPos=o}.]%
- {Again a caption of a ``fullpage'' object, which has the caption position in the
- outer page. This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}{fig:two}
+ [A float which needs the complete page width and height with \texttt{capPos=o}.]%
+ {A caption of a ``fullpage'' object in twocolumn mode: It uses the star version
+ of \textbackslash hvFloat. The object goes over both columns.}{fig:two}
\end{lstlisting}
-\Float[capPos=o]
-\hvFloat*[fullpage, capPos=o]{figure}%
+\iffalse
+\Float[capPos=i]
+\hvFloat*[fullpage, capPos=i]{figure}%
{\includegraphics[FullPage]{rose}}%
- [Again a float which needs the complete page width and height with \texttt{capPos=o}.]%
- {Again a caption of a ``fullpage'' object, which has the caption position in the
- outer page. This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}{fig:two}
+ [Star version with \texttt{capPos=o}.]%
+ {A caption of a ``fullpage'' object in twocolumn mode: It uses the star version
+ of \textbackslash hvFloat. The object goes over both columns.}{fig:two}
-\Blindtext
-\Blindtext
-\blindtext
+\fi
+\begin{figure}
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-default2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-default2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-default2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-default2s2c}}
-\onecolumn
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-default2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-default2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-default2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-default2s2c}}
+%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-default2s2c}}
+\caption{Output of \texttt{paper-default2s2c} (pages 2--9)}\label{paper-default2s2c}
+\end{figure}
-\subsection{Using the paper size}
-With the macro \Lcs{IncludeGraphics} (two uppercase letters!), which has the same syntax as the well-known \Lcs{includegraphics},
-the width and height of the object are set to the paper dimensions \Ldim{paperwidth} and
-\Ldim{paperheight}.
+\begin{figure}[p]
+%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/paper-LEFT1s2c}}\hfill
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-LEFT1s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-LEFT1s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-LEFT1s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-LEFT1s2c}}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-LEFT1s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-LEFT1s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-LEFT1s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-LEFT1s2c}}
+\caption{Output of \texttt{paper-LEFT2s2c} (pages 2--9)}\label{paper-LEFT2s2c}
+%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/paper-RIGHT1s2c}}\hfill
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}
+\caption{Output of \texttt{paper-RIGHT2s2c} (pages 2--9)}\label{paper-RIGHT2s2c}
+\end{figure}
+
+
+\begin{figure}
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-inner2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-inner2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-inner2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-inner2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-inner2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-inner2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-inner2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-inner2s2c}}
+
+%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-inner1s2c}}
+\caption{Output of \texttt{paper-inner2s2c} (pages 2--9)}\label{paper-inner2s2c}
+\end{figure}
+
+
+\FloatBarrier
+
+
+\subsection{Multifloats}
+Multifloats is the name for more than one image and/or tabular in \emph{one} floating
+environment. Every image and/or tabular has its own caption, which is different to
+a subcaption.
+The + symbol defines an additional Object which will be part of the same floating environment.
+It's up too the user to be sure that one page or one column can hold all defined objects.
+Every object gets its own caption which is the reason why figures and tabulars and \ldots\
+can be mixed:
+
\begin{lstlisting}
-\hvFloat[fullpage]{figure}%
- {\IncludeGraphics{frose}}%
- [A float which needs the complete paper width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. The object uses the complete paper dimensions}%
- {fig:paper}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat,capPos=i]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
\end{lstlisting}
-\hvFloat[fullpage]{figure}%
- {\IncludeGraphics{frose}}%
- [A float which needs the complete paper width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. The object uses the complete paper dimensions}%
- {fig:paper}
-\Blindtext
+\iffalse
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat,capPos=i]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+\fi
+The page with the objects has no additional informations it holds only the figures and/or tabulars.
+If you want it like subfigures or subtabulars then go to section~\vref{sec:subfloats}. The setting
+\Lcs{captionsetup}\Largb{\Lkeyset{singlelinecheck=false}} is needed if you want the captions always
+left aligned.
+
+
+\begin{figure}%[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/multi-default2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-default2s2c}}
+%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-default2s2c}}
+\caption{Output of \texttt{multi-default2s2c} (pages 2-9)}\label{multi-defaults2s2c}
+
+%\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+%\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+%\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+%\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/multi-inner2s2c}}%%
+
+%\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+%\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+%\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-inner2s2c}}
+%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-inner2s2c}}
+%\caption{Output of \texttt{multi-inner2s2c} (pages 2-9)}\label{multi-inners2s2c}
+\end{figure}
+
+
+\clearpage
+
+\section{Subfloat page}
+A subfloat page can have only one type of floats which will have one main caption and
+individual subcaptions.
+Some arguments are ignored for a subfloat, one can leave them empty. The first line defines only the type and the main caption,
+the object entry is ignored! All aditional lines will have the same float type, the reason why the
+float type entry is ignored.
+
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo00}%
+ +{}{\includegraphics[height=0.28\textheight]{rose}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[height=0.28\textheight]{rose}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo10}
+ +{}{\includegraphics[height=0.28\textheight]{rose}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo20}
+\end{lstlisting}
+
+
+The keyword \Lkeyword{subFloat} defines the images or tabulars as subfloats.
+The package \Lpack{subcaption} is loaded by default. For the subcaptions the \Lkeyword{singlelinecheck}
+should be true (see listing).
+
+\iffalse
+\captionsetup[sub]{singlelinecheck}
+\Float[subFloat]
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]%
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {sub:demo00}%
+ +{}{\includegraphics[height=0.28\textheight]{rose}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}%
+ {}%
+ +{}{\includegraphics[height=0.28\textheight]{rose}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {sub:demo10}
+ +{}{\includegraphics[height=0.28\textheight]{rose}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo20}
+\fi
+
+
+
+\begin{figure}[p]
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/sub-default2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/sub-default2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-default2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-default2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-default2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/sub-default2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/sub-default2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/sub-default2s2c}}
+\caption{Output of \texttt{sub-default2s2c} (pages 2--9)}\label{sub-default2s2c}
+
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/sub-right2s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/sub-right2s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-right2s2c}}\hfill
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-right2s2c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-right2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/sub-right2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/sub-right2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/sub-right2s2c}}
+%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd2s2c}}
+\caption{Output of \texttt{sub-right2s2c} (pages 2--9)}\label{sub-right2s2c}
+\end{figure}
+
+
+
+\FloatBarrier
+
+
+
+
+
\section{References to the page}\label{varioref}
%Whith loading package \texttt{hyperref} references to floating objects with a caption left or right of the object
%are no problem in difference to captions below othe object or on another page (using \texttt{fullpage} option).
@@ -1596,36 +2477,48 @@
the object is set. Let's assume that we use something like
\begin{verbatim}
-\hvFloat[fullpage]{figure}{\includegraphics{rose}}{A Caption}{fig:demo}
+\setDefaults
+\hvFloat[fullpage,capPos=e]{figure}%
+ {\IncludeGraphics{frose}}%
+ [A float which needs the complete paper width and height.]%
+ {A Caption of a ``fullpage'' object, which follows on the next page.
+ This can be an even or odd page. The object uses the complete paper dimensions}%
+ {demo:fullpage}
\end{verbatim}
-The label \texttt{fig:demo} is used for the \emph{image} and not for the caption! Internally another label
-called \texttt{fig:demo-cap} is set on the caption page which can be before or
+The label \texttt{demo:fullpage} is used for the \emph{image} and not for the caption! Internally another label
+called \texttt{demo:fullpage-cap} is set on the caption page which can be before or
behind the opject (depending to the optional argument of \Lkeyword{capPos}).
For example:
\begin{verbatim}
-The caption of figure~\ref{fig:fullpage0-cap} is on page~\pageref{fig:fullpage0-cap}, but
-the image itself is on page~\pageref{fig:fullpage0}.
+The caption of figure~\ref{demo:fullpage-cap} is on page~\pageref{demo:fullpage-cap}, but
+the image itself is on page~\pageref{demo:fullpage}.
\end{verbatim}
-The caption of figure~\ref{fig:fullpage0-cap} is on page~\pageref{fig:fullpage0-cap}, but
-the image itself is on page~\pageref{fig:fullpage0}.
-Whith the package \Lpack{varioref} one can % an additional
-%command \Lcs{fltref} is defined which uses a combination of \CMD{ref} and \CMD{vpageref}
-get something like: see figure~\vref{fig:fullpage2}, which uses a correct page number
-of the floatinmg object and not the caption page number which is~\vpageref{fig:fullpage2-cap}.
+The caption of figure~\ref{demo:fullpage-cap} is on page~\pageref{demo:fullpage-cap}, but
+the image itself is on page~\pageref{demo:fullpage}.
+With package \Lpack{varioref} it is:
-
\begin{verbatim}
-Whith the package \Lpack{varioref} one can % an additional
-get something like: see figure~\vref{fig:fullpage2}, which uses a correct page number
-of the floatinmg object and not the caption page number which is~\vpageref{fig:fullpage2-cap}.
+Whith the package \Lpack{varioref} (\url{https://ctan.org/pkg/varioref})
+one can get something like: see figure~\vref{demo:fullpage}, which uses a
+correct page number of the floatinmg object and not the caption
+page number which is~\vpageref{demo:fullpage-cap}.
+The figure~\ref{demo:fullpage} is on page~\pageref{demo:fullpage}
+and the caption on page~\pageref{demo:fullpage-cap}
\end{verbatim}
+Whith the package \Lpack{varioref} (\url{https://ctan.org/pkg/varioref})
+one can get something like: see figure~\vref{demo:fullpage}, which uses a
+correct page number of the floating object and not the caption
+pagenumber which is~\vpageref{demo:fullpage-cap}.
+The figure~\ref{demo:fullpage} is on page~\pageref{demo:fullpage}
+and the caption on page~\pageref{demo:fullpage-cap}
+\FloatBarrier
\section{Defining a style}
@@ -1676,6 +2569,17 @@
+\setDefaults
+\hvFloat[fullpage]{figure}%
+ {\IncludeGraphics{frose}}%
+ [A float which needs the complete paper width and height.]%
+ {A Caption of a ``fullpage'' object, which follows on the next page.
+ This can be an even or odd page. The object uses the complete paper dimensions}%
+ {demo:fullpage}
+
+
+
+
\printindex
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2019-03-21 20:47:41 UTC (rev 50506)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2019-03-21 20:48:00 UTC (rev 50507)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 964 2019-03-14 11:37:36Z herbert $
+%% $Id: hvfloat.sty 988 2019-03-20 21:34:05Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hvfloat}[2019/02/03 rotating of floating objects]
@@ -7,7 +7,7 @@
%%
%% This is file `hvfloat.sty',
%%
-%% Herbert Voss <hvoss at tug.de>
+%% Herbert Voss <hvoss at tug.org>
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -16,8 +16,8 @@
%% DESCRIPTION:
%% `hvfloat' offers rotating of captions and objects for floats
%%
-\def\fileversion{2.00}
-\def\filedate{2019/03/14}
+\def\fileversion{2.10}
+\def\filedate{2019/03/20}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
%
\newif\ifhv at fbox \hv at fboxfalse
@@ -27,18 +27,20 @@
\ProcessOptions
+\PassOptionsToPackage{hypcap}{caption}
+\RequirePackage{caption}
+\PassOptionsToPackage{hypcap}{subcaption}
+\RequirePackage{subcaption}
\ifhv at hyperref
\RequirePackage{hyperref}
- \RequirePackage{hypcap}
-% \newcommand\fltref[1]{\ref{#1}\vpageref{#1-flt}}%%
+% \RequirePackage{hypcap}
\fi
-\AtBeginDocument{\providecommand\capstart{}}% in no hyperref/hypcap is loaded
+%\AtBeginDocument{\providecommand\capstart{}}% in no hyperref/hypcap is loaded
%
+\RequirePackage{expl3,multido}
\RequirePackage{graphicx}
-
\RequirePackage{xkeyval}
-\RequirePackage{caption}
\RequirePackage{ifoddpage}
%
\RequirePackage{afterpage}
@@ -46,6 +48,7 @@
\newlength\hvObjectWidth
\newlength\hvCapWidth
\newlength\hvWideWidth
+\newlength\hvMultiFloatSkip
\newlength\hvMaxCapWidth
\newsavebox\hvObjectBox
@@ -52,20 +55,14 @@
\newsavebox\hvCaptionBox
\newsavebox\hvOBox
%
-\newif\ifhv at useOBox
-\newif\ifhv at nonFloat
-\newif\ifhv at onlyText
-\newif\ifhv at wide
-\newif\ifhv at fullpage
-\newif\ifhv at FullPage
\newif\ifhv at capbeside \hv at capbesidefalse
-\newif\ifhv at separatorLine \hv at separatorLinetrue
-\newif\ifhv at objectFrame \hv at objectFramefalse
\def\hv at Top{t}
\def\hv at Bottom{b}
\def\hv at Right{r}
+\def\hv at RIGHT{R}
\def\hv at Left{l}
+\def\hv at LEFT{L}
\def\hv at Center{c}
\def\hv at Outer{o}
\def\hv at Inner{i}
@@ -95,12 +92,12 @@
\def\hvSet at capPos{#1}% it is relativ to the object, (e),(d) only valid for fullpage float
\edef\@tempa{#1}%
\ifx\hv at Bottom\@tempa
- \global\hv at capbesidefalse
+ \hv at capbesidefalse
\else
\ifx\hv at Top\@tempa
- \global\hv at capbesidefalse
+ \hv at capbesidefalse
\else
- \global\hv at capbesidetrue
+ \hv at capbesidetrue
\fi
\fi
}
@@ -116,32 +113,23 @@
\define at key{hvSet}{floatCapSep}[5]{% a width with the unit pt
\def\hvSet at floatCapSep{#1}%
}
-\define at key{hvSet}{useOBox}[true]{% use of the hvOBox contents
- \@nameuse{hv at useOBox#1}%
+\define at key{hvSet}{multiFloatSkip}[\normalbaselineskip]{% a width with the unit pt
+ \setlength\hvMultiFloatSkip{#1}%
}
-\define at key{hvSet}{nonFloat}[true]{% Do not use float environment
- \@nameuse{hv at nonFloat#1}%
-}
-\define at key{hvSet}{onlyText}[false]{% Write the caption only as text
- \@nameuse{hv at onlyText#1}%
-}
-\define at key{hvSet}{wide}[true]{% Write the caption only as text
- \@nameuse{hv at wide#1}%
-}
-\define at key{hvSet}{fullpage}[true]{% fullpage float with caption on other page
- \@nameuse{hv at fullpage#1}%
-% \def\hvSet at capWidth{n}%
-}
-\define at key{hvSet}{FullPage}[true]{% fullpage float with caption on other page
- \@nameuse{hv at FullPage#1}%
-% \def\hvSet at capWidth{n}%
-}
-\define at key{hvSet}{separatorLine}[true]{% separator line for caption of a full page float
- \@nameuse{hv at separatorLine#1}%
+\define at boolkey{hvSet}[hv@]{useOBox}[true]{}% use of the hvOBox contents
+\define at boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment
+\define at boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text
+\define at boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text
+\define at boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page
+\define at boolkey{hvSet}[hv@]{FullPage}[true]{}% fullpage float with caption on other page
+\define at boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats
+ \ifhv at subFloat\setkeys{hvSet}{multiFloat=false}\fi%
}%
-\define at key{hvSet}{objectFrame}[true]{% a frame around the object with no separation
- \@nameuse{hv at objectFrame#1}%
+\define at boolkey{hvSet}[hv@]{multiFloat}[true]{% typeset values as continous floats
+ \ifhv at multiFloat\setkeys{hvSet}{subFloat=false}\fi%
}%
+\define at boolkey{hvSet}[hv@]{separatorLine}[true]{}% separator line for caption of a full page float
+\define at boolkey{hvSet}[hv@]{objectFrame}[true]{}% a frame around the object with no separation
\define at key{hvSet}{style}{%
\@ifundefined{hv@#1}%
{\errmessage{Custom style `#1' undefined}}%
@@ -149,19 +137,27 @@
\edef\x{\endgroup\noexpand\setkeys{hvSet}{\@nameuse{hv@#1}}}\x}% use a defined style
}
-\def\hvset#1{\setkeys{hvSet}{#1}}
+
+\def\hv at set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x}
%
\def\defhvstyle#1#2{\@namedef{hv@#1}{#2}}
%
\newcommand{\setDefaults}{%
- \hvset{%
+ \hv at set{%
floatPos=htbp, rotAngle=0, capWidth=n, capAngle=0,
capPos=b, capVPos=c, objectPos=c, objectAngle=0,
floatCapSep=5, useOBox=false, nonFloat=false,
onlyText=false, wide=false, fullpage=false, FullPage=false,
- separatorLine,objectFrame=false}%
+ multiFloat=false,subFloat=false,
+ separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip,
+}%
}
+\newcommand\reset at special@float{%
+ \hv at set{subFloat=false,fullpage=false,FullPage=false,multiFloat=false}}
+
+\def\hv at vskip{\vspace{\hvMultiFloatSkip}}
+
%
\newlength\hvAboveCaptionSkip
\newlength\hvBelowCaptionSkip
@@ -184,9 +180,9 @@
}
%
\newcommand\figcaption[2][]{\def\@captype{figure}%
- \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi}
+ \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup}
\newcommand\tabcaption[2][]{\def\@captype{table}%
- \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi}
+ \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup}
%
\newlength\hv at maxImageWidth
\AtBeginDocument{\hv at maxImageWidth=\columnwidth}
@@ -252,20 +248,16 @@
\fi
}
-\newif\if at hvstar
+\newif\ifhv at star
+\newif\if at hvsubstar
+\setDefaults
\def\hvFloat{\@ifnextchar*%
- {\@hvstartrue
- \hv at maxImageWidth=\textwidth
- \hvFloat at i}%
- {\@hvstarfalse
- \hv at maxImageWidth=\columnwidth
- \hvFloat at i*}%
+ {\hv at startrue\hv at maxImageWidth=\textwidth\hvFloat at i}%
+ {\hv at starfalse\hv at maxImageWidth=\columnwidth\hvFloat at i*}%
}
-\setDefaults
-
-%\newcommand*{\hvFloat}[5][]{%
+%\newcommand*{\hvFloat}[5][]+{%
% [#1}: keyvalues
% #2: type figure | table | ...
% #3: float contents
@@ -274,12 +266,86 @@
% #6: label
%
\def\hvFloat at i*{\@ifnextchar[{\do at hvFloat}{\do at hvFloat[]}}
-\def\do at hvFloat[#1]#2#3{%
+
+\def\do at hvFloat[#1]{%
\begingroup
\setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
\hv at maxImageWidth=\textwidth
- \global\hv at capbesidefalse
+ \hv at capbesidefalse
+ \reset at special@float
+ \setcounter{hv at pfigure}{\value{figure}}%
+ \setcounter{hv at ptable}{\value{table}}%
+ \gdef\hv at save@setting{#1}%
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
+%\ifhv at multiFloat\typeout{>>>>>>>>multiFloat!!}\else\typeout{>>>>>>>> KEIN MultiFloat!}\fi%
+ \gdef\hv at floatType{figure}%
+ \@ifnextchar+{\do at multiFloat}{\hvFloat at ii[#1]}}
+
+\ExplSyntaxOn
+
+\def\do at multiFloat+#1#2{%
+ \clist_set:Nn\l_clist_Type{{#1}}%
+ \clist_set:Nn\l_clist_Object{{#2}}%
+ \@ifnextchar[\do at multiFloat@i{\do at multiFloat@i[]}%
+}
+\def\do at multiFloat@i[#1]#2#3{% lof-caption, caption,label
+ \ifx\relax#1\relax
+ \clist_set:Nn\l_clist_LofCaption{{}}%
+ \else
+ \clist_set:Nn\l_clist_LofCaption{{#1}}%
+ \fi
+ \clist_set:Nn\l_clist_Caption{{#2}}%
+ \ifx\relax#3\relax
+ \clist_set:Nn\l_clist_Label{{}}%
+ \else
+ \clist_set:Nn\l_clist_Label{{#3}}%
+ \fi
+ \@ifnextchar+{\do at multiFloat@ii}{}%
+}
+\def\do at multiFloat@ii+#1#2{%
+ \clist_put_right:Nn\l_clist_Type{{#1}}%
+ \clist_put_right:Nn\l_clist_Object{{#2}}%
+ \@ifnextchar[\do at multiFloat@iii{\do at multiFloat@iii[]}%
+}
+
+\def\do at multiFloat@iii[#1]#2#3{% lof-caption, caption, label
+ \ifx\relax#1\relax
+ \clist_put_right:Nn\l_clist_LofCaption{{}}%
+ \else
+ \clist_put_right:Nn\l_clist_LofCaption{{#1}}%
+ \fi
+ \clist_put_right:Nn\l_clist_Caption{{#2}}%
+ \ifx\relax#3\relax
+ \clist_put_right:Nn\l_clist_Label{{}}%
+ \else
+ \clist_put_right:Nn\l_clist_Label{{#3}}%
+ \fi
+ \@ifnextchar+\do at multiFloat@ii%
+ {\def\hvSet at CapWidth{n}%
+ \do@@@@hvFloat}%
+}
+\ExplSyntaxOff
+
+
+\newcounter{hv at pfigure}
+\newcounter{hv at ptable}
+\newcounter{subhv at pfigure}
+\newcounter{subhv at ptable}
+
+\def\drawSepLine{%
+ \noindent
+ \if at twocolumn\rule{\columnwidth}{0.4pt}\else\rule{\linewidth}{0.4pt}\fi
+ \vspace{0pt}%
+}
+
+\newcount\hv at cnta
+\newcount\hv at cntb
+
+
+\def\hvFloat at ii[#1]#2#3{%
+ \hv at maxImageWidth=\textwidth
+ \hv at capbesidefalse
+ \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
\gdef\hv at floatType{#2}%
\ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi
\gdef\hv at floatObject{#3}%
@@ -339,7 +405,7 @@
\else
\ifhv at capbeside
\ifhv at wide
- \setlength\hvCapWidth{\hvSet at capWidth\hv at WideWidth}%
+ \setlength\hvCapWidth{\hvSet at capWidth\hvWideWidth}%
\setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet at floatCapSep pt\relax}%
\else
\setlength\hvCapWidth{\hvSet at capWidth\columnwidth}%
@@ -350,7 +416,7 @@
\fi
\else
\ifhv at wide
- \setlength\hvCapWidth{\hvSet at capWidth\hv at WideWidth}%
+ \setlength\hvCapWidth{\hvSet at capWidth\hvWideWidth}%
\else
\setlength\hvCapWidth{\hvSet at capWidth\columnwidth}%
\fi
@@ -375,7 +441,7 @@
\let\@captype\hv at floatType
\expandafter\ifx\expandafter\relax\hv at shortCap\relax \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}\fi
\fi
- \label{\hv at label}%
+ \expandafter\label\expandafter{\hv at label}%
\end{minipage}%
}%
\else
@@ -518,12 +584,12 @@
\else
\rotatebox{\hvSet at rotAngle}{\usebox{\@tempboxa}}%
\fi
- \ifhv at nonFloat
- \ifx\hvSet at objectPos\hv at Center
- \ifhv at nonFloat
+ \ifhv at nonFloat
+ \ifx\hvSet at objectPos\hv at Center
+ \ifhv at nonFloat
\hspace{\fill}%
- \fi
\fi
+ \fi
\endgroup% End the nonfloat part
\else
\end{\hv at floatType}% End the floating environment
@@ -535,84 +601,7 @@
{\minipage{#1}\center}
{\endcenter\endminipage}
%
-\newcounter{hvpfigure}
-\newcounter{hvptable}
-
-\def\drawSepLine{%
- \noindent
- \if at twocolumn\rule{\columnwidth}{0.4pt}\else\rule{\linewidth}{0.4pt}\fi
- \vspace{0pt}%
-}
-
-\def\set at caption@object{% first caption, then object
- \begin{\hv at floatType}[!b]
- \capstart
- \belowcaptionskip=0pt% local change
- \ifhv at separatorLine\drawSepLine\fi
- \expandafter\ifx\expandafter\relax\hv at shortCap\relax
- \caption{\hv at longCap}%
- \else
- \caption[\hv at shortCap]{\hv at longCap}%
- \fi
- \expandafter\ifx\expandafter\relax\hv at label\relax\else
- \label{\hv at label-cap}\fi
- \end{\hv at floatType}%
-%
- \if at hvstar
- \begin{\hv at floatType*}[!p]
- \else
- \begin{\hv at floatType}[!p]
- \fi
- \edef\@captype{hvp\@captype}%
- \capstart
- \refstepcounter{\@captype}%
- \expandafter\ifx\expandafter\relax\hv at label\relax\else
- \expandafter\label\expandafter{\hv at label}%
- \fi
- \ifhv at objectFrame\frame{\hv at floatObject}\else\hv at floatObject\fi
- \if at hvstar
- \end{\hv at floatType*}%
- \else
- \end{\hv at floatType}%
- \fi
-}
-\def\set at object@caption{% first object, then caption
- \if at hvstar
- \begin{\hv at floatType*}[!p]
- \else
- \begin{\hv at floatType}[!p]
- \fi
- \edef\@captype{hvp\@captype}%
- \capstart
- \refstepcounter{\@captype}%
- \expandafter\ifx\expandafter\relax\hv at label\relax\else
- \expandafter\label\expandafter{\hv at label}%
- \fi
- \ifhv at objectFrame\frame{\hv at floatObject}\else\hv at floatObject\fi
- \if at hvstar
- \end{\hv at floatType*}%
- \else
- \end{\hv at floatType}%
- \fi
-%
- \begin{\hv at floatType}[!b]
- \capstart
- \belowcaptionskip=0pt% local change
- \ifhv at separatorLine\drawSepLine\fi
- \expandafter\ifx\expandafter\relax\hv at shortCap\relax
- \caption{\hv at longCap}%
- \else
- \caption[\hv at shortCap]{\hv at longCap}%
- \fi
- \expandafter\ifx\expandafter\relax\hv at label\relax\else
- \label{\hv at label-cap}
- \fi
- \end{\hv at floatType}%
-}
-%
\def\do@@@@hvFloat{% special float page: caption <-> fullpage image
-% \typeout{hvfloat: \hvSet at capPos}%
-% \ifoddpage\typeout{hvfloat: Oddpage}\else\typeout{hvfloat: Evenpage}\fi
\ifx\hvSet at capPos\hv at Right \hv@@capPos=1
\else
\ifx\hvSet at capPos\hv at Even \hv@@capPos=2
@@ -623,59 +612,98 @@
\else
\ifx\hvSet at capPos\hv at Outer \hv@@capPos=5
\else
- \hv@@capPos=0
+ \ifx\hvSet at capPos\hv at RIGHT \hv@@capPos=6
+ \else
+ \ifx\hvSet at capPos\hv at LEFT \hv@@capPos=7
+ \else
+ \hv@@capPos=0
+ \fi
+ \fi
\fi
\fi
\fi
\fi
\fi
+%\ifhv at multiFloat\typeout{>>>>do@@@@hvFloat: multiFloatTRUE}\else\typeout{>>>>do@@@@hvFloat: multiFloatFALSE}\fi
\checkoddpage
- \ifcase\hv@@capPos% caption before object 0->left
- \if at twocolumn
- \if at firstcolumn
- \ifhv at FullPage\afterpage{\set at caption@object}\else\set at caption@object\fi
- \else
- \afterpage{\set at caption@object}%
- \fi
- \else
+ \ifcase\hv@@capPos% caption before object 0-> _always_ left
+ \set at caption@object
+ \or% caption after object 1-> _always_ right
+ \set at object@caption
+ \or% caption on even page 2-> left page
+ \ifoddpage
+ \afterpage{\set at caption@object}%
+ \else% we are on an even page
\set at caption@object
\fi
- \or% caption after object 1->right
- \if at twocolumn
- \if at firstcolumn
- \afterpage{\null\afterpage{\set at object@caption}}%
- \else
- \set at object@caption%
+ \or% caption on odd page 3->right page
+ \if at twoside
+ \if at twocolumn
+ \ifoddpage
+ \if at firstcolumn% on right side
+ \set at caption@object
+ \else
+ \afterpage{\null\set at object@caption}% start next column
+ \fi
+ \else% left (even) page
+ \if at firstcolumn
+ \afterpage{\set at object@caption}% start next column
+ \else
+ \set at object@caption
+ \fi
+ \fi
+ \else % onecolumn
+ \ifoddpage
+ \set at object@caption
+ \else
+ \afterpage{\set at object@caption}
+ \fi
\fi
- \else
- \set at object@caption
- \fi
- \or% caption on even page 2->left page
- \ifoddpage\set at object@caption\else\set at caption@object\fi
- \or% caption on odd page 3->right page
- \ifoddpage\set at caption@object\else\afterpage{\set at caption@object}\fi
+ \else % oneside
+ \if at twocolumn
+ \ifoddpage
+ \if at firstcolumn% on right side
+ \set at caption@object
+ \else
+ \set at object@caption%
+ \fi
+ \else
+ \if at firstcolumn% on left side
+ \afterpage{\set at object@caption}
+ \else
+ \set at object@caption%
+ \fi
+ \fi
+ \else % onecolumn
+ \ifoddpage
+ \set at caption@object
+ \else
+ \set at object@caption
+ \fi
+ \fi
+ \fi
\or% caption on the inner column 4->inner
\if at twocolumn
\ifoddpage
- \if at firstcolumn
+ \set at object@caption
+ \else
+ \if at firstcolumn% on right side
+ \afterpage{\null\set at caption@object}% start next column
+ \else% left page/column
\set at caption@object
- \else
- \afterpage{\set at object@caption}%
\fi
- \else% even page (left)
- \afterpage{%
- \if at firstcolumn
- \set at caption@object
- \else
- \afterpage{\set at caption@object}%
- \fi
- }%
\fi
+ \else % onecolumn
+ \set at caption@object
\fi
- \or% caption on the outer column
+ \or% caption on the outer column 5->outer
\if at twocolumn
\ifoddpage
- \afterpage{\if at firstcolumn\set at caption@object\else\afterpage{\set at caption@object}\fi}%
+ \if at firstcolumn
+ \afterpage{\null\set at caption@object}%
+ \else
+ \set at caption@object%
+ \fi
\else% even page (left)
\if at firstcolumn
\set at caption@object
@@ -683,11 +711,248 @@
\afterpage{\set at object@caption}%
\fi
\fi
+ \else
+ \set at caption@object
\fi
+ \or% caption after object 6->RIGHT for twoside/twocolumn
+ \if at twocolumn
+ \if at firstcolumn
+ \afterpage{\set at object@caption}%
+ \else
+ \set at object@caption
+ \fi
+ \else% always caption _after_ object for onecolumn
+ \set at object@caption
+ \fi
+ \or% caption before object 7->LEFT for twoside/twocolumn
+ \if at twocolumn
+ \if at firstcolumn
+ \set at caption@object
+ \else
+ \afterpage{\set at caption@object}
+ \fi
+ \else% onecolumn
+ \ifoddpage
+ \afterpage{\set at caption@object}%
+ \else
+ \set at caption@object
+ \fi
+ \fi
\fi
\endgroup% startet at main \hvFloat
}%
%
+\ExplSyntaxOn
+\def\getMultiCaptionAndLabel{%}
+ \hv at cntb=\clist_count:N\l_clist_Type
+ \advance\hv at cntb by \@ne
+ \hv at cnta=1
+ \begingroup
+ \loop
+ \edef\@captype{\clist_item:Nn\l_clist_Type{\hv at cnta}}
+ \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{\hv at cnta}}%
+ \ifx\@tempa\@empty
+ \caption{\clist_item:Nn\l_clist_Caption{\hv at cnta}}%
+ \else
+ \expandafter\caption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{\hv at cnta}}%
+ \fi
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv at cnta}}%
+ \ifx\@tempa\@empty
+ \else
+ \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv at cnta}-cap}\fi
+ \advance\hv at cnta by \@ne
+ \ifnum\hv at cnta<\hv at cntb
+ \repeat
+ \endgroup
+}
+\def\getMultiObjectAndLabel{%
+ \hv at cntb=\clist_count:N\l_clist_Type
+ \advance\hv at cntb by \@ne
+ \hv at cnta=1
+% \clist_show:N\l_clist_Label
+% ist bereits gesetzt! \edef\@captype{hv at p\@captype}
+ \loop
+ \def\@temp{\clist_item:Nn\l_clist_Object{\hv at cnta}}%
+ \ifhv at objectFrame\frame{\@temp}\else\@temp\fi
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv at cnta}}%
+ \ifx\@tempa\@empty
+ \else
+ \refstepcounter{\@captype}%
+ \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv at cnta}}%
+ \fi
+ \ifnum\hv at cnta<\clist_count:N\l_clist_Type\par\hv at vskip\fi
+ \advance\hv at cnta by \@ne
+ \ifnum\hv at cnta<\hv at cntb
+ \repeat
+}
+
+\def\getMultiSubCaptionAndLabel{%
+ \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
+ \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{1}}%
+ \ifx\@tempa\@empty
+ \caption{\clist_item:Nn\l_clist_Caption{1}}%
+ \else
+ \expandafter\caption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{1}}%
+ \fi
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}%
+ \ifx\@tempa\@empty\else\expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{1}-cap}\fi
+}
+
+\def\getMultiSubObjectAndLabel{%
+% \clist_show:N\l_clist_Object
+ \hv at cntb=\clist_count:N\l_clist_Caption
+ \advance\hv at cntb by \@ne
+ \hv at cnta=2
+ \loop
+ \begingroup
+ \def\@temp{\clist_item:Nn\l_clist_Object{\hv at cnta}}%
+ \ifhv at objectFrame\frame{\@temp}\else\@temp\fi
+ \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{\hv at cnta}}%
+ \ifx\@tempa\@empty
+ \subcaption{\clist_item:Nn\l_clist_Caption{\hv at cnta}}%
+ \else
+ \expandafter\subcaption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{\hv at cnta}}%
+ \fi
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv at cnta}}%
+ \ifx\@tempa\@empty
+ \else
+ \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv at cnta}}%
+ \fi
+ \endgroup
+ \ifnum\hv at cnta<\clist_count:N\l_clist_Type\par\hv at vskip\fi
+ \advance\hv at cnta by \@ne
+ \ifnum\hv at cnta<\hv at cntb
+ \repeat
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}% the main label at the end
+ \ifx\@tempa\@empty
+ \else
+%\typeout{>>>>>>>>>>>>>>>>>>>>>>>>>\@captype}%
+% bereits gesetzt \edef\@captype{hv at p\@captype}
+ \refstepcounter{\@captype}
+ \expandafter\label\expandafter{\@tempa}%
+ \fi
+}
+
+\ExplSyntaxOff
+
+\def\set at caption@object{% first caption, then object
+ \begin{\hv at floatType}[!b]
+% \capstart
+ \belowcaptionskip=0pt% local change
+ \ifhv at separatorLine\drawSepLine\fi
+ \ifhv at multiFloat
+% \edef\@captype{hv at p\@captype}
+ \getMultiCaptionAndLabel
+ \else
+ \ifhv at subFloat
+ \getMultiSubCaptionAndLabel
+ \else
+ \expandafter\ifx\expandafter\relax\hv at shortCap\relax
+ \caption{\hv at longCap}%
+ \else
+ \caption[\hv at shortCap]{\hv at longCap}%
+ \fi
+ \expandafter\ifx\expandafter\relax\hv at label\relax\else
+ \label{\hv at label-cap}
+ \fi
+ \fi
+ \fi
+ \end{\hv at floatType}%
+%
+ \ifhv at star
+ \begin{\hv at floatType*}[!p]
+ \else
+ \begin{\hv at floatType}[!p]
+ \fi
+% \ifhv at subFloat
+% \else
+ \edef\@captype{hv at p\@captype}
+% \fi
+% \capstart
+ \ifx\hvSet at objectPos\hv at Right\raggedleft\else
+ \ifx\hvSet at objectPos\hv at Left\raggedleft\else
+ \ifx\hvSet at objectPos\hv at Center\centering
+ \fi\fi\fi
+ \ifhv at multiFloat
+ \getMultiObjectAndLabel
+ \else
+ \ifhv at subFloat
+ \getMultiSubObjectAndLabel
+ \else
+ \refstepcounter{\@captype}%
+ \ifhv at objectFrame\frame{\hv at floatObject}\else\hv at floatObject\fi
+ \expandafter\ifx\expandafter\relax\hv at label\relax
+ \else
+ \expandafter\label\expandafter{\hv at label}%
+ \fi
+ \fi
+ \fi
+ \ifhv at star
+ \end{\hv at floatType*}%
+ \else
+ \end{\hv at floatType}%
+ \fi
+}
+\def\set at object@caption{% first object, then caption
+%\ifhv at multiFloat\typeout{>>>>set at object@caption: multiFloatTRUE}\else\typeout{>>>>set at object@caption: multiFloatFALSE}\fi
+ \ifhv at star
+ \begin{\hv at floatType*}[!p]
+ \else
+ \begin{\hv at floatType}[!p]
+ \fi
+% \ifhv at subFloat
+% \else
+% \edef\@captype{hv at p\@captype}
+% \fi
+% \capstart
+ \ifx\hvSet at objectPos\hv at Right\raggedleft\else
+ \ifx\hvSet at objectPos\hv at Left\raggedleft\else
+ \ifx\hvSet at objectPos\hv at Center\centering
+ \fi\fi\fi
+ \ifhv at multiFloat
+ \edef\@captype{hv at p\@captype}
+ \getMultiObjectAndLabel
+ \else
+ \ifhv at subFloat
+ \getMultiSubObjectAndLabel
+ \else
+ \edef\@captype{hv at p\@captype}%
+ \ifhv at objectFrame\frame{\hv at floatObject}\else\hv at floatObject\fi
+ \refstepcounter{\@captype}%
+ \expandafter\ifx\expandafter\relax\hv at label\relax\else
+ \expandafter\label\expandafter{\hv at label}%
+ \fi
+ \fi
+ \fi
+ \ifhv at star
+ \end{\hv at floatType*}%
+ \else
+ \end{\hv at floatType}%
+ \fi
+%
+ \begin{\hv at floatType}[!b]
+% \capstart
+ \belowcaptionskip=0pt% local change
+ \ifhv at separatorLine\drawSepLine\fi
+ \ifhv at multiFloat
+ \getMultiCaptionAndLabel
+ \else
+ \ifhv at subFloat
+ \getMultiSubCaptionAndLabel
+ \else
+ \expandafter\ifx\expandafter\relax\hv at shortCap\relax
+ \caption{\hv at longCap}%
+ \else
+ \caption[\hv at shortCap]{\hv at longCap}%
+ \fi
+ \expandafter\ifx\expandafter\relax\hv at label\relax\else
+ \label{\hv at label-cap}
+ \fi
+ \fi
+ \fi
+ \end{\hv at floatType}%
+}
+%
\endinput
More information about the tex-live-commits
mailing list