summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-04-02 21:12:09 +0000
committerKarl Berry <karl@freefriends.org>2019-04-02 21:12:09 +0000
commita538e0c7c47ec0e5a275e4d86ea8e748a3854346 (patch)
tree1f863111e5bc2ecfe62f86157a5298b97d481960
parente5db423bac837a15f88a6ed1f46540d852b4ce46 (diff)
hvfloat (2apr19)
git-svn-id: svn://tug.org/texlive/trunk@50712 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/README.exa30
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdfbin0 -> 95237 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex77
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdfbin0 -> 97510 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdfbin0 -> 90034 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex72
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdfbin0 -> 96545 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdfbin0 -> 88317 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex71
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdfbin0 -> 96300 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex78
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdfbin0 -> 96849 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex79
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdfbin0 -> 96145 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex79
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdfbin0 -> 94724 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex63
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin3440513 -> 2858058 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex811
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdfbin0 -> 95597 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex76
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdfbin0 -> 95740 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex75
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdfbin0 -> 94696 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex76
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdfbin0 -> 156151 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex146
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdfbin0 -> 104360 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex137
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdfbin0 -> 158009 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex146
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdfbin0 -> 103112 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex137
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdfbin0 -> 104072 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex147
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdfbin0 -> 106941 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex145
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdfbin0 -> 155689 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex146
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdfbin0 -> 89974 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex73
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdfbin0 -> 97230 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdfbin0 -> 96430 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex79
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdfbin0 -> 97719 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdfbin0 -> 95886 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex75
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdfbin0 -> 96051 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex75
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdfbin0 -> 95391 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex75
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdfbin0 -> 94290 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdfbin0 -> 100235 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdfbin0 -> 100052 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdfbin0 -> 98824 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdfbin0 -> 90657 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex81
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdfbin0 -> 98918 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex78
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/preamble.ltx43
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdfbin0 -> 91515 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex75
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdfbin0 -> 98990 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex80
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdfbin0 -> 91944 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex73
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdfbin0 -> 96269 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex78
-rwxr-xr-xMaster/texmf-dist/doc/latex/hvfloat/runAll.sh9
-rwxr-xr-xMaster/texmf-dist/doc/latex/hvfloat/runEXA.sh10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdfbin0 -> 153450 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex129
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdfbin0 -> 153854 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex130
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdfbin0 -> 154601 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex130
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdfbin0 -> 153259 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex128
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdfbin0 -> 154554 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex128
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdfbin0 -> 154393 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex128
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty490
92 files changed, 4812 insertions, 588 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index b8b50f627b0..edc8204275d 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,6 @@
hvfloat.sty:
+2.11 2019-04-01 - fix for sub float pages
+ - added examples directory
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.exa b/Master/texmf-dist/doc/latex/hvfloat/README.exa
new file mode 100644
index 00000000000..5f934b4fcb6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/README.exa
@@ -0,0 +1,30 @@
+The meaning of a filename like default1s2c.tex is:
+ default: no special setting
+ 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
+ 2s : twoside mode
+ 1c : onecolumn mode
+
+The meaning of a filename like odd1s2c.tex is:
+ odd : capPos=d
+ 1s : oneside mode
+ 2c : twocolumn mode
+
+The meaning of a filename like inner2s2c.tex is:
+ inner : capPos=i
+ 2s : twoside mode
+ 2c : twocolumn mode
+
+a.s.o.
+
+runEXA.sh <base>
+runs an examplegroup, e.g. "./runEXA.sh inner" runs _all_ examples
+started with "inner".
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
new file mode 100644
index 00000000000..e3bbcb90e2e
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..c5d95c9e323
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex
@@ -0,0 +1,77 @@
+\documentclass{scrartcl}
+
+\input{preamble.ltx}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+
+\blinddocument
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-cap}.
+\end{lstlisting}
+
+The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-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
+ 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]%
+ {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]%
+ {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]%
+ {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/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
new file mode 100644
index 00000000000..c10d9fbae62
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..bcd20f6d81d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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]%
+ {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]%
+ {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]%
+ {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]%
+ {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/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
new file mode 100644
index 00000000000..82f7e39b0fc
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..d3c0316aeb2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex
@@ -0,0 +1,72 @@
+\documentclass[twoside]{scrartcl}
+
+\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]%
+ {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]%
+ {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]%
+ {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]%
+ {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/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
new file mode 100644
index 00000000000..603d2a7ad74
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..f3ae745d7e8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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]%
+ {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]%
+ {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]%
+ {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]%
+ {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/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
new file mode 100644
index 00000000000..af6eb5099bf
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..f6fdec31605
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex
@@ -0,0 +1,71 @@
+\documentclass{scrartcl}
+
+\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=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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}
+
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
new file mode 100644
index 00000000000..ed47d2ab5c8
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..ce5195d9224
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex
@@ -0,0 +1,78 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
new file mode 100644
index 00000000000..751853191de
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..bcc8e26d0f0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex
@@ -0,0 +1,79 @@
+\documentclass[twoside]{scrartcl}
+
+\input{preamble.ltx}
+
+\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=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
new file mode 100644
index 00000000000..956f56849e7
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..fa102307d9d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex
@@ -0,0 +1,79 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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=evenPage]%
+ {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=evenPage]
+\hvFloat[fullpage,capPos=evenPage]%
+ {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/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
new file mode 100644
index 00000000000..c47d94c85b3
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..3b10bc3b9f3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex
@@ -0,0 +1,63 @@
+\documentclass[twocolumn]{scrartcl}
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\section{The fullpage optional arguments}
+\Blindtext
+
+\subsection{\texttt{fullpage}}
+\blindtext
+
+\verb|\includegraphics[fullpage]{tiger}|
+
+\includegraphics[fullpage]{tiger}
+
+\Blindtext
+\subsection{\texttt{FullPage}}
+\blindtext
+
+\verb|\includegraphics[FullPage]{tiger}|
+\begin{figure*}[p]
+\includegraphics*[FullPage]{tiger}
+\end{figure*}
+
+\Blindtext
+
+\Blindtext
+
+\subsection{\texttt{FULLPAGE}}
+\blindtext
+
+\verb|\includegraphics[FULLPAGE]{tiger}|
+
+\begin{figure*}[p]
+ \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}%
+ \if@twoside
+ \leavevmode\checkoddpage
+ \ifoddpage
+ \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
+ \else
+ \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
+ \fi
+ \else
+ \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
+ \fi
+ \put(0,0){\usebox\hvObjectBox}%
+ \AtBeginShipoutNext{\thispagestyle{empty}}%
+\includegraphics*[FULLPAGE]{tiger}
+\end{figure*}
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index c468e57c6e2..3d0a60784be 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 ef04c968c9c..e9787059bd0 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 988 2019-03-20 21:34:05Z herbert $
+%% $Id: hvfloat.tex 1009 2019-04-01 12:44:03Z herbert $
%\listfiles
\errorcontextlines=100
-\documentclass[twoside,paper=a4]{scrartcl}
+\documentclass[usegeometry,twoside,paper=a4]{scrartcl}
\usepackage{fontspec}
\usepackage{libertinus}
%\usepackage[scaled=0.85]{beramono}
@@ -13,7 +13,7 @@
\usepackage[automark]{scrlayer-scrpage}
\pagestyle{scrheadings}
-%\usepackage{showframe}
+\usepackage[showframe=false]{geometry}
\usepackage{listings}
%
\lstset{%
@@ -54,7 +54,6 @@
\captionsetup{format=plain,font=sf,labelfont=sf}
\captionsetup[sub]{format=plain,font=sf,labelfont=sf}
-
\hypersetup{urlcolor=blue, linktocpage, colorlinks=true}
%
\makeatletter
@@ -156,7 +155,7 @@
\begin{document}
-\title{Package \texttt{hvfloat}\\Rotating and scaling of objects and captions\\ver \hvVersion}
+\title{Package \texttt{hvfloat}\\Positioning, rotating and scaling of objects and captions\\ver \hvVersion}
\author{Herbert Voß\thanks{\protect\url{hvoss@tug.org}}}
\date{\today}
\maketitle
@@ -171,17 +170,17 @@ All objects and captions are framed on the first pages, which is only for some d
has no additional sense!
To compare the place of the definition of the floating objects in the source and the output a
-marginnote \fbox{float} is set into the margin. This is also only for demonstration!
+marginnote \fbox{float} is set into the margin. This is done also only for demonstration!
\end{abstract}
\vfill
\hvFloat[%
nonFloat=true,
capWidth=0.5,
- capPos=r,
+ capPos=right,
objectAngle=120,
capAngle=-210,
- objectPos=c
+ objectPos=center
]{figure}{\protect\fbox{\includegraphics[scale=0.9]{rose}}}{\protect\fbox{What a nice Caption :-)}}{fig:title}
\vspace*{\fill}
@@ -208,7 +207,7 @@ problems if images seems to have too much whitespace.\\
\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
@@ -269,26 +268,31 @@ the individual setting:
Internally the style is saved in a macro named \verb|\hv@<name>|.
+\index{capPos@\texttt {capPos} (keyword)|(}
+
%\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 the same placement option like the one from the floats.\\
+\Lkeyword{floatPos} & \texttt{htb} & This is \emph{not} the same placement option 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,
- "\texttt{w}" for the width of the object, "\texttt{h}" for the height of the object, or a scale for \verb|\columnwidth|.\\
+\Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width,
+ »\texttt{w}« for the width of the object, »\texttt{h}« for the height of the object, or a scale for \verb|\columnwidth|.\\
\Lkeyword{capAngle} & 0 & The value for the angle if the caption should be rotated. Counted anti clockwise.\\
\Lkeyword{capPos} & b& The position of the caption relative to the object. Possible values
- are (\textbf{l})eft|(\textbf{L})EFT|(\textbf{b})ottom|(\textbf{t})op|(\textbf{r})ight|(\textbf{R})IGHT|(\textbf{e})ven|o(\textbf{d})d. The
+ 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{capVPos}& c& This is only important for \texttt{capPos=l|r}. Only in this case the
- caption can vertically placed at the (\textbf{b})ottom|(\textbf{c})enter|(\textbf{t})op.\\
+\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.\\
@@ -297,11 +301,11 @@ There are the following keywords:
\Lkeyword{floatCapSep} & 5 & The additional width between the object and a left or right placed caption. The default unit is \texttt{pt}.\\
-\Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \texttt{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\
+\Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \Lcs{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\
\Lkeyword{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counters are increased as usual and can be referenced.\\
-\Lkeyword{wide} & false & The float can use \verb|\textwidth+\marginparwidth| as horizontal width.\\
+\Lkeyword{wide} & false & The float can use \Ldim{textwidth}+\Ldim{marginparwidth} as horizontal width.\\
\Lkeyword{objectFrame} & false & put a frame with no separation around the float object.\\
@@ -334,7 +338,7 @@ Code for figure \ref{fig:0}:
\end{lstlisting}
\Float
-\hvFloat[capPos=t]{table}{%
+\hvFloat[capPos=top]{table}{%
\begin{tabularx}{\textwidth}{l|l|X}
\rmfamily Name & Type & Description\\\hline
\CMD{hvFloat} & command & places object and caption in different ways\\
@@ -344,11 +348,11 @@ Code for figure \ref{fig:0}:
\CMD{setDefaults} & command & sets all options to the defaults\\
\CMD{defhvstyle} & command & define a user style
\end{tabularx}%
-}{With the only Option \texttt{capPos=t} to place the caption on top of the table, which is often the default.}{tab:0}
+}{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}{tab:0}
Code for table \ref{tab:0}:
\begin{lstlisting}
-\hvFloat[capPos=t]{table}{%
+\hvFloat[capPos=top]{table}{%
\begin{tabularx}{\textwidth}{>{\ttfamily}l|l|X}
\rmfamily Name & Type & Description\\\hline
\CMD{hvFloat} & command & places object and caption in different ways\\
@@ -358,7 +362,7 @@ Code for table \ref{tab:0}:
\CMD{setDefaults} & command & sets all options to the defaults\\
\CMD{defhvstyle} & command & define a user style
\end{tabularx}}%
-{With the only Option \texttt{capPos=t} to place the caption on top of the table, which is often the default.}%
+{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}%
{tab:0}
\end{lstlisting}
@@ -404,13 +408,13 @@ minus the width of the object and the space between object and caption, which is
\makeatother
\begin{lstlisting}
-\hvFloat[floatPos=!htb,capPos=r,objectFrame]{figure}{\includegraphics[scale=1.5]{rose}}%
+\hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{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=r,objectFrame]{figure}{\includegraphics[scale=1.5]{rose}}%
+\hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{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}
@@ -445,13 +449,16 @@ If not then the width is set to the possible value between object and margin:
\begin{lstlisting}
-\hvFloat[floatPos=!htb,capPos=r,capWidth=0.9]{figure}{\includegraphics[scale=1.5]{rose}}%
+\hvFloat[floatPos=!htb,
+ capPos=after,
+ capWidth=0.9]{figure}{\includegraphics[scale=1.5]{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}
+ 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=r,capWidth=0.9]{figure}{\includegraphics[scale=1.5]{rose}}%
+\hvFloat[floatPos=!htb,capPos=after,capWidth=0.9]{figure}{\includegraphics[scale=1.5]{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}
@@ -479,42 +486,45 @@ 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=r,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{rose}}%
+\hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{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=r,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{rose}}%
+\hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{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}
-\section{Caption right or left of the object}
+\section{Caption left or right of the object}
+By default the caption is set on the left side of the object. If the caption and the object are set side by side, then
+the keyvalue \Lkeyval{before} is identical to the setting \Lkeyval{left}.
+
\subsection{Caption right with specific length}
Code for figure \ref{fig:1}:
\begin{lstlisting}
\hvFloat%
[floatPos=htb,
- capWidth=0.5,% of \columnwidth
- capPos=r,
+ capPos=right,
objectFrame,
- objectPos=c]{figure}{\includegraphics{rose}}%
+ objectPos=c]{figure}{\includegraphics[scale=0.9]{rose}}%
[Caption beside object and vertically centered]%
- {Caption vertically centered right beside the float with a caption width of
- \texttt{0.5\textbackslash columnwidth} and \texttt{floatcapsep=5pt} (the default)}{fig:1}
+ {Caption vertically centered right beside the float with a natural caption width
+ (the default). \blindtext}%
+ {fig:1}
\end{lstlisting}
-\Float[capPos=r]
+\Float[capPos=right]
\hvFloat%
[floatPos=htb,
- capWidth=0.5,% of \columnwidth
- capPos=r,
+ capPos=right,
objectFrame,
- objectPos=c]{figure}{\includegraphics{rose}}%
+ objectPos=c]{figure}{\includegraphics[scale=0.9]{rose}}%
[Caption beside object and vertically centered]%
- {Caption vertically centered right beside the float with a caption width of
- \texttt{0.5\textbackslash columnwidth} and \texttt{floatcapsep=5pt} (the default)}{fig:1}
+ {Caption vertically centered right beside the float with a natural caption width
+ (the default). \blindtext}%
+ {fig:1}
\subsection{Caption left and rotated}
@@ -523,8 +533,8 @@ Code for figure \ref{fig:2}:
\begin{lstlisting}
\hvFloat%
[floatPos=htb,
+ capPos=left,
capWidth=h,% of \columnwidth
- capPos=l,
capAngle=90,
objectFrame
]{figure}{\includegraphics{rose}}%
@@ -533,11 +543,11 @@ Code for figure \ref{fig:2}:
of \texttt{capWidth=h}, which is the height of the object.}{fig:2}
\end{lstlisting}
-\Float[capPos=l]
+\Float[capAngle=90]
\hvFloat%
[floatPos=htb,
+ capPos=left,
capWidth=h,% of \columnwidth
- capPos=l,
capAngle=90,
objectFrame
]{figure}{\includegraphics{rose}}%
@@ -558,11 +568,11 @@ Code for figure \ref{fig:3}:
\begin{lstlisting}
\hvFloat[%
capWidth=h,
- capPos=r,
+ capPos=after,
capAngle=180,
objectAngle=90,
- capVPos=c,
- objectPos=c]{figure}{\frame{\includegraphics{rose}}}%
+ capVPos=center,
+ objectPos=center]{figure}{\frame{\includegraphics{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}
@@ -572,11 +582,11 @@ Code for figure \ref{fig:3}:
\Float
\hvFloat[%
capWidth=h,% of \columnwidth
- capPos=r,
+ capPos=after,
capAngle=180,
objectAngle=90,
- capVPos=c,
- objectPos=c]{figure}{\frame{\includegraphics{rose}}}%
+ capVPos=center,
+ objectPos=center]{figure}{\frame{\includegraphics{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}
@@ -584,46 +594,46 @@ Code for figure \ref{fig:3}:
\section{Caption inner or outer}
Setting the caption position to \emph{inner} or \emph{outer} makes only sense for a document in \Index{twoside} mode.
For a oneside document \emph{inner} is the same as \emph{left} and \emph{outer} is
-the same as \emph{right}. We show only the code for the first image with the setting \Lkeyset{capPos=i},
+the same as \emph{right}. We show only the code for the first image with the setting \Lkeyset{capPos=inner},
whereas the second one
-chooses only \Lkeyset{capPos=o}.
+chooses only \Lkeyset{capPos=outer}.
Code for figure~\ref{fig:20}:
\begin{lstlisting}
-\hvFloat[capPos=i]{figure}{\includegraphics{rose}}%
+\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}%
[Centered Caption on the inner side]{%
- Caption set with the parameter setting \texttt{capPos=i}, which will be
+ 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}
\end{lstlisting}
-\Float[capPos=i]
-\hvFloat[capPos=i]{figure}{\includegraphics{rose}}%
+\Float[capPos=inner]
+\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}%
[Centered Caption on the inner side]{%
- Caption set with the parameter setting \texttt{capPos=i}, which will be
+ 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
\begin{lstlisting}
-\hvFloat[capPos=i]{figure}{\includegraphics{rose}}%
+\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}%
[Centered Caption on the inner side]{%
- Caption set with the parameter setting \texttt{capPos=i}, which will be
+ 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:20b}
\end{lstlisting}
-\Float[capPos=i]
-\hvFloat[capPos=i]{figure}{\includegraphics{rose}}%
+\Float[capPos=inner]
+\hvFloat[capPos=inner]{figure}{\includegraphics{rose}}%
[Centered Caption on the inner side]{%
- Caption set with the parameter setting \texttt{capPos=i}, which will be
+ 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:20b}
\label{page:1}\checkoddpage
-Now the same Image with \Lkeyset{capPos=o}. The current pagenumber is~\pageref{page:1}, an \ifoddpage odd \else
+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}.
@@ -632,13 +642,13 @@ even \fi page. We now set a pagebreak at the end of the second image to see if i
\Float
\hvFloat[%
capWidth=0.5,% of \columnwidth
- capPos=o,
+ capPos=outer,
capAngle=0,%
- capVPos=b,%
- objectPos=c]{figure}{\includegraphics{rose}}%
+ capVPos=bottom,%
+ objectPos=center]{figure}{\includegraphics{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=o}.}{fig:21}
+ of \texttt{0.5\textbackslash columnwidth} and and \texttt{capPos=outer}.}{fig:21}
We have an \checkoddpage
\ifoddpage odd \else
@@ -653,25 +663,25 @@ Code for figure \ref{fig:22}:
\begin{lstlisting}
\hvFloat[%
capWidth=0.5,% of \columnwidth
- capPos=o,% ====> OUTER
+ capPos=outer,% ====> OUTER
capAngle=0,
- capVPos=b,
- objectPos=c]{figure}{\includegraphics{rose}}%
+ capVPos=bottom,
+ 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=o} }{fig:22}
+ width of \texttt{0.5\textbackslash columnwidth} and \texttt{capPos=outer} }{fig:22}
\end{lstlisting}
\Float
\hvFloat[%
capWidth=0.5,% of \columnwidth
- capPos=o,
+ capPos=outer,
capAngle=0,%
- capVPos=c,%
- objectPos=c]{figure}{\includegraphics{rose}}%
+ 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=o}}{fig:22}
+width of \texttt{0.5\textbackslash columnwidth} and \texttt{capPos=outer}}{fig:22}
\iffalse
@@ -679,13 +689,13 @@ width of \texttt{0.5\textbackslash columnwidth} and \texttt{capPos=o}}{fig:22}
\hvFloat[%
floatPos=htb,%
capWidth=0.5,% of \columnwidth
- capPos=o,
+ capPos=outer,
capAngle=0,%
- capVPos=c,%
- objectPos=c]{figure}{\includegraphics{rose}}%
+ 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=o}.}{}
+ and \texttt{capPos=outer}.}{}
\fi
@@ -707,8 +717,8 @@ The code for figure \ref{fig:4}:
\hvFloat[%
floatPos=htb,%
capWidth=0.25,%
- capPos=r,%
- capVPos=b,%
+ capPos=right,%
+ capVPos=bottom,%
]{figure}{\frame{\includegraphics{rose}}}{Caption at bottom right beside the float}{fig:4}
\end{lstlisting}
@@ -717,8 +727,8 @@ The code for figure \ref{fig:4}:
\hvFloat[%
floatPos=htb,%
capWidth=0.25,%
- capPos=r,%
- capVPos=b,%
+ capPos=right,%
+ capVPos=bottom,%
]{figure}{\frame{\includegraphics{rose}}}{Caption at bottom right beside the float}{fig:4}
@@ -728,8 +738,8 @@ The code for figure \ref{fig:5}:
\hvFloat[%
floatPos=htb,
capWidth=0.25,
- capPos=r,
- capVPos=t,
+ capPos=right,
+ capVPos=top,
]{figure}{\frame{\includegraphics{rose}}}{Caption at top left beside the float}{fig:5}
\end{lstlisting}
@@ -738,8 +748,8 @@ The code for figure \ref{fig:5}:
\hvFloat[%
floatPos=htb,%
capWidth=0.25,%
- capPos=l,%
- capVPos=t,%
+ capPos=before,%
+ capVPos=top,%
]{figure}{\frame{\includegraphics{rose}}}{Caption at top left beside the float}{fig:5}
@@ -747,8 +757,8 @@ The code for figure \ref{fig:6}:
\begin{lstlisting}
\hvFloat[%
capWidth=0.25,
- capPos=r,
- capVPos=c,% the default
+ capPos=right,
+ capVPos=center,% the default
]{figure}{\frame{\includegraphics{rose}}}{Caption centered right beside the float}{fig:6}
\end{lstlisting}
@@ -756,22 +766,30 @@ The code for figure \ref{fig:6}:
\Float
\hvFloat[%
capWidth=0.25,%
- capPos=r,%
- capVPos=c,% the default
+ capPos=right,%
+ capVPos=center,% the default
]{figure}{\frame{\includegraphics{rose}}}{Caption centered right beside the float}{fig:6}
\section{Horizontal Position of the Float}
+The caption is always near the object, only divided by the length \Ldim{floatCapSep}
+which can be set by the keyword of the same name \Lkeyword{floatCapSep}. It accepts only
+a decimal number and is preset to 5. The default unit is \texttt{pt} and cannot be changed.
+The keyword \Lkeyword{objectPos} refers always to the complete floating object: caption
+\emph{and} object. The meaning of \Lkeyset{objectPos=left} is: Put the object as far as possible to the
+left margin. If \Lkeyset{capPos=left} is also used, then the caption is at the left margin followed by
+the object (see Figure~\vref{fig:700}).
The code for figure \ref{fig:7}:
\begin{lstlisting}
\hvFloat[%
capWidth=0.25,
- capPos=r,
- capVPos=t,
- objectPos=l,
+ capPos=right,
+ capVPos=top,
+ objectPos=left,
+ objectFrame,
]{figure}{\includegraphics{rose}}{%
Caption at top right beside the float and object position left}{fig:7}
\end{lstlisting}
@@ -780,12 +798,26 @@ The code for figure \ref{fig:7}:
\Float
\hvFloat[%
capWidth=0.25,%
- capPos=r,%
- capVPos=t,%
- objectPos=l,%
+ capPos=right,%
+ capVPos=top,%
+ objectPos=left,%
+ objectFrame,
]{figure}{\includegraphics{rose}}{%
Caption at top right beside the float and object position left}{fig:7}
+The same with \Lkeyset{capPos=left}:
+
+
+\Float[capPos=left]
+\hvFloat[%
+ capWidth=0.25,%
+ capPos=left,%
+ capVPos=top,%
+ objectPos=left,%
+ objectFrame,
+]{figure}{\includegraphics{rose}}{%
+ Caption at top right beside the float and object position left}{fig:700}
+
\blindtext
@@ -793,9 +825,10 @@ The code for figure \ref{fig:8}:
\begin{lstlisting}
\hvFloat[%
capWidth=0.25,%
- capPos=l,%
- capVPos=t,%
- objectPos=r,%
+ capPos=before,%
+ capVPos=top,%
+ objectPos=right,%
+ objectFrame,
]{figure}{\includegraphics{rose}}{%
Caption at top leftt beside the float and object position right}{fig:8}
\end{lstlisting}
@@ -804,9 +837,10 @@ The code for figure \ref{fig:8}:
\Float
\hvFloat[%
capWidth=0.25,%
- capPos=l,%
- capVPos=t,%
- objectPos=r,%
+ capPos=before,%
+ capVPos=top,%
+ objectPos=right,%
+ objectFrame,
]{figure}{\includegraphics{rose}}{%
Caption at top left beside the float and object position right}{fig:8}
@@ -815,34 +849,29 @@ The code for figure \ref{fig:8}:
\section{Wide floats}
-With the optional argument \Lkeyword{wide} the width of the defined marginpar is
+With the optional argument \Lkeyword{wide} the width of the defined \Ldim{marginparwidth} is
added to the allowed horizontal width of the float.
The code for figure \ref{fig:70}:
\begin{lstlisting}
\hvFloat[wide,
- capWidth=0.5,
- capPos=r,
- capVPos=t,
- objectPos=l,
+ capPos=right,
+ capVPos=top,
+ objectPos=left,
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
Caption at top right beside the float and object position left and
-the option \texttt{wide}.
- Caption at top right beside the float and object position left and
- the option \texttt{wide}.}{fig:70}
+the option \texttt{wide}.}{fig:70}
\end{lstlisting}
%\Float
\hvFloat[%
wide,
- capPos=r,%
- capVPos=t,%
- objectPos=l,%
+ capPos=right,%
+ capVPos=top,%
+ objectPos=left,%
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
Caption at top right beside the float and object position left and
-the option \texttt{wide}.
- Caption at top right beside the float and object position left and
- the option \texttt{wide}.}{fig:70}
+the option \texttt{wide}.}{fig:70}
\blindtext
@@ -850,9 +879,9 @@ the option \texttt{wide}.
The code for figure \ref{fig:80}:
\begin{lstlisting}
\hvFloat[wide,
- capPos=l,
- capVPos=t,
- objectPos=r,
+ capPos=left,
+ capVPos=top,
+ objectPos=right,
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}%
{Caption at top left beside the object and object position left and
the option \texttt{wide}.}{fig:80}
@@ -861,8 +890,8 @@ The code for figure \ref{fig:80}:
%\Float
\hvFloat[wide,
- capPos=l,%
- capVPos=t,%
+ capPos=left,%
+ capVPos=top,%
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}%
{Caption at top left beside the object and object position left and
the option \texttt{wide}.}{fig:80}
@@ -874,24 +903,24 @@ For a twosided document it will place the object always in the margin.
\begin{lstlisting}
\hvFloat[wide,
- capPos=i,
- capVPos=t,
+ capPos=inner,
+ capVPos=top,
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
Caption at top and inner beside the float and object position right and
the option \texttt{wide}.}{fig:81}
\end{lstlisting}
-%\Float[capPos=o]
+%\Float[capPos=outer]
\hvFloat[wide,
- capPos=i,
- capVPos=t,
+ capPos=inner,
+ capVPos=top,
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
Caption at top and inner beside the float and object position right and
the option \texttt{wide}.}{fig:81}
Now we set the same image with the same setting on the next page. The caption will
-change its side due to the setting \Lkeyset{capPos=o}.
+change its side due to the setting \Lkeyset{capPos=outer}.
\blindtext
@@ -899,25 +928,25 @@ change its side due to the setting \Lkeyset{capPos=o}.
\begin{lstlisting}
\hvFloat[wide,
- capPos=i,
- capVPos=t,
+ capPos=inner,
+ capVPos=top,
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
Caption at top inner beside the float and object position right and
the option \texttt{wide}.}{fig:811}
\end{lstlisting}
-%\Float[capPos=o]
+%\Float[capPos=outer]
\hvFloat[wide,
- capPos=i,
- capVPos=t,
+ capPos=inner,
+ capVPos=top,
]{figure}{\includegraphics[width=0.75\linewidth]{CTAN}}{%
Caption at top inner beside the float and object position right and
the option \texttt{wide}.}{fig:811}
-\section{Full Page Width in Landscape Mode}
+\section{Full text area 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}).
@@ -926,29 +955,29 @@ Code for figure \ref{fig:9}:
\begin{lstlisting}
\hvFloat[%
floatPos=p,
- capPos=b,
+ capPos=bottom,
rotAngle=90,
- objectPos=c
+ objectPos=center,
]{figure}{\includegraphics[width=0.9\textheight]{CTAN}}%
[Object and Caption in landscape mode]{%
Caption and object in landscape mode. \blindtext}{fig:9}
\end{lstlisting}
The float can also be put to the left or to the right (above/below in landscape)
-with the \Lkeyset{objectPos=l} parameter
+with the \Lkeyset{objectPos=left} parameter
\Float[landscape]
\hvFloat[%
floatPos=p,
- capPos=b,
+ capPos=bottom,
rotAngle=90,
- objectPos=c
+ objectPos=center,
]{figure}{\includegraphics[width=0.9\textheight]{CTAN}}%
[Object and Caption in landscape mode]{%
Caption and object in landscape mode. \blindtext}{fig:9}
-\Blindtext
+\blindtext
The code for figure \ref{fig:10}:
@@ -956,10 +985,10 @@ The code for figure \ref{fig:10}:
\hvFloat[%
floatPos=p,
capWidth=h,
- capPos=r,
+ capPos=right,
objectAngle=90,
capAngle=-90,
- objectPos=l
+ objectPos=left,
]{figure}{\includegraphics[width=\textheight]{CTAN}}%
[Rotated Caption in Landscape]{%
Caption right beside the float and object position left. The caption rotated by $-90$
@@ -970,10 +999,10 @@ The code for figure \ref{fig:10}:
\hvFloat[%
floatPos=p,%
capWidth=h,%
- capPos=r,%
+ capPos=right,%
objectAngle=90,%
capAngle=-90,%
- objectPos=l%
+ objectPos=left%
]{figure}{\includegraphics[width=\textheight]{CTAN}}%
[Rotated Caption in Landscape]{%
Caption right beside the float and object position left. The caption rotated by $-90$ degrees.
@@ -991,30 +1020,38 @@ Sometimes it is better to put a ``float'' in a specific position of the page. Th
with the \Lpack{nonfloat} package and the keyword \Lkeyword{nonFloat}.
\begin{lstlisting}
+Some nonsense text before the following \emph{non floating} object.
+
\hvFloat[%
nonFloat,
capWidth=0.25,
- capPos=r,
- capVPos=b,
- objectPos=c,
- objectFrame,
+ capPos=right,
+ capVPos=bottom,
+ objectPos=center,
+ objectFrame,
]{figure}{\includegraphics[scale=1.5]{rose}}%
[Nonfloat Captions]{%
Caption of a ``nonfloat'' Object, using the \texttt{nonfloat} Package}{fig:11}
+
+Some nonsense text after the preceding \emph{non floating} object.
\end{lstlisting}
\Float
+Some nonsense text before the following \emph{non floating} object.
+
\hvFloat[%
nonFloat,%
capWidth=0.25,%
- capPos=r,%
- capVPos=b,%
- objectPos=c,%
+ capPos=right,%
+ capVPos=bottom,%
+ objectPos=center,%
objectFrame,
]{figure}{\includegraphics[scale=1.5]{rose}}%
[Nonfloat Captions]{%
Caption of a ``nonfloat'' Object, using the \texttt{nonfloat} Package}{fig:11}
+Some nonsense text after the preceding \emph{non floating} object.
+
\bigskip
The image \ref{fig:11} is exactly placed where the command \Lcs{hvFloat} appears.
There are only commands for \Lenv{figure} and \Lenv{table} environments:
@@ -1048,6 +1085,8 @@ For example see table~\ref{table:1} and \ref{table:2}:
\end{tabular}%
}
+\blindtext
+
%[xrightmargin=-8em,xleftmargin=-1em]
\begin{lstlisting}
\savebox{\hvOBox}{%
@@ -1068,16 +1107,18 @@ The code for table \ref{table:1} and \ref{table:2} is:
\begin{lstlisting}
\hvFloat[%
floatPos=!hb,
- capPos=t,
+ capPos=top,
useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1}
+\blindtext
+
\hvFloat[%
floatPos=hb,
useOBox=true,
objectAngle=90,
- capPos=r,
- capVPos=t,
- capWidth=0.3]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:2}
+ capPos=right,
+ capVPos=top,
+ capWidth=0.3]{table}{}{Another demonstration of the \texttt{useOBox} Parameter}{table:2}
\end{lstlisting}
In this case leave the third parameter empty.
@@ -1085,7 +1126,7 @@ In this case leave the third parameter empty.
\Float
\hvFloat[%
floatPos=!hb,
- capPos=t,
+ capPos=top,
useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1}
@@ -1095,8 +1136,8 @@ In this case leave the third parameter empty.
floatPos=!htb,%
useOBox=true,%
objectAngle=90,%
- capPos=r,%
- capVPos=t,%
+ capPos=right,%
+ capVPos=top,%
capWidth=0.3]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:2}
@@ -1112,8 +1153,8 @@ The code for figure \ref{fig:text}:
\hvFloat[%
onlyText=true,
capAngle=90,
- capPos=r,
- capVPos=t,
+ capPos=right,
+ capVPos=top,
capWidth=h]{}{\includegraphics{rose}}%
[``\texttt{onlyText}'' Caption]{%
Demonstration of the \texttt{onlyText} Parameter, which makes it
@@ -1126,8 +1167,8 @@ The code for figure \ref{fig:text}:
\hvFloat[%
onlyText=true,%
capAngle=90,%
- capPos=r,%
- capVPos=t,%
+ capPos=right,%
+ capVPos=top,%
capWidth=h]{}{\includegraphics{rose}}%
[``\texttt{onlyText}'' Caption]{%
Demonstration of the \texttt{onlyText} Parameter, which makes it
@@ -1185,10 +1226,10 @@ L & C & R \\\hline
\end{tabular}
\end{hvFloatEnv}
-\bigskip
-\blindtext
+%\bigskip
+%\blindtext
-\blindtext
+%\blindtext
\section{Full page objects in onecolumn mode}
@@ -1196,13 +1237,47 @@ 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:
+
+\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}
+
+\begin{figure}[!h]
+\frame{\includegraphics[page=1,width=0.24\linewidth]{examples/fullpage1s2c}}\hfill
+\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/fullpage1s2c}}\hfill
+\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/fullpage1s2c}}\hfill
+\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/fullpage1s2c}}
+
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/fullpage1s2c}}\hfill
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/fullpage1s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/fullpage1s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/fullpage1s2c}}
+\caption{Output of \texttt{fullpage1s2c} (pages 1--8)}\label{fig:fullpage60}
+\end{figure}
+
\subsection{Using the textarea}
-The setting \Lkeyset{capPos=e} (even) or \Lkeyset{capPos=d} (odd) page for
+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=i} for inner or \Lkeyset{capPos=o} for outer
+setting like \Lkeyset{capPos=inner} for inner or \Lkeyset{capPos=outer} for outer
margin makes more sense.
@@ -1216,11 +1291,11 @@ Without any additional argument the caption is set first and the object on the f
-\subsubsection{Using the default or \Lkeyset{capPos=l}}
+\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=l}.
-For the \Loption{twoside} option it makes more sense to use the setting \Lkeyset{capPos=LEFT}
+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}
@@ -1232,7 +1307,7 @@ For the \Loption{twoside} option it makes more sense to use the setting \Lkeyset
% {\includegraphics[width=\linewidth,height=\textheight,keepaspectratio=false]{rose}}%
[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.
+ 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}
@@ -1249,7 +1324,7 @@ For the \Loption{twoside} option it makes more sense to use the setting \Lkeyset
{\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.
+ 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}
@@ -1261,8 +1336,8 @@ With this setting the caption is always placed \textit{before} the following obj
This maybe sufficient for a \Index{oneside} document but not the best solution if
this document is printed on a duplex machine. In such a case
it may make sense to have the captions always on an even (left) page, even though the
-socument is typeset in a oneside mode. Figure~\vref{fig:fullpage1-LEFT} shows the output
-vor a oneside document with a setting \Lkeyset{capPos=L}.
+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.
@@ -1277,7 +1352,13 @@ Table~\vref{tab:fullpage} shows the valid optional arguments for a full page flo
\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 and the object alone a page.\\
+\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 & The same for \Index{twocolumn} mode with object over both columns.\\
+
+\Lkeyword{FULLPAGE} & true|false & The same for full papersize objects over one or two columns.
+The pagestyle is set to \texttt{empty}\\
\Lkeyword{multiFloat} & true|false & For multiple objects with captions for every object. See section~\vref{sec:multifloats}.\\
@@ -1285,7 +1366,9 @@ Table~\vref{tab:fullpage} shows the valid optional arguments for a full page flo
\Lkeyword{separatorLine} & true & Put a line with a predefined width of 0.4pt between
the text and the caption. Only valid for the keyword \Lkeyword{fullpage}.\\
-\Lkeyword{capPos} & l|L|r|R|e|d & caption on l)eft, L)EFT (before object), r)ight, R)IGHT (after object), e)ven or od)d page\\
+\Lkeyword{capPos} & \shortstack[l]{\Lkeyval{before}\\\Lkeyval{after}\\
+ \Lkeyval{evenPage}\\\Lkeyval{oddPage}}
+ & caption before, after, even page, or odd page.\\
\bottomrule
\end{tabularx}%
\end{table}
@@ -1293,7 +1376,7 @@ Table~\vref{tab:fullpage} shows the valid optional arguments for a full page flo
-\begin{figure}[p]
+\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
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/default1s1c}}\hfill
@@ -1305,7 +1388,7 @@ Table~\vref{tab:fullpage} shows the valid optional arguments for a full page flo
\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/default1s1c}}
\caption{Output of \texttt{default1s1c} (pages 2--9)}\label{fig:fullpage0}
-
+\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
@@ -1316,8 +1399,11 @@ Table~\vref{tab:fullpage} shows the valid optional arguments for a full page flo
\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
@@ -1330,20 +1416,21 @@ Table~\vref{tab:fullpage} shows the valid optional arguments for a full page flo
\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
-\subsubsection{Using \Lkeyset{capPos=r}}
+\subsubsection{Using \Lkeyset{capPos=after}}
-The\marginpar{\raggedleft!!!} caption will be printed right side which is the same as \textit{after} the full page object.
+The caption will be printed always on the right side which is the same as \textit{after} the full page object.
The object appers immediately on the next page and the caption of the next following page at the bottom. There
is no check for an even or odd page. This behaviour makes only sense for a oneside document.
\begin{lstlisting}
-\hvFloat[fullpage, capPos=r]%
+\hvFloat[fullpage, capPos=after]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
@@ -1355,8 +1442,8 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi
\iffalse
-\Float[capPos=r]
-\hvFloat[fullpage, capPos=r]%
+\Float[capPos=after]
+\hvFloat[fullpage, capPos=after]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
@@ -1367,7 +1454,7 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi
\fi
-\begin{figure}[p]
+\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
@@ -1380,6 +1467,7 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi
\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
@@ -1390,9 +1478,11 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi
\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
\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
@@ -1405,6 +1495,8 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi
\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
@@ -1412,15 +1504,15 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi
-\subsubsection{Using \Lkeyset{capPos=e} --- caption on an even page}
+\subsubsection{Using \Lkeyset{capPos=evenPage} --- caption on an even page}
-With \Lkeyset{capPos=e} the caption will be printed on an even (left) page,
+With \Lkeyset{capPos=evenPage} the caption will be printed on an even (left) page,
the object will always be on an odd (right) page.
This option makes only real sense for The \Loption{twoside} mode!
\begin{lstlisting}
-\hvFloat[fullpage, capPos=e]%
+\hvFloat[fullpage, capPos=evenPage]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A float whith a caption on an even page (left)]%
@@ -1429,8 +1521,8 @@ This option makes only real sense for The \Loption{twoside} mode!
\end{lstlisting}
\iffalse
-\Float[capPos=e]
-\hvFloat[fullpage, capPos=e]%
+\Float[capPos=evenPage]
+\hvFloat[fullpage, capPos=evenPage]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A float whith a caption on an even page (left)]%
@@ -1440,7 +1532,7 @@ This option makes only real sense for The \Loption{twoside} mode!
-\begin{figure}[p]
+\begin{figure}[!h]
\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/even1s1c}}\hfill
\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/even1s1c}}\hfill
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/even1s1c}}\hfill
@@ -1452,7 +1544,7 @@ 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
@@ -1463,6 +1555,7 @@ This option makes only real sense for The \Loption{twoside} mode!
\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}
@@ -1470,15 +1563,15 @@ This option makes only real sense for The \Loption{twoside} mode!
\FloatBarrier
-\subsubsection{Using \Lkeyset{capPos=d} --- caption on an odd page}
+\subsubsection{Using \Lkeyset{capPos=oddPage} --- caption on an odd page}
-With \Lkeyset{capPos=d} the caption will be printed on an odd (right) page, the object will always be on an even (left) page,
+With \Lkeyset{capPos=oddPage} the caption will be printed on an odd (right) page, the object will always be on an even (left) page,
which is before the caption.
-This option makes only sense for The \Loption{twoside} mode!
+%This option makes only sense for The \Loption{twoside} mode!
\begin{lstlisting}
-\hvFloat[fullpage, capPos=d]%
+\hvFloat[fullpage, capPos=oddPage]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
@@ -1491,8 +1584,8 @@ This option makes only sense for The \Loption{twoside} mode!
\iffalse
-\Float[capPos=d]
-\hvFloat[fullpage, capPos=d]%
+\Float[capPos=oddPage]
+\hvFloat[fullpage, capPos=oddPage]%
{figure}%
{\includegraphics[fullpage]{frose}}%
[A float which needs the complete page width and height.]%
@@ -1503,7 +1596,7 @@ This option makes only sense for The \Loption{twoside} mode!
\fi
-\begin{figure}
+\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
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/odd1s1c}}\hfill
@@ -1517,7 +1610,7 @@ This option makes only sense for The \Loption{twoside} mode!
\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
@@ -1547,6 +1640,9 @@ This option makes only sense for The \Loption{twoside} mode!
\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
@@ -1561,61 +1657,63 @@ This option makes only sense for The \Loption{twoside} mode!
\caption{Output of \texttt{odd2s2c} (pages 2--9)}\label{fig:fullpage13}
\end{figure}
+\fi
\FloatBarrier
-\subsubsection{Using \Lkeyset{capPos=i} or \Lkeyset{capPos=o}--- caption on the inner or outer side}
+\subsubsection{Using \Lkeyset{capPos=inner} or \Lkeyset{capPos=outer}--- caption on the inner or outer side}
These settings make no sense in \Index{onecolumn} mode.
\subsection{Using the paper size}
-With the macro \Lcs{IncludeGraphics}, which has the same syntax as the well-known \Lcs{includegraphics},
-the width and height of the object are set to the paper dimensions \Ldim{paperwidth} and
-\Ldim{paperheight}. It can be used in one- and twosolumn mode!
+It belongs to the user to create an object which fills the complete page. However, with the
+keyword \Lkeyword{FULLPAGE} which is valis for \Lcs{hvfloat} \emph{and}
+for the macro \Lcs{includegraphics} an image will be scaled to
+the paper dimensions \Ldim{paperwidth} and
+\Ldim{paperheight}. It can be used in one- and twocolumn mode!
\begin{lstlisting}
-\Float[fullpage]
-\hvFloat[fullpage,capPos=l]{figure}%
- {\IncludeGraphics{frose}}%
- [A float which needs the complete paper width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
+\hvFloat[FULLPAGE]%
+ {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:fullpage4}
+ {fig:fullpage0}
\end{lstlisting}
-\iffalse
-\Float[fullpage]
-\hvFloat[fullpage,capPos=l]{figure}%
- {\IncludeGraphics{frose}}%
- [A float which needs the complete paper width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}%
- {fig:fullpage4}
-\fi
-
-
-
\begin{figure}[p]
-\frame{\includegraphics[page=2,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
-\frame{\includegraphics[page=3,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
-\frame{\includegraphics[page=4,width=0.32\linewidth]{examples/paper-default1s1c}}
-
-\frame{\includegraphics[page=5,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
-\frame{\includegraphics[page=6,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
-\frame{\includegraphics[page=7,width=0.32\linewidth]{examples/paper-default1s1c}}
-
-\frame{\includegraphics[page=8,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
-\frame{\includegraphics[page=9,width=0.32\linewidth]{examples/paper-default1s1c}}\hfill
-\frame{\includegraphics[page=10,width=0.32\linewidth]{examples/paper-default1s1c}}
-\caption{Output of \texttt{paper-default1s1c} (pages 2--10)}\label{fig:fullpage14}
+\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
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-default1s1c}}
+
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-default1s1c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-default1s1c}}\hfill
+\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}
\end{figure}
@@ -1642,7 +1740,7 @@ can be mixed:
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=l,multiFloat]%
+\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
@@ -1671,7 +1769,7 @@ can be mixed:
\iffalse
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=l,multiFloat]%
+\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
@@ -1753,7 +1851,7 @@ float type entry is ignored.
\begin{lstlisting}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\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
@@ -1782,7 +1880,7 @@ The package \Lpack{subcaption} is loaded by default and should be activated with
\iffalse
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\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
@@ -1834,20 +1932,32 @@ 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}
+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.
+In such a case use one of the other setting.
+Table~\vref{tab:fullpage} shows the valid optional arguments for a full page floating object.
+%In the following we use some blind text to show the other setting for full page objects.
+%Such text has no meaning here.
+
+
\subsection{Default setting}
For the \Index{twocolumn} mode the caption can be in the left (first) or right (second) column.
-With the default which is equivalent to the setting \Lkeyset{capPos=l}, the caption is always placed \emph{before}
-the object. This can be the first or the second column.
-With \Lkeyset{capPos=L} it is possible to get the caption in the twocolumn mode always in
-the left (first) column (see figure~\vref{LEFT2s2c})
+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.
+This is then the left (first) column for the caption (see figure~\vref{default2s2c}).
\begin{lstlisting}
@@ -1877,7 +1987,7 @@ the left (first) column (see figure~\vref{LEFT2s2c})
-\begin{figure}[!htb]
+\begin{figure}[p]
%\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
@@ -1894,15 +2004,9 @@ the left (first) column (see figure~\vref{LEFT2s2c})
%Figure~\vref{fig:fullpage0-2} shows the behaviour if only the optional argument \Lkeyword{fullpage}
%in twocolumn mode is used. With this default setting the caption is always placed \textit{before} the following object.
-Depending to the
-used documentclass it can be a problem, if the caption should be placed on the first page of the whole document.
-In such a case use one of the other setting.
-Table~\vref{tab:fullpage} shows the valid optional arguments for a full page floating object.
-In the following we use some blind text to show the other setting for full page objects.
-Such text has no meaning here.
-
-\begin{figure}%[p]
+\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
@@ -1916,18 +2020,18 @@ Such text has no meaning here.
\caption{Output of \texttt{LEFT2s2c} (pages 2--9)}\label{LEFT2s2c}
\end{figure}
+\fi
\FloatBarrier
-\subsubsection{Using \Lkeyset{capPos=r}}
+\subsubsection{Using \Lkeyset{capPos=after}}
-The caption will be printed always right of the object which is the same as \textit{after} the full page object.
-With \Lkeyset{capPos=R} it is possible to get the caption in the twocolumn mode always in
-the right (second) column (see figure~\vref{RIGHT2s2c})
+The caption will be printed always right (\textit{after}) of the object. This can be the frist or second
+column.
\begin{lstlisting}
-\hvFloat[fullpage, capPos=r]{figure}%
+\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.
@@ -1939,8 +2043,8 @@ the right (second) column (see figure~\vref{RIGHT2s2c})
\iffalse
-\Float[capPos=r]
-\hvFloat[fullpage, capPos=r]{figure}%
+\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.
@@ -1951,7 +2055,7 @@ the right (second) column (see figure~\vref{RIGHT2s2c})
\fi
-\begin{figure}[p]
+\begin{figure}[!h]
%\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
@@ -1963,9 +2067,9 @@ the right (second) column (see figure~\vref{RIGHT2s2c})
\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}
-
+\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
@@ -1980,13 +2084,15 @@ the right (second) column (see figure~\vref{RIGHT2s2c})
\caption{Output of \texttt{RIGHT2s2c} (pages 2--9)}\label{RIGHT2s2c}
\end{figure}
+\fi
+
\FloatBarrier
-\subsubsection{Using \Lkeyset{capPos=e} --- caption on an even page}
+\subsubsection{Using \Lkeyset{capPos=evenPage} --- caption on an even page}
There can be a problem if there is not enough space on the bottom of the
even page. Then the caption will be on the next page which is an odd one.
@@ -2009,7 +2115,7 @@ of \Lpack{hvfloat}.
\caption{Output of \texttt{even1s2c} (pages 2--9)}\label{even1s2c}
\fi
-\begin{figure}
+\begin{figure}[!h]
\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
@@ -2029,7 +2135,7 @@ of \Lpack{hvfloat}.
\clearpage
-\subsubsection{Using \Lkeyset{capPos=d} --- caption on an odd page}
+\subsubsection{Using \Lkeyset{capPos=oddPage} --- caption on an odd page}
There can be a problem if there is not enough space on the bottom of the
even page. Then the caption will be on the next page which is an odd one.
@@ -2052,7 +2158,7 @@ of \Lpack{hvfloat}.
\caption{Output of \texttt{odd1s2c} (pages 2--9)}\label{odd1sc2}
\fi
-\begin{figure}
+\begin{figure}[!h]
\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
@@ -2073,14 +2179,14 @@ of \Lpack{hvfloat}.
\clearpage
-\subsubsection{Using \Lkeyset{capPos=i} --- caption in the inner column}
+\subsubsection{Using \Lkeyset{capPos=inner} --- caption in the inner column}
The caption will be printed in the right column for an even page and
in the left column for an odd page.
\begin{lstlisting}
-\hvFloat[fullpage,capPos=i]{figure}{\includegraphics[fullpage]{rose}}%
+\hvFloat[fullpage,capPos=inner]{figure}{\includegraphics[fullpage]{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
@@ -2088,8 +2194,8 @@ in the left column for an odd page.
\end{lstlisting}
\iffalse
-\Float[capPos=i]
-\hvFloat[fullpage,capPos=i]{figure}%
+\Float[capPos=inner]
+\hvFloat[fullpage,capPos=inner]{figure}%
{\includegraphics[fullpage]{rose}}%
[A float which needs the complete column width and height.]%
{A Caption of a ``fullpage'' object, which follows on the left or
@@ -2099,7 +2205,7 @@ in the left column for an odd page.
\fi
-\begin{figure}
+\begin{figure}[!h]
%\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
@@ -2130,26 +2236,26 @@ in the left column for an odd page.
\clearpage
-\subsubsection{Using \Lkeyset{capPos=o} --- caption on the outer column}
+\subsubsection{Using \Lkeyset{capPos=outer} --- caption on the outer column}
The caption will be printed on the left column an odd page, the object can appear before
or after this caption.
\begin{lstlisting}
-\hvFloat[fullpage, capPos=o]{figure}%
+\hvFloat[fullpage, capPos=outer]{figure}%
{\includegraphics[fullpage]{rose}}%
- [A float which needs the complete page width and height with \texttt{capPos=o}.]%
+ [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
real meaning because it fills only the space for a long caption.}{fig:fullpage2-2a}
\end{lstlisting}
\iffalse
-\Float[capPos=o]
-\hvFloat[fullpage, capPos=o]{figure}%
+\Float[capPos=outer]
+\hvFloat[fullpage, capPos=outer]{figure}%
{\includegraphics[fullpage]{rose}}%
- [A float which needs the complete page width and height with \texttt{capPos=o}.]%
+ [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
real meaning because it fills only the space for a long caption.}{fig:fullpage2-2a}
@@ -2158,7 +2264,7 @@ or after this caption.
-\begin{figure}
+\begin{figure}[!h]
%\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
@@ -2195,29 +2301,29 @@ or after this caption.
\subsection{Using full page in twocolumn mode}
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=i} for \emph{inner}.
+In such a case the only useful caption position is \Lkeyset{capPos=inner} for \emph{inner}.
\begin{lstlisting}
-\hvFloat*[fullpage, capPos=i]{figure}%
+\hvFloat*[fullpage]{figure}%
{\includegraphics[FullPage]{rose}}%
- [A float which needs the complete page width and height with \texttt{capPos=o}.]%
+ [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}
\end{lstlisting}
\iffalse
-\Float[capPos=i]
-\hvFloat*[fullpage, capPos=i]{figure}%
+\Float[capPos=inner]
+\hvFloat*[fullpage, capPos=inner]{figure}%
{\includegraphics[FullPage]{rose}}%
- [Star version with \texttt{capPos=o}.]%
+ [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}
\fi
-\begin{figure}
+\begin{figure}[!h]
\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
@@ -2232,35 +2338,32 @@ In such a case the only useful caption position is \Lkeyset{capPos=i} for \emph{
\caption{Output of \texttt{paper-default2s2c} (pages 2--9)}\label{paper-default2s2c}
\end{figure}
-
-
-\begin{figure}[p]
+\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=1,width=0.24\linewidth]{examples/paper-RIGHT1s2c}}\hfill
-\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
-\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
-\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
-\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}
-
-\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
-\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
-\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}\hfill
-\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/paper-RIGHT2s2c}}
-\caption{Output of \texttt{paper-RIGHT2s2c} (pages 2--9)}\label{paper-RIGHT2s2c}
+%\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
@@ -2291,7 +2394,7 @@ can be mixed:
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=i]%
+\hvFloat[fullpage,multiFloat,capPos=inner]%
+{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
@@ -2319,7 +2422,7 @@ can be mixed:
\iffalse
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=i]%
+\hvFloat[fullpage,multiFloat,capPos=inner]%
+{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
@@ -2349,7 +2452,7 @@ left aligned.
-\begin{figure}%[p]
+\begin{figure}[p]
\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/multi-default2s2c}}\hfill
@@ -2361,18 +2464,20 @@ 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}
-%\frame{\includegraphics[page=2,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
-%\frame{\includegraphics[page=3,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
-%\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
-%\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/multi-inner2s2c}}%%
+%\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
+\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/multi-inner2s2c}}%%
-%\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
-%\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
-%\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
-%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-inner2s2c}}
+\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+\frame{\includegraphics[page=7,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+\frame{\includegraphics[page=8,width=0.24\linewidth]{examples/multi-inner2s2c}}\hfill
+\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-inner2s2c}}
%\frame{\includegraphics[page=9,width=0.24\linewidth]{examples/multi-inner2s2c}}
-%\caption{Output of \texttt{multi-inner2s2c} (pages 2-9)}\label{multi-inners2s2c}
+\caption{Output of \texttt{multi-inner2s2c} (pages 2-9)}\label{multi-inners2s2c}
\end{figure}
@@ -2388,7 +2493,7 @@ float type entry is ignored.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\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
@@ -2414,7 +2519,7 @@ should be true (see listing).
\iffalse
\captionsetup[sub]{singlelinecheck}
\Float[subFloat]
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=before,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]%
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -2464,6 +2569,7 @@ should be true (see listing).
\FloatBarrier
+\index{capPos@\texttt {capPos} (keyword)|)}
@@ -2478,7 +2584,7 @@ the object is set. Let's assume that we use something like
\begin{verbatim}
\setDefaults
-\hvFloat[fullpage,capPos=e]{figure}%
+\hvFloat[fullpage,capPos=evenPage]{figure}%
{\IncludeGraphics{frose}}%
[A float which needs the complete paper width and height.]%
{A Caption of a ``fullpage'' object, which follows on the next page.
@@ -2517,8 +2623,21 @@ 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}
@@ -2530,24 +2649,38 @@ With \Lcs{defhvstyle} one can define a special style to get rid of the individua
For example:
\begin{verbatim}
-\defhvstyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=r, capVPos=b, objectPos=c}
+\defhvstyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center}
\end{verbatim}
\begin{lstlisting}
-\hvFloat[style=RightCaption]{figure}{\includegraphics{rose}}%
+\hvFloat[style=RightCaption]{figure}{\includegraphics[scale=1.5]{frose}}%
{Caption vertically centered right beside the float with a caption width of
\texttt{0.5\textbackslash columnwidth}.}{fig:style}
\end{lstlisting}
-\defhvstyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=r, capVPos=b, objectPos=c}
+\defhvstyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center}
-\hvFloat[style=RightCaption]{figure}{\includegraphics{rose}}%
+\hvFloat[style=RightCaption]{figure}{\includegraphics[scale=1.5]{frose}}%
{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:
@@ -2559,23 +2692,19 @@ 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}. It allows
-optional package options to set the global placement:
+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:
\begin{verbatim}
\usepackage[figure=tb,table=t]{hvfloat-fps}
+\usepackage[all=!htb]{hvfloat-fps}
\end{verbatim}
+\blindtext
-\setDefaults
-\hvFloat[fullpage]{figure}%
- {\IncludeGraphics{frose}}%
- [A float which needs the complete paper width and height.]%
- {A Caption of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. The object uses the complete paper dimensions}%
- {demo:fullpage}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
new file mode 100644
index 00000000000..44bb2161914
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..e69a4b74e18
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
@@ -0,0 +1,76 @@
+\documentclass{scrartcl}
+
+\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=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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=e]
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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=e]
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
new file mode 100644
index 00000000000..dfd528b2d1d
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..09cd7f622a8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
@@ -0,0 +1,75 @@
+\documentclass[twoside]{scrartcl}
+
+\input{preamble.ltx}
+
+\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=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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=e]
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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=e]
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
new file mode 100644
index 00000000000..e53cf513255
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..8dad428f164
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
@@ -0,0 +1,76 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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=e]
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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=e]
+\hvFloat[fullpage, capPos=inner]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the inner side of a twosided document.
+ 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/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
new file mode 100644
index 00000000000..a82f823ce67
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..da15c39412a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
@@ -0,0 +1,146 @@
+\documentclass{scrartcl}
+
+\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=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img:demo0}%
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
+ L & R & C & P\\
+ left & right & center & Text with possible linebreaks\\
+ \multicolumn{4}{c}{Multicolumn over all columns}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo1}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo2}
+\end{lstlisting}
+
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img:demo0}%
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
+ L & R & C & P\\
+ left & right & center & Text with possible linebreaks\\
+ \multicolumn{4}{c}{Multicolumn over all columns}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo1}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption D of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo2}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img: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=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img: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-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
new file mode 100644
index 00000000000..f51ad86b11a
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..42b785cc1d2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
@@ -0,0 +1,137 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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 multi images~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+\end{lstlisting}
+
+The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+\end{lstlisting}
+
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+
+
+
+
+\blinddocument
+
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+\end{lstlisting}
+
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+
+
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
new file mode 100644
index 00000000000..96f69963a18
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..98b8292a581
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
@@ -0,0 +1,146 @@
+\documentclass[twoside]{scrartcl}
+
+\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=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img:demo0}%
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
+ L & R & C & P\\
+ left & right & center & Text with possible linebreaks\\
+ \multicolumn{4}{c}{Multicolumn over all columns}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo1}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo2}
+\end{lstlisting}
+
+\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img:demo0}%
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
+ L & R & C & P\\
+ left & right & center & Text with possible linebreaks\\
+ \multicolumn{4}{c}{Multicolumn over all columns}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo1}
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 4
+ {A Caption D of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {img:demo2}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,capPos=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img: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=l,multiFloat]%
+ +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {img: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-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
new file mode 100644
index 00000000000..d13d5f4a089
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..40446f6f5a4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
@@ -0,0 +1,137 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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 multi images~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+\end{lstlisting}
+
+The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+\end{lstlisting}
+
+%\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+
+
+
+
+\blinddocument
+
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+\end{lstlisting}
+
+%\Float[Multi]
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+
+
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
new file mode 100644
index 00000000000..7b81a8e1b26
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..81f4006f2f0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
@@ -0,0 +1,147 @@
+\errorcontextlines=200
+\documentclass[twoside]{scrartcl}
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+\captionsetup{singlelinecheck=false}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\twocolumn
+\Blindtext
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The multi images~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+\end{lstlisting}
+
+The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat,capPos=inner]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+\end{lstlisting}
+
+
+\Float[Multi]
+
+
+\hvFloat[fullpage,multiFloat,capPos=inner]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+
+
+%\blinddocument
+\Blindtext
+\Blindtext
+
+
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat,capPos=inner]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+\end{lstlisting}
+
+
+\Float[Multi]
+
+%\end{document}
+\hvFloat[fullpage,multiFloat,capPos=inner]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+
+
+
+
+\blinddocument
+
+\Blindtext
+
+\Blindtext
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
new file mode 100644
index 00000000000..ffc6441fec2
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..930d1c01778
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
@@ -0,0 +1,145 @@
+\errorcontextlines=100
+\documentclass[twoside]{scrartcl}
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+\captionsetup{singlelinecheck=false}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+
+\twocolumn
+\Blindtext
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The multi images~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+\end{lstlisting}
+
+The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-cap}.
+
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat,capPos=outer]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+\end{lstlisting}
+
+\Float[Multi]
+
+\hvFloat[fullpage,multiFloat,capPos=outer,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
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo0}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo1}
+
+
+
+\blinddocument
+\blindtext
+
+
+\Blindtext
+
+\begin{lstlisting}
+\captionsetup{singlelinecheck=false}
+\hvFloat[fullpage,multiFloat,capPos=outer]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}%
+ {}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+\end{lstlisting}
+
+
+\Float[Multi]
+
+%\end{document}
+\hvFloat[fullpage,multiFloat,capPos=outer]%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
+ [Short caption A]%
+ {A Caption A of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {multi:demo2}%
+ +{table}{\begin{tabular}{lr}\hline % no 2
+ Linksbündig & Rechtsbündig\\
+ L & R \\
+ left & right \\
+ \multicolumn{2}{c}{Multicolumn}\\\hline
+ \end{tabular}}%
+ [Short Caption B]%
+ {A Caption B of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page.}{}%
+ +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 3
+ {A Caption C of a ``fullpage'' object, which follows on the left or
+ right column.}%
+ {multi:demo3}
+
+
+
+
+\blinddocument
+
+\Blindtext
+
+\Blindtext
+
+
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
new file mode 100644
index 00000000000..4f307de76f2
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..45884abb5cf
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
@@ -0,0 +1,146 @@
+\documentclass{scrartcl}
+
+\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/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
new file mode 100644
index 00000000000..92bde25741b
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..d2ccbd7885c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
@@ -0,0 +1,73 @@
+\documentclass{scrartcl}
+
+\input{preamble.ltx}
+
+\begin{document}
+
+\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=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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}
+
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
new file mode 100644
index 00000000000..0425cad9a88
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..49a97399540
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
new file mode 100644
index 00000000000..86485ecdc24
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..311074e8937
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
@@ -0,0 +1,79 @@
+\documentclass[twoside]{scrartcl}
+
+\input{preamble.ltx}
+
+\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=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
new file mode 100644
index 00000000000..b3ebce3522c
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..d33b8cf30e6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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=oddPage]%
+ {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=oddPage]
+\hvFloat[fullpage,capPos=oddPage]%
+ {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/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
new file mode 100644
index 00000000000..3e3793c9147
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..0d5f5928bfa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
@@ -0,0 +1,75 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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:full0} has a caption~\vpageref{fig:full0-cap}.
+\end{lstlisting}
+
+The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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:full0}
+\end{lstlisting}
+
+\Float[capPos=outer]
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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:full0}
+
+\blinddocument
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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=outer]
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
new file mode 100644
index 00000000000..3cdce808a73
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..9b3a8c29363
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
@@ -0,0 +1,75 @@
+\documentclass[twoside]{scrartcl}
+
+\input{preamble.ltx}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
+\end{lstlisting}
+
+The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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:full0}
+\end{lstlisting}
+
+\Float[capPos=outer]
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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:full0}
+
+\blinddocument
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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=outer]
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
new file mode 100644
index 00000000000..553a79404ba
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..9503d835e78
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
@@ -0,0 +1,75 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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:full0} has a caption~\vpageref{fig:full0-cap}.
+\end{lstlisting}
+
+The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}.
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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:full0}
+\end{lstlisting}
+
+\Float[capPos=outer]
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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:full0}
+
+\blinddocument
+
+\section{Next Example}
+
+\begin{lstlisting}
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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=outer]
+\hvFloat[fullpage, capPos=outer]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A float which needs the complete page width and height.]%
+ {A Caption on the outer side of a twosided document.
+ 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
new file mode 100644
index 00000000000..14aac1f8885
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..29b0290e8a3
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
@@ -0,0 +1,80 @@
+\documentclass{scrartcl}
+
+\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]%
+ {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]%
+ {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]%
+ {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]%
+ {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-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
new file mode 100644
index 00000000000..530f479dc5e
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..447cbfd50f6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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]%
+ {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]%
+ {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]%
+ {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]%
+ {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/paper-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
new file mode 100644
index 00000000000..bc2134385dc
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..447cbfd50f6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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]%
+ {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]%
+ {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]%
+ {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]%
+ {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/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
new file mode 100644
index 00000000000..f98af24258a
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..1784f8c1083
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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=inner]%
+ {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=inner]%
+ {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=inner]%
+ {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=inner]%
+ {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/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
new file mode 100644
index 00000000000..6f8989ff452
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..e4615a0bf5c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
@@ -0,0 +1,81 @@
+\documentclass{scrartcl}
+
+\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[capPos=after]
+\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}
+
+\Blindtext
+
+\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[capPos=after]
+\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-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdf
new file mode 100644
index 00000000000..94971c8feac
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex
new file mode 100644
index 00000000000..b54687c8411
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right2s2c.tex
@@ -0,0 +1,78 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+\end{lstlisting}
+
+
+\Float[capPos=after]
+\hvFloat*[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat*[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+\end{lstlisting}
+
+
+\Float[capPos=after]
+\hvFloat*[FULLPAGE,capPos=after]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+
+\blinddocument
+
+\Blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
new file mode 100644
index 00000000000..cff53b56ef4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
@@ -0,0 +1,43 @@
+\PassOptionsToPackage{silent}{fontspec}
+\usepackage{libertinus}
+\setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{DejaVu Sans Mono}
+\usepackage{microtype}
+\usepackage[english]{babel}
+
+\usepackage{listings}
+\usepackage{xcolor}
+\usepackage[automark]{scrlayer-scrpage}
+\pagestyle{scrheadings}
+%
+\lstset{%
+ language=[LaTeX]TeX,%
+ showstringspaces=false,%
+ tabsize=5,%
+% frame={tb},%
+% lineskip=-1pt,%
+ extendedchars=true,%
+ basicstyle={\small\ttfamily},%
+% numbers=left,%
+% stepnumber=1,%
+% numberstyle=\tiny,%
+% xleftmargin=2em,%
+% backgroundcolor=black!20,
+ breaklines=true}
+%
+
+%\usepackage{marginnote}
+%newcommand\Float[1][]{\ifx\relax#1\relax\marginnote{\fbox{float}}\else
+% \marginnote{\fbox{\shortstack{float\\#1}}}\fi
+%
+
+\newcommand\Float[1][]{\centerline{\fbox{Float #1}}}
+
+\usepackage{graphicx}
+\usepackage{varioref}
+\usepackage{nameref}
+\usepackage[hyperref]{hvfloat}
+%\usepackage{hvfloat}
+\DeclareCaptionFont{red}{\color{red}}
+\captionsetup{labelfont={red,sf},font={red,sf},format=plain}
+
+\usepackage{blindtext}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
new file mode 100644
index 00000000000..e79d04aba32
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..eb06ae1db1b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
@@ -0,0 +1,75 @@
+\documentclass{scrartcl}
+
+\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/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
new file mode 100644
index 00000000000..68bc9e4449f
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..5e8b4b3e85d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
@@ -0,0 +1,80 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage0}
+\end{lstlisting}
+
+
+\Float[capPos=after]
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage1}
+\end{lstlisting}
+
+
+\Float[capPos=after]
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage1}
+
+\blinddocument
+
+
+
+\blinddocument
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
new file mode 100644
index 00000000000..a5f3a34822e
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..7e2f13e6b50
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
@@ -0,0 +1,73 @@
+\documentclass[twoside]{scrartcl}
+
+\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}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage1}
+\end{lstlisting}
+
+
+\Float[capPos=after]
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage1}
+
+\blinddocument
+
+
+\Blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
new file mode 100644
index 00000000000..44859b5ade0
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..f296934ed37
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
@@ -0,0 +1,78 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+
+\begin{document}
+
+\tableofcontents\newpage
+
+\blinddocument
+
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}.
+\end{lstlisting}
+
+The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-cap}.
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage0}
+\end{lstlisting}
+
+
+\Float[capPos=after]
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage1}
+\end{lstlisting}
+
+
+\Float[capPos=after]
+\hvFloat[fullpage,capPos=after]%
+ {figure}%
+ {\includegraphics[fullpage]{frose}}%
+ [A fullpage float with the default caption setting]%
+ {A default caption of a ``fullpage'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:fullpage1}
+
+\blinddocument
+
+
+\Blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
new file mode 100755
index 00000000000..ae97108d50e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+for datei in *.tex
+do
+ lualatex $datei
+ lualatex $datei
+ lualatex $datei
+ MAIN=$(basename -a -s .tex $datei)
+ 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
new file mode 100755
index 00000000000..2d4060b9360
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+for datei in $1????.tex
+do
+
+ lualatex $datei
+ lualatex $datei
+ lualatex $datei
+ MAIN=$(basename -a -s .tex $datei)
+ rm $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
+done
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
new file mode 100644
index 00000000000..06464c61b38
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..0d924e7eb15
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
@@ -0,0 +1,129 @@
+\documentclass{scrartcl}
+
+\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{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=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub: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:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo6}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub: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:demo7}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo6}
+
+
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document} \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
new file mode 100644
index 00000000000..dabd57b4a22
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..9b006a9d855
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
@@ -0,0 +1,130 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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 multi 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=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub: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:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo6}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub: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-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
new file mode 100644
index 00000000000..9539cbc982b
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..9326118b219
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
@@ -0,0 +1,130 @@
+\documentclass[twoside,twocolumn]{scrartcl}
+
+\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 multi 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=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub:demo0}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ [Short caption B]%
+ {A Caption B of a ``fullpage'' sub object.}% subcaption
+ {}%
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
+ {sub:demo1}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption D of a ``fullpage'' object}%
+ {sub:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo3}
+
+
+
+\blinddocument
+
+
+\begin{lstlisting}
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub: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:demo2}
+ +{}{\includegraphics[width=\linewidth]{CTAN}}%
+ {A Caption E of a ``fullpage'' object}%
+ {sub:demo6}
+\end{lstlisting}
+
+\Float[subfloat]
+\captionsetup[sub]{singlelinecheck}
+\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+ +{figure}{}[Short main caption of the objects]% main short lsi entry
+ {The main caption of a ``fullpage'' object, which follows on the left or
+ right column. This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}% main caption
+ {sub: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-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
new file mode 100644
index 00000000000..c6875b06589
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..9448ec2f4e9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
@@ -0,0 +1,128 @@
+\documentclass{scrartcl}
+
+\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-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
new file mode 100644
index 00000000000..f2b95d19a3b
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..5c02fccb9f6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
@@ -0,0 +1,128 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
new file mode 100644
index 00000000000..ae4a3af1faa
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..5c02fccb9f6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
@@ -0,0 +1,128 @@
+\documentclass[twocolumn]{scrartcl}
+
+\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/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index 3a9e26e91dd..c5a2e2bc77c 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 988 2019-03-20 21:34:05Z herbert $
+%% $Id: hvfloat.sty 1009 2019-04-01 12:44:03Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hvfloat}[2019/02/03 rotating of floating objects]
@@ -16,8 +16,8 @@
%% DESCRIPTION:
%% `hvfloat' offers rotating of captions and objects for floats
%%
-\def\fileversion{2.10}
-\def\filedate{2019/03/20}
+\def\fileversion{2.11}
+\def\filedate{2019/04/01}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
%
\newif\ifhv@fbox \hv@fboxfalse
@@ -31,6 +31,7 @@
\RequirePackage{caption}
\PassOptionsToPackage{hypcap}{subcaption}
\RequirePackage{subcaption}
+\RequirePackage{atbegshi}
\ifhv@hyperref
\RequirePackage{hyperref}
% \RequirePackage{hypcap}
@@ -54,20 +55,25 @@
\newsavebox\hvObjectBox
\newsavebox\hvCaptionBox
\newsavebox\hvOBox
+\newsavebox\@tempbox
+\newsavebox\hv@caption@box
+
%
\newif\ifhv@capbeside \hv@capbesidefalse
-\def\hv@Top{t}
-\def\hv@Bottom{b}
-\def\hv@Right{r}
-\def\hv@RIGHT{R}
-\def\hv@Left{l}
-\def\hv@LEFT{L}
-\def\hv@Center{c}
-\def\hv@Outer{o}
-\def\hv@Inner{i}
-\def\hv@Even{e}
-\def\hv@Odd{d}
+\def\hv@Top{top}
+\def\hv@Bottom{bottom}
+\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}
+\def\hv@Even{evenPage}
+\def\hv@Odd{oddPage}
\def\hv@Natural{n}
\def\hv@Width{w}
\def\hv@Height{h}
@@ -88,7 +94,7 @@
\define@key{hvSet}{capAngle}[0]{% -360..+360
\def\hvSet@capAngle{#1}%
}
-\define@key{hvSet}{capPos}[b]{% (l)eft|(b)ottom|(t)op|(r)ight|(i)nner|(o)uter|(e)ven|o(d)d
+\define@key{hvSet}{capPos}[bottom]{% (l)eft|(b)ottom|(t)op|(r)ight|(i)nner|(o)uter|(e)ven|o(d)d
\def\hvSet@capPos{#1}% it is relativ to the object, (e),(d) only valid for fullpage float
\edef\@tempa{#1}%
\ifx\hv@Bottom\@tempa
@@ -101,10 +107,10 @@
\fi
\fi
}
-\define@key{hvSet}{capVPos}[c]{% (b)ottom|(c)enter|(t)op
+\define@key{hvSet}{capVPos}[center]{% bottom|center|top
\def\hvSet@capVPos{#1}% it is relativ to the object
}
-\define@key{hvSet}{objectPos}[c]{% (l)eft|(c)enter|(r)ight|(i)nner|(o)uter
+\define@key{hvSet}{objectPos}[center]{% (l)eft|(c)enter|(r)ight|(i)nner|(o)uter
\def\hvSet@objectPos{#1}% it is relativ to the document
}
\define@key{hvSet}{objectAngle}[0]{% -360..+360
@@ -121,7 +127,8 @@
\define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text
\define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text
\define@boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page
-\define@boolkey{hvSet}[hv@]{FullPage}[true]{}% fullpage float with caption on other page
+%\define@boolkey{hvSet}[hv@]{FullPage}[true]{}% fullpage float with caption on other page
+\define@boolkey{hvSet}[hv@]{FULLPAGE}[true]{}% fullpage float with caption on other page
\define@boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats
\ifhv@subFloat\setkeys{hvSet}{multiFloat=false}\fi%
}%
@@ -146,15 +153,17 @@
\newcommand{\setDefaults}{%
\hv@set{%
floatPos=htbp, rotAngle=0, capWidth=n, capAngle=0,
- capPos=b, capVPos=c, objectPos=c, objectAngle=0,
+ capPos=bottom, capVPos=center, objectPos=center, objectAngle=0,
floatCapSep=5, useOBox=false, nonFloat=false,
- onlyText=false, wide=false, fullpage=false, FullPage=false,
+ onlyText=false, wide=false, fullpage=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}}
+ \hv@set{subFloat=false,fullpage=false,%FullPage=false,
+ multiFloat=false,FULLPAGE=false}}
\def\hv@vskip{\vspace{\hvMultiFloatSkip}}
@@ -197,15 +206,10 @@
\def\Gin@eheight{\textheight}%
\Gin@boolkey{false}{iso}%
}
-\newcommand\IncludeGraphics[2][]{%
- \checkoddpage
- \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}%
- \ifoddpage
- \hspace*{\dimexpr-\oddsidemargin-\parindent-1in}%
- \else
- \hspace*{\dimexpr-\evensidemargin-\parindent-1in}%
- \fi
- \includegraphics[#1,width=\paperwidth,height=\paperheight,keepaspectratio=false]{#2}%
+\define@key{Gin}{FULLPAGE}[true]{%
+ \def\Gin@ewidth{\paperwidth}%
+ \def\Gin@eheight{\paperheight}%
+ \Gin@boolkey{false}{iso}%
}
\newcommand\put@CaptionBox[1][0]{%
@@ -277,7 +281,6 @@
\setcounter{hv@ptable}{\value{table}}%
\gdef\hv@save@setting{#1}%
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
-%\ifhv@multiFloat\typeout{>>>>>>>>multiFloat!!}\else\typeout{>>>>>>>> KEIN MultiFloat!}\fi%
\gdef\hv@floatType{figure}%
\@ifnextchar+{\do@multiFloat}{\hvFloat@ii[#1]}}
@@ -333,7 +336,7 @@
\newcounter{subhv@ptable}
\def\drawSepLine{%
- \noindent
+ \par\noindent
\if@twocolumn\rule{\columnwidth}{0.4pt}\else\rule{\linewidth}{0.4pt}\fi
\vspace{0pt}%
}
@@ -359,7 +362,12 @@
\def\hvSet@CapWidth{n}% relative value
\do@@@@hvFloat% fullpage with caption on other page
\else
- \do@@@hvFloat
+ \ifhv@FULLPAGE
+ \def\hvSet@CapWidth{n}% relative value
+ \do@@@@hvFloat% fullpage with caption on other page
+ \else
+ \do@@@hvFloat
+ \fi
\fi
}
%
@@ -601,8 +609,17 @@
{\minipage{#1}\center}
{\endcenter\endminipage}
%
+
+\ExplSyntaxOn
+\let\clist@item@Nn\clist_item:Nn
+\let\l@clist@Type\l_clist_Type
+\let\l@clist@LofCaption\l_clist_LofCaption
+\let\l@clist@Label\l_clist_Label
+\let\clist@count@N\clist_count:N
+\ExplSyntaxOff
+
\def\do@@@@hvFloat{% special float page: caption <-> fullpage image
- \ifx\hvSet@capPos\hv@Right \hv@@capPos=1
+ \ifx\hvSet@capPos\hv@After \hv@@capPos=1
\else
\ifx\hvSet@capPos\hv@Even \hv@@capPos=2
\else
@@ -624,118 +641,124 @@
\fi
\fi
\fi
-%\ifhv@multiFloat\typeout{>>>>do@@@@hvFloat: multiFloatTRUE}\else\typeout{>>>>do@@@@hvFloat: multiFloatFALSE}\fi
\checkoddpage
- \ifcase\hv@@capPos% caption before object 0-> _always_ left
- \set@caption@object
+ \set@caption@object% set caption and object into a box
+ \ifcase\hv@@capPos% caption before object 0-> _always_ left
+ \setBottomCaption\setPageObject
\or% caption after object 1-> _always_ right
- \set@object@caption
+ \setPageObject\setBottomCaption
\or% caption on even page 2-> left page
\ifoddpage
- \afterpage{\set@caption@object}%
+ \afterpage{\setBottomCaption\setPageObject}%
\else% we are on an even page
- \set@caption@object
+ \setBottomCaption\setPageObject
\fi
\or% caption on odd page 3->right page
\if@twoside
\if@twocolumn
\ifoddpage
\if@firstcolumn% on right side
- \set@caption@object
+ \setBottomCaption\setPageObject
\else
- \afterpage{\null\set@object@caption}% start next column
+ \afterpage{\setPageObject\setBottomCaption}% start next column
\fi
\else% left (even) page
\if@firstcolumn
- \afterpage{\set@object@caption}% start next column
+ \afterpage{\setPageObject\setBottomCaption}% start next column
\else
- \set@object@caption
+ \setPageObject\setBottomCaption
\fi
\fi
\else % onecolumn
\ifoddpage
- \set@object@caption
+ \setPageObject\setBottomCaption
\else
- \afterpage{\set@object@caption}
+ \afterpage{\setPageObject\setBottomCaption}%
\fi
\fi
\else % oneside
\if@twocolumn
\ifoddpage
\if@firstcolumn% on right side
- \set@caption@object
+ \setBottomCaption\setPageObject
\else
- \set@object@caption%
+ \setPageObject\setBottomCaption
\fi
\else
\if@firstcolumn% on left side
- \afterpage{\set@object@caption}
+ \afterpage{\setPageObject\setBottomCaption}%
\else
- \set@object@caption%
+ \setPageObject\setBottomCaption
\fi
\fi
\else % onecolumn
\ifoddpage
- \set@caption@object
+ \setBottomCaption\setPageObject
\else
- \set@object@caption
+ \afterpage{\setBottomCaption\setPageObject}%
\fi
\fi
\fi
\or% caption on the inner column 4->inner
+ \set@caption@object
\if@twocolumn
\ifoddpage
- \set@object@caption
- \else
\if@firstcolumn% on right side
- \afterpage{\null\set@caption@object}% start next column
+ \setBottomCaption\setPageObject
+ \else % right column on right side
+ \setPageObject\setBottomCaption% start next firstcolumn next page
+ \fi
+ \else
+ \if@firstcolumn% on left side
+ \afterpage{\setBottomCaption\setPageObject}% start next page/first column
\else% left page/column
- \set@caption@object
+ \setBottomCaption\setPageObject% start same page
\fi
\fi
\else % onecolumn
- \set@caption@object
+ \setBottomCaption\setPageObject
\fi
\or% caption on the outer column 5->outer
+ \set@caption@object
\if@twocolumn
\ifoddpage
\if@firstcolumn
- \afterpage{\null\set@caption@object}%
+ \afterpage{\afterpage{\setBottomCaption\setPageObject}}%
\else
- \set@caption@object%
+ \afterpage{\setBottomCaption\setPageObject}%
\fi
\else% even page (left)
\if@firstcolumn
- \set@caption@object
+ \setBottomCaption\setPageObject
\else
- \afterpage{\set@object@caption}%
+ \afterpage{\setBottomCaption\setPageObject}%
\fi
\fi
- \else
- \set@caption@object
- \fi
+ \else% onecolumn
+ \setBottomCaption\setPageObject
+ \fi
\or% caption after object 6->RIGHT for twoside/twocolumn
\if@twocolumn
\if@firstcolumn
- \afterpage{\set@object@caption}%
+ \afterpage{\setPageObject\setBottomCaption}%
\else
- \set@object@caption
+ \setPageObject\setBottomCaption
\fi
\else% always caption _after_ object for onecolumn
- \set@object@caption
+ \setPageObject\setBottomCaption
\fi
\or% caption before object 7->LEFT for twoside/twocolumn
\if@twocolumn
\if@firstcolumn
- \set@caption@object
+ \setPageObject\setBottomCaption
\else
- \afterpage{\set@caption@object}
+ \afterpage{\setBottomCaption\setPageObject}
\fi
\else% onecolumn
\ifoddpage
- \afterpage{\set@caption@object}%
+ \afterpage{\setBottomCaption\setPageObject}%
\else
- \set@caption@object
+ \setBottomCaption\setPageObject
\fi
\fi
\fi
@@ -743,216 +766,189 @@
}%
%
-\ExplSyntaxOn
-
-\def\getMultiCaptionAndLabel{%}
- \hv@cntb=\clist_count:N\l_clist_Type
- \advance\hv@cntb by \@ne
- \hv@cnta=1
- \begingroup
- \loop
- \edef\@captype{\clist_item:Nn\l_clist_Type{\hv@cnta}}
- \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{\hv@cnta}}%
- \ifx\@tempa\@empty
- \caption{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
- \else
- \expandafter\caption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
- \fi
- \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
- \ifx\@tempa\@empty
- \else
- \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv@cnta}-cap}\fi
- \advance\hv@cnta by \@ne
- \ifnum\hv@cnta<\hv@cntb
- \repeat
- \endgroup
+\def\setBottomCaption{%
+ \begin{\hv@floatType}[!b]
+ \ifhv@separatorLine\drawSepLine\fi
+ \par
+ \usebox\hvCaptionBox
+ \end{\hv@floatType}%
}
-\def\getMultiObjectAndLabel{%
- \hv@cntb=\clist_count:N\l_clist_Type
- \advance\hv@cntb by \@ne
- \hv@cnta=1
-% \clist_show:N\l_clist_Label
-% ist bereits gesetzt! \edef\@captype{hv@p\@captype}
- \loop
- \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}%
- \ifhv@objectFrame\frame{\@temp}\else\@temp\fi
- \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
- \ifx\@tempa\@empty
+
+\def\setPageObject{%
+ \ifhv@star
+ \begin{\hv@floatType*}[p]%
+ \else
+ \begin{\hv@floatType}[p]%
+ \fi
+ \ifhv@FULLPAGE
+ \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}%
+ \if@twoside
+ \leavevmode\checkoddpage
+ \ifoddpage
+ \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
+ \else
+ \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
+ \fi
\else
- \refstepcounter{\@captype}%
- \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
\fi
- \ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi
- \advance\hv@cnta by \@ne
- \ifnum\hv@cnta<\hv@cntb
- \repeat
+ \put(0,0){\usebox\hvObjectBox}%
+ \AtBeginShipoutNext{\thispagestyle{empty}}%
+ \else
+ \usebox\hvObjectBox
+ \fi
+ \ifhv@star
+ \end{\hv@floatType*}%
+ \else
+ \end{\hv@floatType}%
+ \fi
}
-\def\getMultiSubCaptionAndLabel{%
- \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
- \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{1}}%
- \ifx\@tempa\@empty
- \caption{\clist_item:Nn\l_clist_Caption{1}}%
- \else
- \expandafter\caption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{1}}%
- \fi
- \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}%
- \ifx\@tempa\@empty\else\expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{1}-cap}\fi
+\ExplSyntaxOn
+
+\def\getMultiCaptionAndLabel{%
+ \global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
+ \setlength\belowcaptionskip{10pt}%
+ \setlength\abovecaptionskip{0pt}%
+ \hv@cntb=\clist_count:N\l_clist_Type
+ \advance\hv@cntb by \@ne
+ \hv@cnta=1
+ \loop
+ \edef\@captype{\clist_item:Nn\l_clist_Type{\hv@cnta}}%
+ \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{\hv@cnta}}%
+ \ifx\@tempa\@empty
+ \caption{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
+ \else
+ \expandafter\caption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
+ \fi
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \ifx\@tempa\@empty
+ \else
+ \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv@cnta}-cap}\fi
+ \advance\hv@cnta by \@ne
+ \ifnum\hv@cnta<\hv@cntb
+ \repeat
+ \endminipage}%
+}
+\def\getMultiObjectAndLabel{%
+ \global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \ifx\hvSet@objectPos\hv@Right\raggedleft\else
+ \ifx\hvSet@objectPos\hv@Left\raggedleft\else
+ \ifx\hvSet@objectPos\hv@Center\centering
+ \fi\fi\fi
+ \hv@cntb=\clist_count:N\l_clist_Type
+ \advance\hv@cntb by \@ne
+ \hv@cnta=1
+ \loop
+ \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}%
+ \ifhv@objectFrame\frame{\@temp}\else\@temp\fi
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \ifx\@tempa\@empty
+ \else
+ \refstepcounter{\@captype}%
+ \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \fi
+ \ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi
+ \advance\hv@cnta by \@ne
+ \ifnum\hv@cnta<\hv@cntb
+ \repeat
+ \endminipage}%
}
-\def\getMultiSubObjectAndLabel{%
-% \clist_show:N\l_clist_Object
- \hv@cntb=\clist_count:N\l_clist_Caption
- \advance\hv@cntb by \@ne
- \hv@cnta=2
- \loop
- \begingroup
- \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}%
- \ifhv@objectFrame\frame{\@temp}\else\@temp\fi
- \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{\hv@cnta}}%
+\def\getMultiSubCaptionAndLabel{%
+ \global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \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
- \subcaption{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
+ \caption{\clist_item:Nn\l_clist_Caption{1}}%
\else
- \expandafter\subcaption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
+ \expandafter\caption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{1}}%
\fi
- \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}%
+ \ifx\@tempa\@empty\else\expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{1}-cap}\fi
+ \endminipage}%
+}
+
+\def\getMultiSubObjectAndLabel{%
+ \global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \ifx\hvSet@objectPos\hv@Right\raggedleft\else
+ \ifx\hvSet@objectPos\hv@Left\raggedleft\else
+ \ifx\hvSet@objectPos\hv@Center\centering
+ \fi\fi\fi
+ \hv@cntb=\clist_count:N\l_clist_Caption
+ \advance\hv@cntb by \@ne
+ \hv@cnta=2
+ \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
+ \loop
+ \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}%
+ \ifhv@objectFrame\frame{\@temp}\else\@temp\fi
+ \begingroup
+ \edef\@tempa{\clist_item:Nn\l_clist_LofCaption{\hv@cnta}}%
+ \ifx\@tempa\@empty
+ \subcaption{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
+ \else
+ \expandafter\subcaption\expandafter[\@tempa]{\clist_item:Nn\l_clist_Caption{\hv@cnta}}%
+ \fi
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \ifx\@tempa\@empty
+ \else
+ \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \fi
+ \endgroup
+ \ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi
+ \advance\hv@cnta by \@ne
+ \ifnum\hv@cnta<\hv@cntb
+ \repeat
+ \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}% the main label at the end
\ifx\@tempa\@empty
\else
- \expandafter\label\expandafter{\clist_item:Nn\l_clist_Label{\hv@cnta}}%
+ \refstepcounter{\@captype}
+ \expandafter\label\expandafter{\@tempa}%
\fi
- \endgroup
- \ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi
- \advance\hv@cnta by \@ne
- \ifnum\hv@cnta<\hv@cntb
- \repeat
- \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}% the main label at the end
- \ifx\@tempa\@empty
- \else
-%\typeout{>>>>>>>>>>>>>>>>>>>>>>>>>\@captype}%
-% bereits gesetzt \edef\@captype{hv@p\@captype}
- \refstepcounter{\@captype}
- \expandafter\label\expandafter{\@tempa}%
- \fi
+ \endminipage}%
}
\ExplSyntaxOff
+\def\getSingleCaptionAndLabel{%
+ \global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \edef\@captype{\hv@floatType}%
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax
+ \caption{\hv@longCap}%
+ \else
+ \caption[\hv@shortCap]{\hv@longCap}%
+ \fi
+ \expandafter\ifx\expandafter\relax\hv@label\relax\else\label{\hv@label-cap}\fi
+ \endminipage}%
+}
+
\def\set@caption@object{% first caption, then object
- \begin{\hv@floatType}[!b]
-% \capstart
- \belowcaptionskip=0pt% local change
- \ifhv@separatorLine\drawSepLine\fi
\ifhv@multiFloat
-% \edef\@captype{hv@p\@captype}
\getMultiCaptionAndLabel
\else
\ifhv@subFloat
\getMultiSubCaptionAndLabel
\else
- \expandafter\ifx\expandafter\relax\hv@shortCap\relax
- \caption{\hv@longCap}%
- \else
- \caption[\hv@shortCap]{\hv@longCap}%
- \fi
- \expandafter\ifx\expandafter\relax\hv@label\relax\else
- \label{\hv@label-cap}
- \fi
- \fi
- \fi
- \end{\hv@floatType}%
-%
- \ifhv@star
- \begin{\hv@floatType*}[!p]
- \else
- \begin{\hv@floatType}[!p]
- \fi
-% \ifhv@subFloat
-% \else
- \edef\@captype{hv@p\@captype}
-% \fi
-% \capstart
- \ifx\hvSet@objectPos\hv@Right\raggedleft\else
- \ifx\hvSet@objectPos\hv@Left\raggedleft\else
- \ifx\hvSet@objectPos\hv@Center\centering
- \fi\fi\fi
- \ifhv@multiFloat
- \getMultiObjectAndLabel
- \else
- \ifhv@subFloat
- \getMultiSubObjectAndLabel
- \else
- \refstepcounter{\@captype}%
- \ifhv@objectFrame\frame{\hv@floatObject}\else\hv@floatObject\fi
- \expandafter\ifx\expandafter\relax\hv@label\relax
- \else
- \expandafter\label\expandafter{\hv@label}%
- \fi
+ \getSingleCaptionAndLabel
\fi
\fi
- \ifhv@star
- \end{\hv@floatType*}%
- \else
- \end{\hv@floatType}%
- \fi
-}
-\def\set@object@caption{% first object, then caption
-%\ifhv@multiFloat\typeout{>>>>set@object@caption: multiFloatTRUE}\else\typeout{>>>>set@object@caption: multiFloatFALSE}\fi
- \ifhv@star
- \begin{\hv@floatType*}[!p]
- \else
- \begin{\hv@floatType}[!p]
- \fi
-% \ifhv@subFloat
-% \else
-% \edef\@captype{hv@p\@captype}
-% \fi
-% \capstart
- \ifx\hvSet@objectPos\hv@Right\raggedleft\else
- \ifx\hvSet@objectPos\hv@Left\raggedleft\else
- \ifx\hvSet@objectPos\hv@Center\centering
- \fi\fi\fi
+ \edef\@captype{hv@p\hv@floatType}%
\ifhv@multiFloat
- \edef\@captype{hv@p\@captype}
\getMultiObjectAndLabel
\else
\ifhv@subFloat
\getMultiSubObjectAndLabel
\else
- \edef\@captype{hv@p\@captype}%
- \ifhv@objectFrame\frame{\hv@floatObject}\else\hv@floatObject\fi
- \refstepcounter{\@captype}%
- \expandafter\ifx\expandafter\relax\hv@label\relax\else
- \expandafter\label\expandafter{\hv@label}%
- \fi
- \fi
- \fi
- \ifhv@star
- \end{\hv@floatType*}%
- \else
- \end{\hv@floatType}%
- \fi
-%
- \begin{\hv@floatType}[!b]
-% \capstart
- \belowcaptionskip=0pt% local change
- \ifhv@separatorLine\drawSepLine\fi
- \ifhv@multiFloat
- \getMultiCaptionAndLabel
- \else
- \ifhv@subFloat
- \getMultiSubCaptionAndLabel
- \else
- \expandafter\ifx\expandafter\relax\hv@shortCap\relax
- \caption{\hv@longCap}%
- \else
- \caption[\hv@shortCap]{\hv@longCap}%
- \fi
- \expandafter\ifx\expandafter\relax\hv@label\relax\else
- \label{\hv@label-cap}
- \fi
+ \global\sbox\hvObjectBox{%
+ \refstepcounter{\@captype}%
+ \ifhv@objectFrame\frame{\hv@floatObject}\else\hv@floatObject\fi
+ \expandafter\ifx\expandafter\relax\hv@label\relax
+ \else
+ \expandafter\label\expandafter{\hv@label}%
+ \fi
+ }%
\fi
\fi
- \end{\hv@floatType}%
}
%
\endinput