summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-22 21:07:59 +0000
committerKarl Berry <karl@freefriends.org>2022-02-22 21:07:59 +0000
commit9d5158d37d74f6401908f8be395bc955664b3f39 (patch)
tree5de8a879311ace689c880966378ca4fe3a0b71c9 /Master
parentf65c2cfca0f4ded47ebedf03b3027900efb5a8d5 (diff)
hvfloat (22feb22)
git-svn-id: svn://tug.org/texlive/trunk@62141 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdfbin80294 -> 80294 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdfbin86720 -> 86722 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/capPos.pdfbin95390 -> 95389 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdfbin81992 -> 81991 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdfbin83375 -> 83275 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdfbin79445 -> 79445 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdfbin85825 -> 85824 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdfbin2317102 -> 2314853 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdfbin619035 -> 619030 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdfbin77658 -> 77658 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdfbin86404 -> 86404 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdfbin84815 -> 84813 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdfbin85100 -> 85098 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdfbin0 -> 1362739 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdfbin86778 -> 86773 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin7126768 -> 5744565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex36
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdfbin84024 -> 84020 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdfbin83979 -> 83977 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdfbin84014 -> 84013 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdfbin85511 -> 85512 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/missing.txt4
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdfbin142627 -> 142624 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdfbin146171 -> 146172 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdfbin94585 -> 94586 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdfbin146344 -> 146343 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdfbin92184 -> 92182 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdfbin89789 -> 89784 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdfbin92987 -> 92984 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdfbin145742 -> 145736 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdfbin77806 -> 77805 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdfbin86525 -> 86523 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdfbin174218 -> 174218 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdfbin85567 -> 85566 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdfbin86320 -> 86318 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdfbin84295 -> 84292 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdfbin84682 -> 84680 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdfbin79176 -> 79267 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdfbin79887 -> 79967 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdfbin90508 -> 90508 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdfbin0 -> 87935 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex81
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdfbin90333 -> 90332 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdfbin87859 -> 87855 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdfbin80205 -> 80290 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdfbin80126 -> 80126 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdfbin89342 -> 89340 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdfbin81033 -> 81033 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdfbin85585 -> 85585 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpgbin0 -> 501524 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdfbin143893 -> 143952 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdfbin144709 -> 144771 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdfbin144111 -> 144003 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdfbin144341 -> 144217 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdfbin143647 -> 143517 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdfbin143826 -> 143873 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdfbin144812 -> 144879 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdfbin144268 -> 144315 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdfbin120954 -> 120949 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdfbin121929 -> 121917 bytes
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty72
64 files changed, 153 insertions, 46 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index 7f4f422ce25..4084d7eb925 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,6 @@
hvfloat.sty:
+2.36 2022-02-22 - fix bug for outer captions (was wrong)
+2.35 2021-10-09 - add \parskip for vertical negative space
2.34 2021-09-23 - fix for nonFloat and forceOutput
2.33 2021-07-14 - fix for doublePAGE, needs length setting inside the macro
2.32 2021-06-29 - make multi and multisubflots caption align with the bottom
diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
index d74d1e268e4..40854d1f723 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
index 9567c26d366..6a3f002998d 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
index 072c584f82f..630a337a539 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
index ff8eec9e741..861efc9ac7a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
index 752c54810d3..60e3cb94ca5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
index 6ac3baf5ad2..33ac8dd8769 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
index 388cf976451..1291839ce84 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
index dd444dd08a4..0d3e2713ef6 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
index 7aa01b02f84..1578d673ffd 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
index cc6273ead85..7be7a1cb5b6 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
index eb062f70e23..e98663ed098 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
index 4f86812e098..09a417c0310 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
index 263b9afc8a0..e2898a14ae0 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf b/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
new file mode 100644
index 00000000000..44f19b9258a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
index 9cdd2ea8822..e0e787f9941 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index cfbc05583e1..79f4e6dfc98 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 d1db08c76bb..44b35f8a900 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 126 2021-06-29 12:56:04Z herbert $
+%% $Id: hvfloat.tex 318 2021-11-20 07:30:54Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,usegeometry]{scrartcl}
@@ -1099,7 +1099,7 @@ the following example (Figure~\vref{default1s2c}) is:
[A float with the default caption setting]%
{A default caption of a ``'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:0}
\end{lstlisting}
@@ -1497,7 +1497,7 @@ caption and object can appear on different pages.
[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
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -1586,7 +1586,7 @@ is no check for an even or odd page. This behaviour makes only sense for a onesi
{\includegraphics[fullpage]{images/frose}}%
[A float which needs the complete page width and height.]%
{A Caption of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage1}
\end{lstlisting}
@@ -1660,7 +1660,7 @@ which is before the caption.
{\includegraphics[fullpage]{images/frose}}%
[A float which needs the complete page width and height.]%
{A Caption on an odd page of a ``fullpage'' object, which follows on the next page.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}
{fig:fullpage2}
\end{lstlisting}
@@ -1726,7 +1726,7 @@ the paper dimensions \Ldim{paperwidth} and
[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
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{fig:fullpage0}
\end{lstlisting}
@@ -1791,7 +1791,7 @@ can be mixed:
+{figure}{\includegraphics[width=\linewidth]{images/CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
+{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
@@ -1875,7 +1875,7 @@ float type entry is ignored.
\hvFloat[fullpage,capPos=before,objectFrame,subFloat,vFill]%
+{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
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo0}%
+{}{\includegraphics[width=\linewidth]{images/CTAN}}%
@@ -1984,7 +1984,7 @@ This is then the left (first) column for the caption (see figure~\vref{default2s
[A float which needs the complete column width and height.]%
{A Caption of a ``fullpage'' object, which follows on the next column.
This is always the right column on an even or odd page. And some more
- text whch has no real meaning because it fills only the space for a long
+ text which has no real meaning because it fills only the space for a long
caption.}%
{fig:fullpage0-2}
\end{lstlisting}
@@ -2025,7 +2025,7 @@ the right (second) column (see figure~\vref{right2s2c})
[A float which needs the complete column width and height.]%
{A Caption of a ``fullpage'' object, which is on the left column.
This is always the right column on an even or odd page. And some more
- text whch has no real meaning because it fills only the space for a long
+ text which has no real meaning because it fills only the space for a long
caption.}%
{fig:fullpage1-2}
\end{lstlisting}
@@ -2167,7 +2167,7 @@ in the left column for an odd page.
\hvFloat[fullpage,capPos=inner]{figure}{\includegraphics[fullpage]{images/rose}}%
[A float which needs the complete column width and height.]%
{A Caption of a ``fullpage'' object, which follows on the left or right column.
- This can be an even or odd page. And some more text whch has no
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}{fig:fullpage3-2}
\end{lstlisting}
@@ -2178,7 +2178,7 @@ in the left column for an odd page.
[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
+ This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}{fig:fullpage3-2}
\fi
@@ -2225,7 +2225,7 @@ or after this caption.
{\includegraphics[fullpage]{images/rose}}%
[A float which needs the complete page width and height with \texttt{capPos=outer}.]%
{A Caption of a ``fullpage'' object, which has the caption position in the
- outer page. This can be an even or odd page. And some more text whch has no
+ outer page. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}{fig:fullpage2-2a}
\end{lstlisting}
@@ -2235,7 +2235,7 @@ or after this caption.
{\includegraphics[fullpage]{images/rose}}%
[A float which needs the complete page width and height with \texttt{capPos=outer}.]%
{A Caption of a ``fullpage'' object, which has the caption position in the
- outer page. This can be an even or odd page. And some more text whch has no
+ outer page. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}{fig:fullpage2-2a}
\fi
@@ -2351,7 +2351,7 @@ can be mixed:
+{figure}{\includegraphics[height=0.4\textheight]{images/rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -2379,7 +2379,7 @@ can be mixed:
+{figure}{\includegraphics[height=0.4\textheight]{images/rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
- right column. This can be an even or odd page. And some more text whch has no
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{multi:demo0}%
+{table}{\begin{tabular}{lr}\hline % no 2
@@ -2449,7 +2449,7 @@ float type entry is ignored.
\hvFloat[fullpage,capPos=before,objectFrame,subFloat,vFill]%
+{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
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}% main caption
{sub:demo00}%
+{}{\includegraphics[height=0.28\textheight]{images/rose}}%
@@ -2475,7 +2475,7 @@ should be true (see listing).
\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
+ right column. This can be an even or odd page. And some more text which has no
real meaning because it fills only the space for a long caption.}%
{sub:demo00}%
+{}{\includegraphics[height=0.28\textheight]{images/rose}}%
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
index 05ac77f5ddf..73a49d0a073 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
index 200ac470d68..3cd80ae1316 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
index 94d1d37488e..6b794b37320 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
index 406285913d2..4e6b0cfae72 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/missing.txt b/Master/texmf-dist/doc/latex/hvfloat/missing.txt
new file mode 100644
index 00000000000..c10e55ce9ce
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/missing.txt
@@ -0,0 +1,4 @@
+Not all images of the documentation are listed here, because
+some are not for public use. You can use any other image if you
+want to run the documentation by yourselve.
+
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
index 6db4613d89e..bc345dc15bf 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
index 16b1cbfb19b..e37e60e6263 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
index a4c58d96b95..614b2fcf30f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
index b9558070711..e2ec474cb79 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
index 75107f1a349..23fdd5f04f1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
index 4370c39d847..3f79249b521 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
index 164dc77f647..7ebd9bd69a9 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
index 1c3c610031a..23f3c0b60c6 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
index fe0ca31256d..9a8f796d025 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
index dfce04c36b1..2d93d7b2b5c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: odd1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: odd1s1c.tex 119 2021-06-20 13:28:09Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
index c24ac2fa55b..eae0be6b8d9 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
index a357bdc1e1a..ef5b9fd7ab4 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
index d7a49ea30da..6aa3ac83cfe 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
index ca7e1e56ec7..c6676e12913 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
index 323011e26fd..a7d55f4c80c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
index 11003f09dac..204d0dad654 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
index 495d644d556..a65718b90a9 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
index 443aae8d5f1..fd27f7ca548 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
index bba76eb3202..6e06341ad56 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
new file mode 100644
index 00000000000..c9cd842897c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
new file mode 100644
index 00000000000..4db02204812
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
@@ -0,0 +1,81 @@
+\documentclass{scrartcl}
+%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for FULLPAGE floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+\end{lstlisting}
+
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+
+\begin{lstlisting}
+\hvFloat*[FULLPAGE]%
+ {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
index e86b9e6674a..330a7425ca1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
index 56253d38e26..b0792355fbd 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
index daca3967b61..5ed8ec5a710 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
index 8c43e8c1f05..c6c6bd27bdb 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
index 954f63954d3..dfd03e566cc 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
index 037f72ae104..dbb63e5fac8 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
index 2fecbfbe051..e269a747a3b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg b/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
new file mode 100644
index 00000000000..e0e4b910a7e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
index d2391f0870b..f75bb23f56f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
index a23af6e14d8..00554afc00b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
index 83d13d78247..efea15759ce 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
index b5e7ae13b85..8d48919902c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
index 026910949fe..84ab3d56ccb 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
index 68d689fca00..b3192656303 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
index d67a0f806a6..72ca9190457 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
index 6456d856289..23e0a03ee7a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
index 6ee1ea42d17..b81fedc701c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
index a12ef0d594a..a95470d1eb5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
index 0090e80f5f0..a86244b9e54 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat-fps.sty 120 2021-06-20 13:31:02Z herbert $
+%% $Id: hvfloat-fps.sty 121 2021-06-20 13:36:11Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
%%
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index e0a378d28f6..739d7599940 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 257 2021-09-23 11:44:35Z herbert $
+%% $Id: hvfloat.sty 392 2022-01-09 10:20:33Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.34}
-\def\filedate{2021/09/23}
+\def\fileversion{2.36}
+\def\filedate{2022/02/22}
%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
@@ -138,17 +138,17 @@
\def\hvSet@capVPos{center}% it is relativ to the object
}
-\define@choicekey*+{hvSet}{allHPos}[\val\nr]{left,center,right}[center]{%
- \def\hvSet@allHPos{#1}%
+\define@choicekey*+{hvSet}{capHPos}[\val\nr]{left,center,right}[center]{%
+ \def\hvSet@capHPos{#1}%
\ifcase\nr\relax
- \gdef\hv@@allHPos{l}%
+ \gdef\hv@@caoHPos{l}%
\or
- \gdef\hv@@allHPos{c}%
+ \gdef\hv@@capHPos{c}%
\else
- \gdef\hv@@allHPos{r}%
+ \gdef\hv@@capHPos{r}%
\fi
-}{\PackageWarning{hvfloat}{erroneous input (#1) for allHPos ignored. Using center.}%
- \def\hvSet@capVPos{center}% it is relativ to the object
+}{\PackageWarning{hvfloat}{erroneous input (#1) for capHPos ignored. Using center.}%
+ \def\hvSet@capHPos{center}% it is relativ to the object
}
\define@choicekey*+{hvSet}{objectPos}[\val\nr]{left,center,right,inner,outer}[center]{%
@@ -238,7 +238,7 @@
\newcommand\setDefaults{%
\hv@set{%
floatPos=, rotAngle=0, capWidth=n, capAngle=0, objectAngle=0,
- capPos=bottom, capVPos=center, objectPos=center, allHPos=center,
+ capPos=bottom, capVPos=center, objectPos=center, capHPos=center,
floatCapSep=5pt, useOBox=false,
onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
doubleFULLPAGE=false, doublePage=false, doublePAGE=false,
@@ -659,6 +659,7 @@
\ifnum\hvSet@capAngle=0 % need rotation?
\savebox\hvCaptionBox{% NO rotation
\minipage[b]{\hvCapWidth}%% minipage, to get hyphenation
+% \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifhv@nonFloat
\ifhv@onlyText
\hv@longCap
@@ -692,7 +693,7 @@
\savebox\hvCaptionBox{% Rotation
\rotatebox{\hvSet@capAngle}{%
\minipage[b]{\hvCapWidth}%% minipage, to get hyphenation
-% \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+% \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifhv@nonFloat
\ifhv@onlyText
\hv@longCap
@@ -777,6 +778,7 @@
\else
\ifx\hvSet@capPos\hv@Outer
\ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi
+ % even page (left=0) | odd page (oneside) (right=2)
\else
\ifx\hvSet@capPos\hv@Before
\hv@@capPos=0% same as cappos=right
@@ -792,6 +794,7 @@
\fi
\fi
%%%%
+%\typeout{>>>>>>>>>Pos: \the\hv@@capPos}%
\savebox{\@tempboxa}{% ***** @tempbox start
\expandafter\ifcase\the\hv@@capPos% 0 is LEFT START \ifcase
\ifx\hvSet@capVPos\hv@Center
@@ -815,7 +818,15 @@
\else
\begin{minipage}{\wd\hvObjectBox}%
\fi
- \centering
+ \ifx\hvSet@capHPos\hv@Left% horizontal justification
+ \raggedright
+ \else
+ \ifx\hvSet@capHPos\hv@Center
+ \centering
+ \else
+ \raggedleft
+ \fi
+ \fi
\ifhv@fbox
\fbox{\usebox{\hvCaptionBox}}\\[0.5\hvBelowCaptionSkip]%
\fbox{\usebox{\hvObjectBox}}%
@@ -846,7 +857,15 @@
\else
\begin{minipage}{\wd\hvObjectBox}%
\fi
- \centering
+ \ifx\hvSet@capHPos\hv@Left% horizontal justification
+ \raggedright
+ \else
+ \ifx\hvSet@capHPos\hv@Center
+ \centering
+ \else
+ \raggedleft
+ \fi
+ \fi
\ifhv@fbox
\fbox{\usebox{\hvObjectBox}}\\[0.5\hvAboveCaptionSkip]%
\fbox{\usebox{\hvCaptionBox}}%
@@ -1072,9 +1091,8 @@
\global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}%
\global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}%
\xdef\hv@caption@format@temp{\hv@caption@format}% it gets lost otherwise for next afterpage
- \setlength\@dblfpbot{0\p@ \@plus 1fil}%
+ \setlength\@dblfpbot{0\p@ \@plus 1fil}%
\global\hv@switchTypefalse
-% \endgroup% started at main macro \hvFloat
\setcounter{hv@tempCNTfigA}{\value{figure}}%
\setcounter{hv@tempCNTfigB}{\value{figure}}%
\setcounter{hv@tempCNTtabA}{\value{table}}%
@@ -1194,7 +1212,9 @@
\hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
+ \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}% FÜR DTK
\hspace*{-\hv@tempWidthA}%
+ \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% FÜR FTK
\savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}%
\global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}%
\hv@typeout{Height of right box: \the\ht\hv@rightBox}%
@@ -1509,7 +1529,7 @@
\afterpage{%
\hfuzz=\maxdimen
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
\ifx\hv@floatType\hv@figure
@@ -1523,7 +1543,7 @@
\if@twocolumn\newpage\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
\hspace*{\hv@tempWidthA}%
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
@@ -1543,7 +1563,7 @@
\afterpage{%
\hfuzz=\maxdimen
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
\clipbox*{0 \the\dp\hvObjectBox{} \the\hv@leftPageObjectWidth{} \the\ht\hvObjectBox}{\usebox\hvObjectBox}%
@@ -1557,7 +1577,7 @@
\if@twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
\hspace*{\hv@tempWidthA}%
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
@@ -1588,7 +1608,7 @@
\def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{%
\afterpage{%
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
\ifx\hv@floatType\hv@figure
@@ -1601,7 +1621,7 @@
\newpage\if@twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
\hspace*{\hv@tempWidthA}%
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
@@ -1632,11 +1652,11 @@
\def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{%
\afterpage{%
- \hfuzz=\maxdimen
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
- \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
+ \hfuzz=\maxdimen
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\clipbox*{0 \depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\ifx\hv@floatType\hv@figure
@@ -1649,7 +1669,7 @@
\if@twocolumn\newpage\if@firstcolumn\else\null\newpage\fi\fi
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
\hspace*{\hv@tempWidthA}%
\clipbox*{\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
\ifx\hv@floatType\hv@figure