summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-04-04 20:52:35 +0000
committerKarl Berry <karl@freefriends.org>2019-04-04 20:52:35 +0000
commitd9783f18c815aa817e3c05a0c214d9421d1c15d8 (patch)
treec5e58873b0e0f171c184b0e294c4584e9b406816
parent67ebf2aef27b507f7520b4ec8a5cc23b9301bee7 (diff)
hvfloat (4apr19)
git-svn-id: svn://tug.org/texlive/trunk@50753 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes5
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/README3
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/README.exa15
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdfbin0 -> 91590 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex76
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdfbin0 -> 96233 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex (renamed from Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex)52
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/bateaux.jpgbin0 -> 45694 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdfbin95237 -> 92636 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex3
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdfbin97510 -> 92893 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex67
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdfbin90034 -> 93006 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdfbin96545 -> 96312 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdfbin88317 -> 88091 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdfbin96300 -> 96144 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdfbin96849 -> 96820 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdfbin96145 -> 96003 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdfbin94724 -> 94193 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin2858058 -> 3052266 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex989
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdfbin95597 -> 95472 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdfbin95740 -> 95624 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdfbin94696 -> 94535 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdfbin0 -> 96060 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex81
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdfbin0 -> 156239 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex147
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdfbin156151 -> 156112 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdfbin104360 -> 104234 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdfbin158009 -> 157949 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdfbin103112 -> 102985 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdfbin104072 -> 103867 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdfbin106941 -> 106428 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex3
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdfbin155689 -> 155606 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex9
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdfbin89974 -> 89850 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdfbin97230 -> 97127 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdfbin96430 -> 96220 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdfbin97719 -> 97589 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdfbin95886 -> 95717 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdfbin96051 -> 95949 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdfbin95391 -> 95222 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdfbin0 -> 89936 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex82
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdfbin94290 -> 90690 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex8
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdfbin100235 -> 100133 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdfbin100052 -> 99960 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdfbin98824 -> 98701 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdfbin90657 -> 90455 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdfbin98918 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/preamble.ltx1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdfbin91515 -> 91413 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex13
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdfbin98990 -> 98824 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdfbin91944 -> 91777 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdfbin96269 -> 95365 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex16
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/rose.eps718
-rwxr-xr-xMaster/texmf-dist/doc/latex/hvfloat/runAll.sh15
-rwxr-xr-xMaster/texmf-dist/doc/latex/hvfloat/runEXA.sh16
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdfbin0 -> 153217 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex129
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdfbin0 -> 154250 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex129
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdfbin153450 -> 153333 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdfbin153854 -> 153779 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdfbin154601 -> 154523 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdfbin153259 -> 153145 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex9
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdfbin154554 -> 154368 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdfbin154393 -> 153787 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex9
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty146
109 files changed, 2013 insertions, 763 deletions
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 <base>
-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
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
Binary files 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
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex
index b54687c8411..cf106566fce 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex
@@ -1,77 +1,79 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
+
\begin{document}
-\title{Example for FULLPAGE floats}
-\author{Herbert Voß}
-\maketitle
\tableofcontents
+ ewpage
\blinddocument
+
\section{File \texttt{\jobname}}
\begin{lstlisting}
-The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+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}.
+The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}.
\begin{lstlisting}
-\hvFloat*[FULLPAGE,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
+ {\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}
+ {fig:fullpage0}
\end{lstlisting}
\Float[capPos=after]
-\hvFloat*[FULLPAGE,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
+ {\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}
+ {fig:fullpage0}
\blinddocument
\begin{lstlisting}
-\hvFloat*[FULLPAGE,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
+ {\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}
+ {fig:fullpage1}
\end{lstlisting}
\Float[capPos=after]
-\hvFloat*[FULLPAGE,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
+ {\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}
+ {fig:fullpage1}
\blinddocument
+
\Blindtext
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
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/bateaux.jpg
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
Binary files 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
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
Binary files 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@<name>|.
%\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@<style name>}. For the defined
-style \Lkeyval{RightCaption} it is \Lcs{hv"@RightCaption}. Using this macro shows it's definition:
-
-\begin{verbatim}
-\makeatletter
-\hv@RightCaption
-\makeatother
-\end{verbatim}
-
-\makeatletter
-\hv@RightCaption
-\makeatother
-
-
\section{Global float setting}
Instead of writing the following sequence into the preamble:
@@ -2692,22 +2481,28 @@ Instead of writing the following sequence into the preamble:
\makeatother
\end{verbatim}
-you can change the global setting of floats by loading the package \Lpack{hvfloat-fps} (fps: float
-placement setting). It allows with
-optional package arguments to set the global placement:
+you can change the global setting of floats by loading the package \Lpack{hvfloat-fps}. It allows
+optional package options to set the global placement:
\begin{verbatim}
\usepackage[figure=tb,table=t]{hvfloat-fps}
-\usepackage[all=!htb]{hvfloat-fps}
\end{verbatim}
-
\blindtext
+\blindtext
+%\setDefaults
+\hvFloat[FULLPAGE]{figure}%
+ {\includegraphics[FULLPAGE]{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}%
+ {demo:fullpage}
+\Blindtext
\printindex
@@ -2724,7 +2519,7 @@ optional package arguments to set the global placement:
\section{The Package Source}
-\lstinputlisting[basicstyle=\ttfamily\footnotesize,tabsize=3]{hvfloat.sty}
+\lstinputlisting[basicstyle=\ttfamily\footnotesize,tabsize=3,numbers=left,numberstyle=\tiny]{hvfloat.sty}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
index 44bb2161914..e185ca85a91 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
index e69a4b74e18..001d9e824df 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: inner1s2c.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/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
index dfd528b2d1d..b05404ae067 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
index 09cd7f622a8..ec50400c019 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside]{scrartcl}
+%% $Id: inner2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
index e53cf513255..78d2c2f541b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
index 8dad428f164..315b04f7690 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: inner2s2c.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/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
new file mode 100644
index 00000000000..67cd3b46193
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex
new file mode 100644
index 00000000000..20f991759a9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex
@@ -0,0 +1,81 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: left2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\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=left]%
+ {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[default]
+\hvFloat[fullpage,capPos=left]%
+ {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=left]%
+ {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[default]
+\hvFloat[fullpage,capPos=left]%
+ {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
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
new file mode 100644
index 00000000000..bf8d162e5fc
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex
new file mode 100644
index 00000000000..e38ac497ee2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex
@@ -0,0 +1,147 @@
+\documentclass{scrartcl}
+%% $Id: multi-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+
+\input{preamble.ltx}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The multi images~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+\end{lstlisting}
+
+The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=after,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img:demo0}%
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
+ L & R & C & P\\
+ left & right & center & Text with possible linebreaks\\
+ \multicolumn{4}{c}{Multicolumn over all columns}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo1}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo2}
+\end{lstlisting}
+
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=after,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}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=after,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:demo3}%
+ +{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:demo4}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo5}
+\end{lstlisting}
+
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=after,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:demo3}%
+ +{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:demo4}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption D of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo5}
+
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
index a82f823ce67..772e0e9ee87 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
index da15c39412a..11a813f4994 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
@@ -1,4 +1,6 @@
\documentclass{scrartcl}
+%% $Id: multi-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
index f51ad86b11a..f2417d7e446 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
index 42b785cc1d2..86d0211eb37 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: multi-default1s2c.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/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
index 96f69963a18..9af48944518 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
index 98b8292a581..3bb4198577f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside]{scrartcl}
+%% $Id: multi-default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
index d13d5f4a089..219f5948772 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
index 40446f6f5a4..2508fa7c711 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: multi-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/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
index 7b81a8e1b26..2716acd52dc 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
index 81f4006f2f0..796f367595a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
@@ -1,5 +1,6 @@
\errorcontextlines=200
\documentclass[twoside]{scrartcl}
+%% $Id: multi-inner2s2c.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/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
index ffc6441fec2..0a0d18ecd0c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
index 930d1c01778..1947d4c409c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
@@ -1,5 +1,6 @@
\errorcontextlines=100
\documentclass[twoside]{scrartcl}
+%% $Id: multi-outer2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -52,7 +53,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\Float[Multi]
-\hvFloat[fullpage,multiFloat,capPos=outer,objectPos=c]%
+\hvFloat[fullpage,multiFloat,capPos=o,objectPos=c]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
index 4f307de76f2..ddf6a4c8999 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
index 45884abb5cf..16b2ebacbf5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: multi-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
@@ -22,7 +23,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -50,7 +51,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -82,7 +83,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -110,7 +111,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
index 92bde25741b..ff7a88c3385 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
index d2ccbd7885c..073d3b0d7e5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: odd1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
index 0425cad9a88..f44559496ba 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
index 49a97399540..b749afc1922 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: odd1s2c.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/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
index 86485ecdc24..ae9529dfaaa 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
index 311074e8937..a2f6e8fb0dd 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside]{scrartcl}
+%% $Id: odd2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
index b3ebce3522c..f756be16732 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
index d33b8cf30e6..a6014dfe5d3 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: odd2s2c.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/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
index 3e3793c9147..03b460da8f8 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
index 0d5f5928bfa..92bca1907c5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: outer1s2c.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/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
index 3cdce808a73..64d625ded29 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
index 9b3a8c29363..2392915bcbe 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside]{scrartcl}
+%% $Id: outer2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
index 553a79404ba..de0a392ba5e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
index 9503d835e78..fd96ebb4c90 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: outer2s2c.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/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
new file mode 100644
index 00000000000..bd4d3fd8755
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex
new file mode 100644
index 00000000000..1832540102d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex
@@ -0,0 +1,82 @@
+\documentclass{scrartcl}
+%% $Id: paper-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+
+\usepackage{pdfpages}
+\input{preamble.ltx}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+\Blindtext
+
+\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,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose.png}}%
+ [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[default]
+\hvFloat[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose.png}}%
+ [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
+\Blindtext
+
+
+\begin{lstlisting}
+\hvFloat[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose.png}}%
+ [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[default]
+\hvFloat[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose.png}}%
+ [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/paper-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
index 14aac1f8885..43b3bfb17b1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
index 29b0290e8a3..09233d3b4f1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: paper-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
@@ -11,7 +12,7 @@
\tableofcontents
\Blindtext
-%\blindtext
+\blindtext
\section{File \texttt{\jobname}}
@@ -45,8 +46,9 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
-\blinddocument
-\blindtext
+%\blinddocument
+\Blindtext
+
\begin{lstlisting}
\hvFloat[FULLPAGE]%
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
index 530f479dc5e..5e58d5eac94 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
index 447cbfd50f6..bb4b173deb7 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: paper-default1s2c.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/paper-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
index bc2134385dc..b4c5ef49b67 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
index 447cbfd50f6..6647b434ed6 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: paper-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/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
index f98af24258a..919e3063533 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
index 1784f8c1083..08a44c47eb9 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: paper-inner2s2c.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/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
index 6f8989ff452..82779134119 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
index e4615a0bf5c..23ee98ff60d 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: paper-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdf
deleted file mode 100644
index 94971c8feac..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
index cff53b56ef4..dd2d7ccc4fd 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
+++ b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
@@ -41,3 +41,4 @@
\captionsetup{labelfont={red,sf},font={red,sf},format=plain}
\usepackage{blindtext}
+\flushbottom
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
index e79d04aba32..24eca5d224b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
index eb06ae1db1b..a3042a3530b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
@@ -15,7 +16,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}.
\begin{lstlisting}
-\hvFloat[fullpage,capPos=after]%
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
@@ -27,8 +28,8 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
\end{lstlisting}
-\Float[capPos=after]
-\hvFloat[fullpage,capPos=after]%
+\Float[capPos=right]
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
@@ -43,7 +44,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
\Blindtext
\begin{lstlisting}
-\hvFloat[fullpage,capPos=after]%
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
@@ -55,8 +56,8 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
\end{lstlisting}
-\Float[capPos=after]
-\hvFloat[fullpage,capPos=after]%
+\Float[capPos=right]
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
index 68bc9e4449f..9776fde7b49 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
index 5e8b4b3e85d..98ce0eb17da 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: right1s2c.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/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
index a5f3a34822e..fef0d892782 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
index 7e2f13e6b50..362f953f8b2 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside]{scrartcl}
+%% $Id: right2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
index 44859b5ade0..e0389a81b00 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
index f296934ed37..42c8ef1fca5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -6,7 +7,8 @@
\begin{document}
-\tableofcontents\newpage
+\tableofcontents
+ ewpage
\blinddocument
@@ -20,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}.
\begin{lstlisting}
-\hvFloat[fullpage,capPos=after]%
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
@@ -32,8 +34,8 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
\end{lstlisting}
-\Float[capPos=after]
-\hvFloat[fullpage,capPos=after]%
+\Float[capPos=right]
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
@@ -46,7 +48,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
\blinddocument
\begin{lstlisting}
-\hvFloat[fullpage,capPos=after]%
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
@@ -58,8 +60,8 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca
\end{lstlisting}
-\Float[capPos=after]
-\hvFloat[fullpage,capPos=after]%
+\Float[capPos=right]
+\hvFloat[fullpage,capPos=right]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A fullpage float with the default caption setting]%
diff --git a/Master/texmf-dist/doc/latex/hvfloat/rose.eps b/Master/texmf-dist/doc/latex/hvfloat/rose.eps
new file mode 100644
index 00000000000..7dc3bf22bb3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/rose.eps
@@ -0,0 +1,718 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: (ImageMagick)
+%%Title: (rose.eps)
+%%CreationDate: (Wed Apr 23 19:37:33 2003)
+%%BoundingBox: 0 0 107 133
+%%DocumentData: Clean7Bit
+%%LanguageLevel: 1
+%%Pages: 1
+%%EndComments
+
+%%BeginDefaults
+%%EndDefaults
+
+%%BeginProlog
+%
+% Display a color image. The image is displayed in color on
+% Postscript viewers or printers that support color, otherwise
+% it is displayed as grayscale.
+%
+/DirectClassPacket
+{
+ %
+ % Get a DirectClass packet.
+ %
+ % Parameters:
+ % red.
+ % green.
+ % blue.
+ % length: number of pixels minus one of this color (optional).
+ %
+ currentfile color_packet readhexstring pop pop
+ compression 0 eq
+ {
+ /number_pixels 3 def
+ }
+ {
+ currentfile byte readhexstring pop 0 get
+ /number_pixels exch 1 add 3 mul def
+ } ifelse
+ 0 3 number_pixels 1 sub
+ {
+ pixels exch color_packet putinterval
+ } for
+ pixels 0 number_pixels getinterval
+} bind def
+
+/DirectClassImage
+{
+ %
+ % Display a DirectClass image.
+ %
+ systemdict /colorimage known
+ {
+ columns rows 8
+ [
+ columns 0 0
+ rows neg 0 rows
+ ]
+ { DirectClassPacket } false 3 colorimage
+ }
+ {
+ %
+ % No colorimage operator; convert to grayscale.
+ %
+ columns rows 8
+ [
+ columns 0 0
+ rows neg 0 rows
+ ]
+ { GrayDirectClassPacket } image
+ } ifelse
+} bind def
+
+/GrayDirectClassPacket
+{
+ %
+ % Get a DirectClass packet; convert to grayscale.
+ %
+ % Parameters:
+ % red
+ % green
+ % blue
+ % length: number of pixels minus one of this color (optional).
+ %
+ currentfile color_packet readhexstring pop pop
+ color_packet 0 get 0.299 mul
+ color_packet 1 get 0.587 mul add
+ color_packet 2 get 0.114 mul add
+ cvi
+ /gray_packet exch def
+ compression 0 eq
+ {
+ /number_pixels 1 def
+ }
+ {
+ currentfile byte readhexstring pop 0 get
+ /number_pixels exch 1 add def
+ } ifelse
+ 0 1 number_pixels 1 sub
+ {
+ pixels exch gray_packet put
+ } for
+ pixels 0 number_pixels getinterval
+} bind def
+
+/GrayPseudoClassPacket
+{
+ %
+ % Get a PseudoClass packet; convert to grayscale.
+ %
+ % Parameters:
+ % index: index into the colormap.
+ % length: number of pixels minus one of this color (optional).
+ %
+ currentfile byte readhexstring pop 0 get
+ /offset exch 3 mul def
+ /color_packet colormap offset 3 getinterval def
+ color_packet 0 get 0.299 mul
+ color_packet 1 get 0.587 mul add
+ color_packet 2 get 0.114 mul add
+ cvi
+ /gray_packet exch def
+ compression 0 eq
+ {
+ /number_pixels 1 def
+ }
+ {
+ currentfile byte readhexstring pop 0 get
+ /number_pixels exch 1 add def
+ } ifelse
+ 0 1 number_pixels 1 sub
+ {
+ pixels exch gray_packet put
+ } for
+ pixels 0 number_pixels getinterval
+} bind def
+
+/PseudoClassPacket
+{
+ %
+ % Get a PseudoClass packet.
+ %
+ % Parameters:
+ % index: index into the colormap.
+ % length: number of pixels minus one of this color (optional).
+ %
+ currentfile byte readhexstring pop 0 get
+ /offset exch 3 mul def
+ /color_packet colormap offset 3 getinterval def
+ compression 0 eq
+ {
+ /number_pixels 3 def
+ }
+ {
+ currentfile byte readhexstring pop 0 get
+ /number_pixels exch 1 add 3 mul def
+ } ifelse
+ 0 3 number_pixels 1 sub
+ {
+ pixels exch color_packet putinterval
+ } for
+ pixels 0 number_pixels getinterval
+} bind def
+
+/PseudoClassImage
+{
+ %
+ % Display a PseudoClass image.
+ %
+ % Parameters:
+ % class: 0-PseudoClass or 1-Grayscale.
+ %
+ currentfile buffer readline pop
+ token pop /class exch def pop
+ class 0 gt
+ {
+ currentfile buffer readline pop
+ token pop /depth exch def pop
+ /grays columns 8 add depth sub depth mul 8 idiv string def
+ columns rows depth
+ [
+ columns 0 0
+ rows neg 0 rows
+ ]
+ { currentfile grays readhexstring pop } image
+ }
+ {
+ %
+ % Parameters:
+ % colors: number of colors in the colormap.
+ % colormap: red, green, blue color packets.
+ %
+ currentfile buffer readline pop
+ token pop /colors exch def pop
+ /colors colors 3 mul def
+ /colormap colors string def
+ currentfile colormap readhexstring pop pop
+ systemdict /colorimage known
+ {
+ columns rows 8
+ [
+ columns 0 0
+ rows neg 0 rows
+ ]
+ { PseudoClassPacket } false 3 colorimage
+ }
+ {
+ %
+ % No colorimage operator; convert to grayscale.
+ %
+ columns rows 8
+ [
+ columns 0 0
+ rows neg 0 rows
+ ]
+ { GrayPseudoClassPacket } image
+ } ifelse
+ } ifelse
+} bind def
+
+/DisplayImage
+{
+ %
+ % Display a DirectClass or PseudoClass image.
+ %
+ % Parameters:
+ % x & y translation.
+ % x & y scale.
+ % label pointsize.
+ % image label.
+ % image columns & rows.
+ % class: 0-DirectClass or 1-PseudoClass.
+ % compression: 0-none or 1-RunlengthEncoded.
+ % hex color packets.
+ %
+ gsave
+ /buffer 512 string def
+ /byte 1 string def
+ /color_packet 3 string def
+ /pixels 768 string def
+
+ currentfile buffer readline pop
+ token pop /x exch def
+ token pop /y exch def pop
+ x y translate
+ currentfile buffer readline pop
+ token pop /x exch def
+ token pop /y exch def pop
+ currentfile buffer readline pop
+ token pop /pointsize exch def pop
+ /Times-Roman findfont pointsize scalefont setfont
+ x y scale
+ currentfile buffer readline pop
+ token pop /columns exch def
+ token pop /rows exch def pop
+ currentfile buffer readline pop
+ token pop /class exch def pop
+ currentfile buffer readline pop
+ token pop /compression exch def pop
+ class 0 gt { PseudoClassImage } { DirectClassImage } ifelse
+ grestore
+} bind def
+%%EndProlog
+%%Page: 1 1
+%%PageBoundingBox: 0 0 107 133
+userdict begin
+DisplayImage
+0 0
+107 133
+12.000000
+107 133
+1
+0
+0
+42
+F8FCF8
+707470
+E8ECE8
+D8DCD8
+A8A8A8
+C8CCC8
+989898
+B8B8B8
+888888
+F80000
+A0A0A0
+A8ACA8
+686868
+707070
+888C88
+808480
+C0C0C0
+686C68
+505050
+606460
+A0A4A0
+909490
+606060
+505450
+484848
+B8BCB8
+989C98
+404040
+404440
+585C58
+B0B0B0
+585858
+383838
+787878
+202020
+484C48
+383C38
+787C78
+008800
+282828
+303030
+101010
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000010102030000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000405030607010605000003010606010402
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000501080105000206050909020408080A0B0C0609090900020806
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000060009000404010009090806020A0D080607010909090909090703
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000201010909090E0F0710000908020006110909090909090908060009090403
+070601040300000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000800090909091201000800090809090606090909090909090903080909130705
+000002070102000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000005040009090900010800080009010906020100040107070404090901090900000909
+090909000607000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+02060909090909020405070509090609010008000A0A0000000807040108140209090909
+090909090506000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000002060804
+090909090009080000080008060209150809000601000909090000050107130909090909
+090909000504000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000808020909
+090009090405090006050704030916000903040100090909090901001717030909090002
+070000060300000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000204090009
+0909040509090006040E0001090406090600070004061809000100060806000902060607
+120500060102000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000009090909
+0008000900020608020612090005050803070603000511190400081A1B06080703000007
+080009020800000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000109090909
+0700090003010909000F0609090115010001090909011B0004080603000000090904030D
+080900060302000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000080809090904
+0009090000120909040100090909010006090909061C0C11050909090909090904000100
+090900040100000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000006020809090602
+09090900010909120F0500000909011909090900041D0000090909000208070003080004
+090003040000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000008040909000801
+01061212070303011E09090909001309090000010804041F1D0D0C0602040606030C1500
+051F04080400000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000506080606040701090909090900
+000002060909090407070909090005010807150C01030000031F01080F01041D060F0106
+000000030400000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000206090909030002011209090909090909
+0909120D20091F05010206211722130108070000060D0C21040603020608020223000309
+090900080000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000002080401090909000004080606241F05000906010706
+060000000007130206060B0C05000701040107070F0A0D1D070704020005080D25000900
+090513000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000800090909000909090300000909020A08180500000909
+090909000600010002010606030909070805000005040701010707251306040600090909
+040208000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000010909000909090F00090909090009090909050600090000
+00090901000307090002070D090909000701060402070301040603000506000900090809
+09041A000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000004090909090508150209090909090909090900060209000909
+090908060008090009000209090909090000080605060000000301040909090909090909
+060800000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000700050605000600040801040101070104000002060909090000
+090001000909090009090509090909131301060806030108080009090904090909000906
+060000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000002010504000005040000000003060708060000090901000909090909
+0003060909090909090902010606080C0700090909090909090908000909090909090406
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000002130707070E00090009000109090909090909090807000909090900
+0008090900040809090909090900000609090909090909090400080D1D0F000909000707
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000010009090909070900090909000909090308060500090909
+080909090000050608090909090806050009090909080200081906000802090900090400
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000001000909090504090009000009090909090909090106000909
+0609090909090000020604140604182509011D010604010201000000011A090909100000
+000000000000000000000000000000000000000000000401040500000000000000000000
+000000000000000000000600090009000809000909090909090900000909090206070909
+0105000909090204080C2002000003010700050402070501000909050109040604000000
+000000000000000000000000000000000000030106032626260605000000000000000000
+000000000000000000020800090900040309090909090900090909090909090905060909
+040800070909020000020109090900030707031302070709090000020604070000000000
+000000000000000000000000000000000104262626262626260802000000000000000000
+000000000000000000020105090000010009090909090909090909090909090902080909
+090405000009090900000900090909090000020803000009000909000800000000000000
+000000000002060000000000051708040326262626262626000600000000000000000000
+000000000000000000000401050005040009090909050409000909090009090002080603
+000009090909090106010909090009090900000708000909000905070000000000000000
+00000000010100000000051C040500262626262626002600010000000002000000000000
+00000000000000000000000508081E080400030401070909090909090909000307000408
+040705000006020618090909090909090909090206060909090400000000000000000000
+000000040100000008060000262626262626260007000002060701070408000000000000
+000000000000000000000000000000030807030705090909090909090906170309090909
+0909090909090006080700090900090900090902150B0909060000000000000000000000
+000008080606010605262626260307002626000603000000002626000204000000000000
+00000000001306011C080300000000000000000105090909090906080801000900000000
+000000090900010003010209090909090909080001090908000000000000000000000000
+000800262626262626262626000602262626000800002626262626000406000000000000
+00001701080300040307080400000000000000070608060F0D0209090600090909090909
+09090900032102000008020909090902010E030700070500000000000000000000000003
+0D2626000603262626262626000802262600040500260026262626262601030000000106
+262626262626262626260301040000000000000000030D00090909080009090909090909
+09000706000802000004080106060600020F070006000000000000000000000000000713
+2626262626262626262613010B0826260005030026260026262600262626150804012626
+26000000262626262626262606070000000000000E090009090902010101010101080406
+08050000000100000007000000000000040D06050000000000000000000000000000070E
+0401080800000000040500030D0D07062103000026262626262600002605080026262626
+262626262626262626262626080000000000021309000909090909090909090909090909
+000909090208000008000000000000001502000000000000000000000000000000000201
+040005262626040500260026262600000408070026260026260026260003132626262626
+0400000004012508260026040300000000040E0009090909090909090909090000000909
+090009090504000602000000000000000000000000000000000000000000000000000005
+0401260026030026262626262626010104030806262626262626260004030004040E0601
+0B0813100000000806260001000000000809090909090909090909090002080606080909
+00090909040502060000000000000000000000000000000000000000000000000000000C
+062626262626262626262626262626260604030826260026262602082626000718020000
+040500000107080D0E03160404030403090000090900090909090006080200000E090909
+090009000802070500000000000000000000000000000000000000000000000000051F00
+26262626260026262600040500002626030602082626260026060026262600010000001F
+08060F1108080101110D060C1A0E03090909090909090909090102000000000009090000
+0009000025030802000000000000000000000000000000000000000000000000051E2626
+262626002626002606210807060800000600020600000515070326262605070013010C0F
+08040000260000200F050315041301090909090909000604000000000000000609090909
+090406170500010000000000000000000000000000000000000000000000000013262600
+260026260026260000000000020808190800050700060C19072626000827230C0C262626
+2626262626001F1008011607070802090000000501020000000000000000010600000301
+030206030605000000000000000000000000000000000000000000000000000604262626
+26262626260000000000000000001E0C0F05080215120326000403080403262626262626
+26262626050A060006050606070606060104130000000000000000000001080B12150601
+0D0F04000000000000000000000000000000000000000000000000000000000301010601
+012605040000000000000000031C03000708120600012626000606020026002626262626
+00262605070100060615081E080606070026080000000000000000000706080200000000
+000000000000000000000000000000000000000000000000000000000000000000000705
+000000000000000000000506002626262626260206262600060326262626262626262626
+262600070103040800000706040005082626080000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000130326262626002626012626262608262626262626262626262600
+000008010107030507050003010403042626030000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000103262626002626262606260026260405260026262600262603060801
+010C12031D25131507060400020808262601000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000010726262626262626262626002626000626262626262626082626262626
+0010010D1506161606030800080826260400000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000104002626260026260003262626262603010126262600050626260000002600
+000013020000060501210205142626070000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+0000000001032626260026000326262604281C0500000504260804262600000000262626
+2601262626260800060E0001062608000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000004150726262626260008280300000007032600051326022626262626262626262626
+26262600260800001802021F030100000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+0001010026262626260206262626262626262608041A13000406070704010D2626262626
+262626260505000B1F081A0D040000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+0606042626262626010800262605060808070000081017050000000001020F1107000006
+1C2626000700080126030F0C020000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000003
+080226262600260805040608070000000000000505060000000003062601000508040208
+172600010001012626262626040000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000401
+072626260026150103000000000000000000000601000000000126260300000002080201
+010208000401262626002604020000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000100
+26262626260D000000000000000000000000010100000003062606000000000000080201
+040400060126262600260001000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000004032626
+00262618030000000000000000000000000808000000062626020000000000000008081C
+010001082626260026000700000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000813080500030106
+08071E000000000000000000000000000401000003262604000000000000000000060411
+070711262626002603070000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000601010106000003
+050000000000000000000000000000080100000826080000000000000000000000070112
+021826262600260707000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000526040007262607000000000000000000000000020403
+122626260026040000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000042606000126080000000000000000000000000000000013
+260026262608000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000006260607262603000000000000000000000000000000000D26
+262626060000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000004000826022626060000000000000000000000000000000000122626
+000605000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000070700062606260802000000000000000000000000000000000512000208
+020000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000001050505262626040000000000000000000000000000000000060208060000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000804010226260800000000000000000000000000000000000008011E15000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000071306072607070000000000000000000000000000000000000003081300000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000290326260600000000000000000000000000000000000000000100110700000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000707262604030000000000000000000000000000000000000005262605110000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+0826260E060000000000000000000000000000000000000005040026020F000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000008
+26000F020000000000000000000000000000000000000217032626080200000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000060226
+030400000000000000000000000000000000000000012626261306000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000206262601
+000000000000000000000000000000000000000001262603010500000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000060226070300
+000000000000000000000000000000000000000826020805000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000008262608000000
+000000000000000000000000000000000000170106000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000052626080200000000
+000000000000000000000000000000000004050000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000006260304000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000032626080000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000001260705000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000032626080000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000026260802000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000052603040000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000026260800000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000042607050000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000008260800000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000082626020000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000403260600061303000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000003062626080601030000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000626262626010200000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000062626262600000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000526262608000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000002082626080000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000800260800000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000003
+072626030000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000826
+260400000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000003262601
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000002626040300
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000004260206000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000022626080000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000008260507000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000052626010000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000008262603000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000082626060000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000326260602000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000262603060000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000726000800000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000002262607030000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000262626020600000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000002626050008000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000026260400040500000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000262604000208000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000002626040000010000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000026260400000802000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+030807000008020000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000030807
+000000040500000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000608041D
+011305000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000322
+020000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000A00
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000
+end
+newpath 0.5 0.5 moveto 0 132 rlineto 106 0 rlineto 0 -132 rlineto closepath 0.1 setlinewidth 0 setgray stroke
+%%PageTrailer
+%%Trailer
+%%EOF
diff --git a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
index ae97108d50e..94e35c43f11 100755
--- a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
+++ b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
@@ -1,9 +1,20 @@
#!/bin/bash
for datei in *.tex
do
- lualatex $datei
- lualatex $datei
+ RUNS=1
+ echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
lualatex $datei
MAIN=$(basename -a -s .tex $datei)
+ TEST=`grep -c "Label(s) may have changed." $MAIN.log`
+ while [ $TEST -gt 0 ];
+ do
+ let RUNS=RUNS+1
+ echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
+ lualatex $datei
+ TEST=`grep -c "Label(s) may have changed." $MAIN.log `
+ if [ $RUNS -gt 5 ]
+ then TEST=0
+ fi
+ done
rm $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
done
diff --git a/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh b/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
index 2d4060b9360..8d6e6f84fe9 100755
--- a/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
+++ b/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
@@ -1,10 +1,20 @@
#!/bin/bash
for datei in $1????.tex
do
-
+ RUNS=1
+ echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
lualatex $datei
- lualatex $datei
- lualatex $datei
MAIN=$(basename -a -s .tex $datei)
+ TEST=`grep -c "Label(s) may have changed." $MAIN.log`
+ while [ $TEST -gt 0 ];
+ do
+ let RUNS=RUNS+1
+ echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
+ lualatex $datei
+ TEST=`grep -c "Label(s) may have changed." $MAIN.log `
+ if [ $RUNS -gt 5 ]
+ then TEST=0
+ fi
+ done
rm $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
done
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
new file mode 100644
index 00000000000..c5cf5fee19f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex
new file mode 100644
index 00000000000..4d87de577ac
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex
@@ -0,0 +1,129 @@
+\documentclass{scrartcl}
+%% $Id: sub-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+
+\input{preamble.ltx}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The sub images~\vref{sub:demo0} has a caption~\vpageref{sub:demo0-cap} and the
+subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
+\end{lstlisting}
+
+The multi images~\vref{sub:demo0} has a caption~\vpageref{sub:demo0-cap} and the
+subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,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}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,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:demo4}%
+ +{}{\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:demo5}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo6}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo7}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,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:demo4}%
+ +{}{\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:demo5}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo6}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo7}
+
+
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
new file mode 100644
index 00000000000..e70b428d5b8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex
new file mode 100644
index 00000000000..5d46609f001
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex
@@ -0,0 +1,129 @@
+\documentclass[twocolumn]{scrartcl}
+%% $Id: sub-after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The sub images~\vref{sub:demo0} has a caption~\vpageref{sub:demo0-cap} and the
+subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
+\end{lstlisting}
+
+The multi images~\vref{sub:demo0} has a caption~\vpageref{sub:demo0-cap} and the
+subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,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}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,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:demo4}%
+ +{}{\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:demo5}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo6}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo7}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=after,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:demo4}%
+ +{}{\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:demo5}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo6}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo7}
+
+
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
index 06464c61b38..9f1823acb6c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
index 0d924e7eb15..6777dea5c74 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: sub-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
index dabd57b4a22..25d97d2ea83 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
index 9b006a9d855..1ebc5bb9cc6 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: sub-default1s2c.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/sub-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
index 9539cbc982b..4ebe3879acd 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
index 9326118b219..3e007f239e2 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
+%% $Id: sub-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/sub-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
index c6875b06589..23be680ca2d 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
index 9448ec2f4e9..078f9019329 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
@@ -1,4 +1,5 @@
\documentclass{scrartcl}
+%% $Id: sub-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
@@ -23,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -46,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -73,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -96,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
index f2b95d19a3b..47e9983279b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
index 5c02fccb9f6..f721256a112 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: sub-right1s2c.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/sub-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
index ae4a3af1faa..887ab0c2519 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
index 5c02fccb9f6..e4f5f9c246a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
@@ -1,4 +1,5 @@
\documentclass[twocolumn]{scrartcl}
+%% $Id: sub-right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -23,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -46,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -73,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -96,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
index 4ed1187c469..6fff6b4323e 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat-fps.sty 949 2019-03-09 10:08:31Z herbert $
+%% $Id: hvfloat-fps.sty 1031 2019-04-03 20:40:25Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hvfloat-fps}[2017/09/16 setting float objects]
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index c5a2e2bc77c..6f3a830f70e 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 1009 2019-04-01 12:44:03Z herbert $
+%% $Id: hvfloat.sty 1033 2019-04-04 07:24:57Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hvfloat}[2019/02/03 rotating of floating objects]
@@ -16,9 +16,10 @@
%% DESCRIPTION:
%% `hvfloat' offers rotating of captions and objects for floats
%%
-\def\fileversion{2.11}
-\def\filedate{2019/04/01}
+\def\fileversion{2.12}
+\def\filedate{2019/04/04}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
+\let\hvFileVersion\fileversion
%
\newif\ifhv@fbox \hv@fboxfalse
\newif\ifhv@hyperref \hv@hyperreffalse
@@ -32,33 +33,38 @@
\PassOptionsToPackage{hypcap}{subcaption}
\RequirePackage{subcaption}
\RequirePackage{atbegshi}
-\ifhv@hyperref
- \RequirePackage{hyperref}
-% \RequirePackage{hypcap}
-\fi
-%\AtBeginDocument{\providecommand\capstart{}}% in no hyperref/hypcap is loaded
-%
+
\RequirePackage{expl3,multido}
\RequirePackage{graphicx}
\RequirePackage{xkeyval}
\RequirePackage{ifoddpage}
-%
\RequirePackage{afterpage}
+%\RequirePackage{zref-abspos}
+
+\ifhv@hyperref
+ \RequirePackage{hyperref}
+% \RequirePackage{hypcap}
+\fi
+%
+%\unitlength=1cm
+\providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}
\newlength\hvObjectWidth
\newlength\hvCapWidth
\newlength\hvWideWidth
\newlength\hvMultiFloatSkip
-
\newlength\hvMaxCapWidth
+%\newlength\hv@BottomSpace
+%\AtBeginDocument{%
+% \setlength\hv@BottomSpace{\dimexpr\paperheight-1in-\topmargin-\headheight-\headsep-\textheight}}
+
\newsavebox\hvObjectBox
\newsavebox\hvCaptionBox
\newsavebox\hvOBox
\newsavebox\@tempbox
\newsavebox\hv@caption@box
-%
\newif\ifhv@capbeside \hv@capbesidefalse
\def\hv@Top{top}
@@ -66,9 +72,7 @@
\def\hv@After{after}
\def\hv@Before{before}
\def\hv@Right{right}
-\def\hv@RIGHT{RIGHT}
\def\hv@Left{left}
-\def\hv@LEFT{LEFT}
\def\hv@Center{center}
\def\hv@Outer{outer}
\def\hv@Inner{inner}
@@ -79,7 +83,6 @@
\def\hv@Height{h}
\def\hv@Zero{0}
%
-
\def\hv@figure{figure}
%
\define@key{hvSet}{floatPos}[htbp]{% LaTeX's position parameters htbp
@@ -143,27 +146,22 @@
{\begingroup
\edef\x{\endgroup\noexpand\setkeys{hvSet}{\@nameuse{hv@#1}}}\x}% use a defined style
}
-
-
\def\hv@set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x}
%
\def\defhvstyle#1#2{\@namedef{hv@#1}{#2}}
%
-
\newcommand{\setDefaults}{%
\hv@set{%
floatPos=htbp, rotAngle=0, capWidth=n, capAngle=0,
capPos=bottom, capVPos=center, objectPos=center, objectAngle=0,
floatCapSep=5, useOBox=false, nonFloat=false,
- onlyText=false, wide=false, fullpage=false, %FullPage=false,
- FULLPAGE=false,
+ onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
multiFloat=false,subFloat=false,
separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip,
}%
}
\newcommand\reset@special@float{%
- \hv@set{subFloat=false,fullpage=false,%FullPage=false,
- multiFloat=false,FULLPAGE=false}}
+ \hv@set{subFloat=false,fullpage=false,multiFloat=false,FULLPAGE=false}}
\def\hv@vskip{\vspace{\hvMultiFloatSkip}}
@@ -211,6 +209,21 @@
\def\Gin@eheight{\paperheight}%
\Gin@boolkey{false}{iso}%
}
+\newcommand\IncludeGraphics[2][]{%
+% \newpage
+%\iffalse
+ \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}%
+ \leavevmode\checkoddpage
+ \ifoddpage
+ \hspace*{\dimexpr-\oddsidemargin-\parindent-1in}%
+ \else
+ \hspace*{\dimexpr-\evensidemargin-\parindent-1in}%
+ \fi\noindent
+ \includegraphics[#1,width=\paperwidth,height=\paperheight,keepaspectratio=false]{#2}%
+%\fi
+% \includepdf[#1]%,width=\paperwidth,height=\paperheight,keepaspectratio=false]
+% {#2}%
+}
\newcommand\put@CaptionBox[1][0]{%
\ifcase#1
@@ -256,7 +269,7 @@
\newif\if@hvsubstar
\setDefaults
-\def\hvFloat{\@ifnextchar*%
+\def\hvFloat{\@ifnextchar*% Main macro
{\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}%
{\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}%
}
@@ -505,16 +518,37 @@
% 2 caption right, inner and even page, oneside outer
% 3 caption bottom
%
- \ifx\hvSet@capPos\hv@Left\hv@@capPos=0\else
- \ifx\hvSet@capPos\hv@Top\hv@@capPos=1\else
- \ifx\hvSet@capPos\hv@Right\hv@@capPos=2\else
- \ifx\hvSet@capPos\hv@Bottom\hv@@capPos=3\else
- \ifx\hvSet@capPos\hv@Inner
- \ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi
+ \ifx\hvSet@capPos\hv@Left
+ \hv@@capPos=0
\else
- \ifx\hvSet@capPos\hv@Outer
- \ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi
- \fi\fi\fi\fi\fi\fi
+ \ifx\hvSet@capPos\hv@Top
+ \hv@@capPos=1
+ \else
+ \ifx\hvSet@capPos\hv@Right
+ \hv@@capPos=2
+ \else
+ \ifx\hvSet@capPos\hv@Bottom
+ \hv@@capPos=3
+ \else
+ \ifx\hvSet@capPos\hv@Inner
+ \ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi
+ \else
+ \ifx\hvSet@capPos\hv@Outer
+ \ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi
+ \else
+ \ifx\hvSet@capPos\hv@Before
+ \hv@@capPos=0 % same as cappos=right
+ \else
+ \ifx\hvSet@capPos\hv@After
+ \hv@@capPos=2 % same as capPos=right
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
+ \fi
%%%%
\savebox{\@tempboxa}{%
\expandafter\ifcase\the\hv@@capPos % 0 is LEFT START \ifcase
@@ -629,9 +663,9 @@
\else
\ifx\hvSet@capPos\hv@Outer \hv@@capPos=5
\else
- \ifx\hvSet@capPos\hv@RIGHT \hv@@capPos=6
+ \ifx\hvSet@capPos\hv@Right \hv@@capPos=6 % only for twocolumn mode
\else
- \ifx\hvSet@capPos\hv@LEFT \hv@@capPos=7
+ \ifx\hvSet@capPos\hv@Left \hv@@capPos=7 % only for twocolumn mode
\else
\hv@@capPos=0
\fi
@@ -651,7 +685,12 @@
\ifoddpage
\afterpage{\setBottomCaption\setPageObject}%
\else% we are on an even page
- \setBottomCaption\setPageObject
+% \zsaveposy{hv@currentPos}%
+% \ifdim\the\dimexpr\zposy{hv@currentPos}sp-\hv@BottomSpace-1cm>\ht\TBox % enough space*
+ \setBottomCaption\setPageObject
+% \else
+% \afterpage{\afterpage{\setBottomCaption\setPageObject}}%
+% \fi
\fi
\or% caption on odd page 3->right page
\if@twoside
@@ -710,9 +749,9 @@
\fi
\else
\if@firstcolumn% on left side
- \afterpage{\setBottomCaption\setPageObject}% start next page/first column
+ \afterpage{\afterpage{\setBottomCaption\setPageObject}}% start next page/first column
\else% left page/column
- \setBottomCaption\setPageObject% start same page
+ \setBottomCaption\setPageObject% start on same page/column
\fi
\fi
\else % onecolumn
@@ -731,41 +770,36 @@
\if@firstcolumn
\setBottomCaption\setPageObject
\else
- \afterpage{\setBottomCaption\setPageObject}%
+
\fi
\fi
\else% onecolumn
\setBottomCaption\setPageObject
\fi
- \or% caption after object 6->RIGHT for twoside/twocolumn
+ \or% caption after object on same page 6->right for twocolumn
\if@twocolumn
\if@firstcolumn
\afterpage{\setPageObject\setBottomCaption}%
\else
- \setPageObject\setBottomCaption
+ \setPageObject\setBottomCaption
\fi
\else% always caption _after_ object for onecolumn
\setPageObject\setBottomCaption
\fi
- \or% caption before object 7->LEFT for twoside/twocolumn
+ \or% caption before object on same page 7->left for twocolumn
\if@twocolumn
\if@firstcolumn
- \setPageObject\setBottomCaption
+ \setBottomCaption\setPageObject
\else
\afterpage{\setBottomCaption\setPageObject}
\fi
- \else% onecolumn
- \ifoddpage
- \afterpage{\setBottomCaption\setPageObject}%
- \else
- \setBottomCaption\setPageObject
- \fi
+ \else% onecolumn -> same as before
+ \setBottomCaption\setPageObject
\fi
\fi
\endgroup% startet at main \hvFloat
}%
%
-
\def\setBottomCaption{%
\begin{\hv@floatType}[!b]
\ifhv@separatorLine\drawSepLine\fi
@@ -781,9 +815,9 @@
\begin{\hv@floatType}[p]%
\fi
\ifhv@FULLPAGE
- \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}%
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip}%
+ \checkoddpage
\if@twoside
- \leavevmode\checkoddpage
\ifoddpage
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
\else
@@ -792,8 +826,9 @@
\else
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
\fi
- \put(0,0){\usebox\hvObjectBox}%
+ %\put(0,0){
\AtBeginShipoutNext{\thispagestyle{empty}}%
+ \usebox\hvObjectBox%}%
\else
\usebox\hvObjectBox
\fi
@@ -808,7 +843,7 @@
\def\getMultiCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
- \setlength\belowcaptionskip{10pt}%
+ \setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
\hv@cntb=\clist_count:N\l_clist_Type
\advance\hv@cntb by \@ne
@@ -857,6 +892,8 @@
\def\getMultiSubCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \setlength\belowcaptionskip{5pt}%
+ \setlength\abovecaptionskip{0pt}%
\xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
\edef\@tempa{\clist_item:Nn\l_clist_LofCaption{1}}%
\ifx\@tempa\@empty
@@ -907,11 +944,12 @@
\fi
\endminipage}%
}
-
\ExplSyntaxOff
\def\getSingleCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \setlength\belowcaptionskip{5pt}%
+ \setlength\abovecaptionskip{0pt}%
\edef\@captype{\hv@floatType}%
\expandafter\ifx\expandafter\relax\hv@shortCap\relax
\caption{\hv@longCap}%