summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdfbin80294 -> 80294 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdfbin86722 -> 86720 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/capPos.pdfbin95389 -> 95390 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdfbin81991 -> 81992 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdfbin83275 -> 83375 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdfbin79445 -> 79445 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdfbin85824 -> 85825 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdfbin2314853 -> 2317102 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdfbin619030 -> 619035 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdfbin77658 -> 77658 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdfbin86404 -> 86404 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdfbin84813 -> 84815 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdfbin85098 -> 85100 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdfbin1362739 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdfbin86773 -> 86778 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin5722430 -> 7126768 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdfbin84020 -> 84024 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdfbin83977 -> 83979 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdfbin84013 -> 84014 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdfbin85512 -> 85511 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/missing.txt4
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdfbin142624 -> 142627 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdfbin146172 -> 146171 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdfbin94586 -> 94585 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdfbin146343 -> 146344 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdfbin92182 -> 92184 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdfbin89784 -> 89789 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdfbin92984 -> 92987 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdfbin145736 -> 145742 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdfbin77805 -> 77806 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex2
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdfbin86523 -> 86525 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdfbin174218 -> 174218 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdfbin85566 -> 85567 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdfbin86318 -> 86320 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdfbin84292 -> 84295 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdfbin84680 -> 84682 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdfbin79267 -> 79176 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdfbin79967 -> 79887 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdfbin90508 -> 90508 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdfbin87935 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex81
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdfbin90332 -> 90333 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdfbin87855 -> 87859 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdfbin80290 -> 80205 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdfbin80126 -> 80126 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdfbin89340 -> 89342 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdfbin81033 -> 81033 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdfbin85585 -> 85585 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpgbin501524 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdfbin143952 -> 143893 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdfbin144771 -> 144709 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdfbin144003 -> 144111 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdfbin144217 -> 144341 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdfbin143517 -> 143647 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdfbin143873 -> 143826 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdfbin144879 -> 144812 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdfbin144315 -> 144268 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdfbin120949 -> 120954 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdfbin121917 -> 121929 bytes
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty2
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty112
63 files changed, 80 insertions, 122 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index b7466e9816d..7f4f422ce25 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,5 @@
hvfloat.sty:
+2.34 2021-09-23 - fix for nonFloat and forceOutput
2.33 2021-07-14 - fix for doublePAGE, needs length setting inside the macro
2.32 2021-06-29 - make multi and multisubflots caption align with the bottom
- added graphicx option doublefullPage
diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
index 40854d1f723..d74d1e268e4 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
index 6a3f002998d..9567c26d366 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
index 630a337a539..072c584f82f 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
index 861efc9ac7a..ff8eec9e741 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
index 60e3cb94ca5..752c54810d3 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
index 33ac8dd8769..6ac3baf5ad2 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
index 1291839ce84..388cf976451 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
index 0d3e2713ef6..dd444dd08a4 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 1578d673ffd..7aa01b02f84 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
index 7be7a1cb5b6..cc6273ead85 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
index e98663ed098..eb062f70e23 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
index 09a417c0310..4f86812e098 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
index e2898a14ae0..263b9afc8a0 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf b/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
deleted file mode 100644
index 44f19b9258a..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
index e0e787f9941..9cdd2ea8822 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index 66228e90ca9..cfbc05583e1 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/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
index 73a49d0a073..05ac77f5ddf 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
index 3cd80ae1316..200ac470d68 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
index 6b794b37320..94d1d37488e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
index 4e6b0cfae72..406285913d2 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/missing.txt b/Master/texmf-dist/doc/latex/hvfloat/missing.txt
deleted file mode 100644
index c10e55ce9ce..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/missing.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Not all images of the documentation are listed here, because
-some are not for public use. You can use any other image if you
-want to run the documentation by yourselve.
-
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
index bc345dc15bf..6db4613d89e 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
index e37e60e6263..16b1cbfb19b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
index 614b2fcf30f..a4c58d96b95 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
index e2ec474cb79..b9558070711 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
index 23fdd5f04f1..75107f1a349 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
index 3f79249b521..4370c39d847 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
index 7ebd9bd69a9..164dc77f647 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
index 23f3c0b60c6..1c3c610031a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
index 9a8f796d025..fe0ca31256d 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 2d93d7b2b5c..dfce04c36b1 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 119 2021-06-20 13:28:09Z 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 eae0be6b8d9..c24ac2fa55b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
index ef5b9fd7ab4..a357bdc1e1a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
index 6aa3ac83cfe..d7a49ea30da 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
index c6676e12913..ca7e1e56ec7 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
index a7d55f4c80c..323011e26fd 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
index 204d0dad654..11003f09dac 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
index a65718b90a9..495d644d556 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
index fd27f7ca548..443aae8d5f1 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
index 6e06341ad56..bba76eb3202 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
deleted file mode 100644
index c9cd842897c..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
+++ /dev/null
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
deleted file mode 100644
index 4db02204812..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
+++ /dev/null
@@ -1,81 +0,0 @@
-\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 330a7425ca1..e86b9e6674a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
index b0792355fbd..56253d38e26 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
index 5ed8ec5a710..daca3967b61 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
index c6c6bd27bdb..8c43e8c1f05 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
index dfd03e566cc..954f63954d3 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
index dbb63e5fac8..037f72ae104 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
index e269a747a3b..2fecbfbe051 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg b/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
deleted file mode 100644
index e0e4b910a7e..00000000000
--- a/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
index f75bb23f56f..d2391f0870b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
index 00554afc00b..a23af6e14d8 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
index efea15759ce..83d13d78247 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
index 8d48919902c..b5e7ae13b85 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
index 84ab3d56ccb..026910949fe 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
index b3192656303..68d689fca00 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
index 72ca9190457..d67a0f806a6 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
index 23e0a03ee7a..6456d856289 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
index b81fedc701c..6ee1ea42d17 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
index a95470d1eb5..a12ef0d594a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
index a86244b9e54..0090e80f5f0 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat-fps.sty 121 2021-06-20 13:36:11Z herbert $
+%% $Id: hvfloat-fps.sty 120 2021-06-20 13:31:02Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
%%
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index 4d9e265b626..e0a378d28f6 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 126 2021-06-29 12:56:04Z herbert $
+%% $Id: hvfloat.sty 257 2021-09-23 11:44:35Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.33}
-\def\filedate{2021/07/14}
+\def\fileversion{2.34}
+\def\filedate{2021/09/23}
%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
@@ -180,6 +180,7 @@
\newif\ifhv@doublePage
\newif\ifhv@setObjectLabel
\newif\ifhv@global@sameHeight
+\newif\ifhv@forceOutput
\newlength\hvSet@bindCorrection
\newlength\hvSet@sepLineskip
@@ -195,7 +196,7 @@
\define@key{hvSet}{doubleFULLPAGE}[true]{\global\@nameuse{hv@doubleFULLPAGE#1}\hv@doublePagefalse\hv@doublePAGEfalse}
\define@key{hvSet}{doublePAGE}[true]{\global\@nameuse{hv@doublePAGE#1}\hv@doublePagefalse\hv@doubleFULLPAGEfalse}
\define@key{hvSet}{doublePage}[true]{\global\@nameuse{hv@doublePage#1}\hv@doublePAGEfalse\hv@doubleFULLPAGEfalse}
-\define@key{hvSet}{bindCorr}[0]{%
+\define@key{hvSet}{bindCorr}[0pt]{%
\def\hv@temp{#1}%
\ifx\hv@temp\hv@Inner
\setlength\hvSet@bindCorr{\dimexpr1in+\oddsidemargin}%
@@ -225,6 +226,8 @@
}
\define@key{hvSet}{capFormat}{\def\hv@caption@format{#1}}%
\define@key{hvSet}{subcapFormat}{\def\hv@subcaption@format{#1}}%
+\define@boolkey{hvSet}[hv@]{forceOutput}[true]{%
+ \ifhv@forceOutput\hv@nonFloattrue\fi}% immediate output, no floating!
\def\hv@set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x}
\let\hvFloatSet\hv@set
@@ -236,7 +239,7 @@
\hv@set{%
floatPos=, rotAngle=0, capWidth=n, capAngle=0, objectAngle=0,
capPos=bottom, capVPos=center, objectPos=center, allHPos=center,
- floatCapSep=5pt, useOBox=false, nonFloat=false,
+ floatCapSep=5pt, useOBox=false,
onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
doubleFULLPAGE=false, doublePage=false, doublePAGE=false,
multiFloat=false,subFloat=false,
@@ -245,10 +248,12 @@
sameHeight=false,
bindCorr=\z@,sepLineskip=0pt,
vFill=false, minTextlines=2,
+ forceOutput=false, nonFloat=false,
}%
}
\let\hvFloatSetDefaults\setDefaults
+\hvFloatSetDefaults% onyl for first loading of the package
\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi}
@@ -452,6 +457,7 @@
% #6: label
%
+
\def\hvFloat{\@ifnextchar*% Main macro
{\global\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}%
{\global\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}%
@@ -1091,6 +1097,9 @@
\fi
\fi
\hv@typeout{do@hvFloat@doublePage:hv@tempWidthA=\the\hv@tempWidthA}%
+ \ifhv@forceOutput
+ \do@hvFloat@doublePAGECaptionRight{#1}% no cheque
+ \else
\checkoddpage
\ifoddpage
\if@twocolumn
@@ -1142,6 +1151,7 @@
\fi
\fi
\let\c@fptop\hv@fptop
+ \fi
\endgroup% started at main macro \hvFloat
}
%
@@ -1465,10 +1475,14 @@
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\ifhv@separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap}%
+ \ifhv@onlyText
+ \hv@longCap
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\end{\hv@floatType}%
@@ -1478,10 +1492,14 @@
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\ifhv@separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap}%
+ \ifhv@onlyText
+ \hv@longCap
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\end{\hv@floatType*}%
@@ -1535,8 +1553,8 @@
\refstepcounter{hv@tempCNTtabA}% before caption
\fi
\ifx\hv@label\@empty\else\label{\hv@label}\fi
-% \afterpage{%
- \newpage\if@twocolumn\null\newpage\fi
+ \newpage
+ \if@twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\thispagestyle{empty}%
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
@@ -1553,14 +1571,18 @@
\begin{\hv@floatType}[!b]
\ifhv@separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap}%
+ \ifhv@onlyText
+ \hv@longCap
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\end{\hv@floatType}%
- }%}%
+ }%
}
\def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{%
@@ -1594,10 +1616,14 @@
\hv@twoColumnCaptiontrue
\ifhv@separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv@caption@format}%
- \ifx\hv@shortCap\@empty
- \captionof{\hv@floatType}{\hv@longCap}%
+ \ifhv@onlyText
+ \hv@longCap
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\end{\hv@floatType*}%
@@ -1638,20 +1664,28 @@
\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}%
+ \ifhv@onlyText
+ \hv@longCap
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
}}}% rotatebox
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\else% ifdim: no space left on page
\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}%
- \else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \ifhv@onlyText
+ \hv@longCap
+ \else
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
}%
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
@@ -1663,10 +1697,14 @@
\else
\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}%
- \else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \ifhv@onlyText
+ \hv@longCap
+ \else
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
}}}%
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
@@ -1863,11 +1901,15 @@
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
- \edef\@captype{\hv@floatType}%
- \expandafter\ifx\expandafter\relax\hv@shortCap\relax
- \caption{\hv@longCap}%
+ \ifhv@onlyText
+ \hv@longCap
\else
- \caption[\hv@shortCap]{\hv@longCap}%
+ \edef\@captype{\hv@floatType}%
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax
+ \caption{\hv@longCap}%
+ \else
+ \caption[\hv@shortCap]{\hv@longCap}%
+ \fi
\fi
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\endminipage}%