summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/hvfloat
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-06-27 03:01:41 +0000
committerNorbert Preining <norbert@preining.info>2021-06-27 03:01:41 +0000
commita090105758cdab68b58246a8aea7cb79dc168501 (patch)
tree367d8c9718710cbba51d660b61273b20fb056080 /macros/latex/contrib/hvfloat
parent3d1055e1e00548f29b9d4ba0a79c717b9b6b2ae3 (diff)
CTAN sync 202106270301
Diffstat (limited to 'macros/latex/contrib/hvfloat')
-rw-r--r--macros/latex/contrib/hvfloat/Changes2
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdfbin80294 -> 80294 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdfbin86720 -> 86722 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/capPos.pdfbin95390 -> 95389 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdfbin81992 -> 81991 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdfbin83375 -> 83275 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdfbin79445 -> 79445 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdfbin85825 -> 85824 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdfbin2317102 -> 2314853 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdfbin619035 -> 619030 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdfbin77658 -> 77658 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdfbin86404 -> 86404 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdfbin84815 -> 84813 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdfbin85100 -> 85098 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdfbin86778 -> 86773 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdfbin84024 -> 84020 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdfbin83979 -> 83977 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdfbin84014 -> 84013 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdfbin85511 -> 85512 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdfbin142627 -> 142624 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdfbin146171 -> 146172 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdfbin94585 -> 94586 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdfbin146344 -> 146343 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdfbin92184 -> 92182 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdfbin89789 -> 89784 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdfbin92987 -> 92984 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdfbin145742 -> 145736 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdfbin77806 -> 77805 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex2
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdfbin86525 -> 86523 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdfbin174218 -> 174218 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdfbin85567 -> 85566 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdfbin86320 -> 86318 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdfbin84295 -> 84292 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdfbin84682 -> 84680 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdfbin79176 -> 79267 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdfbin79887 -> 79967 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdfbin90508 -> 90508 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdfbin0 -> 87935 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex81
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdfbin90333 -> 90332 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdfbin87859 -> 87855 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdfbin80205 -> 80290 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdfbin80126 -> 80126 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdfbin89342 -> 89340 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdfbin81033 -> 81033 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdfbin85585 -> 85585 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdfbin143893 -> 143952 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdfbin144709 -> 144771 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdfbin144111 -> 144003 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdfbin144341 -> 144217 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdfbin143647 -> 143517 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdfbin143826 -> 143873 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdfbin144812 -> 144879 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdfbin144268 -> 144315 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdfbin120954 -> 120949 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdfbin121929 -> 121917 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.pdfbin7119431 -> 7126601 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.tex227
-rw-r--r--macros/latex/contrib/hvfloat/doc/images/missing.txt4
-rw-r--r--macros/latex/contrib/hvfloat/latex/hvfloat-fps.sty10
-rw-r--r--macros/latex/contrib/hvfloat/latex/hvfloat.sty19
62 files changed, 254 insertions, 91 deletions
diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes
index d3e0318635..676ac9822c 100644
--- a/macros/latex/contrib/hvfloat/Changes
+++ b/macros/latex/contrib/hvfloat/Changes
@@ -1,4 +1,6 @@
hvfloat.sty:
+2.31 2021-06-26 - suppress "Overful hbox" message for full page or
+ double page floats
2.30 2021-06-20 - fix for introduced bug for multifloats
2.29 2021-06-15 - some more fixes for doublepage objects
- added option sameHeight for same text height on left
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
index d74d1e268e..40854d1f72 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
index 9567c26d36..6a3f002998 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
index 072c584f82..630a337a53 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
index ff8eec9e74..861efc9ac7 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
index 752c54810d..60e3cb94ca 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
index 6ac3baf5ad..33ac8dd876 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
index 388cf97645..1291839ce8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
index dd444dd08a..0d3e2713ef 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
index 7aa01b02f8..1578d673ff 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
index cc6273ead8..7be7a1cb5b 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
index eb062f70e2..e98663ed09 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
index 4f86812e09..09a417c031 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
index 263b9afc8a..e2898a14ae 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
index 9cdd2ea882..e0e787f994 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
index 05ac77f5dd..73a49d0a07 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
index 200ac470d6..3cd80ae131 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
index 94d1d37488..6b794b3732 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
index 406285913d..4e6b0cfae7 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
index 6db4613d89..bc345dc15b 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
index 16b1cbfb19..e37e60e626 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
index a4c58d96b9..614b2fcf30 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
index b955807071..e2ec474cb7 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
index 75107f1a34..23fdd5f04f 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
index 4370c39d84..3f79249b52 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
index 164dc77f64..7ebd9bd69a 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
index 1c3c610031..23f3c0b60c 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
index fe0ca31256..9a8f796d02 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
index dfce04c36b..2d93d7b2b5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: odd1s1c.tex 72 2021-05-02 11:40:10Z herbert $
+%% $Id: odd1s1c.tex 119 2021-06-20 13:28:09Z herbert $
\input{preamble.ltx}
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
index c24ac2fa55..eae0be6b8d 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
index a357bdc1e1..ef5b9fd7ab 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
index d7a49ea30d..6aa3ac83cf 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
index ca7e1e56ec..c6676e1291 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
index 323011e26f..a7d55f4c80 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
index 11003f09da..204d0dad65 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
index 495d644d55..a65718b90a 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
index 443aae8d5f..fd27f7ca54 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
index bba76eb320..6e06341ad5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
new file mode 100644
index 0000000000..c9cd842897
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex
new file mode 100644
index 0000000000..4db0220481
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/examples/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/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
index e86b9e6674..330a7425ca 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
index 56253d38e2..b0792355fb 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
index daca3967b6..5ed8ec5a71 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
index 8c43e8c1f0..c6c6bd27bd 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
index 954f63954d..dfd03e566c 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
index 037f72ae10..dbb63e5fac 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
index 2fecbfbe05..e269a747a3 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
index d2391f0870..f75bb23f56 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
index a23af6e14d..00554afc00 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
index 83d13d7824..efea15759c 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
index b5e7ae13b8..8d48919902 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
index 026910949f..84ab3d56cc 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
index 68d689fca0..b319265630 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
index d67a0f806a..72ca919045 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
index 6456d85628..23e0a03ee7 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
index 6ee1ea42d1..b81fedc701 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
index a12ef0d594..a95470d1eb 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
index 6ddf3c1f56..918e5f5f67 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
index 90bea8a9eb..5382371f7e 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
@@ -1,7 +1,7 @@
-%% $Id: hvfloat.tex 114 2021-06-15 13:20:03Z herbert $
+%% $Id: hvfloat.tex 122 2021-06-26 12:35:53Z herbert $
\listfiles
\errorcontextlines=100
-\documentclass[twoside,paper=a4,]{scrartcl}
+\documentclass[twoside,paper=a4,usegeometry]{scrartcl}
\usepackage{fontspec}
\usepackage{libertinus}
%\usepackage[scaled=0.85]{beramono}
@@ -10,25 +10,29 @@
\usepackage{microtype}
\usepackage[english]{babel}
+\usepackage[marginparwidth=3cm,bottom=2cm,top=1cm,includeheadfoot]{geometry}
+
+
\usepackage[automark]{scrlayer-scrpage}
\pagestyle{scrheadings}
-\usepackage[showframe=false]{geometry}
\usepackage{listings}
%
\lstset{%
language=[LaTeX]TeX,%
showstringspaces=false,%
tabsize=5,%
+ backgroundcolor=\color{black!15},
% frame={tb},%
-% lineskip=-1pt,%
+ lineskip=-1pt,%
extendedchars=true,%
basicstyle={\small\ttfamily},%
-% numbers=left,%
-% stepnumber=1,%
-% numberstyle=\tiny,%
-% xleftmargin=2em,%
- breaklines=true}
+ numbers=left,%
+ stepnumber=1,%
+ numberstyle=\tiny,%
+ xleftmargin=2em,%
+ breaklines=true,
+ }
%
\usepackage{graphicx}
@@ -86,8 +90,6 @@
\index{#1@\texttt{#1} (keyword)}\index{Keyword!#1@\texttt{#1}}
\index{#2@\texttt{#2} (value)}\index{Value!#2@\texttt{#2}}}
-
-
\newsavebox\boxdef
\newenvironment{BDef}
{\begin{lrbox}{\boxdef}
@@ -160,6 +162,13 @@
\let\CMD\Lcs
\let\ENV\Lenv
+\newdimen\normalparindent
+\normalparindent=20pt
+\def\NormalParIndent{\global\parindent=\normalparindent}
+\NormalParIndent
+
+
+
\newcommand\Float[1][]{\ifx\relax#1\relax\marginnote{\fbox{float}}\else
\marginnote{\fbox{\shortstack{float\\#1}}}\fi
}
@@ -301,57 +310,106 @@ Internally the style is saved in a macro named \verb|\hv@<name>|.
There are the following keywords:
+%\begin{lrbox}\hvOBox
+\begingroup
+\small
+ \def\rowvsp{\rule{0pt}{9pt}}%
+ \def\rowhsp{\hspace*{\normalparindent}}%
+ \def\rownl{\newline\rowhsp}%
+ \def\none{{\itshape none}}%
+ \def\arraystretch{0.96}%
\begin{xltabular}{\textwidth}{@{} l>{\small\ttfamily}cX @{}}
\caption{The optional keywords for the macro \nxLcs{hvFloat}}\label{tab:options}\\\toprule
-\emph Keyword & \emph Default & \emph Description\\\midrule
+\emph{K\kern-.1em eyword} & \rmfamily\emph{Default} & \emph{Description}\\\midrule
\endfirsthead
\midrule
-\emph Keyword & \emph Default & \emph Description\\\midrule
+\emph{K\kern-.1em eyword} & \rmfamily\emph{Default} & \emph{Description}\\\midrule
\endhead
\midrule
\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 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 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 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 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 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 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}
+\Lkeyword{floatPos} & \texttt{tbp} & This is the same default placement
+ setting as in standard \LaTeX; maybe not always the best setting.\\
+\Lkeyword{rotAngle} & 0& \rowvsp The value for the angle if both the object and
+ the caption should be rotated together.\\
+\Lkeyword{capWidth} & n& \rowvsp The width of the caption. Can be \texttt{n}
+ for a natural width given by the current linewidth,
+ \texttt{w} for the width of the object,
+ \rownl\texttt{h} for the height of the object,
+ or a scale factor for \Lcs{columnwidth}.\\
+\Lkeyword{capAngle} & 0 & \rowvsp The integer value for the angle if the caption
+ should be rotated. Positive is counter-clockwise.\\
+%
+\Lkeyword{capPos} & bottom& \rowvsp The position of the caption relative to the
+ object. Possible values:\\
+ & & \rowhsp\Lkeyval{before}: \emph{always} before (left) from the object.\\
+ & & \rowhsp\Lkeyval{top}: \emph{always} on top of the object.\\
+ & & \rowhsp\Lkeyval{left}: \emph{always} before (left) from the object,
+ but on the same page in twocolumn mode.\\
+ & & \rowhsp\Lkeyval{after}: \emph{always} after (right) from the object.\\
+ & & \rowhsp\Lkeyval{bottom}: \emph{always} on the bottom of the object.\\
+ & & \rowhsp\Lkeyval{right}: \emph{always} after (right) from the
+ object, but on the same page in twocolumn mode.\\
+ & & \rowhsp\Lkeyval{inner}: in twoside mode always typeset at the inner
+ margin.\\
+ & & \rowhsp\Lkeyval{outer}: in twoside mode always typeset at the outer
+ margin.\\
+ & & \rowhsp\Lkeyval{evenPage}: in twoside mode with fullpage objects
+ always on an even page.\\
+ & & \rowhsp\Lkeyval{oddPage}: in twoside mode with fullpage objects
+ always on an odd page.\\
+%
+\Lkeyword{capVPos}& center& \rowvsp Only used when
+ \texttt{capPos=left$\,|\,$right}; in these cases, the caption can
+ be vertically placed at the \Lkeyval{bottom}, \Lkeyval{center} or
+ \Lkeyval{top}.\\
+\Lkeyword{objectPos} & center & \rowvsp Horizontal placement of the object
+ relative to the document. Possible values are
+ (\textbf{l})eft, (\textbf{c})enter, (\textbf{r})ight.\\
+\Lkeyword{objectAngle} & 0 & \rowvsp Integer value for the angle if
+ the object should be rotated. Positive is counter-clockwise.\\
+\Lkeyword{floatCapSep} & 5pt & \rowvsp Additional space between the
+ object and a left- or right-placed caption.\\
+\Lkeyword{useOBox} & false & \rowvsp Instead of passing the object as a
+ parameter to \Lcs{hvFloat}, with \texttt{useOBox=true} the contents
+ of the predefined box \texttt{\textbackslash hvOBox} is used.\\
+\Lkeyword{onlyText} & false & \rowvsp The caption is printed as normal
+ text with no entry in any list of \ldots\\
+\Lkeyword{nonFloat} & false & \rowvsp The object isn't put in a floating
+ environment, but printed as standard text with an additional caption.
+ \rownl The float counter is increased as usual and can be referenced.\\
+\Lkeyword{wide} & false & \rowvsp The float can use
+ \Ldim{textwidth}$\,+\,$\Ldim{marginparwidth} as horizontal width.\\
+\Lkeyword{objectFrame} & false & \rowvsp Put a frame with no separation
+ around the float object.\\
+\Lkeyword{style} & \none & \rowvsp Use a defined style.\\
+\Lkeyword{capFormat} & \none & \rowvsp Define formatting options for
+ \Lcs{caption}; see documentation of package \Lpack{caption}.\\
+\Lkeyword{subcapFormat} & \none & \rowvsp Define formatting options for
+ \Lcs{subcaption}.\\
+\Lkeyword{fullpage} & false & \rowvsp Use a complete column in twocolumn mode.\\
+\Lkeyword{FullPage} & false & \rowvsp Use the full text area for the object.\\
+\Lkeyword{FULLPAGE} & false & \rowvsp Use the full paper width/height for the object.\\
+\Lkeyword{doublePage} & false & \rowvsp Use the text area on a doublepage with additional text.\\
+\Lkeyword{doublePAGE} & false & \rowvsp Use the text area on a doublepage without additional text.\\
+\Lkeyword{doubleFULLPAGE} & false & \rowvsp Use the paperwidth on a doublepage without additional text.\\
+\Lkeyword{vFill} & false & \rowvsp Put a \Lcs{vfill} between every two objects in a multi- or subfloat.\\
+\Lkeyword{sameHeight} & false & \rowvsp use the same text height on both pages for a \Lkeyword{doublePage} object.\\
+\end{xltabular}
+%\end{lrbox}
+\endgroup
+
+%\hvFloat*[floatPos=p,rotAngle=90,capPos=top,capWidth=w,useOBox=true]
+% {table}
+% {}
+% [The optional keywords for the \newline\Lcs{hvFloat} macro]
+% {The optional keywords for the \protect\Lcs{hvFloat} macro.}
+% {tab:options}
+
+
+
@@ -786,10 +844,12 @@ The code for figure \ref{fig:5}:
The code for figure \ref{fig:6}:
\begin{lstlisting}
\hvFloat[%
- capWidth=0.25,
- capPos=right,
+ capWidth=0.25,%
+ capPos=right,%
capVPos=center,% the default
-]{figure}{\frame{\includegraphics{images/rose}}}{Caption centered right beside the float}{fig:6}
+]{figure}{\frame{\includegraphics{images/rose}}
+ \frame{\includegraphics[origin=c,angle=180]{images/rose}}}%
+ {Caption centered right beside the float}{fig:6}
\end{lstlisting}
@@ -798,7 +858,9 @@ The code for figure \ref{fig:6}:
capWidth=0.25,%
capPos=right,%
capVPos=center,% the default
-]{figure}{\frame{\includegraphics{images/rose}}}{Caption centered right beside the float}{fig:6}
+]{figure}{\frame{\includegraphics{images/rose}}
+ \frame{\includegraphics[origin=c,angle=180]{images/rose}}}%
+ {Caption centered right beside the float}{fig:6}
\section{Caption format}
@@ -1633,6 +1695,9 @@ which is before the caption.
\end{figure}
\fi
+
+
+
\FloatBarrier
@@ -1641,6 +1706,11 @@ which is before the caption.
These settings make no sense in \Index{onecolumn} mode.
+\clearpage
+
+
+
+
\subsection{Using the paper size}
It belongs to the user to create an object which fills the complete page. However, with the
@@ -1695,6 +1765,8 @@ the paper dimensions \Ldim{paperwidth} and
\FloatBarrier
+\clearpage
+
\subsection{Multifloats}\label{sec:multifloats}
Multifloats is the name for more than one image and/or tabular in \emph{one} floating
@@ -2542,7 +2614,7 @@ in the inner margin on both pages.
\Blindtext
-%\Blindtext
+\Blindtext
@@ -2589,7 +2661,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
{figure}%
{\includegraphics[doubleFULLPAGE,
keepaspectratio=false]{images/rheinsberg}}%
- {A caption for a double-sided image that will be placed before
+ {A caption for a double-sided image that will be placed \textbf{after}
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}}%
@@ -2602,7 +2674,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
{\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
- {A caption for a double-sided image that will be placed before
+ {A caption for a double-sided image that will be placed \textbf{after}
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}}%
@@ -2613,14 +2685,17 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\hvblindtext
\hvblindtext
-\hvblindtext
+
+\Blindtext
+
+\Blindtext
\begin{lstlisting}
\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
+ {A caption for a double-sided image that will be placed \textbf{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}}%
@@ -2631,7 +2706,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\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
+ {A caption for a double-sided image that will be placed \textbf{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}}%
@@ -2673,7 +2748,7 @@ 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
@@ -2697,7 +2772,7 @@ and the rest of the text area is filled with text.
\end{lstlisting}
-%\hvFloatSetDefaults
+\hvFloatSetDefaults
\marginnote{Fig. \ref{fig:doublePage0sH}}
\hvFloat[doublePage,sameHeight]%
@@ -2717,6 +2792,8 @@ and the rest of the text area is filled with text.
\hvblindtext
+
+
\begin{lstlisting}
\hvFloat[doublePage,capPos=right,capVPos=top]%
{figure}%
@@ -2730,7 +2807,7 @@ and the rest of the text area is filled with text.
\end{lstlisting}
-%\hvFloatSetDefaults
+\hvFloatSetDefaults
\marginnote{Fig. \ref{fig:doublePage0}}
\hvFloat[doublePage,capPos=right,capVPos=top]%
@@ -2747,7 +2824,7 @@ and the rest of the text area is filled with text.
\Blindtext
-\hvblindtext
+\Blindtext
@@ -2765,7 +2842,7 @@ and the rest of the text area is filled with text.
\end{lstlisting}
-%\hvFloatSetDefaults
+\hvFloatSetDefaults
\marginnote{Fig. \ref{fig:doublePage0sH2}}
\hvFloat[doublePage,,bindCorr=inner]%
@@ -2782,7 +2859,7 @@ and the rest of the text area is filled with text.
\Blindtext
-\hvblindtext
+\Blindtext
@@ -2947,12 +3024,10 @@ With \Lcs{hvDefFloatStyle} one can define a special style to get rid of the indi
\end{BDef}
For example:
-\begin{verbatim}
-\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center}
-\end{verbatim}
-
-
\begin{lstlisting}
+\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after,
+ capVPos=bottom, objectPos=center}
+
\hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}%
{Caption vertically centered right beside the float with a caption width of
\texttt{0.5\textbackslash columnwidth}.}{fig:style}
@@ -2967,10 +3042,6 @@ For example:
\texttt{0.5\textbackslash columnwidth}.}{fig:style}
-\Blindtext
-
-\Blindtext
-
\section{Global float setting}
Instead of writing the following sequence into the preamble:
@@ -2990,7 +3061,7 @@ optional package options to set the global placement:
\usepackage[figure=tb,table=t]{hvfloat-fps}
\end{verbatim}
-\Blindtext
+%\Blindtext
\Blindtext
diff --git a/macros/latex/contrib/hvfloat/doc/images/missing.txt b/macros/latex/contrib/hvfloat/doc/images/missing.txt
new file mode 100644
index 0000000000..c10e55ce9c
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/images/missing.txt
@@ -0,0 +1,4 @@
+Not all images of the documentation are listed here, because
+some are not for public use. You can use any other image if you
+want to run the documentation by yourselve.
+
diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat-fps.sty b/macros/latex/contrib/hvfloat/latex/hvfloat-fps.sty
index 0090e80f5f..99b7cbfbab 100644
--- a/macros/latex/contrib/hvfloat/latex/hvfloat-fps.sty
+++ b/macros/latex/contrib/hvfloat/latex/hvfloat-fps.sty
@@ -1,6 +1,7 @@
-%% $Id: hvfloat-fps.sty 120 2021-06-20 13:31:02Z herbert $
+%% $Id: hvfloat-fps.sty 35 2020-10-31 07:41:00Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{hvfloat-fps}[2017/09/16 setting float objects]
%%
%% IMPORTANT NOTICE:
%%
@@ -15,10 +16,9 @@
%% DESCRIPTION:
%% `hvfloat-fps' offers global placement of floats
%%
-\def\fileversion{0.03}
-\def\filedate{2020/06/20}
-\ProvidesPackage{hvfloat-fps}[\filedate\space v\fileversion\space global float position setting (hv)]
-%\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)}
+\def\fileversion{0.02}
+\def\filedate{2017/09/20}
+\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)}
%
\RequirePackage{xkeyval}
%
diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
index 2159575d1c..82bf238e6d 100644
--- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty
+++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 119 2021-06-20 13:28:09Z herbert $
+%% $Id: hvfloat.sty 122 2021-06-26 12:35:53Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.30}
-\def\filedate{2021/06/20}
+\def\fileversion{2.31}
+\def\filedate{2021/06/26}
%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
@@ -303,15 +303,13 @@
\renewcommand\tabcaption[2][]{%
\begingroup
\def\@captype{table}%
- \edef\hv@caption@format{position=top,\hv@caption@format}%
- \expandafter\captionsetup\expandafter{\hv@caption@format}%
+ \expandafter\captionsetup\expandafter{\hv@caption@format,position=top}%
\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
\endgroup}
\renewcommand\tabcaptionbelow[2][]{%
\begingroup
\def\@captype{table}%
- \edef\hv@caption@format{position=below,\hv@caption@format}%
- \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \expandafter\captionsetup\expandafter{\hv@caption@format,position=below}
\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
\endgroup}
%
@@ -1138,6 +1136,7 @@
%
\def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object
\begin{\hv@floatType*}[!t]
+ \hfuzz=\maxdimen
\let\c@hv@tempCNTfigA\c@figure
\let\c@hv@tempCNTtabA\c@table
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
@@ -1163,6 +1162,7 @@
}
\def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object
\begin{\hv@floatType*}[!t]
+ \hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\hspace*{-\hv@tempWidthA}%
@@ -1272,6 +1272,7 @@
\def\do@hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ----------------------------------
% #1-> 0/1 caption under/right
\afterpage{%
+ \hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\noindent
@@ -1463,6 +1464,7 @@
\def\do@hvFloat@doubleFULLPAGE@CaptionBefore{%
\afterpage{%
+ \hfuzz=\maxdimen
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
@@ -1496,6 +1498,7 @@
\def\do@hvFloat@doubleFULLPAGE@CaptionAfter{%
\afterpage{%
+ \hfuzz=\maxdimen
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
@@ -1578,6 +1581,7 @@
\def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{%
\afterpage{%
+ \hfuzz=\maxdimen
\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
@@ -1664,6 +1668,7 @@
\else
\begin{\hv@floatType}[p]%
\fi
+ \hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\ifhv@FULLPAGE
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip%