From d9783f18c815aa817e3c05a0c214d9421d1c15d8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Apr 2019 20:52:35 +0000 Subject: hvfloat (4apr19) git-svn-id: svn://tug.org/texlive/trunk@50753 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvfloat/Changes | 5 +- Master/texmf-dist/doc/latex/hvfloat/README | 3 + Master/texmf-dist/doc/latex/hvfloat/README.exa | 15 +- Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf | Bin 0 -> 91590 bytes Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex | 76 ++ Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf | Bin 0 -> 96233 bytes Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex | 80 ++ Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg | Bin 0 -> 45694 bytes .../texmf-dist/doc/latex/hvfloat/default1s1c.pdf | Bin 95237 -> 92636 bytes .../texmf-dist/doc/latex/hvfloat/default1s1c.tex | 3 +- .../texmf-dist/doc/latex/hvfloat/default1s2c.pdf | Bin 97510 -> 92893 bytes .../texmf-dist/doc/latex/hvfloat/default1s2c.tex | 67 +- .../texmf-dist/doc/latex/hvfloat/default2s1c.pdf | Bin 90034 -> 93006 bytes .../texmf-dist/doc/latex/hvfloat/default2s1c.tex | 1 + .../texmf-dist/doc/latex/hvfloat/default2s2c.pdf | Bin 96545 -> 96312 bytes .../texmf-dist/doc/latex/hvfloat/default2s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf | Bin 88317 -> 88091 bytes Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf | Bin 96300 -> 96144 bytes Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf | Bin 96849 -> 96820 bytes Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf | Bin 96145 -> 96003 bytes Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex | 1 + .../texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf | Bin 94724 -> 94193 bytes .../texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | Bin 2858058 -> 3052266 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 989 ++++++++------------- Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf | Bin 95597 -> 95472 bytes Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf | Bin 95740 -> 95624 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf | Bin 94696 -> 94535 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf | Bin 0 -> 96060 bytes Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex | 81 ++ .../doc/latex/hvfloat/multi-after1s1c.pdf | Bin 0 -> 156239 bytes .../doc/latex/hvfloat/multi-after1s1c.tex | 147 +++ .../doc/latex/hvfloat/multi-default1s1c.pdf | Bin 156151 -> 156112 bytes .../doc/latex/hvfloat/multi-default1s1c.tex | 2 + .../doc/latex/hvfloat/multi-default1s2c.pdf | Bin 104360 -> 104234 bytes .../doc/latex/hvfloat/multi-default1s2c.tex | 1 + .../doc/latex/hvfloat/multi-default2s1c.pdf | Bin 158009 -> 157949 bytes .../doc/latex/hvfloat/multi-default2s1c.tex | 1 + .../doc/latex/hvfloat/multi-default2s2c.pdf | Bin 103112 -> 102985 bytes .../doc/latex/hvfloat/multi-default2s2c.tex | 1 + .../doc/latex/hvfloat/multi-inner2s2c.pdf | Bin 104072 -> 103867 bytes .../doc/latex/hvfloat/multi-inner2s2c.tex | 1 + .../doc/latex/hvfloat/multi-outer2s2c.pdf | Bin 106941 -> 106428 bytes .../doc/latex/hvfloat/multi-outer2s2c.tex | 3 +- .../doc/latex/hvfloat/multi-right1s1c.pdf | Bin 155689 -> 155606 bytes .../doc/latex/hvfloat/multi-right1s1c.tex | 9 +- Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf | Bin 89974 -> 89850 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf | Bin 97230 -> 97127 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf | Bin 96430 -> 96220 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf | Bin 97719 -> 97589 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf | Bin 95886 -> 95717 bytes Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf | Bin 96051 -> 95949 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf | Bin 95391 -> 95222 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex | 1 + .../doc/latex/hvfloat/paper-after1s1c.pdf | Bin 0 -> 89936 bytes .../doc/latex/hvfloat/paper-after1s1c.tex | 82 ++ .../doc/latex/hvfloat/paper-default1s1c.pdf | Bin 94290 -> 90690 bytes .../doc/latex/hvfloat/paper-default1s1c.tex | 8 +- .../doc/latex/hvfloat/paper-default1s2c.pdf | Bin 100235 -> 100133 bytes .../doc/latex/hvfloat/paper-default1s2c.tex | 1 + .../doc/latex/hvfloat/paper-default2s2c.pdf | Bin 100052 -> 99960 bytes .../doc/latex/hvfloat/paper-default2s2c.tex | 1 + .../doc/latex/hvfloat/paper-inner2s2c.pdf | Bin 98824 -> 98701 bytes .../doc/latex/hvfloat/paper-inner2s2c.tex | 1 + .../doc/latex/hvfloat/paper-right1s1c.pdf | Bin 90657 -> 90455 bytes .../doc/latex/hvfloat/paper-right1s1c.tex | 1 + .../doc/latex/hvfloat/paper-right2s2c.pdf | Bin 98918 -> 0 bytes .../doc/latex/hvfloat/paper-right2s2c.tex | 78 -- Master/texmf-dist/doc/latex/hvfloat/preamble.ltx | 1 + Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf | Bin 91515 -> 91413 bytes Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex | 13 +- Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf | Bin 98990 -> 98824 bytes Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf | Bin 91944 -> 91777 bytes Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex | 1 + Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf | Bin 96269 -> 95365 bytes Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex | 16 +- Master/texmf-dist/doc/latex/hvfloat/rose.eps | 718 +++++++++++++++ Master/texmf-dist/doc/latex/hvfloat/runAll.sh | 15 +- Master/texmf-dist/doc/latex/hvfloat/runEXA.sh | 16 +- .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf | Bin 0 -> 153217 bytes .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex | 129 +++ .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf | Bin 0 -> 154250 bytes .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex | 129 +++ .../doc/latex/hvfloat/sub-default1s1c.pdf | Bin 153450 -> 153333 bytes .../doc/latex/hvfloat/sub-default1s1c.tex | 1 + .../doc/latex/hvfloat/sub-default1s2c.pdf | Bin 153854 -> 153779 bytes .../doc/latex/hvfloat/sub-default1s2c.tex | 1 + .../doc/latex/hvfloat/sub-default2s2c.pdf | Bin 154601 -> 154523 bytes .../doc/latex/hvfloat/sub-default2s2c.tex | 1 + .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf | Bin 153259 -> 153145 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex | 9 +- .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf | Bin 154554 -> 154368 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex | 1 + .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf | Bin 154393 -> 153787 bytes .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex | 9 +- .../texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty | 2 +- Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty | 146 +-- 110 files changed, 2066 insertions(+), 816 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg create mode 100644 Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdf delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/rose.eps create mode 100644 Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index edc8204275d..a02f4e33684 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,6 +1,7 @@ hvfloat.sty: -2.11 2019-04-01 - fix for sub float pages - - added examples directory +2.12 2019-04-04 - added option left/right for twocolumn mode +2.11 2019-03-29 - fix for sub float pages + - added examples.zip 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, diff --git a/Master/texmf-dist/doc/latex/hvfloat/README b/Master/texmf-dist/doc/latex/hvfloat/README index 66c38bec861..c1f973c24c3 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/README +++ b/Master/texmf-dist/doc/latex/hvfloat/README @@ -8,6 +8,9 @@ side by side in one- and twocolumn mode. Fullpage objects with captions on the preceeding or following page in one- and twocolumn mode. +hvfloat-fps +Simple global placement setting for floats + %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives %% in directory macros/latex/base/lppl.txt. diff --git a/Master/texmf-dist/doc/latex/hvfloat/README.exa b/Master/texmf-dist/doc/latex/hvfloat/README.exa index 5f934b4fcb6..f5c52e2e980 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/README.exa +++ b/Master/texmf-dist/doc/latex/hvfloat/README.exa @@ -3,28 +3,23 @@ The meaning of a filename like default1s2c.tex is: 1s : oneside mode 2c : twocolumn mode -The meaning of a filename like right2s1c.tex is: - right : capPos=after - 2s : twoside mode - 1c : onecolumn mode - -The meaning of a filename like left2s1c.tex is: - left : capPos=before +The meaning of a filename like after2s1c.tex is: + after : capPos=after 2s : twoside mode 1c : onecolumn mode The meaning of a filename like odd1s2c.tex is: - odd : capPos=d + odd : capPos=oddPage 1s : oneside mode 2c : twocolumn mode The meaning of a filename like inner2s2c.tex is: - inner : capPos=i + inner : capPos=inner 2s : twoside mode 2c : twocolumn mode a.s.o. runEXA.sh -runs an examplegroup, e.g. "./runEXA.sh inner" runs _all_ examples +runs a group of examples, e.g. "./runEXA.sh inner" runs _all_ examples started with "inner". diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf new file mode 100644 index 00000000000..9f629122b5a Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex new file mode 100644 index 00000000000..de0464cc9d7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex @@ -0,0 +1,76 @@ +\documentclass{scrartcl} +%% $Id: after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ + +\input{preamble.ltx} + +\begin{document} + +\blinddocument + +\section{File \texttt{\jobname}} + +\begin{lstlisting} +The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}. +\end{lstlisting} + +The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}. + +\begin{lstlisting} +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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} +\end{lstlisting} + + +\Float[capPos=after] +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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} + +\Blindtext + +\Blindtext + +\begin{lstlisting} +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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:fullpage1} +\end{lstlisting} + + +\Float[capPos=after] +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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:fullpage1} + +\blinddocument + + +\Blindtext + + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf new file mode 100644 index 00000000000..9ce278c7142 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex new file mode 100644 index 00000000000..cf106566fce --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex @@ -0,0 +1,80 @@ +\documentclass[twoside,twocolumn]{scrartcl} +%% $Id: after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ + +\input{preamble.ltx} +\setlength\columnseprule{0.4pt} + + +\begin{document} + +\tableofcontents + ewpage + +\blinddocument + + +\section{File \texttt{\jobname}} + +\begin{lstlisting} +The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}. +\end{lstlisting} + +The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}. + +\begin{lstlisting} +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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} +\end{lstlisting} + + +\Float[capPos=after] +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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} + +\blinddocument + +\begin{lstlisting} +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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:fullpage1} +\end{lstlisting} + + +\Float[capPos=after] +\hvFloat[fullpage,capPos=after]% + {figure}% + {\includegraphics[fullpage]{frose}}% + [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:fullpage1} + +\blinddocument + + +\Blindtext + + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg b/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg new file mode 100644 index 00000000000..bbf5485f076 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf index e3bbcb90e2e..f5d14d67a43 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex index c5d95c9e323..387ebd6a24f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex @@ -1,4 +1,5 @@ \documentclass{scrartcl} +%% $Id: default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} @@ -10,7 +11,7 @@ \tableofcontents -\blinddocument +\Blindtext \section{File \texttt{\jobname}} \begin{lstlisting} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf index c10d9fbae62..9ccfc457e6b 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex index bcd20f6d81d..daec2236c95 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex @@ -1,74 +1,63 @@ \documentclass[twocolumn]{scrartcl} +%% $Id: default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} \begin{document} -\title{Example for fullpage floats} +\title{Example for a star version of hvfloat} \author{Herbert Voß} \maketitle \tableofcontents -\blinddocument +\Blindtext \section{File \texttt{\jobname}} \begin{lstlisting} -The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}. -\end{lstlisting} - -The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}. - -\begin{lstlisting} -\hvFloat[fullpage]% - {figure}% - {\includegraphics[fullpage]{frose}}% - [A fullpage float with the default caption setting]% - {A default caption of a ``fullpage'' object with the default setting, which +\hvFloat*[capPos=right]{figure}% + {\includegraphics{frose}}% + [A float with the default caption setting]% + {A default caption of a ``'' 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} + {fig:0} \end{lstlisting} -\Float[default] -\hvFloat[fullpage]% - {figure}% - {\includegraphics[fullpage]{frose}}% - [A fullpage float with the default caption setting]% - {A default caption of a ``fullpage'' object with the default setting, which +\Float[default star] +\hvFloat*[capPos=right]{figure}% + {\includegraphics{frose}}% + [A float with the default caption setting]% + {A default caption of a ``'' 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} + {fig:0} \blinddocument +\blindtext + \begin{lstlisting} -\hvFloat[fullpage]% - {figure}% - {\includegraphics[fullpage]{frose}}% - [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:fullpage1} +\hvFloat[capPos=right]{figure}% + {\includegraphics{frose}}% + [A float with the default caption setting]% + {A default caption of a ``'' object with the default setting, which + is a ``left'' caption which means that it always appears before the object.}% + {fig:1} \end{lstlisting} \Float[default] -\hvFloat[fullpage]% - {figure}% - {\includegraphics[fullpage]{frose}}% - [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:fullpage1} +\hvFloat[capPos=right]{figure}% + {\includegraphics{frose}}% + [A float with the default caption setting]% + {A default caption of a ``'' object with the default setting, which + is a ``left'' caption which means that it always appears before the object.}% + {fig:1} \blinddocument diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf index 82f7e39b0fc..02d855525e3 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex index d3c0316aeb2..b0935fe53cf 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex @@ -1,4 +1,5 @@ \documentclass[twoside]{scrartcl} +%% $Id: default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf index 603d2a7ad74..ed37dd7a9b2 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex index f3ae745d7e8..6bd583d8de1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex @@ -1,4 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} +%% $Id: default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf index af6eb5099bf..8ed3320d8b8 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex index f6fdec31605..ac29b4782bc 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex @@ -1,4 +1,5 @@ \documentclass{scrartcl} +%% $Id: even1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf index ed47d2ab5c8..7ec2329fd52 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex index ce5195d9224..aed80a2d3c6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex @@ -1,4 +1,5 @@ \documentclass[twocolumn]{scrartcl} +%% $Id: even1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf index 751853191de..1b309e47df3 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex index bcc8e26d0f0..06a0b3119e3 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex @@ -1,4 +1,5 @@ \documentclass[twoside]{scrartcl} +%% $Id: even2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf index 956f56849e7..a629edf636e 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex index fa102307d9d..a35ce24fbc5 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex @@ -1,4 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} +%% $Id: even2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf index c47d94c85b3..6e9841d1b34 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex index 3b10bc3b9f3..11dd836028a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex @@ -1,4 +1,5 @@ \documentclass[twocolumn]{scrartcl} +%% $Id: fullpage1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf index 3d0a60784be..7fb53c3181a 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf and b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex index e9787059bd0..b3b94022b49 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -1,7 +1,7 @@ -%% $Id: hvfloat.tex 1009 2019-04-01 12:44:03Z herbert $ -%\listfiles +%% $Id: hvfloat.tex 1034 2019-04-04 07:29:45Z herbert $ +\listfiles \errorcontextlines=100 -\documentclass[usegeometry,twoside,paper=a4]{scrartcl} +\documentclass[twoside,paper=a4]{scrartcl} \usepackage{fontspec} \usepackage{libertinus} %\usepackage[scaled=0.85]{beramono} @@ -50,7 +50,6 @@ \usepackage{hvindex} \usepackage[all=!htb]{hvfloat-fps} \usepackage[fbox,hyperref]{hvfloat} -\def\hvVersion{2.10} \captionsetup{format=plain,font=sf,labelfont=sf} \captionsetup[sub]{format=plain,font=sf,labelfont=sf} @@ -155,7 +154,7 @@ \begin{document} -\title{Package \texttt{hvfloat}\\Positioning, rotating and scaling of objects and captions\\ver \hvVersion} +\title{Package \texttt{hvfloat}\\Rotating and scaling of objects and captions\\ver \hvFileVersion} \author{Herbert Voß\thanks{\protect\url{hvoss@tug.org}}} \date{\today} \maketitle @@ -181,7 +180,7 @@ marginnote \fbox{float} is set into the margin. This is done also only for demon objectAngle=120, capAngle=-210, objectPos=center -]{figure}{\protect\fbox{\includegraphics[scale=0.9]{rose}}}{\protect\fbox{What a nice Caption :-)}}{fig:title} +]{figure}{\protect\fbox{\includegraphics[scale=0.9]{images/rose}}}{\protect\fbox{What a nice Caption :-)}}{fig:title} \vspace*{\fill} @@ -203,15 +202,29 @@ marginnote \fbox{float} is set into the margin. This is done also only for demon \Loption{fbox} & The objects and captions are put into a \Lcs{fbox} command, like in this documentation. This doesn't make real sense and is only for some demonstration useful or for locating problems if images seems to have too much whitespace.\\ -\Loption{hyperref} & Load package \Lpack{hyperref} and also package \Lpack{hypcap}. +\Loption{hyperref} & Load package \Lpack{hyperref}. % and also package \Lpack{hypcap}. \end{tabularx} - \bigskip The length \Lskip{belowcaptionskip} is set by \LaTeX{} to 0pt and changed in \Lpack{hvfloat} to the same value than \Lskip{abovecaptionskip}. This length can be changed to another value in the usual -way with \CMD{setlength} or \CMD{addtolength}. +way with \Lcs{setlength} or \Lcs{addtolength}. + +The following packages are loaded by \Lpack{hvfloat} and the optional argument +\Loption{hypcap} is passed to the packages \Lpack{caption} and \Lpack{subcaption}: + +\Lpack{caption}, +\Lpack{subcaption}, +\Lpack{atbegshi}, +%\RequirePackage{hyperref} +\Lpack{expl3}, \Lpack{multido}, +\Lpack{graphicx}, +\Lpack{xkeyval}, +\Lpack{ifoddpage}, and +\Lpack{afterpage}. + + \section{The Macros and optional arguments} The syntax for the macros and \Lcs{setDefaults}, \Lcs{hvSet}, and \CMD{hvFloat} is @@ -222,8 +235,8 @@ The syntax for the macros and \Lcs{setDefaults}, \Lcs{hvSet}, and \CMD{hvFloat} \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}. - +The star version is explained in section~\vref{star-version0} and \vref{star-version} and +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}. @@ -237,7 +250,6 @@ There are some more macros defined, more or less for internally use in \Lpack{hv be used for own purposes. - \begin{BDef} \Lcs{figcaption}\OptArg{short caption text}\Largb{caption text}\\ \Lcs{tabcaption}\OptArg{short caption text}\Largb{caption text} @@ -273,10 +285,18 @@ Internally the style is saved in a macro named \verb|\hv@|. %\subsection{The Options} There are the following keywords: -\begin{xltabular}{\textwidth}{l>{\small\ttfamily}cX} -\caption{The optional keywords for the macro \nxLcs{hvFloat}}\label{tab:options}\\\hline -\emph Keyword & \emph Default & \emph Description\\\hline -\Lkeyword{floatPos} & \texttt{htb} & This is \emph{not} the same placement option like the one from the floats.\\ +\begin{xltabular}{\textwidth}{@{} l>{\small\ttfamily}cX @{}} +\caption{The optional keywords for the macro \nxLcs{hvFloat}}\label{tab:options}\\\toprule +\emph Keyword & \emph Default & \emph Description\\\midrule +\endfirsthead +\midrule +\emph Keyword & \emph Default & \emph Description\\\midrule +\endhead +\midrule +\endfoot +\bottomrule +\endlastfoot +\Lkeyword{floatPos} & \texttt{htb} & This is \emph{not} the same default placement setting like the one from the floats.\\ \Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption should be rotated in the same way.\\ \Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width, @@ -284,17 +304,20 @@ There are the following keywords: \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 \Lkeyval{left}, \Lkeyval{before}, - \Lkeyval{right}, \Lkeyval{after}, - \Lkeyval{evenPage}, and \Lkeyval{oddPage}. -The - last two are only valid for the option \texttt{fullpage}.\\ +\Lkeyword{capPos} & before& The position of the caption relative to the object. Possible values are\\ + & & \Lkeyval{before}: \emph{always} before (left) from the object.\\ + & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\ + & & \Lkeyval{after}: \emph{always} after (right) from the object.\\ + & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\ + & & \Lkeyval{inner}: in \Index{twoside} mode always typeset at the inner margin.\\ + & & \Lkeyval{outer}: in \Index{twoside} mode always typeset at the outer margin.\\ + & & \Lkeyval{evenPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an even page.\\ + & & \Lkeyval{oddPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an odd page.\\ \Lkeyword{capVPos}& c& This is only important for \texttt{capPos=left|right}. Only in this case the caption can vertically placed at the \Lkeyval{bottom}, \Lkeyval{center} and \Lkeyval{top}.\\ -\Lkeyword{objectPos} & c & The horizontalplacement of the object relative to the document. Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\ +\Lkeyword{objectPos} & center & The horizontalplacement of the object relative to the document. Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\ \Lkeyword{objectAngle} & 0 & The value for the angle if the object should be rotated. Counted anti clockwise.\\ @@ -310,7 +333,6 @@ The \Lkeyword{objectFrame} & false & put a frame with no separation around the float object.\\ \Lkeyword{style} & --- & Use a defined style\\ -\hline \end{xltabular} @@ -330,11 +352,11 @@ or \Lenv{table} environment, f.ex.: \normalsize -\hvFloat{figure}{\includegraphics{rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0} +\hvFloat{figure}{\includegraphics{images/rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0} Code for figure \ref{fig:0}: \begin{lstlisting} -\hvFloat{figure}{\includegraphics{rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0} +\hvFloat{figure}{\includegraphics{images/rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0} \end{lstlisting} \Float @@ -384,12 +406,12 @@ floating environments like \Lenv{figure} or \Lenv{table}: \begin{lstlisting} -\hvFloat[floatPos=!htb]{figure}{\includegraphics{rose}}% +\hvFloat[floatPos=!htb]{figure}{\includegraphics{images/rose}}% {Default caption width setting, which is the natural width with respect to the current linewidth.}{fig:width0} \end{lstlisting} \Float -\hvFloat[floatPos=!htb]{figure}{\includegraphics{rose}}% +\hvFloat[floatPos=!htb]{figure}{\includegraphics{images/rose}}% {Default caption width setting, which is the natural width with respect to the current linewidth.}{fig:width0} @@ -408,13 +430,13 @@ minus the width of the object and the space between object and caption, which is \makeatother \begin{lstlisting} -\hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{rose}}% +\hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{images/rose}}% {Caption right beside with a \emph{natural} width, which is given by the width of the object, the separation between object and caption, and the current linewidth.}{fig:width1} \end{lstlisting} \Float -\hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{rose}}% +\hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{images/rose}}% {Caption right beside with a \emph{natural} width, which is given by the width of the object, the separation between object and caption, and the current linewidth.}{fig:width1} @@ -430,13 +452,13 @@ is greater than 1. %greater caption width than this maximal caption width, it will automatically set to the maximal width: \begin{lstlisting} -\hvFloat[floatPos=!htb,capWidth=0.9]{figure}{\includegraphics{rose}}% +\hvFloat[floatPos=!htb,capWidth=0.9]{figure}{\includegraphics{images/rose}}% {Caption below with a width of 0.9 of the current line width (column width), which is in this special case \the\linewidth. Divide it by 28.82 to get cm.}{fig:width2} \end{lstlisting} \Float -\hvFloat[floatPos=!htb,capWidth=0.9]{figure}{\includegraphics{rose}}% +\hvFloat[floatPos=!htb,capWidth=0.9]{figure}{\includegraphics{images/rose}}% {Caption below with a width of 0.9 of the current line width (column width), which is in this special case \the\linewidth. Divide it by 28.82 to get cm.}{fig:width2} @@ -451,14 +473,14 @@ If not then the width is set to the possible value between object and margin: \begin{lstlisting} \hvFloat[floatPos=!htb, capPos=after, - capWidth=0.9]{figure}{\includegraphics[scale=1.5]{rose}}% + capWidth=0.9]{figure}{\includegraphics[scale=1.5]{images/rose}}% {Caption right beside with a width setting of \texttt{0.9\textbackslash linewidth} which is too big for this example and therefore corrected by the macro to the maximal width.}{fig:width3} \end{lstlisting} \Float -\hvFloat[floatPos=!htb,capPos=after,capWidth=0.9]{figure}{\includegraphics[scale=1.5]{rose}}% +\hvFloat[floatPos=!htb,capPos=after,capWidth=0.9]{figure}{\includegraphics[scale=1.5]{images/rose}}% {Caption right beside with a width setting of \texttt{0.9\textbackslash linewidth} which is too big for this example and therefore corrected by the macro to the maximal width.}{fig:width3} @@ -469,13 +491,13 @@ With \Lkeyset{capWidth=w} the caption width is like the object width which makes real sense if you have a lot of identical images with respect to its widths. \begin{lstlisting} -\hvFloat[floatPos=!htb,capWidth=w]{figure}{\includegraphics[width=0.5\linewidth]{CTAN}}% +\hvFloat[floatPos=!htb,capWidth=w]{figure}{\includegraphics[width=0.5\linewidth]{images/CTAN}}% {Caption below with a width of the given object which may be a problem if it is a very small object.}{fig:width4} \end{lstlisting} \Float -\hvFloat[floatPos=!htb,capWidth=w]{figure}{\includegraphics[width=0.5\linewidth]{CTAN}}% +\hvFloat[floatPos=!htb,capWidth=w]{figure}{\includegraphics[width=0.5\linewidth]{images/CTAN}}% {Caption below with a width of the given object which may be a problem if it is a very small object.}{fig:width4} @@ -486,12 +508,12 @@ With \Lkeyset{capWidth=h} the caption width is like the object height which make real sense if you want to put a rotated caption beside the object. \begin{lstlisting} -\hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{rose}}% +\hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{images/rose}}% {Caption beside with a width of the given object height which may be a problem if it is a very small object.}{fig:width5} \end{lstlisting} -\hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{rose}}% +\hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{images/rose}}% {Caption beside with a width of the given object height which may be a problem if it is a very small object.}{fig:width5} @@ -508,7 +530,7 @@ Code for figure \ref{fig:1}: [floatPos=htb, capPos=right, objectFrame, - objectPos=c]{figure}{\includegraphics[scale=0.9]{rose}}% + objectPos=c]{figure}{\includegraphics[scale=0.9]{images/rose}}% [Caption beside object and vertically centered]% {Caption vertically centered right beside the float with a natural caption width (the default). \blindtext}% @@ -520,7 +542,7 @@ Code for figure \ref{fig:1}: [floatPos=htb, capPos=right, objectFrame, - objectPos=c]{figure}{\includegraphics[scale=0.9]{rose}}% + objectPos=c]{figure}{\includegraphics[scale=0.9]{images/rose}}% [Caption beside object and vertically centered]% {Caption vertically centered right beside the float with a natural caption width (the default). \blindtext}% @@ -537,7 +559,7 @@ Code for figure \ref{fig:2}: capWidth=h,% of \columnwidth capAngle=90, objectFrame - ]{figure}{\includegraphics{rose}}% + ]{figure}{\includegraphics{images/rose}}% [Centered Caption beside Object]% {Caption vertically centered left beside the float with a caption width of \texttt{capWidth=h}, which is the height of the object.}{fig:2} @@ -550,7 +572,7 @@ Code for figure \ref{fig:2}: capWidth=h,% of \columnwidth capAngle=90, objectFrame - ]{figure}{\includegraphics{rose}}% + ]{figure}{\includegraphics{images/rose}}% [Centered Caption beside Object]% {Caption vertically centered left beside the float with a caption width of \texttt{capWidth=h}, which is the height of the object.}{fig:2} @@ -572,7 +594,7 @@ Code for figure \ref{fig:3}: capAngle=180, objectAngle=90, capVPos=center, - objectPos=center]{figure}{\frame{\includegraphics{rose}}}% + objectPos=center]{figure}{\frame{\includegraphics{images/rose}}}% [Centered Caption beside Object]{% {Caption vertically centered right beside the float with a caption width of the height of the image and a rotation of the caption and the object.}{fig:3} @@ -586,7 +608,7 @@ Code for figure \ref{fig:3}: capAngle=180, objectAngle=90, capVPos=center, - objectPos=center]{figure}{\frame{\includegraphics{rose}}}% + objectPos=center]{figure}{\frame{\includegraphics{images/rose}}}% {Caption vertically centered right beside the float with a caption width of the height of the image and a rotation of the caption and the object.}{fig:3} @@ -601,7 +623,7 @@ chooses only \Lkeyset{capPos=outer}. Code for figure~\ref{fig:20}: \begin{lstlisting} -\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}% +\hvFloat[capPos=inner]{figure}{\includegraphics{images/rose}}% [Centered Caption on the inner side]{% Caption set with the parameter setting \texttt{capPos=inner}, which will be a caption on the right side for an even page and on the left side for @@ -609,34 +631,39 @@ Code for figure~\ref{fig:20}: \end{lstlisting} \Float[capPos=inner] -\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}% +\hvFloat[capPos=inner]{figure}{\includegraphics{images/rose}}% [Centered Caption on the inner side]{% Caption set with the parameter setting \texttt{capPos=inner}, which will be a caption on the right side for an even page and on the left side for an odd page.}{fig:20} \blindtext + + +\label{page:1}\checkoddpage +Now the same Image with \Lkeyset{capPos=outer}. The current pagenumber is~\pageref{page:1}, an \ifoddpage odd \else +even \fi page. We now set a pagebreak at the end of the second image to see if it works with +\emph{inner}/\emph{outer}. + + + + \begin{lstlisting} -\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}% +\hvFloat[capPos=outer]{figure}{\includegraphics{images/rose}}% [Centered Caption on the inner side]{% - Caption set with the parameter setting \texttt{capPos=inner}, which will be + Caption set with the parameter setting \texttt{capPos=outer}, which will be a caption on the right side for an even page and on the left side for an odd page.}{fig:20b} \end{lstlisting} -\Float[capPos=inner] -\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}% +\Float[capPos=outer] +\hvFloat[capPos=outer]{figure}{\includegraphics{images/rose}}% [Centered Caption on the inner side]{% - Caption set with the parameter setting \texttt{capPos=inner}, which will be + Caption set with the parameter setting \texttt{capPos=outer}, which will be a caption on the right side for an even page and on the left side for an odd page.}{fig:20b} -\label{page:1}\checkoddpage -Now the same Image with \Lkeyset{capPos=outer}. The current pagenumber is~\pageref{page:1}, an \ifoddpage odd \else -even \fi page. We now set a pagebreak at the end of the second image to see if it works with -\emph{inner}/\emph{outer}. - \Float @@ -645,7 +672,7 @@ even \fi page. We now set a pagebreak at the end of the second image to see if i capPos=outer, capAngle=0,% capVPos=bottom,% - objectPos=center]{figure}{\includegraphics{rose}}% + objectPos=center]{figure}{\includegraphics{images/rose}}% [Centered Caption beside Object]{% Caption at the bottom right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth} and and \texttt{capPos=outer}.}{fig:21} @@ -663,10 +690,10 @@ Code for figure \ref{fig:22}: \begin{lstlisting} \hvFloat[% capWidth=0.5,% of \columnwidth - capPos=outer,% ====> OUTER + capPos=inner,% ====> INNER capAngle=0, capVPos=bottom, - objectPos=center]{figure}{\includegraphics{rose}}% + objectPos=center]{figure}{\includegraphics{images/rose}}% [Centered Caption beside Object]{% Caption vertically centered right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth} and \texttt{capPos=outer} }{fig:22} @@ -675,30 +702,15 @@ Code for figure \ref{fig:22}: \Float \hvFloat[% capWidth=0.5,% of \columnwidth - capPos=outer, + capPos=inner, capAngle=0,% capVPos=center,% - objectPos=center]{figure}{\includegraphics{rose}}% + objectPos=center]{figure}{\includegraphics{images/rose}}% [Centered Caption beside Object]{% Caption vertically centered right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth} and \texttt{capPos=outer}}{fig:22} -\iffalse -\Float[fig:23] -\hvFloat[% - floatPos=htb,% - capWidth=0.5,% of \columnwidth - capPos=outer, - capAngle=0,% - capVPos=center,% - objectPos=center]{figure}{\includegraphics{rose}}% - [Centered Caption beside Object]{% - Caption vertically centered right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth} - and \texttt{capPos=outer}.}{} - - -\fi We have an \checkoddpage \ifoddpage odd \else @@ -719,7 +731,7 @@ The code for figure \ref{fig:4}: capWidth=0.25,% capPos=right,% capVPos=bottom,% -]{figure}{\frame{\includegraphics{rose}}}{Caption at bottom right beside the float}{fig:4} +]{figure}{\frame{\includegraphics{images/rose}}}{Caption at bottom right beside the float}{fig:4} \end{lstlisting} @@ -729,7 +741,7 @@ The code for figure \ref{fig:4}: capWidth=0.25,% capPos=right,% capVPos=bottom,% -]{figure}{\frame{\includegraphics{rose}}}{Caption at bottom right beside the float}{fig:4} +]{figure}{\frame{\includegraphics{images/rose}}}{Caption at bottom right beside the float}{fig:4} @@ -740,7 +752,7 @@ The code for figure \ref{fig:5}: capWidth=0.25, capPos=right, capVPos=top, -]{figure}{\frame{\includegraphics{rose}}}{Caption at top left beside the float}{fig:5} +]{figure}{\frame{\includegraphics{images/rose}}}{Caption at top left beside the float}{fig:5} \end{lstlisting} @@ -750,7 +762,7 @@ The code for figure \ref{fig:5}: capWidth=0.25,% capPos=before,% capVPos=top,% -]{figure}{\frame{\includegraphics{rose}}}{Caption at top left beside the float}{fig:5} +]{figure}{\frame{\includegraphics{images/rose}}}{Caption at top left beside the float}{fig:5} The code for figure \ref{fig:6}: @@ -759,7 +771,7 @@ The code for figure \ref{fig:6}: capWidth=0.25, capPos=right, capVPos=center,% the default -]{figure}{\frame{\includegraphics{rose}}}{Caption centered right beside the float}{fig:6} +]{figure}{\frame{\includegraphics{images/rose}}}{Caption centered right beside the float}{fig:6} \end{lstlisting} @@ -768,7 +780,7 @@ The code for figure \ref{fig:6}: capWidth=0.25,% capPos=right,% capVPos=center,% the default -]{figure}{\frame{\includegraphics{rose}}}{Caption centered right beside the float}{fig:6} +]{figure}{\frame{\includegraphics{images/rose}}}{Caption centered right beside the float}{fig:6} @@ -790,7 +802,7 @@ The code for figure \ref{fig:7}: capVPos=top, objectPos=left, objectFrame, -]{figure}{\includegraphics{rose}}{% +]{figure}{\includegraphics{images/rose}}{% Caption at top right beside the float and object position left}{fig:7} \end{lstlisting} @@ -802,9 +814,12 @@ The code for figure \ref{fig:7}: capVPos=top,% objectPos=left,% objectFrame, -]{figure}{\includegraphics{rose}}{% +]{figure}{\includegraphics{images/rose}}{% Caption at top right beside the float and object position left}{fig:7} +\blindtext + + The same with \Lkeyset{capPos=left}: @@ -815,7 +830,7 @@ The same with \Lkeyset{capPos=left}: capVPos=top,% objectPos=left,% objectFrame, -]{figure}{\includegraphics{rose}}{% +]{figure}{\includegraphics{images/rose}}{% Caption at top right beside the float and object position left}{fig:700} \blindtext @@ -824,12 +839,12 @@ The same with \Lkeyset{capPos=left}: The code for figure \ref{fig:8}: \begin{lstlisting} \hvFloat[% - capWidth=0.25,% - capPos=before,% - capVPos=top,% - objectPos=right,% + capWidth=0.25, + capPos=before, + capVPos=top, + objectPos=right, objectFrame, -]{figure}{\includegraphics{rose}}{% +]{figure}{\includegraphics{images/rose}}{% Caption at top leftt beside the float and object position right}{fig:8} \end{lstlisting} @@ -841,7 +856,7 @@ The code for figure \ref{fig:8}: capVPos=top,% objectPos=right,% objectFrame, -]{figure}{\includegraphics{rose}}{% +]{figure}{\includegraphics{images/rose}}{% Caption at top left beside the float and object position right}{fig:8} \blindtext @@ -858,7 +873,7 @@ The code for figure \ref{fig:70}: capPos=right, capVPos=top, objectPos=left, -]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% Caption at top right beside the float and object position left and the option \texttt{wide}.}{fig:70} \end{lstlisting} @@ -869,11 +884,11 @@ the option \texttt{wide}.}{fig:70} capPos=right,% capVPos=top,% objectPos=left,% -]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% Caption at top right beside the float and object position left and the option \texttt{wide}.}{fig:70} -\blindtext +%\blindtext The code for figure \ref{fig:80}: @@ -882,7 +897,7 @@ The code for figure \ref{fig:80}: capPos=left, capVPos=top, objectPos=right, - ]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}% + ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% {Caption at top left beside the object and object position left and the option \texttt{wide}.}{fig:80} \end{lstlisting} @@ -892,7 +907,7 @@ The code for figure \ref{fig:80}: \hvFloat[wide, capPos=left,% capVPos=top,% -]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% {Caption at top left beside the object and object position left and the option \texttt{wide}.}{fig:80} @@ -905,7 +920,7 @@ For a twosided document it will place the object always in the margin. \hvFloat[wide, capPos=inner, capVPos=top, -]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% Caption at top and inner beside the float and object position right and the option \texttt{wide}.}{fig:81} \end{lstlisting} @@ -915,7 +930,7 @@ the option \texttt{wide}.}{fig:81} \hvFloat[wide, capPos=inner, capVPos=top, -]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% Caption at top and inner beside the float and object position right and the option \texttt{wide}.}{fig:81} @@ -930,7 +945,7 @@ change its side due to the setting \Lkeyset{capPos=outer}. \hvFloat[wide, capPos=inner, capVPos=top, -]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% Caption at top inner beside the float and object position right and the option \texttt{wide}.}{fig:811} \end{lstlisting} @@ -940,16 +955,50 @@ the option \texttt{wide}.}{fig:811} \hvFloat[wide, capPos=inner, capVPos=top, -]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% Caption at top inner beside the float and object position right and the option \texttt{wide}.}{fig:811} -\section{Full text area in Landscape Mode} +\section{The star version \Lcs{hvFloat*}}\label{star-version0} +In the \Index{twocolumn} mode the floating environment can be set over both +columns with the star version \Lcs{hvFloat*}. The floating environment will +not be on the bottom of the page. The code for +the following example (Figure~\vref{default1s2c}) is: + +\begin{lstlisting} +\hvFloat*[capPos=right]{figure}% + {\includegraphics{images/frose}}% + [A float with the default caption setting]% + {A default caption of a ``'' 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:0} +\end{lstlisting} + +The example shows on page 3 the star version and on page 4 the same without using the star. + + +\begin{figure}[!h] +\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/default1s2c}}\hfill +\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/default1s2c}}\hfill +\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/default1s2c}}\hfill +\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/default1s2c}} +\caption{Output of \texttt{default1s2c} (pages 2 --5)}\label{default1s2c} +\end{figure} + + + + +\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} -option to put the image on an own page and rotated by 90 degrees (figure~\ref{fig:9}). +option to put the image on an own page and rotated by 90 degrees (figure~\ref{fig:9}). + + + Code for figure \ref{fig:9}: \begin{lstlisting} @@ -958,13 +1007,13 @@ Code for figure \ref{fig:9}: capPos=bottom, rotAngle=90, objectPos=center, -]{figure}{\includegraphics[width=0.9\textheight]{CTAN}}% +]{figure}{\includegraphics[width=0.9\textheight]{images/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=left} parameter +with the \Lkeyset{objectPos=l} parameter \Float[landscape] \hvFloat[% @@ -972,7 +1021,7 @@ with the \Lkeyset{objectPos=left} parameter capPos=bottom, rotAngle=90, objectPos=center, -]{figure}{\includegraphics[width=0.9\textheight]{CTAN}}% +]{figure}{\includegraphics[width=0.9\textheight]{images/CTAN}}% [Object and Caption in landscape mode]{% Caption and object in landscape mode. \blindtext}{fig:9} @@ -989,7 +1038,7 @@ The code for figure \ref{fig:10}: objectAngle=90, capAngle=-90, objectPos=left, -]{figure}{\includegraphics[width=\textheight]{CTAN}}% +]{figure}{\includegraphics[width=\textheight]{images/CTAN}}% [Rotated Caption in Landscape]{% Caption right beside the float and object position left. The caption rotated by $-90$ degrees.\blindtext}{fig:10} @@ -1003,15 +1052,16 @@ The code for figure \ref{fig:10}: objectAngle=90,% capAngle=-90,% objectPos=left% -]{figure}{\includegraphics[width=\textheight]{CTAN}}% +]{figure}{\includegraphics[width=\textheight]{images/CTAN}}% [Rotated Caption in Landscape]{% Caption right beside the float and object position left. The caption rotated by $-90$ degrees. \blindtext}{fig:10} -\Blindtext +\blindtext +\blindtext @@ -1029,7 +1079,7 @@ Some nonsense text before the following \emph{non floating} object. capVPos=bottom, objectPos=center, objectFrame, -]{figure}{\includegraphics[scale=1.5]{rose}}% +]{figure}{\includegraphics[scale=1.5]{images/rose}}% [Nonfloat Captions]{% Caption of a ``nonfloat'' Object, using the \texttt{nonfloat} Package}{fig:11} @@ -1046,7 +1096,7 @@ Some nonsense text before the following \emph{non floating} object. capVPos=bottom,% objectPos=center,% objectFrame, -]{figure}{\includegraphics[scale=1.5]{rose}}% +]{figure}{\includegraphics[scale=1.5]{images/rose}}% [Nonfloat Captions]{% Caption of a ``nonfloat'' Object, using the \texttt{nonfloat} Package}{fig:11} @@ -1155,7 +1205,8 @@ The code for figure \ref{fig:text}: capAngle=90, capPos=right, capVPos=top, - capWidth=h]{}{\includegraphics{rose}}% + objectFrame, + capWidth=h]{}{\includegraphics{images/rose}}% [``\texttt{onlyText}'' Caption]{% Demonstration of the \texttt{onlyText} Parameter, which makes it possible to put some text beside a floating object without getting @@ -1169,15 +1220,17 @@ The code for figure \ref{fig:text}: capAngle=90,% capPos=right,% capVPos=top,% - capWidth=h]{}{\includegraphics{rose}}% + objectFrame, + capWidth=h]{}{\includegraphics{images/rose}}% [``\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 +\bigskip +%\blindtext -\blindtext +%\blindtext \section{Environment \texttt{hvFloatEnv}}\label{sec:env} @@ -1203,6 +1256,7 @@ L & C & R \\\hline \end{hvFloatEnv} +\bigskip The environment has an optional argument for setting the line width which is preset to \Ldim{textwidth}. The object is always centered. @@ -1236,27 +1290,37 @@ L & C & R \\\hline 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. - +% \Lpack{hvfloat} defines three additional optional arguments for placing images in a complete column, page or paper: +\noindent +\minipage[t]{0.49\linewidth} \begin{verbatim} \define@key{Gin}{fullpage}[true]{% \def\Gin@ewidth{\columnwidth}% \def\Gin@eheight{\textheight}% \Gin@boolkey{false}{iso}% } -\define@key{Gin}{FullPage}[true]{% - \def\Gin@ewidth{\textwidth}% - \def\Gin@eheight{\textheight}% - \Gin@boolkey{false}{iso}% -} \define@key{Gin}{FULLPAGE}[true]{% \def\Gin@ewidth{\paperwidth}% \def\Gin@eheight{\paperheight}% \Gin@boolkey{false}{iso}% } \end{verbatim} +\endminipage\hfill +\minipage[t]{0.49\linewidth} +\begin{verbatim} +\define@key{Gin}{FullPage}[true]{% + \def\Gin@ewidth{\textwidth}% + \def\Gin@eheight{\textheight}% + \Gin@boolkey{false}{iso}% +} +\end{verbatim} +\endminipage + +Figure~\vref{fig:fullpage60} shows the meaning of the optional arguments \Lkeyword{fullpage}, +\Lkeyword{FullPage}, and \Lkeyword{FULLPAGE} for \Lcs{inclugegraphics}\OptArg{...}\Largb{tiger}. \begin{figure}[!h] \frame{\includegraphics[page=1,width=0.24\linewidth]{examples/fullpage1s2c}}\hfill @@ -1272,15 +1336,16 @@ images in a complete column, page or paper: \end{figure} -\subsection{Using the textarea} + +\subsection{Using the textarea} + The setting \Lkeyset{capPos=evenPage} (even) or \Lkeyset{capPos=oddPage} (odd) page for a document in \Index{twocolumn} mode makes no real sense. For a twosided document a setting like \Lkeyset{capPos=inner} for inner or \Lkeyset{capPos=outer} 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, but makes only real sense in the twoside mode. @@ -1288,14 +1353,12 @@ Without any additional argument the caption is set first and the object on the f - - - \subsubsection{Using the default or \Lkeyset{capPos=before}} 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=before}. -For the \Loption{twoside} option it makes more sense to use the setting \Lkeyset{capPos=beforeEFT} +and the object on the following page. This is the same setting like \Lkeyset{capPos=left} for a onecolumn document. +For the \Loption{twocolumn} option it makes more sense to use the setting \Lkeyset{capPos=before} if the +caption and object can appear on different pages. @@ -1303,8 +1366,7 @@ For the \Loption{twoside} option it makes more sense to use the setting \Lkeyset \begin{lstlisting} \hvFloat[fullpage]% {figure}% - {\includegraphics[fullpage]{frose}}% -% {\includegraphics[width=\linewidth,height=\textheight,keepaspectratio=false]{rose}}% + {\includegraphics[fullpage]{images/frose}}% [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. @@ -1317,43 +1379,13 @@ For the \Loption{twoside} option it makes more sense to use the setting \Lkeyset -\iffalse -\Float[default] -\hvFloat[fullpage]% - {figure}% - {\includegraphics[fullpage]{frose}}% - [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:fullpage0} shows the output -for a oneside document with a setting \Lkeyset{capPos=before}. - -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} +\begin{table}[!h] \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 -\Lkeyword{fullpage} & true|false & Put the caption on the bottom of the preceding or following page/column and the - object alone a page/column.\\ +\Lkeyword{fullpage} & true|false & Put the caption on the bottom of the preceding or following page and the object alone a page.\\ %\Lkeyword{FullPage} & true|false & The same for \Index{twocolumn} mode with object over both columns.\\ @@ -1366,9 +1398,9 @@ The pagestyle is set to \texttt{empty}\\ \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} & \shortstack[l]{\Lkeyval{before}\\\Lkeyval{after}\\ - \Lkeyval{evenPage}\\\Lkeyval{oddPage}} - & caption before, after, even page, or odd page.\\ +\Lkeyword{capPos} & value + & caption \Lkeyval{before}, \Lkeyval{after} an object or on an + \Lkeyval{evenPage} or \Lkeyval{oddPage}.\\ \bottomrule \end{tabularx}% \end{table} @@ -1376,6 +1408,23 @@ The pagestyle is set to \texttt{empty}\\ +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:fullpage0} shows the output +for a oneside document with a setting \Lkeyset{capPos=before}. + + + +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{figure}[!h] \frame{\includegraphics[page=2,width=0.24\linewidth]{examples/default1s1c}}\hfill \frame{\includegraphics[page=3,width=0.24\linewidth]{examples/default1s1c}}\hfill @@ -1387,41 +1436,16 @@ The pagestyle is set to \texttt{empty}\\ \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} +\end{figure} -\iffalse -\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} -\fi -\end{figure} -\iffalse -\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} -\fi -\FloatBarrier +%\FloatBarrier +\clearpage \subsubsection{Using \Lkeyset{capPos=after}} @@ -1432,7 +1456,7 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi \begin{lstlisting} \hvFloat[fullpage, capPos=after]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{images/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 @@ -1441,68 +1465,24 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi \end{lstlisting} -\iffalse -\Float[capPos=after] -\hvFloat[fullpage, capPos=after]% - {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. - 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 - \begin{figure}[!h] -\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} - - -\iffalse -\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} -\fi +\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/after1s1c}}\hfill +\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/after1s1c}}\hfill +\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/after1s1c}}\hfill +\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/after1s1c}} + +\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/after1s1c}}\hfill +\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/after1s1c}}\hfill +\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/after1s1c}}\hfill +\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/after1s1c}} +\caption{Output of \texttt{after1s1c} (pages 2--9)}\label{after1s1c} \end{figure} -\iffalse -\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} -\fi - - - -\FloatBarrier - - +%\FloatBarrier +\clearpage \subsubsection{Using \Lkeyset{capPos=evenPage} --- caption on an even page} @@ -1514,23 +1494,12 @@ This option makes only real sense for The \Loption{twoside} mode! \begin{lstlisting} \hvFloat[fullpage, capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{images/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=evenPage] -\hvFloat[fullpage, capPos=evenPage]% - {figure}% - {\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 - - \begin{figure}[!h] \frame{\includegraphics[page=2,width=0.24\linewidth]{examples/even1s1c}}\hfill @@ -1544,23 +1513,11 @@ This option makes only real sense for The \Loption{twoside} mode! \frame{\includegraphics[page=9,width=0.24\linewidth]{examples/even1s1c}} \caption{Output of \texttt{even1s1c} (pages 2--9)}\label{fig:fullpage6} -\iffalse -\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} -\fi - \end{figure} -\FloatBarrier +%\FloatBarrier +\clearpage \subsubsection{Using \Lkeyset{capPos=oddPage} --- caption on an odd page} @@ -1573,7 +1530,7 @@ which is before the caption. \begin{lstlisting} \hvFloat[fullpage, capPos=oddPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{images/frose}}% [A float which needs the complete page width and height.]% {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 @@ -1583,19 +1540,6 @@ which is before the caption. -\iffalse -\Float[capPos=oddPage] -\hvFloat[fullpage, capPos=oddPage]% - {figure}% - {\includegraphics[fullpage]{frose}}% - [A float which needs the complete page width and height.]% - {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} - -\fi - \begin{figure}[!h] \frame{\includegraphics[page=2,width=0.24\linewidth]{examples/odd1s1c}}\hfill \frame{\includegraphics[page=3,width=0.24\linewidth]{examples/odd1s1c}}\hfill @@ -1609,24 +1553,8 @@ which is before the caption. \caption{Output of \texttt{odd1s1c} (pages 2--9)}\label{fig:fullpage10} \end{figure} - \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{fig:fullpage11} -%\end{figure} - - -%\begin{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 @@ -1638,28 +1566,8 @@ which is before the caption. \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} - \fi - \FloatBarrier @@ -1690,7 +1598,7 @@ the paper dimensions \Ldim{paperwidth} and -\begin{figure}[p] +\begin{figure}[!h] \frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-default1s1c}}\hfill \frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-default1s1c}}\hfill \frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-default1s1c}}\hfill @@ -1701,19 +1609,21 @@ the paper dimensions \Ldim{paperwidth} and \frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-default1s1c}}\hfill \frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-default1s1c}} %\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/paper-default1s1c}} -\caption{Output of \texttt{paper-default1s1c} (pages 2--9)}\label{fig:fullpage14} - -\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-right1s1c}}\hfill -\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-right1s1c}}\hfill -\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-right1s1c}}\hfill -\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-right1s1c}} - -\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-right1s1c}}\hfill -\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-right1s1c}}\hfill -\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-right1s1c}}\hfill -\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-right1s1c}} -%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/paper-right1s1c}} -\caption{Output of \texttt{paper-right1s1c} (pages 2--9)}\label{fig:fullpage140} +\caption{Output of \texttt{paper-default1s1c} (pages 2--9)}\label{paper-default1s1c} +\end{figure} + +\begin{figure}[!h] +\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-after1s1c}}\hfill +\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-after1s1c}}\hfill +\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-after1s1c}}\hfill +\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-after1s1c}} + +\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-after1s1c}}\hfill +\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-after1s1c}}\hfill +\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-after1s1c}}\hfill +\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-after1s1c}} +%\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/paper-after1s1c}} +\caption{Output of \texttt{paper-after1s1c} (pages 2--9)}\label{paper-after1s1c} \end{figure} @@ -1741,7 +1651,7 @@ can be mixed: \begin{lstlisting} \captionsetup{singlelinecheck=false} \hvFloat[fullpage,capPos=before,multiFloat]% - +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 + +{figure}{\includegraphics[width=\linewidth]{images/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 @@ -1756,46 +1666,18 @@ can be mixed: [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 + +{figure}{\includegraphics[width=\linewidth]{images/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 + +{figure}{\includegraphics[width=\linewidth]{images/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=before,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] +\begin{figure}[!h] \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 @@ -1806,18 +1688,20 @@ can be mixed: \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} +\end{figure} -\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}} +\begin{figure}[!h] +\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/multi-after1s1c}}\hfill +\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/multi-after1s1c}}\hfill +\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/multi-after1s1c}}\hfill +\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/multi-after1s1c}} + +\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/multi-after1s1c}}\hfill +\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-after1s1c}}\hfill +\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/multi-after1s1c}}\hfill +\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/multi-after1s1c}} %\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}} -\caption{Output of \texttt{multi-right1s1c} (pages 4--11)}\label{multi-right1s1c} +\caption{Output of \texttt{multi-after1s1c} (pages 4--11)}\label{multi-after1s1c} \end{figure} @@ -1857,17 +1741,17 @@ float type entry is ignored. 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}}% + +{}{\includegraphics[width=\linewidth]{images/CTAN}}% [Short caption B]% {A Caption B of a ``fullpage'' sub object.}% subcaption {}% - +{}{\includegraphics[width=\linewidth]{CTAN}}% + +{}{\includegraphics[width=\linewidth]{images/CTAN}}% {A Caption C of a ``fullpage'' object, which follows on the left or right column.}% {sub:demo1} - +{}{\includegraphics[width=\linewidth]{CTAN}}% + +{}{\includegraphics[width=\linewidth]{images/CTAN}}% {A Caption D of a ``fullpage'' object}% {sub:demo2} - +{}{\includegraphics[width=\linewidth]{CTAN}}% + +{}{\includegraphics[width=\linewidth]{images/CTAN}}% {A Caption E of a ``fullpage'' object}% {sub:demo3} \end{lstlisting} @@ -1878,28 +1762,6 @@ 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=before,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 @@ -1913,17 +1775,17 @@ The package \Lpack{subcaption} is loaded by default and should be activated with \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=4,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill +\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill +\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill +\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/sub-after1s1c}} -\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=8,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill +\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill +\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill +\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/sub-after1s1c}} %\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd1s2c}} -\caption{Output of \texttt{sub-right1s1c} (pages 4--11)}\label{sub-right1s1c} +\caption{Output of \texttt{sub-after1s1c} (pages 4--11)}\label{sub-after1s1c} \end{figure} @@ -1938,7 +1800,7 @@ The package \Lpack{subcaption} is loaded by default and should be activated with %\twocolumn[ \section{Full page objects in twocolumn mode}%] -The filenames always have a ``2c'' for two columns in its names, e.g. \texttt{default2s2c} +The filenames always have a ``2c'' for two columns in its names, e.g. \texttt{left2s2c} indicates \Lkeyset{capPos=before} and the documentclass setting \Loption{twoside} and \Loption{twocolumn}. Depending to the used documentclass it can be a problem, if the caption should be placed on the first page of the whole document. @@ -1955,39 +1817,13 @@ For the \Index{twocolumn} mode the caption can be in the left (first) or right With the default setting (without using the keyword \Lkeyword{capPos}) it is equivalent to the setting \Lkeyset{capPos=before}, the caption is always placed \emph{before} (left of) the object. This can be the first or the second column and both can be on different pages. -With \Lkeyset{capPos=before} (uppercase L) it is possible to get the caption and the object in -the twocolumn mode always on one page. +With \Lkeyset{capPos=before} (uppercase L) it is possible to get the caption and the object in the twocolumn mode always on one page. This is then the left (first) column for the caption (see figure~\vref{default2s2c}). -\begin{lstlisting} -\hvFloat[fullpage]{figure}% - {\includegraphics[width=\columnwidth,height=0.9\textheight]{frose}}% - [A float which needs the complete column width and height.]% - {A Caption of a ``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-2} -\end{lstlisting} - - -\iffalse -\Float[default] -\hvFloat[fullpage]{figure}% - {\includegraphics[width=\columnwidth,height=0.9\textheight]{frose}}% - [A float which needs the complete column width and height.]% - {A Caption of a ``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-2} -\fi - - -\begin{figure}[p] +\begin{figure}[!h] %\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 @@ -2002,37 +1838,53 @@ This is then the left (first) column for the caption (see figure~\vref{default2s \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. +\FloatBarrier -\iffalse -\begin{figure}[!htbp] -%\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} + +\begin{lstlisting} +\hvFloat[fullpage]{figure}% + {\includegraphics[width=\columnwidth,height=0.9\textheight]{images/frose}}% + [A float which needs the complete column width and height.]% + {A Caption of a ``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-2} +\end{lstlisting} + + + +The example~\vref{default2s2c} shows that the caption and the object can be on different +pages. If you do not like this behaviour, then use the setting \Lkeyset{capPos=left}, which puts +the caption before the object, but always on the \emph{same page} (see Figure~\vref{left2s2c}). + + +\begin{figure}[!h] +%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/right2s2c}}\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} -\fi -\FloatBarrier \subsubsection{Using \Lkeyset{capPos=after}} -The caption will be printed always right (\textit{after}) of the object. This can be the frist or second -column. +The caption will be printed always right of the object which is the same as \textit{after} the full page object. +With \Lkeyset{capPos=after} 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=after]{figure}% - {\includegraphics[fullpage]{rose}}% + {\includegraphics[fullpage]{images/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 @@ -2042,18 +1894,25 @@ column. \end{lstlisting} -\iffalse -\Float[capPos=after] -\hvFloat[fullpage, capPos=after]{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-2} -\fi +\begin{figure}[!h] +%\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/after2s2c}}\hfill +\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/after2s2c}}\hfill +\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/after2s2c}}\hfill +\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/after2s2c}}\hfill +\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/after2s2c}} + +\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/after2s2c}}\hfill +\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/after2s2c}}\hfill +\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/after2s2c}}\hfill +\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/after2s2c}} +\caption{Output of \texttt{after2s2c} (pages 2--9)}\label{after2s2c} +\end{figure} + +The caption and the object can be on different pages (Figure~\vref{after2s2c}). +If you do not like this behaviour, then use the setting \Lkeyset{capPos=right} instead +of \Lkeyset{capPos=after}. Figure~{right2s2c} shows that caption and object in this case +are always on the same page. \begin{figure}[!h] %\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/right2s2c}}\hfill @@ -2069,27 +1928,9 @@ column. \caption{Output of \texttt{right2s2c} (pages 2--9)}\label{right2s2c} \end{figure} -\iffalse -%\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} - -\fi - - -\FloatBarrier - +%\FloatBarrier +\clearpage%%%%%%%%%%%%%%%%%%%%%%%%% \subsubsection{Using \Lkeyset{capPos=evenPage} --- caption on an even page} @@ -2115,7 +1956,7 @@ of \Lpack{hvfloat}. \caption{Output of \texttt{even1s2c} (pages 2--9)}\label{even1s2c} \fi -\begin{figure}[!h] +\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 @@ -2158,7 +1999,7 @@ of \Lpack{hvfloat}. \caption{Output of \texttt{odd1s2c} (pages 2--9)}\label{odd1sc2} \fi -\begin{figure}[!h] +\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 @@ -2186,7 +2027,7 @@ in the left column for an odd page. \begin{lstlisting} -\hvFloat[fullpage,capPos=inner]{figure}{\includegraphics[fullpage]{rose}}% +\hvFloat[fullpage,capPos=inner]{figure}{\includegraphics[fullpage]{images/rose}}% [A float which needs the complete column width and height.]% {A 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 @@ -2196,7 +2037,7 @@ in the left column for an odd page. \iffalse \Float[capPos=inner] \hvFloat[fullpage,capPos=inner]{figure}% - {\includegraphics[fullpage]{rose}}% + {\includegraphics[fullpage]{images/rose}}% [A float which needs the complete column width and height.]% {A Caption of a ``fullpage'' object, which follows on the left or right column. @@ -2205,7 +2046,7 @@ in the left column for an odd page. \fi -\begin{figure}[!h] +\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 @@ -2244,7 +2085,7 @@ or after this caption. \begin{lstlisting} \hvFloat[fullpage, capPos=outer]{figure}% - {\includegraphics[fullpage]{rose}}% + {\includegraphics[fullpage]{images/rose}}% [A float which needs the complete page width and height with \texttt{capPos=outer}.]% {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 @@ -2254,7 +2095,7 @@ or after this caption. \iffalse \Float[capPos=outer] \hvFloat[fullpage, capPos=outer]{figure}% - {\includegraphics[fullpage]{rose}}% + {\includegraphics[fullpage]{images/rose}}% [A float which needs the complete page width and height with \texttt{capPos=outer}.]% {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 @@ -2264,7 +2105,7 @@ or after this caption. -\begin{figure}[!h] +\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 @@ -2298,15 +2139,15 @@ or after this caption. \clearpage -\subsection{Using full page in twocolumn mode} +\subsection{Using full page in twocolumn mode}\label{star-version} With the star version of \Lcs{hvfloat} The object ist placed over both columns, the whole page. In such a case the only useful caption position is \Lkeyset{capPos=inner} for \emph{inner}. \begin{lstlisting} -\hvFloat*[fullpage]{figure}% - {\includegraphics[FullPage]{rose}}% +\hvFloat*[fullpage, capPos=inner]{figure}% + {\includegraphics[FullPage]{images/rose}}% [A float which needs the complete page width and height with \texttt{capPos=outer}.]% {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} @@ -2315,7 +2156,7 @@ In such a case the only useful caption position is \Lkeyset{capPos=inner} for \e \iffalse \Float[capPos=inner] \hvFloat*[fullpage, capPos=inner]{figure}% - {\includegraphics[FullPage]{rose}}% + {\includegraphics[FullPage]{images/rose}}% [Star version with \texttt{capPos=outer}.]% {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} @@ -2323,7 +2164,7 @@ In such a case the only useful caption position is \Lkeyset{capPos=inner} for \e \fi -\begin{figure}[!h] +\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 @@ -2338,32 +2179,7 @@ In such a case the only useful caption position is \Lkeyset{capPos=inner} for \e \caption{Output of \texttt{paper-default2s2c} (pages 2--9)}\label{paper-default2s2c} \end{figure} -\begin{figure}[!h] -%\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=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 @@ -2395,7 +2211,7 @@ can be mixed: \begin{lstlisting} \captionsetup{singlelinecheck=false} \hvFloat[fullpage,multiFloat,capPos=inner]% - +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 + +{figure}{\includegraphics[height=0.4\textheight]{images/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 @@ -2411,7 +2227,7 @@ can be mixed: {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 + +{figure}{\includegraphics[height=0.4\textheight]{images/rose}}%% no 3 {A Caption C of a ``fullpage'' object, which follows on the left or right column.}% {multi:demo1} @@ -2423,7 +2239,7 @@ can be mixed: \Float[Multi] \captionsetup{singlelinecheck=false} \hvFloat[fullpage,multiFloat,capPos=inner]% - +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 + +{figure}{\includegraphics[height=0.4\textheight]{images/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 @@ -2438,7 +2254,7 @@ can be mixed: [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 + +{figure}{\includegraphics[height=0.4\textheight]{images/rose}}%% no 3 {A Caption C of a ``fullpage'' object, which follows on the left or right column.}% {multi:demo1} @@ -2452,7 +2268,7 @@ left aligned. -\begin{figure}[p] +\begin{figure}[!h] \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 @@ -2464,9 +2280,9 @@ left aligned. \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} -%\end{figure} +\end{figure} -%\begin{figure}[!h] +\begin{figure}[!h] \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 @@ -2481,7 +2297,6 @@ left aligned. \end{figure} -\clearpage \section{Subfloat page} A subfloat page can have only one type of floats which will have one main caption and @@ -2490,6 +2305,7 @@ Some arguments are ignored for a subfloat, one can leave them empty. The first l the object entry is ignored! All aditional lines will have the same float type, the reason why the float type entry is ignored. +\enlargethispage{\normalbaselineskip} \begin{lstlisting} \captionsetup[sub]{singlelinecheck} @@ -2499,14 +2315,14 @@ float type entry is ignored. 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}}% + +{}{\includegraphics[height=0.28\textheight]{images/rose}}% [Short caption B]% {A Caption B of a ``fullpage'' sub object.}% subcaption {}% - +{}{\includegraphics[height=0.28\textheight]{rose}}% + +{}{\includegraphics[height=0.28\textheight]{images/rose}}% {A Caption C of a ``fullpage'' object, which follows on the left or right column.}% {sub:demo10} - +{}{\includegraphics[height=0.28\textheight]{rose}}% + +{}{\includegraphics[height=0.28\textheight]{images/rose}}% {A Caption D of a ``fullpage'' object}% {sub:demo20} \end{lstlisting} @@ -2525,15 +2341,15 @@ should be true (see listing). 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}}% + +{}{\includegraphics[height=0.28\textheight]{images/rose}}% [Short caption B]% {A Caption B of a ``fullpage'' sub object.}% {}% - +{}{\includegraphics[height=0.28\textheight]{rose}}% + +{}{\includegraphics[height=0.28\textheight]{images/rose}}% {A Caption C of a ``fullpage'' object, which follows on the left or right column.}% {sub:demo10} - +{}{\includegraphics[height=0.28\textheight]{rose}}% + +{}{\includegraphics[height=0.28\textheight]{images/rose}}% {A Caption D of a ``fullpage'' object}% {sub:demo20} \fi @@ -2552,17 +2368,17 @@ should be true (see listing). \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=2,width=0.24\linewidth]{examples/sub-after2s2c}}\hfill +\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/sub-after2s2c}}\hfill +\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-after2s2c}}\hfill +\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-after2s2c}} -\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=6,width=0.24\linewidth]{examples/sub-after2s2c}}\hfill +\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/sub-after2s2c}}\hfill +\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/sub-after2s2c}}\hfill +\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/sub-after2s2c}} %\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/odd2s2c}} -\caption{Output of \texttt{sub-right2s2c} (pages 2--9)}\label{sub-right2s2c} +\caption{Output of \texttt{sub-after2s2c} (pages 2--9)}\label{sub-after2s2c} \end{figure} @@ -2585,7 +2401,7 @@ the object is set. Let's assume that we use something like \begin{verbatim} \setDefaults \hvFloat[fullpage,capPos=evenPage]{figure}% - {\IncludeGraphics{frose}}% + {\IncludeGraphics{images/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}% @@ -2623,21 +2439,8 @@ 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} -\blindtext - - -\setDefaults -\hvFloat[FULLPAGE,capPos=after]{figure}% - {\includegraphics[FULLPAGE]{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} - - -\blindtext - +\FloatBarrier \section{Defining a style} @@ -2654,7 +2457,7 @@ For example: \begin{lstlisting} -\hvFloat[style=RightCaption]{figure}{\includegraphics[scale=1.5]{frose}}% +\hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}% {Caption vertically centered right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth}.}{fig:style} \end{lstlisting} @@ -2662,25 +2465,11 @@ For example: \defhvstyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} -\hvFloat[style=RightCaption]{figure}{\includegraphics[scale=1.5]{frose}}% +\hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}% {Caption at bottom right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth}.}{fig:style} -A defined style is internally saved in a macro named \texttt{hv@