summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-05-31 20:24:24 +0000
committerKarl Berry <karl@freefriends.org>2021-05-31 20:24:24 +0000
commitb48bb6a909ebbc5a1af3a01a6fb187e8770e799c (patch)
tree37c33d0248aa12a28756ef21494534665e2b7e88 /Master/texmf-dist
parent10d58b650d57a8ef1a125721339aaf4613fa5ea8 (diff)
hvfloat (31may21)
git-svn-id: svn://tug.org/texlive/trunk@59409 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes4
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/README.exa5
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdfbin87302 -> 82729 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdfbin93142 -> 87651 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex4
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdfbin88012 -> 83533 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdfbin88328 -> 83672 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdfbin88184 -> 82305 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdfbin91542 -> 85901 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdfbin2355469 -> 2357654 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdfbin2397912 -> 615046 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex16
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdfbin83762 -> 79245 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdfbin91719 -> 86865 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdfbin91681 -> 85643 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdfbin91234 -> 85535 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdfbin91736 -> 87688 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin7070591 -> 7111003 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex149
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdfbin90740 -> 84929 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdfbin90738 -> 84881 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdfbin90034 -> 84251 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdfbin91294 -> 85613 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdfbin151473 -> 146330 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdfbin151360 -> 146151 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdfbin99838 -> 94686 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdfbin152818 -> 146317 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdfbin98240 -> 92271 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdfbin99167 -> 93238 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdfbin101578 -> 95366 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdfbin150853 -> 145707 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdfbin85682 -> 81305 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdfbin92599 -> 87711 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdfbin91057 -> 85195 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdfbin92727 -> 86754 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdfbin91491 -> 86623 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdfbin91066 -> 85191 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdfbin90681 -> 84961 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdfbin85528 -> 81145 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdfbin86261 -> 81801 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdfbin95490 -> 90608 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdfbin0 -> 88335 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex81
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdfbin95312 -> 90429 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdfbin93716 -> 87924 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdfbin85996 -> 81720 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/preamble.ltx2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdfbin87117 -> 82552 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdfbin94212 -> 89273 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdfbin86973 -> 81502 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdfbin92840 -> 86853 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex2
-rwxr-xr-xMaster/texmf-dist/doc/latex/hvfloat/runAll.sh2
-rwxr-xr-xMaster/texmf-dist/doc/latex/hvfloat/runEXA.sh4
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdfbin148850 -> 143999 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex12
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdfbin149638 -> 145131 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdfbin148984 -> 144046 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdfbin149897 -> 144594 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdfbin150072 -> 143892 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdfbin148775 -> 143930 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdfbin149735 -> 145245 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdfbin149445 -> 144680 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex10
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdfbin0 -> 121490 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex165
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdfbin0 -> 123328 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex159
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty576
113 files changed, 963 insertions, 372 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index c6fc9698b40..90d8f75e715 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,8 @@
hvfloat.sty:
+2.26 2021-05-31 - allow option wide in twocolumn mode
+ - allow a stretched minipage for
+ multifloat and multisubfloat by using
+ option vFill
2.25 2021-05-18 - support of \twocolumn mode
2.24 2021-05-12 - allow a caption on the bottom of a preceding or a
following page of double page floats (left-right)
diff --git a/Master/texmf-dist/doc/latex/hvfloat/README.exa b/Master/texmf-dist/doc/latex/hvfloat/README.exa
index e6a3dff255f..4f03d70150c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/README.exa
+++ b/Master/texmf-dist/doc/latex/hvfloat/README.exa
@@ -22,7 +22,4 @@ a.s.o.
runEXA.sh <base>
runs a group of examples, e.g. "./runEXA.sh inner" runs _all_ examples
-started with "inner".
-
-** single files **
-lualatex capPos.ltx \ No newline at end of file
+starting with "inner".
diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
index 92a7a3e94cf..8ba1d252033 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/after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex
index de0464cc9d7..bdb9db7170e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: after1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
index 7930998fffb..777c5374fd8 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/after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex
index 4e0e17c83a7..8c9f9989316 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: after2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -8,7 +8,7 @@
\begin{document}
\tableofcontents
- ewpage
+\newpage
\blinddocument
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
index 69580b76012..68aaa6a751f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex
index 387ebd6a24f..357a8c75432 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
index 098f2cf9c50..772abdc767e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex
index a1d9e9d997f..86c3b0a8981 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
index 300d92e5aa8..0c515b09769 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex
index b0935fe53cf..282925826d9 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
index 24f6f83ab68..51712f5755e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex
index 6bd583d8de1..45278e1e8d2 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
index 84a90a4282d..81e91f49c93 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 3099998bdf8..b535662f1ca 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/doublepage2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex
index 5c579160cc7..48214608fce 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex
@@ -1,5 +1,7 @@
+\errorcontextlines=100
+%\documentclass[final]{ltugboat}
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: doublepage2s2c.tex 92 2021-05-18 09:46:55Z herbert $
+%% $Id: doublepage2s2c.tex 97 2021-05-26 19:31:53Z herbert $
\input{preamble.ltx}
\usepackage{blindtext,xcolor,marginnote}
@@ -36,7 +38,7 @@
\begin{lstlisting}
-\hvFloat[doublePage,capWidth=n,capPos=right]%
+\hvFloat[doublePage]%,capWidth=n,capPos=right]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
[A doublepage image with a caption on the right side of the right part.]%
@@ -49,7 +51,7 @@
\marginnote{Fig. \ref{fig:doublePage0}}
-\hvFloat[doublePage,capWidth=n,capPos=right]%
+\hvFloat[doublePage]%,capWidth=n,capPos=right]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
[A doublepage image with a caption on the right side of the right part.]%
@@ -165,6 +167,10 @@
\Blindtext
+
+\end{document}
+
+
\subsection{Definition on an even page}
@@ -740,7 +746,6 @@ is on the pages~\pageref{fig:doubleFULLPAGE0after2col}f.
{fig:doubleFULLPAGE0after2col}
\end{lstlisting}
-
\marginnote{Fig. \ref{fig:doubleFULLPAGE0after2col}}
\hvFloat[doubleFULLPAGE,capWidth=n,twoColumnCaption,capPos=after,separatorLine]%
{figure}%
@@ -751,9 +756,8 @@ is on the pages~\pageref{fig:doubleFULLPAGE0after2col}f.
the paper. A short form is used for the LOF.
The parameter is \texttt{doubleFULLPAGE}}%
{fig:doubleFULLPAGE0after2col}
-
+
\Blindtext
-
%\hvblindtext
%\hvblindtext
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
index 11f2859fe96..0ef401d15a9 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex
index ac29b4782bc..75eb2bf8722 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: even1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
index db6dd0f3481..ccaa0a0c439 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex
index aed80a2d3c6..da5d013c400 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: even1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
index c1a47cdedf1..8a629410428 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex
index 06a0b3119e3..1ee584c81af 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: even2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
index 2a76ef9e65e..226ea5471a7 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex
index a35ce24fbc5..ce3206c0754 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: even2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
index 15b69d3f9fe..1a18b67057a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex
index cbc25e80bf6..799aa9ed6bc 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: fullpage1s2c.tex 1072 2019-06-09 14:14:19Z herbert $
+%% $Id: fullpage1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index fe878066ec5..981f685c0a9 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 902f9c07549..807a63415e4 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 90 2021-05-14 09:08:46Z herbert $
+%% $Id: hvfloat.tex 103 2021-05-31 12:37:11Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,]{scrartcl}
@@ -210,7 +210,8 @@ marginnote \fbox{float} is set into the margin. This is done also only for demon
\Loption{fbox} & The objects and captions are put into a \Lcs{fbox} command, like in
this documentation. This doesn't make real sense and is only for some demonstration useful or for locating
problems if images seems to have too much whitespace.\\
-\Loption{hyperref} & Load package \Lpack{hyperref}. % and also package \Lpack{hypcap}.
+\Loption{hyperref} & Load package \Lpack{hyperref}.\\
+\Loption{nostfloats} & do not load package \Lpack{stfloats}.
\end{tabularx}
\bigskip
@@ -225,7 +226,7 @@ The following packages are loaded by \Lpack{hvfloat} and the optional argument
\Lpack{caption},
\Lpack{subcaption},
\Lpack{atbegshi},
-%\RequirePackage{hyperref}
+\Lpack{stfloats},
\Lpack{expl3}, \Lpack{multido},
\Lpack{graphicx},
\Lpack{xkeyval},
@@ -271,16 +272,18 @@ A label can be put inside the argument or after the command in the usual way, so
the not existing table~\ref{dummy} is no problem.
{\small\begin{verbatim}
-[...] It is no problem to use the \verb|\tabcaption| command to place a caption anywhere,
-like here in an inlined mode: \tabcaption[The Caption without sense ...]{A Caption without any
-sense and any object}\label{dummy} A label can be put inside the argument or after the command
-in the usual way, so that a reference to the not existing table~\ref{dummy} is no problem.
+[...] It is no problem to use the \verb|\tabcaption|
+command to place a caption anywhere,
+like here in an inlined mode:
+\tabcaption[The Caption without sense ...]%
+{A Caption without any sense and any
+object}\label{dummy} A label can be put
+inside the argument or after the command
+in the usual way, so that a reference to
+the not existing table~\ref{dummy} is no problem.
\end{verbatim}}
-%\hvDefFloatStyle
-%\hvFloatSetDefaults
-
With the macro \Lcs{hvDefFloatStyle} one can define a style which can be used instead of
the individual setting:
@@ -290,10 +293,6 @@ 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 @{}}
@@ -307,52 +306,45 @@ There are the following keywords:
\endfoot
\bottomrule
\endlastfoot
+
\Lkeyword{floatPos} & \texttt{tbp} & This is the same default placement setting like the one from standard \LaTeX, but maybe not always
the best setting. \\
-\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,
+\Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption, should be rotated together.\\
+\Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width given by the current linewidth,
»\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{capAngle} & 0 & The integer value for the angle if the caption should be rotated. Counted counter clockwise.\\
\Lkeyword{capPos} & bottom& The position of the caption relative to the object. Possible values are\\
& & \Lkeyval{before}: \emph{always} before (left) from the object.\\
& & \Lkeyval{top}: \emph{always} on top of the object.\\
- & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\
+ & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in twocolumn mode.\\
& & \Lkeyval{after}: \emph{always} after (right) from the object.\\
& & \Lkeyval{bottom}: \emph{always} on the bottom of the object.\\
- & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\
- & & \Lkeyval{inner}: in \Index{twoside} mode always typeset at the inner margin.\\
- & & \Lkeyval{outer}: in \Index{twoside} mode always typeset at the outer margin.\\
- & & \Lkeyval{evenPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an even page.\\
- & & \Lkeyval{oddPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an odd page.\\
-
+ & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in twocolumn mode.\\
+ & & \Lkeyval{inner}: in twoside mode always typeset at the inner margin.\\
+ & & \Lkeyval{outer}: in twoside mode always typeset at the outer margin.\\
+ & & \Lkeyval{evenPage}: in twoside mode with fullpage objects always on an even page.\\
+ & & \Lkeyval{oddPage}: in twoside mode with fullpage objects always on an odd page.\\
\Lkeyword{capVPos}& center& 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} & center & The horizontalplacement of the object relative to the document. Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\
-
-\Lkeyword{objectAngle} & 0 & The value for the angle if the object should be rotated. Counted anti clockwise.\\
-
-\Lkeyword{floatCapSep} & 5pt & The additional width between the object and a left or right placed caption.\\
-
-
+\Lkeyword{objectPos} & center & The horizontal placement of the object relative to the document.
+Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\
+\Lkeyword{objectAngle} & 0 & The integer value for the angle if the object should be rotated. Counted counter clockwise.\\
+\Lkeyword{floatCapSep} & 5pt & The additional space between the object and a left or right placed caption.\\
\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{onlyText} & false & The caption will be printed as normal text and there is no entry in the list of \ldots.\\
-
-\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{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counter is increased as usual and can be referenced.\\
\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.\\
-
\Lkeyword{style} & --- & Use a defined style\\
-
\Lkeyword{capFormat} & --- & Define formatting options for \Lcs{caption} (see documentation of package \Lpack{caption}).\\
-
\Lkeyword{subcapFormat} & --- & Define formatting options for \Lcs{subcaption}.\\
+\Lkeyword{fullpage} & false & Use a complete column in twocolumn mode.\\
+\Lkeyword{FULLPAGE} & false & Use the complete paper width/height for the object.\\
+\Lkeyword{FullPage} & false & Use the complete text area for the object.\\
+\Lkeyword{doublePage} & false & Use the textarea on a doublepage with additional text.\\
+\Lkeyword{doublePAGE} & false & Use the textarea on a doublepage without additional text.\\
+\Lkeyword{doubleFULLPAGE} & false & Use the paperwidth on a doublepage without additional text.\\
+\Lkeyword{vFill} & false & Put a \Lcs{vfill} between every two objects in a multi- or subfloat.\\
\end{xltabular}
@@ -1717,14 +1709,14 @@ can be mixed:
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=before,multiFloat]%
+\hvFloat[fullpage,capPos=before,multiFloat,vFill]%
+{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
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
- +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ +{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\\
@@ -1802,7 +1794,7 @@ float type entry is ignored.
\begin{lstlisting}
-\hvFloat[fullpage,capPos=before,objectFrame,subFloat]%
+\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
@@ -1816,11 +1808,9 @@ float type entry is ignored.
{A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
{sub:demo1}
+{}{\includegraphics[width=\linewidth]{images/CTAN}}%
- {A Caption D of a ``fullpage'' object}%
- {sub:demo2}
+ {A Caption D of a ``fullpage'' object}{sub:demo2}
+{}{\includegraphics[width=\linewidth]{images/CTAN}}%
- {A Caption E of a ``fullpage'' object}%
- {sub:demo3}
+ {A Caption E of a ``fullpage'' object}{sub:demo3}
\end{lstlisting}
@@ -1830,7 +1820,7 @@ The package \Lpack{subcaption} is loaded by default and should be activated with
-\begin{figure}[p]
+\begin{figure}[!htb]
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
@@ -1841,7 +1831,9 @@ The package \Lpack{subcaption} is loaded by default and should be activated with
\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/sub-default1s1c}}
\caption{Output of \texttt{sub-default1s1c} (pages 4--11)}\label{sub-default1s1c}
+\end{figure}
+\begin{figure}[!htb]
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill
\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill
\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill
@@ -2277,7 +2269,7 @@ can be mixed:
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{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
@@ -2376,7 +2368,7 @@ float type entry is ignored.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=before,objectFrame,subFloat]%
+\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
@@ -2498,7 +2490,7 @@ even page and following text will be placed \emph{before} the object.
\marginnote{Fig.~\ref{fig:doubleFULLPAGE0}}
\hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]%
{figure}%
- {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}%
+ {\includegraphics[angle=90,height=\paperheight]{images/r+j}}%
[A doublepage image with a caption on the image.]%
{A caption for a double-sided image that will be placed on the right-hand
part of the illustration. The illustration begins on the left edge of the paper.
@@ -2587,9 +2579,9 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\verb/\pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}/ $\rightarrow$ \pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}
\begin{lstlisting}
- \hvFloat[doubleFULLPAGE,capPos=before]%
+ \hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
- {\includegraphics[height=\paperheight,width=2\paperwidth,
+ {\includegraphics[doubleFULLPAGE,
keepaspectratio=false]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed before
the image. The image begins on the left edge of the paper.
@@ -2598,21 +2590,27 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
{foo}
\end{lstlisting}
+\hvFloatSetDefaults
+
\marginnote{Fig.~\ref{foo}}
- \hvFloat[doubleFULLPAGE,capPos=before]%
+ \hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
- {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed before
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
The parameter is \texttt{doubleFULLPAGE}}%
{foo}
-\Blindtext \Blindtext
+\Blindtext %\Blindtext
+\hvblindtext
+
+\hvblindtext
+\hvblindtext
\begin{lstlisting}
- \hvFloat[doubleFULLPAGE,capPos=after]%
+ \hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
{\includegraphics[height=\paperheight,width=2\paperwidth,
keepaspectratio=false]{images/rheinsberg}}%
@@ -2620,11 +2618,11 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
The parameter is \texttt{doubleFULLPAGE}}%
- {foo}
+ {bar}
\end{lstlisting}
\marginnote{Fig.~\ref{bar}}
- \hvFloat[doubleFULLPAGE,capPos=after]%
+ \hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
{\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed after
@@ -2638,6 +2636,9 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\Blindtext
\hvblindtext
+
+%\hvblindtext
+
\subsection{\Lkeyword{doublePAGE}}
With this option the object also starts at the left paper margin but on the top of the text area.
There will be pagenumbers and a caption can be rotated on the right of the object or under it.
@@ -2666,10 +2667,11 @@ There will be pagenumbers and a caption can be rotated on the right of the objec
The parameter is \texttt{doublePAGE}}%
{fig:doublePAGE0}
-\hvblindtext
+%\hvblindtext
\Blindtext
+\Blindtext
\subsection{\Lkeyword{doublePage}}
With this option the object also starts at the left top of the text area.
@@ -2689,6 +2691,8 @@ and the rest of the text area is filled with text.
\end{lstlisting}
+%\hvFloatSetDefaults
+
\marginnote{Fig. \ref{fig:doublePage0}}
\hvFloat[doublePage,capWidth=n,capPos=right]%
{figure}%
@@ -2746,7 +2750,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15
\Blindtext
-\hvFloat[doublePage,capWidth=n,capPos=right]%
+\hvFloat[doublePage,capWidth=n,capPos=right,capVPos=top]%
{table}%
{\usebox\hvOBox}%%%%%%%%%%%%%%
[A doublepage tabular with a caption on the right side of the right part.]%
@@ -2786,6 +2790,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15
\bottomrule
\end{tabular}}
+
\hvFloat[doublePage,capWidth=n,capPos=right]%
{table}%
{\usebox\hvOBox}%%%%%%%%%%%%%%
@@ -2801,7 +2806,6 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15
\Blindtext
-
\section{References to the page}\label{varioref}
%Whith loading package \texttt{hyperref} references to floating objects with a caption left or right of the object
%are no problem in difference to captions below othe object or on another page (using \texttt{fullpage} option).
@@ -2838,7 +2842,7 @@ With package \Lpack{varioref} it is:
\begin{verbatim}
Whith the package \Lpack{varioref} (\url{https://ctan.org/pkg/varioref})
one can get something like: see figure~\vref{demo:fullpage}, which uses a
-correct page number of the floatinmg object and not the caption
+^correct page number of the floatinmg object and not the caption
page number which is~\vpageref{demo:fullpage-cap}.
The figure~\ref{demo:fullpage} is on page~\pageref{demo:fullpage}
and the caption on page~\pageref{demo:fullpage-cap}
@@ -2852,7 +2856,7 @@ The figure~\ref{demo:fullpage} is on page~\pageref{demo:fullpage}
and the caption on page~\pageref{demo:fullpage-cap}
-\FloatBarrier
+%\FloatBarrier
\section{Defining a style}
@@ -2876,16 +2880,16 @@ For example:
\hvFloatSetDefaults
-\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center}
-
+\hvDefFloatStyle{RightCaption}{capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center}
\hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}%
{Caption at bottom right beside the float with a caption width of
\texttt{0.5\textbackslash columnwidth}.}{fig:style}
-\hvblindtext
+\Blindtext
+\Blindtext
\section{Global float setting}
@@ -2908,6 +2912,8 @@ optional package options to set the global placement:
\Blindtext
+\Blindtext
+
%\hvFloatSetDefaults
\hvFloat[FULLPAGE]{figure}%
{\includegraphics[FULLPAGE]{tiger}}%
@@ -2919,8 +2925,9 @@ optional package options to set the global placement:
\Blindtext
-\printindex
+\Blindtext
+\printindex
\clearpage
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
index f90af1abd10..8b5431fbf6d 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
index 001d9e824df..6960658c3bc 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: inner1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: inner1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
index e5487420bc3..c829f3b1e2b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
index ec50400c019..15b65081111 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: inner2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: inner2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
index da0c2ba44ab..10e8df1039c 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
index 315b04f7690..0f4a3856c8e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
index d4354bfe516..2a18ce58e87 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/left2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex
index 20f991759a9..d415c7e3433 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: left2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: left2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
index 222eede9be8..05c79cb897e 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-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex
index e38ac497ee2..62cd6734cea 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -23,7 +23,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -51,7 +51,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -83,7 +83,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -111,7 +111,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
index 1e82b18692e..8eadf52437d 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
index 11a813f4994..1c4e98195f1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
index 6d5726c2385..5482c3316f5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
index 86d0211eb37..f42bc85ae59 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: multi-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
index 5a02689ef61..5610832201e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
index 3bb4198577f..8725520a265 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: multi-default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
index 7f2cf310494..8a4a84c5a9f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
index 2508fa7c711..4ce8149cdae 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: multi-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
index 2dd7669927a..b50b8fa959f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
index 796f367595a..668da0a1471 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
@@ -1,6 +1,6 @@
\errorcontextlines=200
\documentclass[twoside]{scrartcl}
-%% $Id: multi-inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-inner2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -27,7 +27,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{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
@@ -54,7 +54,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\Float[Multi]
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{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
@@ -86,7 +86,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{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
@@ -113,7 +113,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\Float[Multi]
%\end{document}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
index 1b1d0907eff..74a5b1a499e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
index 1947d4c409c..fef798e1e96 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
@@ -1,6 +1,6 @@
\errorcontextlines=100
\documentclass[twoside]{scrartcl}
-%% $Id: multi-outer2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-outer2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=outer]%
+\hvFloat[fullpage,multiFloat,capPos=outer,vFill]%
+{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
@@ -53,7 +53,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\Float[Multi]
-\hvFloat[fullpage,multiFloat,capPos=o,objectPos=c]%
+\hvFloat[fullpage,multiFloat,capPos=o,objectPos=c,vFill]%
+{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
@@ -84,7 +84,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=outer]%
+\hvFloat[fullpage,multiFloat,capPos=outer,vFill]%
+{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
@@ -111,7 +111,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c
\Float[Multi]
%\end{document}
-\hvFloat[fullpage,multiFloat,capPos=outer]%
+\hvFloat[fullpage,multiFloat,capPos=outer,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
index 2dd5415802b..56ffb0b3540 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
index 16b2ebacbf5..1b78f0fba64 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -23,7 +23,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -51,7 +51,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -83,7 +83,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -111,7 +111,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}.
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
index de422395620..e4749a98c89 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 073d3b0d7e5..ae4ea4dd4a5 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 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd1s1c.tex 72 2021-05-02 11:40:10Z 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 90d6d622067..4bb050f6b48 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
index b749afc1922..8454f4198bb 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: odd1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
index af4fd9ca4d2..ef2c6e6b8dd 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
index a2f6e8fb0dd..adcb965bf59 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: odd2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
index 6e466829107..bd173e8e0d3 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
index a6014dfe5d3..f044fa127c7 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: odd2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
index 15198bc21d6..bada8ae5e08 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
index 92bca1907c5..f6444f614c3 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: outer1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: outer1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
index e13c10e5261..03a57f68622 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
index 2392915bcbe..d30d66e8fae 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: outer2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: outer2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
index 1b7d295d704..8853b2acbab 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
index fd96ebb4c90..84b3dc0cf5f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: outer2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: outer2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
index 09d3cf9c52f..5b0e63ac7ff 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-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex
index 1832540102d..90e4ac91968 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-after1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
index 7d8a729015f..642314e1920 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
index 09233d3b4f1..bb789ab5937 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
index 91fe896dc97..6d396debdc0 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
index bb4b173deb7..73701e6c1ee 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: paper-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
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..297458c7729
--- /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 4a303dee2f7..6ba30899882 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
index 6647b434ed6..64b430652b1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: paper-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
index 945d4e9c412..739474d9388 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
index 08a44c47eb9..1cb218ac795 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: paper-inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
index e4606b57515..207f1b69c6b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
index 23ee98ff60d..f2857044961 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-right1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
index dd2d7ccc4fd..4b49852be71 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
+++ b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
@@ -36,8 +36,8 @@
\usepackage{varioref}
\usepackage{nameref}
\usepackage[hyperref]{hvfloat}
-%\usepackage{hvfloat}
\DeclareCaptionFont{red}{\color{red}}
+\DeclareCaptionFont{white}{\color{white}}
\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
index 8423fc99de6..288656941c1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
index a3042a3530b..4ad53de6b9d 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
index 62e121a492f..acaf0cb9389 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
index 98ce0eb17da..ada1d0b1864 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: right1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
index c4cf6296360..c4ca0345800 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
index 362f953f8b2..6672586390f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: right2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
index 04fe952cb51..d35d53ecf06 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
index 154a7beeae7..eaaed1d57cb 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
index 94e35c43f11..3b6bc2008fa 100755
--- a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
+++ b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
@@ -12,7 +12,7 @@ do
echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
lualatex $datei
TEST=`grep -c "Label(s) may have changed." $MAIN.log `
- if [ $RUNS -gt 5 ]
+ if [ $RUNS -gt 4 ]
then TEST=0
fi
done
diff --git a/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh b/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
index 8d6e6f84fe9..ea7f8b1f781 100755
--- a/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
+++ b/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
@@ -12,9 +12,9 @@ do
echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
lualatex $datei
TEST=`grep -c "Label(s) may have changed." $MAIN.log `
- if [ $RUNS -gt 5 ]
+ if [ $RUNS -gt 4 ]
then TEST=0
fi
done
- rm $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
+ rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc $MAIN.lof $MAIN.lot $MAIN.idx
done
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
index 2ba15f5ffc4..16eee22b91f 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-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex
index 4d87de577ac..660e942090f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -45,9 +45,9 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
{sub:demo3}
\end{lstlisting}
-\Float[subfloat]
+\Float[subFloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
index a06feaca2a0..c2971c97e6f 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-after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex
index 5d46609f001..761faa2c4b7 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-after2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
index 89721e02701..89b800947de 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
index 6777dea5c74..ec371418a7e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
index db16fbc2ddb..a0d1f89e3c4 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
index 1ebc5bb9cc6..c9307aecefc 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
index 6de66848d66..80c7cf22df8 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
index 3e007f239e2..cd6d370b80f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: sub-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
index 7f7bd678927..109dd4d3a52 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
index 078f9019329..e4fea435069 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
index 87ff80154a1..4b6d8d5eb36 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
index f721256a112..d1073b78385 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-right1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-right1s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
@@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,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
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
index e27919a3bc6..0c733019514 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
index e4f5f9c246a..a6e556161cf 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-right2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
@@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,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
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
new file mode 100644
index 00000000000..c3a7c2cb9a1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex
new file mode 100644
index 00000000000..f7c4f36b5ef
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex
@@ -0,0 +1,165 @@
+\documentclass[twocolumn,DIV=12]{scrartcl}
+%% $Id: sub-right2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\usepackage{ragged2e}
+\usepackage{showframe}
+\setlength\columnseprule{0.4pt}
+
+\usepackage{marginnote}
+\let\Lkeyword\texttt
+\let\Lkeyset\texttt
+\def\Ldim#1{\texttt{\textbackslash#1}}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\textcolor{black!40}{\blindtext}
+
+\textcolor{black!40}{\blindtext}
+
+\section{File \texttt{\jobname}}
+
+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,nonFloat,
+ capPos=right,
+ capVPos=top,
+ objectPos=left,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+\end{lstlisting}
+
+\hvFloat[%
+ wide,nonFloat,
+ capPos=right,%
+ capVPos=top,%
+ objectPos=left,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+
+\textcolor{black!40}{\blindtext}
+%\blindtext
+
+
+The code for figure \ref{fig:80}:
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=left,
+ capVPos=top,
+ objectPos=right,
+ ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=left,%
+ capVPos=top,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+
+
+For a twosided document it will place the object always in the margin.
+
+\textcolor{black!40}{\blindtext}
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+\end{lstlisting}
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+
+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=outer}.
+
+
+\textcolor{black!40}{\blindtext}
+
+
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+
+The caption can be typeset completely into the margin with:
+
+\textcolor{black!40}{\blindtext}
+
+
+\begin{lstlisting}
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,nonFloat,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\end{lstlisting}
+
+\textcolor{black!40}{\blindtext}
+
+\begingroup
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,nonFloat,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\endgroup
+
+\textcolor{black!40}{\blindtext}
+
+\hvFloat[wide,nonFloat,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:813}
+
+
+
+
+
+\textcolor{black!40}{\Blindtext}
+
+\end{document}
+
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
new file mode 100644
index 00000000000..7e5c40c7c96
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex
new file mode 100644
index 00000000000..46c8182cb9a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex
@@ -0,0 +1,159 @@
+\documentclass[twocolumn]{scrartcl}
+%% $Id: sub-right2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\usepackage{ragged2e}
+\usepackage{showframe}
+\setlength\columnseprule{0.4pt}
+
+\usepackage{marginnote}
+\let\Lkeyword\texttt
+\let\Lkeyset\texttt
+\def\Ldim#1{\texttt{\textbackslash#1}}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\Blindtext
+
+\section{File \texttt{\jobname}}
+
+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,nonFloat,
+ capPos=right,
+ capVPos=top,
+ objectPos=left,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+\end{lstlisting}
+
+\hvFloat[%
+ wide,nonFloat,
+ capPos=right,%
+ capVPos=top,%
+ objectPos=left,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+
+%\blindtext
+
+
+The code for figure \ref{fig:80}:
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=left,
+ capVPos=top,
+ objectPos=right,
+ ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=left,%
+ capVPos=top,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+
+
+For a twosided document it will place the object always in the margin.
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+\end{lstlisting}
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+
+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=outer}.
+
+\blindtext
+
+
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+
+The caption can be typeset completely into the margin with:
+
+\begin{lstlisting}
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,nonFloat,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\end{lstlisting}
+
+%\Float[capPos=outer]
+
+\begingroup
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,nonFloat,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\endgroup
+
+\blindtext
+\blindtext
+
+\hvFloat[wide,nonFloat,
+ capPos=outer,
+ capVPos=top,
+ floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:813}
+
+
+
+
+
+\Blindtext
+
+\end{document}
+
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index 59bfd20a45e..66a354eae60 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 92 2021-05-18 09:46:55Z herbert $
+%% $Id: hvfloat.sty 103 2021-05-31 12:37:11Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,26 +15,35 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.25}
-\def\filedate{2021/05/18}
+\def\fileversion{2.26}
+\def\filedate{2021/05/26}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
\let\hvFloatFileVersion\fileversion
%
\newif\ifhv@fbox \hv@fboxfalse
\newif\ifhv@hyperref \hv@hyperreffalse
-\newif\ifhv@stfloats \hv@stfloatsfalse
+\newif\ifhv@nostfloats \hv@nostfloatsfalse
+\newif\ifhv@tugboat \hv@tugboatfalse
\DeclareOption{fbox}{\hv@fboxtrue\setlength{\fboxsep}{1pt}}
\DeclareOption{hyperref}{\hv@hyperreftrue}
-\DeclareOption{stfloats}{\hv@stfloatstrue}
+\DeclareOption{nostfloats}{\hv@nostfloatstrue}
\ProcessOptions
+\providecommand\@tugclass{\@empty}
+\ifx\@tugclass\@empty
+\else
+ \hv@tugboattrue % special page handling
+ \typeout{>>> we are using a TUGboat class}%
+\fi
+
\PassOptionsToPackage{hypcap}{caption}
\RequirePackage{caption}
\PassOptionsToPackage{hypcap}{subcaption}
\RequirePackage{subcaption}
+\RequirePackage{atbegshi}
\RequirePackage{picture,trimclip}
\RequirePackage{expl3,multido}
@@ -47,7 +56,7 @@
\ifhv@hyperref
\RequirePackage{hyperref}
\fi
-\ifhv@stfloats
+\ifhv@nostfloats\else
\RequirePackage{stfloats}% for bottom floats in a twocolumn mode
\fi
%
@@ -99,12 +108,12 @@
\define@key{hvSet}{capWidth}[n]{% (n)atural width|object (w)idth)|object (h)eight|<scale of \columnwidth>
\def\hvSet@capWidth{#1}%
}
-\define@key{hvSet}{capAngle}[0]{% -360..+360
+\define@key{hvSet}{capAngle}[0]{% -360..+360, only integers
\def\hvSet@capAngle{#1}%
}
-\define@choicekey*+{hvSet}{capPos}[\val\nr]{bottom,top,left,before,right,after,inner,outer,even,odd}[bottom]{%
+\define@choicekey*+{hvSet}{capPos}[\val\nr]{bottom,top,left,before,right,after,inner,outer,evenPage,oddPage}[bottom]{%
\def\hvSet@capPos{#1}% it is relativ to the object, (e),(d) only valid for fullpage float
\ifcase\nr\relax
\hv@capbesidefalse
@@ -120,6 +129,13 @@
\define@choicekey*+{hvSet}{capVPos}[\val\nr]{bottom,center,top}[center]{%
\def\hvSet@capVPos{#1}% it is relativ to the object
+ \ifcase\nr\relax
+ \gdef\hv@@capVPos{b}%
+ \or
+ \gdef\hv@@capVPos{c}%
+ \else
+ \gdef\hv@@capVPos{t}%
+ \fi
}{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using bottom.}%
\def\hvSet@capVPos{center}% it is relativ to the object
}
@@ -164,7 +180,7 @@
}
\define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal
-\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{#1}\fi}
+\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi}
\newif\ifhv@fullpage
\newif\ifhv@FULLPAGE
@@ -190,8 +206,10 @@
\ifhv@subFloat\setkeys{hvSet}{multiFloat=false}\fi%
}%
\define@boolkey{hvSet}[hv@]{multiFloat}[true]{% typeset values as continous floats
- \ifhv@multiFloat\setkeys{hvSet}{subFloat=false}\fi%
+ \ifhv@multiFloat\setkeys{hvSet}{subFloat=false}\fi
}%
+\define@boolkey{hvSet}[hv@]{vFill}[true]{}% \vfill between multifloat objects
+
\define@boolkey{hvSet}[hv@]{separatorLine}[true]{}% separator line for caption of a full page float
\define@key{hvSet}{sepLineskip}{\def\hv@sepLineskip{#1}}%
\define@boolkey{hvSet}[hv@]{objectFrame}[true]{}% a frame around the object with no separation
@@ -222,6 +240,7 @@
capFormat={}, subcapFormat={}, twoColumnCaption=false,
% floatRef=object,
bindCorr=\z@,sepLineskip=0pt,
+ vFill=false,
}%
}
@@ -270,6 +289,11 @@
\newlength\hv@maxImageWidth
\AtBeginDocument{\hv@maxImageWidth=\columnwidth}
+\define@key{Gin}{columnWidth}[true]{%
+ \def\Gin@ewidth{\columnwidth}%
+% \def\Gin@eheight{1ex}%
+ \Gin@boolkey{true}{iso}%
+}
\define@key{Gin}{fullpage}[true]{%
\def\Gin@ewidth{\columnwidth}%
\def\Gin@eheight{\textheight}%
@@ -291,7 +315,7 @@
\Gin@boolkey{false}{iso}%
}
\define@key{Gin}{doubleFULLPAGEbindCorr}[true]{%
- \def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection}%
+ \def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection\relax}%
\def\Gin@eheight{\paperheight}%
\Gin@boolkey{false}{iso}%
}
@@ -342,11 +366,22 @@
\ifhv@fbox
\fbox{\usebox{\hvObjectBox}}%
\else
- \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi%
+ % rotated object with a depth need to raise up the \depth
+ \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\raisebox{\depth}{\usebox{\hvObjectBox}}\fi%
\fi
\fi
}
+\newcounter{hv@tempCNTfigA}%
+\newcounter{hv@tempCNTfigB}%
+\newcounter{hv@tempCNTtabA}%
+\newcounter{hv@tempCNTtabB}%
+
+\newcounter{hv@pfigure}
+\newcounter{hv@ptable}
+\newcounter{subhv@pfigure}
+\newcounter{subhv@ptable}
+
\newif\ifhv@star
\newif\if@hvsubstar
\setDefaults
@@ -367,15 +402,20 @@
\def\hvFloat@i*{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}}
\def\do@hvFloat[#1]{%
\begingroup
- \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}%
+ \setlength\hvWideWidth{\dimexpr\columnwidth+\marginparwidth+\marginparsep}%
+% \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}%
% \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
\hv@maxImageWidth=\textwidth
\reset@special@float
- \setcounter{hv@pfigure}{\value{figure}}%
- \setcounter{hv@ptable}{\value{table}}%
+ \global\setcounter{hv@pfigure}{\value{figure}}%
+ \global\setcounter{hv@ptable}{\value{table}}%
+ \setcounter{hv@tempCNTfigA}{\value{figure}}%
+ \setcounter{hv@tempCNTfigB}{\value{figure}}%
+ \setcounter{hv@tempCNTtabA}{\value{table}}%
+ \setcounter{hv@tempCNTtabB}{\value{table}}%
\gdef\hv@save@setting{#1}%
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
- \gdef\hv@floatType{figure}%
+ \gdef\hv@floatType{figure}% presetting
\@ifnextchar+{\do@multiFloat}{\hvFloat@ii[#1]}%
}
@@ -425,14 +465,6 @@
\ExplSyntaxOff
-\newcounter{hv@tempCNTa}\setcounter{hv@tempCNTa}{0}% defined after \refstepcounter{figure}
-\newcounter{hv@tempCNTb}\setcounter{hv@tempCNTb}{0}% defined before \refstepcounter{figure}
-\def\thehv@tempCNTa{\arabic{figure}}
-\def\thehv@tempCNTb{\the\numexpr\arabic{figure}+1}
-\newcounter{hv@pfigure}
-\newcounter{hv@ptable}
-\newcounter{subhv@pfigure}
-\newcounter{subhv@ptable}
\def\drawSepLine{%
\par\noindent
@@ -503,10 +535,14 @@
%
% First we save the object in \hvObjectBox
%
- \ifx\hvSet@objectAngle\hv@Zero% rotate the object?
- \savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
+ \ifnum\hvSet@objectAngle=0 % rotate the object?
+ \ifhv@useOBox
+ \let\hvObjectBox\hvOBox
+ \else
+ \savebox\hvObjectBox{\hv@floatObject}%
+ \fi
\else
- \savebox{\hvObjectBox}{%
+ \savebox\hvObjectBox{%
\rotatebox{\hvSet@objectAngle}{%
\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi
}%
@@ -559,25 +595,25 @@
\fi
\fi
\saveCaptionSkip% we put this space ourselve
- \ifx\hvSet@capAngle\hv@Zero% need rotation?
+ \ifnum\hvSet@capAngle=0 % need rotation?
\savebox\hvCaptionBox{% NO rotation
\begin{minipage}[b]{\hvCapWidth}%% minipage, to get hyphenation
- \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifhv@nonFloat
\ifhv@onlyText
\hv@longCap
\else
\ifx\hv@floatType\hv@figure
\ifx\relax\hv@shortCap\relax
- \figcaption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \figcaption{\hv@longCap}%
\else
- \figcaption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \figcaption[\hv@shortCap]{\hv@longCap}%
\fi
\else
\ifx\relax\hv@shortCap\relax
- \tabcaption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \tabcaption{\hv@longCap}%
\else
- \tabcaption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \tabcaption[\hv@shortCap]{\hv@longCap}%
\fi
\fi
\fi
@@ -586,15 +622,10 @@
\hv@longCap
\else
\let\@captype\hv@floatType
- \expandafter\ifx\expandafter\relax\hv@shortCap\relax
- \caption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
- \else
- \caption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
- \fi
-% \fi
+ \ifx\hv@shortCap\@empty\caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}\fi
\fi
\fi
-% \expandafter\label\expandafter{\hv@label}% 2.17 put label into the caption argument
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\end{minipage}%
}%
\else
@@ -617,12 +648,11 @@
\hv@longCap
\else
\let\@captype\hv@floatType
- \expandafter\ifx\expandafter\relax\hv@shortCap\relax
- \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}%
+ \ifx\relax\hv@shortCap\relax \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}%
\fi
\fi
\fi
- \label{\hv@label}%
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\end{minipage}%
}% rotatebox
}% \sbox
@@ -638,10 +668,15 @@
\@namedef{fps@\hv@floatType}{\hvSet@floatPos}%
\fi
\ifhv@nonFloat
+ \noindent
\begingroup% Start the nonfloat part
\else
\ifhv@star
- \@nameuse{\hv@floatType*}% Start the floating environment *****************************
+ \ifx\hvSet@floatPos\hv@floatBottom
+ \@nameuse{\hv@floatType*}[b]% Start the floating environment *****************************
+ \else
+ \@nameuse{\hv@floatType*}%
+ \fi
\else
\begin{\hv@floatType}% Start the floating environment
\fi
@@ -766,7 +801,28 @@
% now we rotate the object and caption, if needed
%
\ifhv@wide
- \ifoddpageoroneside\else\ifoddpage\else\hspace*{\dimexpr-\marginparwidth-\marginparsep}\fi\fi% <- for wide and left page
+ \ifoddpageoroneside
+ \if@twocolumn
+ \if@firstcolumn
+ \noindent
+ \hspace*{\dimexpr-\marginparwidth-\marginparsep}% oddpage first column
+ \fi
+ \fi
+ \else
+ \ifoddpage
+ \if@twocolumn
+ \if@firstcolumn
+ \noindent
+ \hspace*{\dimexpr-\marginparwidth-\marginparsep}% oddpage first column
+ \fi
+ \fi
+ \else% evenpage
+ \if@firstcolumn
+ \noindent
+ \hspace*{\dimexpr-\marginparwidth-\marginparsep}% <- for wide and left page
+ \fi
+ \fi
+ \fi
\fi
\ifx\hvSet@rotAngle\hv@Zero
\usebox{\@tempboxa}%
@@ -775,9 +831,9 @@
\fi
\ifhv@nonFloat
\ifx\hvSet@objectPos\hv@Center
- \ifhv@nonFloat
+% \ifhv@nonFloat
\hspace{\fill}%
- \fi
+% \fi
\fi
\endgroup% End the nonfloat part
\else
@@ -827,7 +883,7 @@
\fi
\fi
\checkoddpage
- \set@caption@object% set caption and object into a box
+ \set@caption@object{\hv@floatType}% 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
@@ -836,12 +892,7 @@
\ifoddpage
\afterpage{\setBottomCaption\setPageObject}%
\else% we are on an even page
-% \zsaveposy{hv@currentPos}%
-% \ifdim\the\dimexpr\zposy{hv@currentPos}sp-\hv@BottomSpace-1cm>\ht\TBox % enough space*
- \setBottomCaption\setPageObject
-% \else
-% \afterpage{\afterpage{\setBottomCaption\setPageObject}}%
-% \fi
+ \setBottomCaption\setPageObject
\fi
\or% caption on odd page 3->right page
\if@twoside
@@ -890,7 +941,7 @@
\fi
\fi
\or% caption on the inner column 4->inner
- \set@caption@object
+% \set@caption@object
\if@twocolumn
\ifoddpage
\if@firstcolumn% on right side
@@ -909,7 +960,7 @@
\setBottomCaption\setPageObject
\fi
\or% caption on the outer column 5->outer
- \set@caption@object
+% \set@caption@object
\if@twocolumn
\ifoddpage
\if@firstcolumn
@@ -957,78 +1008,122 @@
\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page
% #1-> 0/1 caption under/right
\global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}%
-% \global\setlength\hv@tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset
\global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection}%
+ \xdef\hv@@capAngle{\hvSet@capAngle}%
\checkoddpage
\ifoddpage
\if@twocolumn
\if@firstcolumn
- \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}%
\else
- \do@hvFloat@doublePageCaptionRight{#1}%
+ \ifhv@tugboat
+ \do@hvFloat@doublePageCaptionRight{#1}%
+ \else
+ \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%
+ \fi
\fi
\else
- \do@hvFloat@doublePageCaptionRight{#1}%
+ \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%
\fi
\else
\if@twocolumn
\if@firstcolumn
- \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}%
+ \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}}%
\else
- \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}%
\fi
\else
- \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}%
\fi
\fi
\endgroup% started at main macro \hvFloat
}
%
\def\do@hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ----------------------------------
- \afterpage{%
- \let\hv@fptop\c@fptop
- \global\setlength{\@fptop}{0pt}%
- \let\hv@c@topnumber\c@topnumber
- \setcounter{topnumber}{1}%
- \begin{\hv@floatType*}[t]
- \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \end{\hv@floatType*}%
- \begin{\hv@floatType*}[t]
- \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \hspace*{\hv@tempWidthA}%
- \noindent
- \clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
- \ifnum#1>0
- \medskip
- \ifdim\dp\hvObjectBox > \z@
- \rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
- \else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
- \fi
- }}%
- \else
- \rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
- \else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
- \fi
- }}%
- \fi
- \else
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
- \else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
- \fi
- \fi
- \end{\hv@floatType*}%
- \let\c@topnumber\hv@c@topnumber
- \let\c@fptop\hv@fptop
+ \let\hv@fptop\c@fptop
+ \global\setlength{\@fptop}{0pt}%
+ \let\hv@c@dbltopnumber\c@dbltopnumber
+ \setcounter{totalnumber}{0}%
+ \setcounter{dbltopnumber}{0}%
+ \def\dblfloatpagefraction{0.5}%
+ \begin{\hv@floatType*}[!thb]
+ \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
+ \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \ifx\hv@label\@empty
+ \else
+ \ifx\hv@floatType\hv@figure
+ \refstepcounter{hv@tempCNTfigA}%
+ \else
+ \refstepcounter{hv@tempCNTtabA}% before caption
+ \fi
+ \label{\hv@label}%
+ \fi
+ \end{\hv@floatType*}%
+ \afterpage{%
+ \begin{\hv@floatType*}[!thb]
+ \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
+ \hspace*{\hv@tempWidthA}%
+ \noindent
+ \savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}%
+ \global\setlength\hv@tempWidthB{\the\dimexpr\textwidth-\wd\hv@rightBox-\hv@tempWidthA-\marginparsep}%
+ \parbox[\hv@@capVPos]{\the\wd\hv@rightBox}{%
+ \vspace{0pt}%
+ \raisebox{\depth}{\usebox\hv@rightBox}%
+ }%
+ \ifx\hv@label\@empty\else
+ \ifx\hv@floatType\hv@figure
+ \global\refstepcounter{hv@tempCNTfigB}%
+ \else
+ \global\refstepcounter{hv@tempCNTtabB}% before caption
+ \fi
+ \label{\hv@label-2}%
+ \fi
+ \ifnum#1>0 % caption on the right
+% \medskip
+ \ifnum\hv@@capAngle > 0
+% \ifdim\dp\hvObjectBox > \z@
+% \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
+% \ifx\relax\hv@shortCap\relax
+% \captionof{\hv@floatType}{\hv@longCap}%
+% \else
+% \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+% \fi
+% \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
+% }}%
+% \else
+ \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
+ }}%
+ \ifx\relax\hv@label\relax\else\label{\hv@label-cap}\fi
+% \fi
+ \else
+ \hspace{\marginparsep}%
+ \parbox[\hv@@capVPos]{\hv@tempWidthB}{%
+ \vspace{0pt}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}
+ \fi
+ }%
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
+ \fi
+ \else % #1 = 0 caption below
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
+ \fi
+ \end{\hv@floatType*}%
}%
+ \let\c@topnumber\hv@c@topnumber
+ \let\c@fptop\hv@fptop
}
%
\newsavebox\hv@boxLeftPage
@@ -1050,6 +1145,8 @@
\if@twocolumn
\if@firstcolumn
\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}%
+ \else
+ \do@hvFloat@doublePAGECaptionRight{#1}%
\fi
\else
\do@hvFloat@doublePAGECaptionRight{#1}%
@@ -1073,40 +1170,40 @@
\afterpage{%
\noindent
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \null
- \global\savebox\hv@boxLeftPage{\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
- \usebox\hv@boxLeftPage
+ \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\newpage\if@twocolumn\null\newpage\fi
\expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\hspace*{-\dimexpr\hv@tempWidthA}%
\noindent
-% \usebox\hv@boxRightPage
\clipbox*{\the\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
\ifnum#1>0
\medskip
\ifdim\dp\hvObjectBox > \z@
\rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
}}%
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
}}%
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\fi
\else
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}%
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\fi
\newpage\if@twocolumn\null\newpage\fi
}%
@@ -1124,8 +1221,11 @@
\fi\fi
\checkoddpage
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \global\setlength\hv@tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset
- \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-\hvSet@bindCorrection}%
+ \global\setlength\hv@tempWidthA{\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset
+ \global\setlength\hv@tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}%
+ \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-\hvSet@bindCorrection}%
+% \savebox\hv@leftBox{\clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
+% \savebox\hv@rightBox{\clipbox*{\the\hv@leftPageObjectWidth{} \depth{} \width{} \height}{\usebox\hvObjectBox}}%
\expandafter\captionsetup\expandafter{\hv@caption@format}%
\ifoddpage
\ifcase\hv@@capPos % =0 Caption before
@@ -1137,29 +1237,40 @@
\else
\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}%
\fi
- \else
+ \else% \if@firstcolumn
\set@Normal@Bottom@Caption
\do@hvFloat@doubleFULLPAGE@CaptionBefore
\fi
- \else
+ \else% \if@twocolumn
\set@Normal@Bottom@Caption
\do@hvFloat@doubleFULLPAGE@CaptionBefore
\fi
\or % =1 Caption after
\ifhv@twoColumnCaption
- \do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol
+ \if@firstcolumn
+ \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol}%
+ \else
+ \do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol
+ \fi
\else
- \do@hvFloat@doubleFULLPAGE@CaptionAfter
+ \if@twocolumn
+ \if@firstcolumn
+ \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}%
+ \else
+ \do@hvFloat@doubleFULLPAGE@CaptionAfter
+ \fi
+ \else
+ \do@hvFloat@doubleFULLPAGE@CaptionAfter
+ \fi
\fi
- \else% >1 all other Captions
+ \else% \ifcase >1 all other Captions
\if@twocolumn
\if@firstcolumn
-% \global\setlength\hv@tempWidthA{\the\dimexpr-\evensidemargin-1in-\parindent+\hvSet@bindCorrection}%
\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}%
\else
\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}%
\fi
- \else % >1 Caption right/bottom
+ \else % \if@twocolumn
\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}%
\fi
\fi% \ifcase
@@ -1175,20 +1286,28 @@
\else
\afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}%
\fi
- \else
+ \else% \if@twocolumn
\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}%
\fi
\or % capPos after
\if@twocolumn
\if@firstcolumn
- \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}%
+ \ifhv@twoColumnCaption
+ \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{#1}}}%
+ \else
+ \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}%
+ \fi
\else
- \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}%
+ \ifhv@twoColumnCaption
+ \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{#1}}}%
+ \else
+ \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}%
+ \fi
\fi
- \else
+ \else% \if@twocolumn
\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}%
\fi
- \else % Any other caption
+ \else % \ifcase Any other caption
\if@twocolumn
\if@firstcolumn
\afterpage{\afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}}}%
@@ -1198,7 +1317,7 @@
\else
\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}%
\fi
- \fi%% \ifcase
+ \fi% \ifcase
\fi% main ifoddpage
\endgroup% started at main macro \hvFloat
}
@@ -1208,34 +1327,44 @@
\begin{\hv@floatType}[!b]
\ifhv@separatorLine\drawSepLine\fi
\expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\end{\hv@floatType}%
}
\def\set@Normal@Bottom@CaptionStar*{%
- \begin{\hv@floatType*}[!b]
- \ifhv@separatorLine\drawSepLine\fi
- \expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
- \else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
- \fi
- \end{\hv@floatType*}%
+ \begin{\hv@floatType*}[!b]
+ \ifhv@separatorLine\drawSepLine\fi
+ \expandafter\captionsetup\expandafter{\hv@caption@format}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
+ \end{\hv@floatType*}%
}
+
\def\do@hvFloat@doubleFULLPAGE@CaptionBefore{%
+% \setcounter{hv@tempCNTfigA}{\value{figure}}%
+% \setcounter{hv@tempCNTfigB}{\value{figure}}%
+% \setcounter{hv@tempCNTtabA}{\value{table}}%
+% \setcounter{hv@tempCNTtabB}{\value{table}}%
\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
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
- \refstepcounter{hv@tempCNTa}%
+ \ifx\hv@floatType\hv@figure
+ \global\refstepcounter{hv@tempCNTfigB}%
+ \else
+ \global\refstepcounter{hv@tempCNTtabB}% before caption
+ \fi
\expandafter\label\expandafter{\hv@label}%
-%%% \global\addtocounter{\hv@floatType}{-1}% to get the same <object>-ref as "label"-cap
\clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\afterpage{%
\if@twocolumn\newpage\null\newpage\fi
@@ -1245,7 +1374,11 @@
\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}%
- \refstepcounter{hv@tempCNTa}%
+ \ifx\hv@floatType\hv@figure
+ \global\refstepcounter{hv@tempCNTfigA}%
+ \else
+ \global\refstepcounter{hv@tempCNTtabA}% before caption
+ \fi
\expandafter\label\expandafter{\hv@label-2}%
\newpage\if@twocolumn\null\newpage\fi
}}%
@@ -1259,10 +1392,14 @@
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
- \refstepcounter{hv@tempCNTb}%
- \expandafter\label\expandafter{\hv@label}%
- \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \afterpage{%
+ \clipbox*{0 \the\dp\hvObjectBox{} \the\hv@leftPageObjectWidth{} \the\ht\hvObjectBox}{\usebox\hvObjectBox}%
+ \ifx\hv@floatType\hv@figure
+ \refstepcounter{hv@tempCNTfigA}%
+ \else
+ \refstepcounter{hv@tempCNTtabA}% before caption
+ \fi
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
+% \afterpage{%
\newpage\if@twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
@@ -1270,19 +1407,24 @@
\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}%
- \refstepcounter{hv@tempCNTb}%
+ \ifx\hv@floatType\hv@figure
+ \refstepcounter{hv@tempCNTfigB}%
+ \else
+ \refstepcounter{hv@tempCNTtabB}% before caption
+ \fi
\expandafter\label\expandafter{\hv@label-2}%
\newpage\if@twocolumn\null\newpage\fi
- \begin{\hv@floatType}[b]
+ \begin{\hv@floatType}[!b]
\ifhv@separatorLine\drawSepLine\fi
\expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
- \fi
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\end{\hv@floatType}%
- }}%
+ }%}%
}
\def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{%
@@ -1291,10 +1433,13 @@
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
- \refstepcounter{hv@tempCNTb}%
- \expandafter\label\expandafter{\hv@label}%
+ \ifx\hv@floatType\hv@figure
+ \refstepcounter{hv@tempCNTfigA}%
+ \else
+ \refstepcounter{hv@tempCNTtabA}% before caption
+ \fi
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \afterpage{%
\newpage\if@twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
@@ -1302,20 +1447,25 @@
\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}%
- \refstepcounter{hv@tempCNTb}%
- \expandafter\label\expandafter{\hv@label-2}%
- \newpage\if@twocolumn\null\newpage\fi
- \begin{\hv@floatType*}[b]
+ \ifx\hv@floatType\hv@figure
+ \refstepcounter{hv@tempCNTfigB}%
+ \else
+ \refstepcounter{hv@tempCNTtabB}% before caption
+ \fi
+ \ifx\hv@label\@empty\else\label{\hv@label-2}\fi
+ \newpage
+ \begin{\hv@floatType*}[!b]
\hv@twoColumnCaptiontrue
\ifhv@separatorLine\drawSepLine\fi
\expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
- \fi
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\end{\hv@floatType*}%
- }}%
+ }%
}
\def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{%
@@ -1325,54 +1475,64 @@
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\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}%
- \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \refstepcounter{hv@tempCNTb}
- \expandafter\label\expandafter{\hv@label}%
+ \clipbox*{0 \depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \ifx\hv@floatType\hv@figure
+ \refstepcounter{hv@tempCNTfigA}%
+ \else
+ \refstepcounter{hv@tempCNTtabA}% before caption
+ \fi
+ \label{\hv@label}%
\afterpage{%
\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
\hspace*{\hv@tempWidthA}%
- \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
- \refstepcounter{hv@tempCNTb}%
+ \clipbox*{\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
+ \ifx\hv@floatType\hv@figure
+ \refstepcounter{hv@tempCNTfigB}%
+ \else
+ \refstepcounter{hv@tempCNTtabB}% before caption
+ \fi
\expandafter\label\expandafter{\hv@label-2}%
\savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv@floatType}{\hv@longCap}}}%
\ifnum#1 > 0\relax % rotation with 90°
- \setlength\hv@tempWidthA{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}%
- \ifdim\hv@tempWidthA < 2\paperwidth
- \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{%
+% \setlength\hv@tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}%
+ \ifdim\hv@tempWidthB < 2\paperwidth
+ \rotatebox[origin=lb]{90}{\makebox[\paperheight][c]{\parbox{0.8\ht\hvObjectBox}{%
\expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
- }}% rotatebox
+ }}}% rotatebox
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\else% ifdim: no space left on page
- \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
+ \put(-2\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
\parbox{0.8\textwidth}{%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
}%
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\endminipage}}}%
\fi
\else% ifnum, caption not rotated, under or over the right page
\setlength\hv@tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}%
\ifdim\hv@tempWidthA > \ht\hvCaptionBox
\else
-% \refstepcounter{hv@temp}%%
- \put(\the\dimexpr-\textwidth-2in-\oddsidemargin,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%%
+ \put(\the\dimexpr1.5\paperwidth-\wd\hvObjectBox-\hvSet@bindCorrection,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][c]{\parbox{\textwidth}{%%
\expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap}%
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}%
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
}}}%
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\fi
\fi% end \ifnum#1>0
\newpage\if@twocolumn\null\newpage\fi
@@ -1407,9 +1567,8 @@
\else
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
\fi
- %\put(0,0){%
\AtBeginShipoutNext{\thispagestyle{empty}}%
- \usebox\hvObjectBox%}%
+ \usebox\hvObjectBox%
\else
\usebox\hvObjectBox
\fi
@@ -1447,8 +1606,14 @@
\repeat
\endminipage}%
}
+
\def\getMultiObjectAndLabel{%
- \global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \global\sbox\hvObjectBox{%
+ \ifhv@vFill
+ \minipage[b][\textheight][s]{\columnwidth}%
+ \else
+ \minipage{\columnwidth}%
+ \fi
\ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifx\hvSet@objectPos\hv@Right\raggedleft\else
\ifx\hvSet@objectPos\hv@Left\raggedleft\else
@@ -1461,6 +1626,8 @@
\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}}%
+ \edef\@tempb{\clist_item:Nn\l_clist_Type{\hv@cnta}}%
+ \edef\@captype{hv@p\@tempb}%
\ifx\@tempa\@empty
\else
\refstepcounter{\@captype}%
@@ -1469,6 +1636,7 @@
\ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi
\advance\hv@cnta by \@ne
\ifnum\hv@cnta<\hv@cntb
+ \ifhv@vFill\vfill\fi
\repeat
\endminipage}%
}
@@ -1491,7 +1659,12 @@
}
\def\getMultiSubObjectAndLabel{%
- \global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \global\sbox\hvObjectBox{%
+ \ifhv@vFill
+ \minipage[b][\textheight][s]{\columnwidth}%
+ \else
+ \minipage{\columnwidth}%
+ \fi
\ifx\hv@subcaption@format\@empty\else
\expandafter
\captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
@@ -1504,7 +1677,7 @@
\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
+ \edef\@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
@@ -1524,6 +1697,7 @@
\ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi
\advance\hv@cnta by \@ne
\ifnum\hv@cnta<\hv@cntb
+ \ifhv@vFill\vfill\fi
\repeat
\edef\@tempa{\clist_item:Nn\l_clist_Label{1}}% the main label at the end
\ifx\@tempa\@empty
@@ -1547,11 +1721,11 @@
\else
\caption[\hv@shortCap]{\hv@longCap}%
\fi
- \expandafter\ifx\expandafter\relax\hv@label\relax\else\label{\hv@label-cap}\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\endminipage}%
}
-\def\set@caption@object{% first caption, then object
+\def\set@caption@object#1{% first caption, then object #1=\hv@floatType
\ifhv@multiFloat
\getMultiCaptionAndLabel
\else
@@ -1561,7 +1735,7 @@
\getSingleCaptionAndLabel
\fi
\fi
- \edef\@captype{hv@p\hv@floatType}%
+ \edef\@captype{hv@p#1}%
\ifhv@multiFloat
\getMultiObjectAndLabel
\else