From 9c8677e09c2c9b0d9593f26ed226411d68160a4e Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 18 Mar 2024 03:01:30 +0000 Subject: CTAN sync 202403180301 --- .../contrib/hvfloat/doc/examples/after1s1c.pdf | Bin 80278 -> 80278 bytes .../contrib/hvfloat/doc/examples/after2s2c.pdf | Bin 86613 -> 86613 bytes .../latex/contrib/hvfloat/doc/examples/capPos.pdf | Bin 98058 -> 98064 bytes .../contrib/hvfloat/doc/examples/default1s1c.pdf | Bin 81968 -> 82047 bytes .../contrib/hvfloat/doc/examples/default1s2c.pdf | Bin 83201 -> 83277 bytes .../contrib/hvfloat/doc/examples/default2s1c.pdf | Bin 79342 -> 79342 bytes .../contrib/hvfloat/doc/examples/default2s2c.pdf | Bin 85763 -> 85844 bytes .../hvfloat/doc/examples/doublepage2s1c.pdf | Bin 2353650 -> 2350647 bytes .../hvfloat/doc/examples/doublepage2s2c.pdf | Bin 617745 -> 618818 bytes .../hvfloat/doc/examples/doublepage2s2c.tex | 4 +- .../contrib/hvfloat/doc/examples/even1s1c.pdf | Bin 77785 -> 77810 bytes .../contrib/hvfloat/doc/examples/even1s2c.pdf | Bin 86361 -> 86582 bytes .../contrib/hvfloat/doc/examples/even2s1c.pdf | Bin 84419 -> 84620 bytes .../contrib/hvfloat/doc/examples/even2s2c.pdf | Bin 85033 -> 1825222 bytes .../contrib/hvfloat/doc/examples/even2s2c.tex | 10 +- .../contrib/hvfloat/doc/examples/fullpage1s2c.pdf | Bin 84979 -> 85143 bytes .../contrib/hvfloat/doc/examples/inner1s2c.pdf | Bin 84016 -> 84100 bytes .../contrib/hvfloat/doc/examples/inner2s1c.pdf | Bin 83984 -> 84068 bytes .../contrib/hvfloat/doc/examples/inner2s2c.pdf | Bin 84071 -> 84149 bytes .../contrib/hvfloat/doc/examples/left2s2c.pdf | Bin 85470 -> 1825644 bytes .../contrib/hvfloat/doc/examples/left2s2c.tex | 10 +- .../hvfloat/doc/examples/multi-after1s1c.pdf | Bin 142607 -> 142513 bytes .../hvfloat/doc/examples/multi-default1s1c.pdf | Bin 146068 -> 145980 bytes .../hvfloat/doc/examples/multi-default1s2c.pdf | Bin 94532 -> 94441 bytes .../hvfloat/doc/examples/multi-default2s1c.pdf | Bin 146241 -> 146159 bytes .../hvfloat/doc/examples/multi-default2s2c.pdf | Bin 92138 -> 92046 bytes .../hvfloat/doc/examples/multi-inner2s2c.pdf | Bin 89696 -> 89597 bytes .../hvfloat/doc/examples/multi-outer2s2c.pdf | Bin 92902 -> 92802 bytes .../hvfloat/doc/examples/multi-right1s1c.pdf | Bin 145635 -> 145541 bytes .../latex/contrib/hvfloat/doc/examples/odd1s1c.pdf | Bin 77734 -> 77734 bytes .../latex/contrib/hvfloat/doc/examples/odd1s2c.pdf | Bin 86529 -> 86601 bytes .../latex/contrib/hvfloat/doc/examples/odd2s1c.pdf | Bin 173858 -> 173938 bytes .../latex/contrib/hvfloat/doc/examples/odd2s2c.pdf | Bin 85527 -> 85726 bytes .../contrib/hvfloat/doc/examples/outer1s2c.pdf | Bin 86353 -> 86554 bytes .../contrib/hvfloat/doc/examples/outer2s1c.pdf | Bin 84291 -> 84373 bytes .../contrib/hvfloat/doc/examples/outer2s2c.pdf | Bin 84725 -> 84940 bytes .../hvfloat/doc/examples/paper-after1s1c.pdf | Bin 79014 -> 79008 bytes .../hvfloat/doc/examples/paper-after2s2c.pdf | Bin 89655 -> 89736 bytes .../hvfloat/doc/examples/paper-default1s1c.pdf | Bin 81199 -> 81374 bytes .../hvfloat/doc/examples/paper-default1s2c.pdf | Bin 90470 -> 90548 bytes .../hvfloat/doc/examples/paper-default2s2c.pdf | Bin 90288 -> 90376 bytes .../hvfloat/doc/examples/paper-even2s1c.pdf | Bin 87273 -> 87492 bytes .../hvfloat/doc/examples/paper-inner2s2c.pdf | Bin 87843 -> 87903 bytes .../contrib/hvfloat/doc/examples/paper-odd2s1c.pdf | Bin 87055 -> 87144 bytes .../hvfloat/doc/examples/paper-right1s1c.pdf | Bin 81469 -> 81463 bytes .../contrib/hvfloat/doc/examples/right1s1c.pdf | Bin 80095 -> 80095 bytes .../contrib/hvfloat/doc/examples/right1s2c.pdf | Bin 89250 -> 89339 bytes .../contrib/hvfloat/doc/examples/right2s1c.pdf | Bin 80969 -> 80969 bytes .../contrib/hvfloat/doc/examples/right2s2c.pdf | Bin 85508 -> 1825612 bytes .../contrib/hvfloat/doc/examples/right2s2c.tex | 10 +- .../contrib/hvfloat/doc/examples/sub-after1s1c.pdf | Bin 143883 -> 143944 bytes .../contrib/hvfloat/doc/examples/sub-after2s2c.pdf | Bin 144738 -> 144840 bytes .../hvfloat/doc/examples/sub-default1s1c.pdf | Bin 143745 -> 143825 bytes .../hvfloat/doc/examples/sub-default1s2c.pdf | Bin 144175 -> 144273 bytes .../hvfloat/doc/examples/sub-default2s2c.pdf | Bin 143455 -> 143556 bytes .../contrib/hvfloat/doc/examples/sub-right1s1c.pdf | Bin 143804 -> 143873 bytes .../contrib/hvfloat/doc/examples/sub-right1s2c.pdf | Bin 144842 -> 144946 bytes .../contrib/hvfloat/doc/examples/sub-right2s2c.pdf | Bin 144282 -> 143003 bytes .../contrib/hvfloat/doc/examples/wide1s2c.pdf | Bin 120972 -> 121991 bytes .../contrib/hvfloat/doc/examples/wide1s2c.tex | 3 +- .../contrib/hvfloat/doc/examples/wide2s2c.pdf | Bin 121957 -> 122005 bytes .../contrib/hvfloat/doc/examples/wide2s2c.tex | 4 +- macros/latex/contrib/hvfloat/doc/hvfloat.pdf | Bin 6393567 -> 11613770 bytes macros/latex/contrib/hvfloat/doc/hvfloat.tex | 104 +++++++++++++++------ macros/latex/contrib/hvfloat/doc/images/usa5.jpg | Bin 0 -> 1742387 bytes 65 files changed, 95 insertions(+), 50 deletions(-) create mode 100644 macros/latex/contrib/hvfloat/doc/images/usa5.jpg (limited to 'macros/latex/contrib/hvfloat/doc') diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf index b49623bceb..565783ae52 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf index 8d29f55e11..a38fc42fd8 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf index 8d12b64b0c..4ec73b2369 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf and b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf index 195d9900c1..727a5a6445 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf index 4cc1b30784..7a32ce70b0 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf index 44e24d3799..d2e4aa44a0 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf index 7e0151eed9..6e5bcf4255 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf index 3b897e3f91..28f72e8894 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf index 282f48c364..9d9afa8171 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex index f7abc397d4..f0b827f5b8 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex @@ -1,7 +1,7 @@ \errorcontextlines=100 %\documentclass[final]{ltugboat} \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: doublepage2s2c.tex 773 2023-10-16 12:29:28Z herbert $ +%% $Id: doublepage2s2c.tex 781 2023-10-19 19:57:50Z herbert $ \input{preamble.ltx} \usepackage{blindtext,xcolor,marginnote} @@ -69,6 +69,8 @@ \hvblindtext +\hvblindtext + \subsubsection{\texttt{bindCorr=1cm}} \begin{lstlisting} diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf index f5129e2fe1..b692c62cfd 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf index 8842af5ebb..147b01df2e 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf index 4f361957fe..6c7bc87f20 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf index c02bd2d322..5a0a113291 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex index 6952e4e45e..7ed746dbe8 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: even2s2c.tex 318 2021-11-20 07:30:54Z herbert $ +%% $Id: even2s2c.tex 878 2024-03-16 20:49:50Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=evenPage] \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=evenPage] \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf index 8abc361d7b..684b4bf305 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf index 7cf579e2b8..9916c10edb 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf index c9364feb7a..909a9cec69 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf index 163ed2b8ee..b15bbe471d 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf index b5fe92532b..4a1ca31be2 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex index 56ea72912e..edebc7b645 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: left2s2c.tex 318 2021-11-20 07:30:54Z herbert $ +%% $Id: left2s2c.tex 878 2024-03-16 20:49:50Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[default] \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[default] \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf index 4ecf842042..1e4aa687e9 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf index 847f10ef7d..960db67b00 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf index 74776bd2ea..80f1fad09f 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf index c84effcb2b..a71f936e33 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf index 214edd0ef7..15f0f07c4b 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf index 3664e14647..ba5a21c919 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf index 8b12502d6f..250ff6b511 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf index 39fbfbf793..5d1e40727d 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf index 2cc3a2f1b6..90cd8e5a6b 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf index ea14d642b3..ebaa94bdd4 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf index fdfe911f30..308f3dfcf7 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf index 8916a62dea..ebce9ce19d 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf index 20b9309053..f655d32345 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf index 449a372b49..d27d74a319 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf index f092b614a1..46c50b5293 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf index 7b0e2c3f58..473a50c75a 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf index fa884c9d46..8cb352fd40 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf index 6acb89ccd1..ac28f4f952 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf index d1c7d7b0d0..6d5c0b9de1 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf index 06cb4d9dc5..27405876d0 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf index c1fb0fc94d..ca44b7e794 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf index 8e4ebfe2ff..dce41271bd 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf index 60a73caf48..e32f14a8a3 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf index f0b80bcd5c..ec63ec4cf6 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf index 7f05564f49..abf1c34521 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf index 1c117348a0..bb0c11a14d 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf index 17f2378168..7465861536 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf index fae4047e16..007db02871 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex index 7c7cf4e67d..ced8b9cdfb 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: right2s2c.tex 318 2021-11-20 07:30:54Z herbert $ +%% $Id: right2s2c.tex 878 2024-03-16 20:49:50Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=right] \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=right] \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [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. diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf index 04d809ad3d..c40eb0d232 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf index 55d63a81c9..f77ebf3cca 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf index c5ff14df2a..9b4874dd73 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf index cf3eeb2e37..1aa9ff594a 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf index 2e264d6fef..c7bec6d8bb 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf index 591ffc1f24..225b3f84c9 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf index 678fa315a9..f8a4378e25 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf index 7732433c50..cdbb8426a0 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf index 198249a15b..c73f885eb4 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex index f7c4f36b5e..fc4298cba9 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex @@ -47,8 +47,7 @@ the option \texttt{wide}.}{fig:70} Caption at top right beside the float and object position left and the option \texttt{wide}.}{fig:70} -\textcolor{black!40}{\blindtext} -%\blindtext +\textcolor{black!40}{\blindtext\blindtext} The code for figure \ref{fig:80}: diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf index fb2b1ca1e9..3cbc36a53c 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex index 46c8182cb9..35b245c6d4 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex @@ -60,8 +60,10 @@ The code for figure \ref{fig:80}: \end{lstlisting} +\newpage + \hvFloat[wide,nonFloat, - capPos=left,% + capPos=right,% capVPos=top,% ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% {Caption at top left beside the object and object position left and diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf index 30058a0475..eb14a418f5 100644 Binary files a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf and b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex index 40bb098819..169270c2d4 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 876 2024-03-03 14:04:56Z herbert $ +%% $Id: hvfloat.tex 878 2024-03-16 20:49:50Z herbert $ %\listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,usegeometry,index=totoc]{scrartcl} @@ -188,6 +188,8 @@ \marginnote{\fbox{\shortstack{float\\#1}}}\fi } +\graphicspath{{images/}} + \begin{document} \title{Package \texttt{hvfloat}\\ Controlling captions, fullpage and doublepage floats\\ver \hvFloatFileVersion} @@ -216,7 +218,10 @@ marginnote \fbox{float} is set into the margin. This is done also only for demon objectAngle=120, capAngle=-210, objectPos=center -]{figure}{\protect\fbox{\includegraphics[scale=0.9]{images/rose}}}{\protect\fbox{What a nice Caption :-)}}{fig:title} + objectFrame, +]{figure}{\includegraphics[scale=0.9]{images/rose}} + {\protect\fbox{What a nice Caption :-)}} + {fig:title} \vspace*{\fill} @@ -458,8 +463,7 @@ Code for figure \ref{fig:0}: \end{lstlisting} -\MarginNote{Tab.~\ref{tab:0}} -\hvFloat[capPos=top]{table}{% +\savebox\hvOBox{% \begin{tabularx}{\textwidth}{l|l|X} \rmfamily Name & Type & Description\\\hline \CMD{hvFloat} & command & places object and caption in different ways\\ @@ -468,23 +472,30 @@ Code for figure \ref{fig:0}: \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\ \CMD{hvDefFloatStyle} & command & define a user style -\end{tabularx}% -}{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}{tab:0} +\end{tabularx}} + +\MarginNote{Tab.~\ref{tab:0}} +\hvFloat[capPos=top,useOBox]{table}{} + {With the only Option \texttt{capPos=top} to place the caption on + top of the table, which is often the default.} + {tab:0} Code for table \ref{tab:0}: \begin{lstlisting} -\hvFloat[capPos=top]{table}{% -\begin{tabularx}{\textwidth}{>{\ttfamily}l|l|X} +\savebox\hvOBox{% +\begin{tabularx}{\textwidth}{l|l|X} \rmfamily Name & Type & Description\\\hline \CMD{hvFloat} & command & places object and caption in different ways\\ - hvFloatEnv & environment & places object and caption exactly Here\\ + \Lenv{hvFloatEnv} & environment & places object and caption exactly Here\\ \CMD{figcaption} & command & writes a figure caption in a non floating environment\\ \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\ \CMD{hvDefFloatStyle} & command & define a user style -\end{tabularx}}% -{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}% -{tab:0} +\end{tabularx}} +\hvFloat[capPos=top,useOBox]{table}{} + {With the only Option \texttt{capPos=top} to place the caption on + top of the table, which is often the default.} + {tab:0} \end{lstlisting} See section~\ref{sec:tables} for some more informations about tabulars as objects. @@ -1147,26 +1158,29 @@ the caption to the left, center, or right of the full width which is linewidth a %\hvblindtext +\clearpage + \section{Margin floats} With the optional argument \Lkeyword{inMargin} the opject and the caption can be placed into the margin. This is done internally with the command \Lcs{marginnote} from the package of the same name. + + %\marginnote{Fig.~\ref{thea}} \hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}} {An image in the margin of the document.} {thea} - \begin{lstlisting} \hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}} {An image in the margin of the document.} {thea} - ... - -\hvFloat[inMargin]{table}{\small\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ +\savebox\hvOBox{\small\begin{tabular}{@{} + ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ Dienst & Dienst & Frei\\\hline \end{tabular}} +\hvFloat[inMargin,useOBox]{table}{} {A tabular in the margin just like the image.} {thea2} \end{lstlisting} @@ -1175,9 +1189,13 @@ the margin. This is done internally with the command \Lcs{marginnote} from the p \hvblindtext +\savebox\hvOBox{% + \small\begin{tabular}{@{}ccc@{}}\hline + Mon& Di& Mi\\ frei & Dienst & frei\\ + Dienst & Dienst & Frei\\\hline \end{tabular}% +} %\marginnote{Fig.~\ref{thea2}} -\hvFloat[inMargin]{table}{\small\tabcolsep=3pt\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ - Dienst & Dienst & Frei\\\hline \end{tabular}} +\hvFloat[inMargin,useOBox]{table}{} {A tabular in the margin just like the image.} {thea2} @@ -1383,7 +1401,7 @@ The code for table \ref{table:1} and \ref{table:2} is: \hvFloat[% floatPos=!hb, capPos=top, - useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} + useOBox]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} \hvblindtext @@ -1403,14 +1421,14 @@ In this case leave the third parameter empty. \hvFloat[% floatPos=!hb, capPos=top, - useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} + useOBox]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} \MarginNote{Tab.~\ref{table:2}} \hvFloat[% floatPos=!htb,% - useOBox=true,% + useOBox,% objectAngle=90,% capPos=right,% capVPos=top,% @@ -2730,7 +2748,7 @@ in the inner margin on both pages. \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=right]% {figure}% - {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% {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. No further text is placed on the pages. A short form is used for the LOF. @@ -2741,7 +2759,7 @@ in the inner margin on both pages. \MarginNote{Fig.~\ref{fig:doubleFULLPAGE1}} \hvFloat[doubleFULLPAGE,capPos=right]% {figure}% - {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% {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. No further text is placed on the pages. A short form is used for the LOF. @@ -2770,7 +2788,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \hvFloat[doubleFULLPAGE,capPos=after]% {figure}% {\includegraphics[doubleFULLPAGE, - keepaspectratio=false]{images/rheinsberg-1000}}% + keepaspectratio=false]{images/rheinsberg}}% {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. @@ -2783,7 +2801,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \MarginNote{Fig.~\ref{foo}} \hvFloat[doubleFULLPAGE,capPos=after]% {figure}% - {\includegraphics[doubleFULLPAGE]{images/rheinsberg-1000}}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% {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. @@ -2804,7 +2822,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-1000}}% + keepaspectratio=false]{images/rheinsberg}}% {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. @@ -2815,7 +2833,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \MarginNote{Fig.~\ref{bar}} \hvFloat[doubleFULLPAGE,capPos=before]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg-1000}}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% {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. @@ -3117,9 +3135,9 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \hvBlindtext -\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]% +\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt,useOBox]% {table}% - {\usebox\hvOBox}%%%%%%%%%%%%%% + {}%%%%%%%%%%%%%% [A doublepage tabular with a caption on the right side of the right part.]% {A caption for a double-sided tabular that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of @@ -3128,7 +3146,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \end{lstlisting} -\global\savebox\hvOBox{% +\savebox\hvOBox{% \begin{tabular}{l*{18}r} \toprule & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976} & \textbf{1977} & \textbf{1978} & \textbf{1979} & \textbf{1980} & \textbf{1981} & \textbf{1982} & \textbf{1983} & \textbf{1984} & \textbf{1985} @@ -3159,7 +3177,31 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \marginpar{Tab.~\ref{tab:doublePage3}}% \hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]% {table}% - {\usebox\hvOBox}%%%%%%%%%%%%%% + {\begin{tabular}{l*{18}r} \toprule + & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976} + & \textbf{1977} & \textbf{1978} & \textbf{1979} & \textbf{1980} & \textbf{1981} & \textbf{1982} & \textbf{1983} & \textbf{1984} & \textbf{1985} + & \textbf{1986} & \textbf{1987} & \textbf{1988} & \textbf{1989} + \\\midrule +\addlinespace[3pt] +Zeile 1 & 1 & 3 & 1 & 1 & 1 & 0 & 1 & 1 & 0 & 0 & 0 & 0 &20 & 0 & 2 & 2 & 2 & 1\\\addlinespace[3pt] +Zeile 2 & 1 & 1 & 3 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 2 & 1 & 3 & 4 & 4 & 6 & 4 & 2\\\addlinespace[3pt] +Zeile 3 & 2 & 1 & 2 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 5 & 3 & 1 & 7 & 7 & 3\\\addlinespace[3pt] +Zeile 4 & 1 & 0 & 5 & 1 & 2 & 0 & 0 & 0 & 0 & 2 & 1 & 0 & 1 & 0 & 3 & 7 & 2 & 1\\\addlinespace[3pt] +Zeile 6 & 2 & 1 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 2 & 0 & 5 & 2 & 2 & 5 & 4 & 2\\\addlinespace[3pt] +Zeile 5 & 0 & 0 & 4 & 2 & 1 & 2 & 2 & 1 & 0 & 0 & 0 & 1 & 1 & 0 & 2 & 5 & 4 & 3\\\addlinespace[3pt] +Zeile 8 & 0 & 1 & 1 & 0 & 0 & 0 & 1 & 1 & 0 & 3 & 2 & 1 & 2 & 1 & 3 & 5 & 3 & 4\\\addlinespace[3pt] +Zeile 9 & 0 & 0 & 0 & 0 & 0 & 1 & 2 & 1 & 0 & 0 & 0 & 0 & 4 & 2 & 1 & 4 & 5 & 2\\\addlinespace[3pt] +Zeile10 & 0 & 1 & 3 & 0 & 1 & 0 & 1 & 0 & 0 & 1 & 1 & 0 & 1 & 1 & 1 & 4 & 4 & 1\\\addlinespace[3pt] +Zeile11 & 0 & 2 & 2 & 1 & 1 & 0 & 1 & 0 & 0 & 0 & 0 & 2 & 6 & 1 & 0 & 2 & 1 & 1 \\\addlinespace[3pt] +Zeile12 & 2 & 0 & 2 & 4 & 1 & 0 & 4 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 3\\\addlinespace[3pt] +Lärm & 2 & 3 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 2 & 0 & 0 & 2 & 2 & 2\\\addlinespace[3pt] +Zeile13 & 0 & 1 & 0 & 0 & 1 & 0 & 3 & 0 & 0 & 0 & 0 & 0 & 2 & 0 & 1 & 3 & 0 & 2\\\addlinespace[3pt] +Zeile14 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 3 & 3 & 2 & 1 & 1 & 0\\\addlinespace[3pt] +Zeile15 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 4 & 0 & 0 & 3 & 1 & 1\\\addlinespace[3pt] +Zeile16 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 3 & 5 & 0 & 1\\\addlinespace[3pt]\midrule +Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 & 13 &1 \\ +\bottomrule +\end{tabular}}%%%%%%%%%%%%%% [A doublepage tabular with a caption on the right side of the right part.]% {A caption for a double-sided tabular that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of diff --git a/macros/latex/contrib/hvfloat/doc/images/usa5.jpg b/macros/latex/contrib/hvfloat/doc/images/usa5.jpg new file mode 100644 index 0000000000..6c0aa69013 Binary files /dev/null and b/macros/latex/contrib/hvfloat/doc/images/usa5.jpg differ -- cgit v1.2.3