From b024398a3a84c23e6127653e24525488c6857299 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 29 Jan 2023 21:19:48 +0000 Subject: hvfloat (29jan23) git-svn-id: svn://tug.org/texlive/trunk@65671 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvfloat/Changes | 3 + Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf | Bin 80294 -> 80292 bytes Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf | Bin 86722 -> 86842 bytes Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/capPos.pdf | Bin 95389 -> 98124 bytes Master/texmf-dist/doc/latex/hvfloat/capVPos.inc | 32 +- .../texmf-dist/doc/latex/hvfloat/default1s1c.pdf | Bin 81991 -> 82105 bytes .../texmf-dist/doc/latex/hvfloat/default1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/default1s2c.pdf | Bin 83275 -> 83450 bytes .../texmf-dist/doc/latex/hvfloat/default1s2c.tex | 6 +- .../texmf-dist/doc/latex/hvfloat/default2s1c.pdf | Bin 79445 -> 79548 bytes .../texmf-dist/doc/latex/hvfloat/default2s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/default2s2c.pdf | Bin 85824 -> 85983 bytes .../texmf-dist/doc/latex/hvfloat/default2s2c.tex | 10 +- .../doc/latex/hvfloat/doublefullpage2s2c.pdf | Bin 0 -> 1759640 bytes .../doc/latex/hvfloat/doublefullpage2s2c.tex | 802 +++++++++++++++++++++ .../doc/latex/hvfloat/doublepage2s1c.pdf | Bin 2314853 -> 2318150 bytes .../doc/latex/hvfloat/doublepage2s1c.tex | 7 +- .../doc/latex/hvfloat/doublepage2s2c.pdf | Bin 619030 -> 617080 bytes Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf | Bin 77658 -> 77798 bytes Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf | Bin 86404 -> 86556 bytes Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf | Bin 84813 -> 84573 bytes Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf | Bin 85098 -> 85253 bytes Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf | Bin 0 -> 85743 bytes .../texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex | 64 ++ .../texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf | Bin 86773 -> 84722 bytes .../texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex | 6 +- Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | Bin 7372289 -> 5163692 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 9 +- Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf | Bin 84020 -> 84306 bytes Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf | Bin 83977 -> 84127 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf | Bin 84013 -> 84232 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf | Bin 85512 -> 85692 bytes Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-after1s1c.pdf | Bin 142624 -> 142671 bytes .../doc/latex/hvfloat/multi-after1s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default1s1c.pdf | Bin 146172 -> 146434 bytes .../doc/latex/hvfloat/multi-default1s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default1s2c.pdf | Bin 94586 -> 94782 bytes .../doc/latex/hvfloat/multi-default1s2c.tex | 10 +- .../doc/latex/hvfloat/multi-default2s1c.pdf | Bin 146343 -> 146566 bytes .../doc/latex/hvfloat/multi-default2s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default2s2c.pdf | Bin 92182 -> 92370 bytes .../doc/latex/hvfloat/multi-default2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-inner2s2c.pdf | Bin 89784 -> 89748 bytes .../doc/latex/hvfloat/multi-inner2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-outer2s2c.pdf | Bin 92984 -> 93075 bytes .../doc/latex/hvfloat/multi-outer2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-right1s1c.pdf | Bin 145736 -> 146003 bytes .../doc/latex/hvfloat/multi-right1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf | Bin 77805 -> 77702 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf | Bin 86523 -> 86699 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf | Bin 174218 -> 173970 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf | Bin 85566 -> 85689 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf | Bin 86318 -> 86575 bytes Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf | Bin 84292 -> 84447 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf | Bin 84680 -> 84939 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex | 10 +- .../doc/latex/hvfloat/paper-after1s1c.pdf | Bin 79267 -> 78972 bytes .../doc/latex/hvfloat/paper-after1s1c.tex | 10 +- .../doc/latex/hvfloat/paper-after2s2c.pdf | Bin 0 -> 89816 bytes .../doc/latex/hvfloat/paper-after2s2c.tex | 81 +++ .../doc/latex/hvfloat/paper-default1s1c.pdf | Bin 79967 -> 81234 bytes .../doc/latex/hvfloat/paper-default1s1c.tex | 13 +- .../doc/latex/hvfloat/paper-default1s2c.pdf | Bin 90508 -> 90660 bytes .../doc/latex/hvfloat/paper-default1s2c.tex | 10 +- .../doc/latex/hvfloat/paper-default2s1c.pdf | Bin 87935 -> 88153 bytes .../doc/latex/hvfloat/paper-default2s1c.tex | 8 +- .../doc/latex/hvfloat/paper-default2s2c.pdf | Bin 90332 -> 90479 bytes .../doc/latex/hvfloat/paper-default2s2c.tex | 10 +- .../doc/latex/hvfloat/paper-even2s1c.pdf | Bin 0 -> 87462 bytes .../doc/latex/hvfloat/paper-even2s1c.tex | 81 +++ .../doc/latex/hvfloat/paper-inner2s2c.pdf | Bin 87855 -> 88039 bytes .../doc/latex/hvfloat/paper-inner2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf | Bin 0 -> 87342 bytes .../texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex | 81 +++ .../doc/latex/hvfloat/paper-right1s1c.pdf | Bin 80290 -> 81413 bytes .../doc/latex/hvfloat/paper-right1s1c.tex | 10 +- .../hvfloat/paper-twocolcaption-after2s2c.pdf | Bin 0 -> 1615749 bytes .../hvfloat/paper-twocolcaption-after2s2c.tex | 81 +++ Master/texmf-dist/doc/latex/hvfloat/preamble.ltx | 3 + Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf | Bin 80126 -> 80120 bytes Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf | Bin 89340 -> 89638 bytes Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf | Bin 81033 -> 81082 bytes Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf | Bin 85585 -> 85693 bytes Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/runAll.sh | 2 +- Master/texmf-dist/doc/latex/hvfloat/runEXA.sh | 3 +- .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf | Bin 143952 -> 144213 bytes .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf | Bin 144771 -> 145001 bytes .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex | 10 +- .../doc/latex/hvfloat/sub-default1s1c.pdf | Bin 144003 -> 144288 bytes .../doc/latex/hvfloat/sub-default1s1c.tex | 10 +- .../doc/latex/hvfloat/sub-default1s2c.pdf | Bin 144217 -> 144422 bytes .../doc/latex/hvfloat/sub-default1s2c.tex | 10 +- .../doc/latex/hvfloat/sub-default2s2c.pdf | Bin 143517 -> 143782 bytes .../doc/latex/hvfloat/sub-default2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf | Bin 143873 -> 144144 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf | Bin 144879 -> 145100 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf | Bin 144315 -> 144505 bytes .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf | Bin 120949 -> 120723 bytes Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf | Bin 121917 -> 121738 bytes Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty | 268 +++++-- 124 files changed, 1672 insertions(+), 328 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.tex diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index bd624f8ca0c..c19902eff39 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,7 @@ hvfloat.sty: +2.45 2023-01-28 - bugfix for doubleFULLPAGE images which followed + fullpage images ... + - added option "forceLeft" for doublepage flloats 2.44 2022-11-21 - support "floats" with caption in the margin 2.43 2022-11-07 - fix for empty caption: don't use \caption 2.42 2022-10-02 - fix for twoColumnCaption and multi(sub)floats diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf index 40854d1f723..872dc973c08 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex index bdb9db7170e..3a1f4a581ee 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: after1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: after1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf index 6a3f002998d..06949359a1e 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex index 8c9f9989316..a8b363d559a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: after2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: after2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf index 630a337a539..c2065016829 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf and b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc b/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc index 10ef70e88c0..5e76aaface7 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc +++ b/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc @@ -19,7 +19,7 @@ justification= \hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText~\protect\parencite{aksin}}{} \blindtext @@ -27,15 +27,15 @@ justification= \hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText~\protect\parencite{aksin}}{} \blindtext \begin{lstlisting} -\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText~\protect\parencite{aksin}}{} \end{lstlisting} -\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText~\protect\parencite{aksin}}{} \blindtext @@ -47,10 +47,10 @@ justification= \subsection{\texttt{capVPos=top}} \begin{lstlisting} -\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=outer,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=outer,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText~\protect\parencite{aksin}}{} \blindtext @@ -65,10 +65,10 @@ justification= \begin{lstlisting} -\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=inner,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} \end{lstlisting} -\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=inner,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} \blindtext @@ -78,10 +78,10 @@ justification= \subsection{\texttt{capVPos=bottom}} \begin{lstlisting} -\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=outer,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=outer,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} \blindtext @@ -95,10 +95,10 @@ justification= \blindtext \begin{lstlisting} -\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=inner,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} \end{lstlisting} -\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=inner,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} \blindtext \NewColumn @@ -107,10 +107,10 @@ justification= \subsection{\texttt{capPos=center}} \begin{lstlisting} -\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=outer,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=outer,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} \blindtext @@ -123,10 +123,10 @@ justification= \blindtext \begin{lstlisting} -\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=inner,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} \end{lstlisting} -\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=inner,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} \blindtext diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf index 861efc9ac7a..062639ee538 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex index 357a8c75432..a974d118a39 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: default1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -40,7 +40,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -53,7 +53,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -66,7 +66,7 @@ The fullpage image~\vref{fig:fullpage1} has a caption~\vpageref{fig:fullpage1-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf index 60e3cb94ca5..bbc7c107e01 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex index 86c3b0a8981..79f9f8b101b 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: default1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -21,7 +21,7 @@ [A float with the default caption setting]% {A default caption of a ``default'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:0} \end{lstlisting} @@ -32,7 +32,7 @@ [A float with the default caption setting]% {A default caption of a ``default'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:0} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf index 33ac8dd8769..d7e0bfce8b8 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex index 282925826d9..449cb5d9c18 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: default2s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: default2s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -48,7 +48,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -61,7 +61,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf index 1291839ce84..8b2bb2a448b 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex index 45278e1e8d2..0055c3c5701 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: default2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf new file mode 100644 index 00000000000..9c890e37062 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex new file mode 100644 index 00000000000..46ae9406ba1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex @@ -0,0 +1,802 @@ +\errorcontextlines=100 +%\documentclass[final]{ltugboat} +\documentclass[twoside,twocolumn,american]{scrartcl} +%% $Id: doublepage2s2c.tex 92 2021-05-18 09:46:55Z herbert $ + +\input{preamble.ltx} +\usepackage{xcolor,marginnote} + +\usepackage{marginnote,showframe} +\setcounter{tocdepth}{2} + +\begin{document} +\title{Examples for doublepage floats \newline with bind correction} +\author{Herbert Voß} +\maketitle + +\tableofcontents + + +\onecolumn +\listoffigures + +\newpage\null +\twocolumn +\part{Argument \texttt{doubleFULLPAGE}} +\section{Definition on an odd page} + +\Blindtext\hvblindtext + +\hvblindtext + +\subsection{The default -- in the first column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0}} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0} + +\Blindtext + +\Blindtext + +%\Blindtext + +\hvblindtext + +\hvblindtext +\hvblindtext + +\subsection{The default -- in the second column} + + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE02nd} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE02nd}} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE02nd} + +\Blindtext + +%\Blindtext + +%\Blindtext + +\hvblindtext + +\hvblindtext +\hvblindtext + +\subsection{\texttt{bindCorr=1cm} -- first column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1} + +\hvblindtext + +%\Blindtext + +\Blindtext + +\Blindtext + +%\Blindtext + +\hvblindtext + +\hvblindtext + +\hvblindtext + +\subsection{\texttt{bindCorr=1cm} -- second column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE12nd} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE12nd}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE12nd} + +\hvblindtext + +%\Blindtext + +\Blindtext + +%\Blindtext + +\hvblindtext +\hvblindtext + +\hvblindtext + + + +\subsection{\texttt{bindCorr=3mm} -- first column} +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2} + + +\Blindtext + +\Blindtext + +%\Blindtext +%\Blindtext + +\hvblindtext + +\hvblindtext +\hvblindtext + + + + +\subsection{\texttt{bindCorr=3mm} -- second column} +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE22nd} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE22nd}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE22nd} + + +\Blindtext + +%\Blindtext + +%\Blindtext + +\hvblindtext +\hvblindtext + +\hvblindtext + + +\subsection{\texttt{bindCorr=} -- first column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE3}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3} + + +\Blindtext + +\Blindtext + +%\Blindtext + +\hvblindtext + +\hvblindtext +\hvblindtext + +\hvblindtext + +\subsection{\texttt{bindCorr=} -- second column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE32nd} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE32nd}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin,capPos=after]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE32nd} + + +%\Blindtext + +\hvblindtext + +\hvblindtext + +%\hvblindtext + + + + +\section{Definition on an even page} + + +\subsection{The default -- first column} +\begin{lstlisting} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0a}} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} + + +\Blindtext + +\Blindtext + +%\Blindtext + +\hvblindtext +%\Blindtext + +\hvblindtext + +\hvblindtext +\hvblindtext + +\subsection{The default -- second column} +\begin{lstlisting} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a2nd} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0a2nd}} +\hvFloat[doubleFULLPAGE]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a2nd} + + +\hvblindtext +\hvblindtext + +\hvblindtext + +\Blindtext + +%\Blindtext + +%\Blindtext + + + + +\subsection{\texttt{bindCorr=1cm} -- first column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a} + +%\hvblindtext + +\Blindtext + +\Blindtext + +%\Blindtext +%\Blindtext + +\hvblindtext + +\hvblindtext +\hvblindtext + +\hvblindtext + + +\subsection{\texttt{bindCorr=1cm} -- second column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a2nd} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1a2nd}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a2nd} + +\hvblindtext + +%\Blindtext + +\Blindtext + +%\Blindtext + +\hvblindtext + +\hvblindtext + + + + +\subsection{\texttt{bindCorr=3mm} -- first column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a} + + +\Blindtext + +\Blindtext + +%\Blindtext +%\Blindtext + +\hvblindtext + +\hvblindtext + +\hvblindtext + +\hvblindtext + + +\subsection{\texttt{bindCorr=3mm} -- second column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a2nd} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2a2nd}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a2nd} + + +\Blindtext + +%\Blindtext + +%\Blindtext + +%\hvblindtext + +\hvblindtext + +\hvblindtext + +\hvblindtext + + + +\subsection{\texttt{bindCorr=} -- first column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE3a}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a} + + +\Blindtext + +\Blindtext + +%\Blindtext + +\hvblindtext + +\hvblindtext + +%\hvblindtext + +%\hvblindtext + + +\subsection{\texttt{bindCorr=} -- second column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a2nd} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE3a2nd}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin,capPos=after]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a2nd} + + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + + + +%\cleardoublepage + + +\hvblindtext + +\hvblindtext + +\Blindtext + +\hvblindtext + +\section{Full height, but no complete double page} +\subsection{The default -- in the first column} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capPos=right]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0n} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0n}} +\hvFloat[doubleFULLPAGE,capPos=right]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0n} + +\Blindtext + +\Blindtext + +%\Blindtext + +\clearpage +\Blindtext +%\hvblindtext + +%\hvblindtext + +\Blindtext + +\hvblindtext +\Blindtext + +\subsection{The default -- in the second column} + + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capPos=before]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE02ndn} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE02ndn}} +\hvFloat[doubleFULLPAGE,capPos=before] + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE02ndn} + +\Blindtext + +\Blindtext + +\Blindtext + +%\hvblindtext + +\Blindtext + +%\Blindtext + + +\subsection{The default -- in the second column} + + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capPos=after,twoColumnCaption]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE02ndnn} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE02ndnn}} +\hvFloat[doubleFULLPAGE,capPos=after,twoColumnCaption]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed + at the bottom of the following page. The doublepage image begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE02ndnn} + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\hvblindtext +\hvblindtext + + + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf index 0d3e2713ef6..ab1c658dbdc 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex index 656cbe68c8f..ebd703e964a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: doublepage2s1c.tex 92 2021-05-18 09:46:55Z herbert $ +%% $Id: doublepage2s1c.tex 299 2021-10-09 14:05:35Z herbert $ \input{preamble.ltx} \usepackage{blindtext,xcolor,marginnote} @@ -166,10 +166,11 @@ \hvblindtext \hvblindtext +\hvblindtext \subsection{Definition on an even page} \subsubsection{The default} -\begin{lstlisting} +\begin{verbatim} \hvFloat[doublePage,capWidth=n,capPos=right]% {figure}% {\includegraphics[width=2\textwidth]{images/sonne-meer}}% @@ -179,7 +180,7 @@ the paper. A short form is used for the LOF. The parameter is \texttt{doublePage}}% {fig:doublePage0a} -\end{lstlisting} +\end{verbatim} \marginnote{Fig. \ref{fig:doublePage0a}} diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf index 1578d673ffd..40ca90301e3 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf index 7be7a1cb5b6..be7272292e5 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex index 75eb2bf8722..d042b908635 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: even1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: even1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -48,7 +48,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -61,7 +61,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf index e98663ed098..a15479bc59a 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex index da5d013c400..2965b475020 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: even1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: even1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf index 09a417c0310..16fba17cebe 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex index 1ee584c81af..0e794a30e74 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: even2s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: even2s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -39,7 +39,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf index e2898a14ae0..c128ab6de6f 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex index ce3206c0754..6952e4e45e4 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: even2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: even2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf new file mode 100644 index 00000000000..3ce06c022f4 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex new file mode 100644 index 00000000000..1b95fbaa034 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex @@ -0,0 +1,64 @@ +\documentclass{scrartcl} +%% $Id: fullpage1s1c.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 + +\section{The fullpage optional arguments} +\Blindtext + +\subsection{\texttt{fullpage}} +\blindtext +\blindtext +\verb|\includegraphics[fullpage]{tiger}| + +\includegraphics[fullpage]{tiger} + +\Blindtext +\subsection{\texttt{FullPage}} +\blindtext + +\verb|\includegraphics[FullPage]{tiger}| +\begin{figure*}[p] +\includegraphics*[FullPage]{tiger} +\end{figure*} + +\Blindtext + +\Blindtext + +\subsection{\texttt{FULLPAGE}} +\blindtext + +\verb|\includegraphics[FULLPAGE]{tiger}| + +\begin{figure*}[p] + \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}% + \if@twoside + \leavevmode\checkoddpage + \ifoddpage + \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% + \else + \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% + \fi + \else + \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% + \fi + \put(0,0){\usebox\hvObjectBox}% + \AtBeginShipoutNext{\thispagestyle{empty}}% +\includegraphics*[FULLPAGE]{tiger} +\end{figure*} + +\Blindtext + +\blindtext + + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf index e0e787f9941..936972b8356 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex index 799aa9ed6bc..c7a9a0ec13d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: fullpage1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: fullpage1s2c.tex 676 2023-01-28 19:47:00Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -16,12 +16,12 @@ \subsection{\texttt{fullpage}} \blindtext -\blindtext \verb|\includegraphics[fullpage]{tiger}| \includegraphics[fullpage]{tiger} -\Blindtext +\Blindtext[2] + \subsection{\texttt{FullPage}} \blindtext diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf index 4322700b01d..441b3d86a27 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf and b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex index 8b5da275916..6c38e880e30 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -1,16 +1,17 @@ -%% $Id: hvfloat.tex 653 2022-11-20 21:54:52Z herbert $ +%% $Id: hvfloat.tex 676 2023-01-28 19:47:00Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,usegeometry]{scrartcl} \usepackage{fontspec} -\usepackage{libertinus} +\usepackage[silent]{libertinus-otf} %\usepackage[scaled=0.85]{beramono} \setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{DejaVu Sans Mono} \usepackage{microtype} \usepackage[english]{babel} -\usepackage[marginparwidth=3cm,bottom=2cm,top=1cm,includeheadfoot,showframe]{geometry} +\usepackage[marginparwidth=3cm,bottom=2cm,top=1cm,includeheadfoot%,showframe +]{geometry} \usepackage[automark]{scrlayer-scrpage} @@ -397,6 +398,8 @@ There are the following keywords: \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{forceLeft} & false & \rowvsp In some cases a doublepage float starts on an odd page. With \Lkeyword{forceLeft} it + uses only one \Lcs{afterpage} instead of two to force a start on an even page. \\ \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} diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf index 73a49d0a073..f1ec08ccaf1 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex index 6960658c3bc..eae3c5ce675 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: inner1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: inner1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} \end{lstlisting} @@ -38,7 +38,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} @@ -52,7 +52,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} \end{lstlisting} @@ -64,7 +64,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf index 3cd80ae1316..6a1325e58e4 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex index 15b65081111..60b226c085a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: inner2s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: inner2s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -26,7 +26,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} \end{lstlisting} @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} @@ -51,7 +51,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} \end{lstlisting} @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf index 6b794b37320..cc0cf680f6f 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex index 0f4a3856c8e..04627efaa86 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: inner2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} \end{lstlisting} @@ -38,7 +38,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} @@ -52,7 +52,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} \end{lstlisting} @@ -64,7 +64,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the inner side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf index 4e6b0cfae72..e9c4adf340f 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex index d415c7e3433..56ea72912e7 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: left2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: left2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf index bc345dc15bf..a17ff0ea752 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex index a01561d8404..6238a6f9106 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: multi-after1s1c.tex 112 2021-06-14 08:01:42Z herbert $ +%% $Id: multi-after1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -56,7 +56,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -88,7 +88,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -116,7 +116,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf index e37e60e6263..d1dd9d195bd 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex index 1c4e98195f1..655d8fd0623 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: multi-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: multi-default1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -28,7 +28,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -56,7 +56,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -88,7 +88,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -116,7 +116,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf index 614b2fcf30f..fd40d114af2 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex index f42bc85ae59..a46ae569381 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: multi-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: multi-default1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -29,7 +29,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -54,7 +54,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -84,7 +84,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -109,7 +109,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf index e2ec474cb79..dbed0dc9ab8 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex index 8725520a265..8ceae45750c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: multi-default2s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: multi-default2s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -55,7 +55,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -87,7 +87,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -115,7 +115,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf index 23fdd5f04f1..5023af475d5 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex index 4ce8149cdae..3848015a925 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: multi-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: multi-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -29,7 +29,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -54,7 +54,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -84,7 +84,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -109,7 +109,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf index 3f79249b521..98fd85f954c 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex index 668da0a1471..ee91984d4ab 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex @@ -1,6 +1,6 @@ \errorcontextlines=200 \documentclass[twoside]{scrartcl} -%% $Id: multi-inner2s2c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: multi-inner2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -31,7 +31,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -58,7 +58,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -90,7 +90,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -117,7 +117,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf index 7ebd9bd69a9..6421ab72fec 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex index fef798e1e96..306762846e8 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex @@ -1,6 +1,6 @@ \errorcontextlines=100 \documentclass[twoside]{scrartcl} -%% $Id: multi-outer2s2c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: multi-outer2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -32,7 +32,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -57,7 +57,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo0}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -88,7 +88,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 @@ -115,7 +115,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {multi:demo2}% +{table}{\begin{tabular}{lr}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf index 23f3c0b60c6..f318e337ea0 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex index 1b78f0fba64..fae07fc3643 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: multi-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: multi-right1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -55,7 +55,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo0}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -87,7 +87,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 @@ -115,7 +115,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {img:demo3}% +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf index 9a8f796d025..1983a9375a5 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex index 2d93d7b2b5c..bc70f79b05a 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 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -23,7 +23,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -36,7 +36,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -55,7 +55,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -68,7 +68,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf index eae0be6b8d9..145c1ecdcea 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex index 8454f4198bb..636a8366d56 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: odd1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: odd1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf index ef5b9fd7ab4..9226490ffea 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex index ee0e69c74e9..d14f499615c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: odd2s1c.tex 107 2021-06-09 06:43:25Z herbert $ +%% $Id: odd2s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -39,7 +39,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf index 6aa3ac83cfe..73d3a810f38 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex index f044fa127c7..98dfd6c84ba 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: odd2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: odd2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf index c6676e12913..06c3a32f05c 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex index f6444f614c3..e0302a6b77d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: outer1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: outer1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -26,7 +26,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:full0} \end{lstlisting} @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:full0} @@ -51,7 +51,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf index a7d55f4c80c..25b6f1174ce 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex index d30d66e8fae..68cd5109766 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: outer2s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: outer2s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -26,7 +26,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:full0} \end{lstlisting} @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:full0} @@ -51,7 +51,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf index 204d0dad654..bc0c66a59fd 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex index 84b3dc0cf5f..4ac33b74785 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: outer2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: outer2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -26,7 +26,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:full0} \end{lstlisting} @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:full0} @@ -51,7 +51,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:full0} has a caption~\vpageref{fig:full0-cap}. {\includegraphics[fullpage]{frose}}% [A float which needs the complete page width and height.]% {A Caption on the outer side of a twosided document. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf index a65718b90a9..90d42533580 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex index 90e4ac91968..c847c531c5f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: paper-after1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: paper-after1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \usepackage{pdfpages} \input{preamble.ltx} @@ -29,7 +29,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -42,7 +42,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -57,7 +57,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -70,7 +70,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf new file mode 100644 index 00000000000..18b1c6e2b25 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex new file mode 100644 index 00000000000..ab7faa4b9d7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex @@ -0,0 +1,81 @@ +\documentclass[twocolumn]{scrartcl} +%% $Id: paper-default2s2c.tex 318 2021-11-20 07:30:54Z 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,capPos=after]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE0} +\end{lstlisting} + + +\Float[default] +\hvFloat*[FULLPAGE,capPos=after]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE0} + +\blinddocument + +\begin{lstlisting} +\hvFloat*[FULLPAGE,capPos=after]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE1} +\end{lstlisting} + + +\Float[default] +\hvFloat*[FULLPAGE,capPos=after]% + {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 which 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-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf index fd27f7ca548..d73336bd0b5 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex index bb789ab5937..a6304754cb7 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex @@ -1,9 +1,10 @@ \documentclass{scrartcl} -%% $Id: paper-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: paper-default1s1c.tex 584 2022-07-20 18:29:58Z herbert $ \usepackage{pdfpages} \input{preamble.ltx} + \begin{document} \title{Example for fullpage floats} \author{Herbert Voß} @@ -12,7 +13,7 @@ \tableofcontents \Blindtext -\blindtext +\Blindtext \section{File \texttt{\jobname}} @@ -29,7 +30,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -42,7 +43,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -57,7 +58,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -70,7 +71,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf index 6e06341ad56..40740a8ccfd 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex index 73701e6c1ee..61cc0278641 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: paper-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: paper-default1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf index c9cd842897c..cc73cf951be 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex index 4db02204812..20cea7741e7 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex @@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf index 330a7425ca1..10d39575818 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex index 64b430652b1..a9b5b15bef2 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: paper-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf new file mode 100644 index 00000000000..a7274de0f2b Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.tex new file mode 100644 index 00000000000..9b8436d6971 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.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,capPos=evenPage]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE0} +\end{lstlisting} + + +\Float[default] +\hvFloat[FULLPAGE,capPos=evenPage]% + {figure}% + {\includegraphics[FULLPAGE]{frose}}% + [A FULLPAGE float with the default caption setting]% + {A caption of a \texttt{FULLPAGE} object with \texttt{capPos=evenPage}, + so it appears on an even-numbered page. + And some more text which has no + meaning because it merely fills the space for a long caption.}% + {fig:FULLPAGE0} + +\blinddocument + +\begin{lstlisting} +\hvFloat[FULLPAGE,capPos=evenPage]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE1} +\end{lstlisting} + + +\Float[default] +\hvFloat[FULLPAGE,capPos=evenPage]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE1} + +\blinddocument + +\Blindtext + +\blindtext + + +\end{document} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf index b0792355fbd..89d0b46c047 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex index 1cb218ac795..b7a6880d363 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: paper-inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: paper-inner2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -41,7 +41,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -54,7 +54,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -67,7 +67,7 @@ The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-ca [A FULLPAGE float with the default caption setting]% {A default caption of a ``FULLPAGE'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf new file mode 100644 index 00000000000..7325a59fea6 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex new file mode 100644 index 00000000000..be6c896aa8f --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.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,capPos=oddPage]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE0} +\end{lstlisting} + + +\Float[default] +\hvFloat[FULLPAGE,capPos=oddPage]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE0} + +\blinddocument + +\begin{lstlisting} +\hvFloat[FULLPAGE,capPos=oddPage]% + {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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE1} +\end{lstlisting} + + +\Float[default] +\hvFloat[FULLPAGE,capPos=oddPage]% + {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 which 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-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf index 5ed8ec5a710..acc1a64f499 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex index f2857044961..41595db2244 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: paper-right1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: paper-right1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \usepackage{pdfpages} \input{preamble.ltx} @@ -29,7 +29,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -42,7 +42,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -57,7 +57,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -70,7 +70,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf new file mode 100644 index 00000000000..b827c1a1306 Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.tex new file mode 100644 index 00000000000..9da31571a34 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.tex @@ -0,0 +1,81 @@ +\documentclass[twocolumn]{scrartcl} +%% $Id: paper-default2s2c.tex 318 2021-11-20 07:30:54Z 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*[doubleFULLPAGE,capPos=after,twoColumnCaption]% + {figure}% + {\includegraphics[doubleFULLPAGE]{rheinsberg}}% + [A doubleFULLPAGE float with the default caption setting]% + {A default caption of a ``doubleFULLPAGE'' 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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:doubleFULLPAGE0} +\end{lstlisting} + + +\Float[default] +\hvFloat*[doubleFULLPAGE,capPos=after,twoColumnCaption]% + {figure}% + {\includegraphics[doubleFULLPAGE]{rheinsberg}}% + [A doubleFULLPAGE float with the default caption setting]% + {A default caption of a ``doubleFULLPAGE'' 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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:doubleFULLPAGE0} + +\blinddocument + +\begin{lstlisting} +\hvFloat*[doubleFULLPAGE,capPos=after,twoColumnCaption]% + {figure}% + {\includegraphics[doubleFULLPAGE]{rheinsberg}}% + [A doubleFULLPAGE float with the default caption setting]% + {A default caption of a ``doubleFULLPAGE'' 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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:doubleFULLPAGE1} +\end{lstlisting} + + +\Float[default] +\hvFloat*[doubleFULLPAGE,capPos=after,twoColumnCaption]% + {figure}% + {\includegraphics[doubleFULLPAGE]{rheinsberg}}% + [A doubleFULLPAGE float with the default caption setting]% + {A default caption of a ``doubleFULLPAGE'' 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 which has no + real meaning because it fills only the space for a long caption.}% + {fig:doubleFULLPAGE1} + +\blinddocument + +\Blindtext + +\blindtext + + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx index 525725c6c02..075d72bba0f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx +++ b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx @@ -41,6 +41,9 @@ \captionsetup{labelfont={red,sf},font={red,sf},format=plain} \usepackage{blindtext} +\usepackage[style=authoryear]{biblatex} +\addbibresource{biblatex-examples.bib} + \def\hvblindtext{\textcolor{black!30}{Hello, here is some text without a meaning. This text should show what a printed text will look like at this place. If you read this text, you will get no information. Really? diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf index c6c6bd27bdb..ac72bcbebd4 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex index 4ad53de6b9d..58dbd7869e6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: right1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: right1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf index dfd03e566cc..f754b73cf7a 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex index ada1d0b1864..26de3dc0bc9 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: right1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: right1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf index dbb63e5fac8..d513759ef83 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex index 6672586390f..f1a07efd74c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: right2s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: right2s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -22,7 +22,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -48,7 +48,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -61,7 +61,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf index e269a747a3b..591a3fdc5c5 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex index eaaed1d57cb..7c7cf4e67d1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: right2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: right2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -41,7 +41,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -54,7 +54,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -67,7 +67,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. - This can be an even or odd page. And some more text whch has no + This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh index 0cecd6a0c25..836c85d33e7 100755 --- a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh +++ b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh @@ -16,5 +16,5 @@ do then TEST=0 fi done - rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc + rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc $MAIN.lof $MAIN.run.xml $MAIN.bcf $MAIN.lot $MAIN.idx done diff --git a/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh b/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh index de0ad052ecb..b9a7d536cf6 100755 --- a/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh +++ b/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh @@ -16,5 +16,6 @@ do then TEST=0 fi done - rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc $MAIN.lof $MAIN.lot $MAIN.idx + rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc $MAIN.lof $MAIN.run.xml $MAIN.bcf $MAIN.lot $MAIN.idx + done diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf index f75bb23f56f..69f39ce9c3d 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex index 660e942090f..a0cdbcde186 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: sub-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: sub-after1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf index 00554afc00b..76baea7cfeb 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex index 761faa2c4b7..d610aff9cd5 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-after2s2c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: sub-after2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf index efea15759ce..3ec3881e002 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex index ec371418a7e..374a2fa0f1c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: sub-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: sub-default1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -28,7 +28,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -51,7 +51,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -78,7 +78,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -101,7 +101,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf index 8d48919902c..9c2150972b0 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex index c9307aecefc..33c1c8ad408 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: sub-default1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -29,7 +29,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -52,7 +52,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -79,7 +79,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -102,7 +102,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf index 84ab3d56ccb..6bc68c681c4 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex index cd6d370b80f..9ecb8918368 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: sub-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: sub-default2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -29,7 +29,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -52,7 +52,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -79,7 +79,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -102,7 +102,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=l,objectFrame,subFloat]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf index b3192656303..246117205e1 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex index e4fea435069..5717edc39e9 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: sub-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: sub-right1s1c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} @@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf index 72ca9190457..103bff8ed27 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex index d1073b78385..0e085d56da8 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-right1s2c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: sub-right1s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf index 23e0a03ee7a..c51e8fc121e 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex index a6e556161cf..0e8b0b67447 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-right2s2c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: sub-right2s2c.tex 318 2021-11-20 07:30:54Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -27,7 +27,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -50,7 +50,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo0}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -77,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% @@ -100,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or - right column. This can be an even or odd page. And some more text whch has no + right column. This can be an even or odd page. And some more text which has no real meaning because it fills only the space for a long caption.}% main caption {sub:demo4}% +{}{\includegraphics[width=\linewidth]{CTAN}}% diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf index b81fedc701c..33a218d07ab 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf index a95470d1eb5..2cd33a23f38 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf differ diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty index c1d78c0db73..394fc869eda 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 653 2022-11-20 21:54:52Z herbert $ +%% $Id: hvfloat.sty 676 2023-01-28 19:47:00Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -6,7 +6,7 @@ %% This is file `hvfloat.sty', %% %% Herbert Voss -%% Copyright (C) 2003-22 +%% Copyright (C) 2003-23 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -16,8 +16,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.44} -\def\filedate{2022/11/21} +\def\fileversion{2.45} +\def\filedate{2023/01/28} \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)] \let\hvFloatFileVersion\fileversion % @@ -25,6 +25,7 @@ \newif\ifhv@hyperref \hv@hyperreffalse \newif\ifhv@nostfloats \hv@nostfloatsfalse \newif\ifhv@tugboat \hv@tugboatfalse +\newif\ifhv@forceLeft \hv@forceLeftfalse \DeclareOption{fbox}{\hv@fboxtrue\setlength\fboxsep{1pt}} \DeclareOption{hyperref}{\hv@hyperreftrue} @@ -67,6 +68,7 @@ % \global\@namedef{\number\@currbox @float}{\thispagestyle{#1}}\relax %} +\providecommand\hvfloat@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi} \providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} \newlength\hvObjectWidth @@ -180,6 +182,7 @@ \define@boolkey{hvSet}[hv@]{inMargin}[true]{}% use of the hvOBox contents \define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text +\define@boolkey{hvSet}[hv@]{forceLeft}[true]{}% use only one \afterpage instead of \afterpage{\afterpage{.. \define@boolkey{hvSet}[hv@]{twoColumnCaption}[true]\global\@nameuse{hv@twoColumnCaption#1}{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{sameHeight}[true]{\@nameuse{hv@sameHeight#1}}% Write the caption only as text \define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal @@ -203,11 +206,36 @@ \newlength\hv@floatCapSep \newlength\hvSet@bindCorr -\define@key{hvSet}{fullpage}[true]{\global\@nameuse{hv@fullpage#1}}% -\define@key{hvSet}{FULLPAGE}[true]{\global\@nameuse{hv@FULLPAGE#1}} -\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}{fullpage}[true]{% + \global\@nameuse{hv@fullpage#1}% + \hv@doublePagefalse\hv@doublePAGEfalse\hv@doubleFULLPAGEfalse + \hv@FULLPAGEfalse + \hvfloat@typeout{>>>>Option fullpage}% +} +\define@key{hvSet}{FULLPAGE}[true]{% + \global\@nameuse{hv@FULLPAGE#1}% + \hv@doublePagefalse\hv@doublePAGEfalse\hv@doubleFULLPAGEfalse + \hv@fullpagefalse + \hvfloat@typeout{>>>>Option FULLPAGE}% +} +\define@key{hvSet}{doubleFULLPAGE}[true]{% + \global\@nameuse{hv@doubleFULLPAGE#1}% + \hv@doublePagefalse\hv@doublePAGEfalse + \hv@fullpagefalse\hv@FULLPAGEfalse + \hvfloat@typeout{>>>>Option doubleFULLPAGE->True / doublePAGE->False}% +} +\define@key{hvSet}{doublePAGE}[true]{% + \global\@nameuse{hv@doublePAGE#1}% + \hv@doublePagefalse\hv@doubleFULLPAGEfalse + \hv@fullpagefalse\hv@FULLPAGEfalse + \hvfloat@typeout{>>>>Option doublePAGE->True / doubleFULLPAGE->False}% +} +\define@key{hvSet}{doublePage}[true]{% + \global\@nameuse{hv@doublePage#1}% + \hv@doublePAGEfalse\hv@doubleFULLPAGEfalse + \hv@fullpagefalse\hv@FULLPAGEfalse + \hvfloat@typeout{>>>>Option doublepage->True / doubleFULLPAGE->False}% +} \define@key{hvSet}{bindCorr}[0pt]{% \def\hv@temp{#1}% \ifx\hv@temp\hv@Inner @@ -251,7 +279,7 @@ \hv@set{% floatPos=, rotAngle=0, capWidth=n, capAngle=0, objectAngle=0, capPos=bottom, capVPos=center, objectPos=center, capHPos=center, - floatCapSep=5pt, useOBox=false, + floatCapSep=5pt, useOBox=false, forceLeft=false, onlyText=false, wide=false, fullpage=false, FULLPAGE=false, doubleFULLPAGE=false, doublePage=false, doublePAGE=false, multiFloat=false,subFloat=false,inMargin=false, @@ -267,13 +295,12 @@ \let\hvFloatSetDefaults\setDefaults \hvFloatSetDefaults% onyl for first loading of the package -\providecommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi} \providecommand\@tugclass{\@empty} \ifx\@tugclass\@empty \else \hv@tugboattrue % special page handling - \hv@typeout{>>> we are using a TUGboat class}% + \hvfloat@typeout{>>> we are using a TUGboat class}% \fi \newcommand\reset@special@float{% @@ -575,26 +602,33 @@ \global\hv@floatCapSep=\hvSet@floatCapSep% % \ifhv@fullpage + \hvfloat@typeout{>>>> do@@hvFloat: fullpage true}% \def\hvSet@CapWidth{n}% relative value \do@@@@hvFloat% fullpage with caption on other page \else \ifhv@FULLPAGE + \hvfloat@typeout{>>>> do@@hvFloat: FULLPAGE true}% \def\hvSet@CapWidth{n}% relative value \do@@@@hvFloat% fullpage with caption on other page \else \ifhv@doubleFULLPAGE + \hvfloat@typeout{>>>> do@@hvFloat: doubleFULLPAGE true}% \setlength\hvCapWidth{\textheight}% \expandafter\do@hvFloat@doubleFULLPAGE\@@temp% fullpage with caption rotated or under on an odd page \else \ifhv@doublePAGE + \hvfloat@typeout{>>>> do@@hvFloat: doublePAGE true}% \expandafter\do@hvFloat@doublePAGE\@@temp% fullpage with caption rotated or under on an odd page \else \ifhv@doublePage + \hvfloat@typeout{>>>> do@@hvFloat: doublePage true}% \expandafter\do@hvFloat@doublePage\@@temp% fullpage with caption rotated or under on an odd page \else \ifhv@inMargin + \hvfloat@typeout{>>>> do@@hvFloat: inMargin true}% \do@@@hvFloatInMargin \else + \hvfloat@typeout{>>>> do@@hvFloat: no special caption}% \do@@@hvFloat \fi \fi @@ -1156,8 +1190,6 @@ }% end marginnote \endgroup}% end of \marginnote and \@@@hvFloatInMargin - - % \newenvironment{hvFloatEnv}[1][\textwidth] {\minipage{#1}} @@ -1173,6 +1205,7 @@ \ExplSyntaxOff \def\do@@@@hvFloat{% special float page: caption <-> fullpage images + \hvfloat@typeout{>>>do@@@@hvFloat: special float page}% \ifx\hvSet@capPos\hv@After \global\hv@@capPos=1 \else \ifx\hvSet@capPos\hv@Even \global\hv@@capPos=2 @@ -1195,60 +1228,88 @@ \fi \fi \fi + \hvfloat@typeout{>>>do@@@@hvFloat: hv@capPos is \the\hv@@capPos}% \checkoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: set floattype}% \set@caption@object{\hv@floatType}% set caption and object into a box \ifcase\hv@@capPos% caption before object 0-> _always_ left + \hvfloat@typeout{>>>do@@@@hvFloat: setBottomCaption and setPageObject (0)}% \setBottomCaption\setPageObject \or% caption after object 1-> _always_ right + \hvfloat@typeout{>>>do@@@@hvFloat: setPageObject and setBottomCaption (1)}% \setPageObject\setBottomCaption \or% caption on even page 2-> left page \ifoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage-> oddpage/setBottomCaption and setPageObject (2)}% \afterpage{\setBottomCaption\setPageObject}% \else% we are on an even page + \hvfloat@typeout{>>>do@@@@hvFloat: evenpage/setBottomCaption and setPageObject (2)}% \setBottomCaption\setPageObject \fi \or% caption on odd page 3->right page \if@twoside + \hvfloat@typeout{>>>do@@@@hvFloat: twoside and caption on oddpage (3)}% \if@twocolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn and caption on oddpage (3)}% \ifoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn/oddpage and caption on oddpage (3)}% \if@firstcolumn% on right side + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn/oddpage/firstcolumn and caption on oddpage (3)}% \setBottomCaption\setPageObject \else + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->twoside/twocolumn/oddpage/secondcolumn and caption on oddpage (3)}% \afterpage{\setPageObject\setBottomCaption}% start next column \fi \else% left (even) page + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn/oddpage and caption on evenpage (3)}% \if@firstcolumn + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->twoside/twocolumn/evenpage/firstcolumn and caption on oddpage (3)}% \afterpage{\setPageObject\setBottomCaption}% start next column \else + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn/evenage/secondcolumn and caption on oddpage (3)}% \setPageObject\setBottomCaption \fi \fi \else% onecolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/onecolumn and caption on oddpage (3)}% \ifoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/onecolumn/oddpage and caption on oddpage (3)}% \setPageObject\setBottomCaption \else% even page + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->twoside/onecolumn/evenpage and caption on oddpage (3)}% \afterpage{\setPageObject\setBottomCaption}% \fi \fi \else% oneside + \hvfloat@typeout{>>>do@@@@hvFloat: oneside and caption on oddpage (3)}% \if@twocolumn + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn and caption on oddpage (3)}% \ifoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/oddpage and caption on oddpage (3)}% \if@firstcolumn% on right side + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/oddpage/firstcolumn and caption on oddpage (3)}% \setBottomCaption\setPageObject \else + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/oddpage/secondcolumn and caption on oddpage (3)}% \setPageObject\setBottomCaption \fi \else + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/evenpage and caption on oddpage (3)}% \if@firstcolumn% on left side + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->oneside/twocolumn/evenpage/firstcolumn and caption on oddpage (3)}% \afterpage{\setPageObject\setBottomCaption}% \else + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/evenpage/secondcolumn and caption on oddpage (3)}% \setPageObject\setBottomCaption \fi \fi \else % onecolumn + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/onecolumn and caption on oddpage (3)}% \ifoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: oneside/onecolumn/oddpage and caption on oddpage (3)}% \setBottomCaption\setPageObject \else + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->oneside/onecolumn/evenpage and caption on oddpage (3)}% \afterpage{\setBottomCaption\setPageObject}% \fi \fi @@ -1256,35 +1317,50 @@ \or% caption on the inner column 4->inner % \set@caption@object \if@twocolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn and caption on inner column (4)}% \ifoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/oddpage and caption on inner column (4)}% \if@firstcolumn% on right side + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/oddpage/firstcolumn and caption on inner column (4)}% \setBottomCaption\setPageObject \else % right column on right side + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/oddpage/secondcolumn and caption on inner column (4)}% \setPageObject\setBottomCaption% start next firstcolumn next page \fi \else + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/evenpage and caption on inner column (4)}% \if@firstcolumn% on left side + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage^2 -> twoside/evenpage/firstcolumn and caption on inner column (4)}% \afterpage{\afterpage{\setBottomCaption\setPageObject}}% start next page/first column \else% left page/column + \hvfloat@typeout{>>>do@@@@hvFloat: twoside/evenpage/secondcolumn and caption on inner column (4)}% \setBottomCaption\setPageObject% start on same page/column \fi \fi \else% onecolumn + \hvfloat@typeout{>>>do@@@@hvFloat: onecolumn and caption on inner column (4)}% \setBottomCaption\setPageObject \fi \or% caption on the outer column 5->outer % \set@caption@object \if@twocolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn and caption on outer column (5)}% \ifoddpage + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/oddpage and caption on outer column (5)}% \if@firstcolumn + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage^2 -> firstcolumn/oddpage/twocolumn and caption on outer column (5)}% \afterpage{\afterpage{\setBottomCaption\setPageObject}}% \else + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/oddpage/secondcolumn and caption on outer column (5)}% \afterpage{\setBottomCaption\setPageObject}% \fi \else% even page (left) + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/evenpage and caption on outer column (5)}% \if@firstcolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/evenpage/firstcolumn and caption on outer column (5)}% \setBottomCaption\setPageObject \else + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/evenpage/secondolumn and caption on outer column (5)}% %%% !!!! to-do: !!!! \fi \fi @@ -1293,22 +1369,30 @@ \fi \or% caption after object on same page 6->right for twocolumn \if@twocolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn and caption after object (6)}% \if@firstcolumn + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/firstcolumn and caption after object (6)}% \afterpage{\setPageObject\setBottomCaption}% \else + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/secondcolumn and caption after object (6)}% \setPageObject\setBottomCaption \fi \else% always caption _after_ object for onecolumn + \hvfloat@typeout{>>>do@@@@hvFloat: onecolumn and caption after object (6)}% \setPageObject\setBottomCaption \fi \or% caption before object on same page 7->left for twocolumn \if@twocolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn and caption before object (7)}% \if@firstcolumn + \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/firstcolumn and caption before object (7)}% \setBottomCaption\setPageObject \else + \hvfloat@typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/secondcolumn and caption before object (7)}% \afterpage{\setBottomCaption\setPageObject}% \fi \else% onecolumn -> same as before + \hvfloat@typeout{>>>do@@@@hvFloat: onecolumn and caption before object (7)}% \setBottomCaption\setPageObject \fi \fi @@ -1322,7 +1406,8 @@ % \def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page % #1-> 0/1 caption under/right - \hv@typeout{>>>doublePage: start with definitions of \hv@floatObject}% + \hvfloat@typeout{----------------------------- do@hvFloat@doublePage#1 --------------------------}% + \hvfloat@typeout{>>>do@hvFloat@doublePage: begin with definitions of \hv@floatObject}% \global\hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax \global\hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection\relax \xdef\hv@caption@format@temp{\hv@caption@format}% it gets lost otherwise for next afterpage @@ -1339,35 +1424,37 @@ \endminipage}% \savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \ifnum#1=0\relax % no rotation, caption below - \hv@typeout{Texthöhe: \the\textheight}% - \hv@typeout{Objekthöhe: \the\ht\hvObjectBox}% - \hv@typeout{Captionhöhe: \the\ht\hvCaptionBox}% + \hvfloat@typeout{Texthöhe: \the\textheight}% + \hvfloat@typeout{Objekthöhe: \the\ht\hvObjectBox}% + \hvfloat@typeout{Captionhöhe: \the\ht\hvCaptionBox}% \@tempdima=\dimexpr\ht\hvObjectBox+\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip +\textfloatsep\relax%+\floatsep\relax - \hv@typeout{Summe: \the\@tempdima}% + \hvfloat@typeout{Summe: \the\@tempdima}% \ifdim\@tempdima > \dimexpr\textheight-\hv@minTextlines\relax - \hv@typeout{hvfloat: switched to floattype p}% + \hvfloat@typeout{hvfloat: switched to floattype p}% \hv@switchTypetrue \fi \fi - \hv@typeout{do@hvFloat@doublePage:hv@tempWidthA=\the\hv@tempWidthA}% + \hvfloat@typeout{do@hvFloat@doublePage:hv@tempWidthA=\the\hv@tempWidthA}% \ifhv@forceOutput \do@hvFloat@doublePAGECaptionRight{#1}% no cheque \else \checkoddpage \ifoddpage + \hvfloat@typeout{do@hvFloat@doublePage:oddpage}% \if@twocolumn + \hvfloat@typeout{do@hvFloat@doublePage: oddpage/twocolumn}% \if@firstcolumn - \hv@typeout{do@hvFloat@doublePage:oddpage->twocolumn->firstcolumn}% + \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->firstcolumn}% \ifhv@switchType - \hv@typeout{hvfloat: switched to floattype p}% + \hvfloat@typeout{hvfloat: switched to floattype p}% \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% \else - \hv@typeout{calling do@hvFloat@doublePageCaptionRight}% + \hvfloat@typeout{calling do@hvFloat@doublePageCaptionRight}% %\afterpage{ \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%}% \fi \else - \hv@typeout{do@hvFloat@doublePage:oddpage->twocolumn->secondcolumn}% + \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->secondcolumn}% \ifhv@tugboat \do@hvFloat@doublePageCaptionRight{#1}% \else @@ -1378,14 +1465,22 @@ \fi \fi \fi - \else + \else% onecolumn + \hvfloat@typeout{do@hvFloat@doublePage: oddpage/onecolumn}% \ifhv@switchType + \hvfloat@typeout{do@hvFloat@doublePage: oddpage/onecolumn/switchType}% \do@hvFloat@doublePAGECaptionRight{#1}% \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \hvfloat@typeout{do@hvFloat@doublePage: call do@hvFloat@doublePageCaptionRight #1}% + \ifhv@forceLeft + \do@hvFloat@doublePageCaptionRight{#1}% no \afterpage + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi \fi \fi \else% we have an even page + \hvfloat@typeout{do@hvFloat@doublePage:evenpage -> (\thepage)}% \if@twocolumn \if@firstcolumn \ifhv@switchType @@ -1401,33 +1496,42 @@ \fi \fi \else% onecolumn + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn -> (\thepage)}% \ifhv@switchType + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/switchType -> (\thepage)}% \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% \else - \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType -> (\thepage)}% + \ifhv@forceLeft + \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType/forceLeft -> (\thepage)}% + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \else + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \fi \fi \fi \fi - \let\c@fptop\hv@fptop + \let\@fptop\hv@fptop \fi \endgroup% started at main macro \hvFloat + \hvfloat@typeout{----------------------------- do@hvFloat@doublePage#1 ... Ende ----------------------}% } % \def\do@hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ---------------------------------- - \hv@typeout{do@hvFloat@doublePageCaptionRight->start}% + \hvfloat@typeout{do@hvFloat@doublePageCaptionRight->start}% \do@hvFloat@doublePageCaptionRightObjectLeft{0pt}% \afterpage{\do@hvFloat@doublePageCaptionRightObjectRight{#1}}% } % \def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object - \begin{\hv@floatType*}[!t] - \hv@typeout{>>>doublePage: start with left side of the object \hv@floatObject}% + \begin{\hv@floatType}[!t] + \hvfloat@typeout{>>>doublePage: begin with left side of the object \hv@floatObject}% \hv@set@noverticalSpace \hfuzz=\maxdimen \let\c@hv@tempCNTfigA\c@figure \let\c@hv@tempCNTtabA\c@table \expandafter\hvFloatSet\expandafter{\hv@save@setting}% - \hv@typeout{Float position parameter is for left page: !t}% + \hvfloat@typeout{Float position parameter is for left page: !t}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \ifx\hv@label\@empty @@ -1440,16 +1544,18 @@ \label{\hv@label}% \fi \ifhv@global@sameHeight - \hv@typeout{text should be of same height of both pages}% + \hvfloat@typeout{text should be of same height of both pages}% \par\noindent\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}% % \vspace{-2pt}% \fi \hv@reset@noverticalSpace - \end{\hv@floatType*}% + \hvfloat@typeout{>>>doublePage: end with left side of the object \hv@floatObject}% + \end{\hv@floatType}% } + \def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object \begin{\hv@floatType*}[!t] - \hv@typeout{>>>doublePage: start with right side of the object \hv@floatObject}% + \hvfloat@typeout{>>>doublePage: begin with right side of the object \hv@floatObject}% \hv@set@noverticalSpace \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% @@ -1459,8 +1565,8 @@ \hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax% FÜR FTK \savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}% \hv@tempWidthB=\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax - \hv@typeout{Height of right box: \the\ht\hv@rightBox}% - \hv@typeout{Depth of right box : \the\dp\hv@rightBox}% + \hvfloat@typeout{Height of right box: \the\ht\hv@rightBox}% + \hvfloat@typeout{Depth of right box : \the\dp\hv@rightBox}% \ifdim\dp\hv@rightBox > \z@ \raisebox{\depth}{\usebox\hv@rightBox}% \else @@ -1482,7 +1588,7 @@ \c@figure=\numexpr\c@hv@tempCNTfigB-1\relax \c@table=\numexpr\c@hv@tempCNTtabB-1\relax \ifnum#1>\z@ % caption on the right - \hv@typeout{doublePage: capAngle=\hvSet@capAngle}% + \hvfloat@typeout{doublePage: capAngle=\hvSet@capAngle}% \ifnum\hvSet@capAngle > \z@ \hspace{\hv@floatCapSep}% \rlap{\rotatebox{\hvSet@capAngle}{\parbox[b]{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% @@ -1519,6 +1625,7 @@ \fi \vspace{0pt}% \hv@reset@noverticalSpace + \hvfloat@typeout{>>>doublePage: end with right side of the object \hv@floatObject}% \end{\hv@floatType*} } % @@ -1537,20 +1644,20 @@ \expandafter\global\expandafter\savebox\expandafter\hv@boxRightPage\expandafter{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}% \checkoddpage \ifoddpage - \hv@typeout{do@hvFloat@doublePAGE: oddpage}% + \hvfloat@typeout{do@hvFloat@doublePAGE: oddpage}% \if@twocolumn \if@firstcolumn - \hv@typeout{do@hvFloat@doublePAGE: ifoddpage->twocolumn->firstcolumn}% + \hvfloat@typeout{do@hvFloat@doublePAGE: ifoddpage->twocolumn->firstcolumn}% \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% \else - \hv@typeout{do@hvFloat@doublePAGE: ifoddpage->twocolumn->secondcolumn}% + \hvfloat@typeout{do@hvFloat@doublePAGE: ifoddpage->twocolumn->secondcolumn}% \do@hvFloat@doublePAGECaptionRight{#1}% \fi \else \do@hvFloat@doublePAGECaptionRight{#1}% \fi \else - \hv@typeout{do@hvFloat@doublePAGE: evenpage}% + \hvfloat@typeout{do@hvFloat@doublePAGE: evenpage}% \if@twocolumn \if@firstcolumn \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}}% @@ -1566,7 +1673,7 @@ % \def\do@hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ---------------------------------- % #1-> 0/1 caption under/right - \hv@typeout{do@hvFloat@doublePAGECaptionRight->start}% + \hvfloat@typeout{do@hvFloat@doublePAGECaptionRight->start}% \afterpage{% \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% @@ -1626,6 +1733,7 @@ % \def\do@hvFloat@doubleFULLPAGE#1{% image on left and right page with caption before/below/right/after % #1-> 0/1 caption under/right + \hvfloat@typeout{>>> do@hvFloat@doubleFULLPAGE: #1}% \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \ifx\hvSet@capPos\hv@After \global\hv@@capPos=1 \else @@ -1642,47 +1750,55 @@ % \savebox\hv@rightBox{\clipbox*{\the\hv@leftPageObjectWidth{} \depth{} \width{} \height}{\usebox\hvObjectBox}}% % \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifoddpage - \hv@typeout{do@hvFloat@doubleFULLPAGE: ifoddpage=true}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage}% \ifcase\hv@@capPos % =0 Caption before - \hv@typeout{do@hvFloat@doubleFULLPAGE: caption before}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption before (0)}% \if@twocolumn - \hv@typeout{do@hvFloat@doubleFULLPAGE: twocolumn=true}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption before/twocolumn}% \if@firstcolumn - \hv@typeout{do@hvFloat@doubleFULLPAGE: firstcolumn=true}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption before/twocolumn/firstcolumn}% \ifhv@twoColumnCaption - \hv@typeout{do@hvFloat@doubleFULLPAGE: twoColumnCaption=true}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage -> oddpage/caption before/twocolumn/firstcolumn/twoColumnCaption}% \set@Normal@Bottom@Caption* \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore}% \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage -> oddpage/caption before/twocolumn/firstcolumn/oneColCaption}% \afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}% \fi - \else% \if@firstcolumn + \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption before/twocolumn/secondcolumn}% \set@Normal@Bottom@Caption \do@hvFloat@doubleFULLPAGE@CaptionBefore \fi - \else% \if@twocolumn + \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption before/onecolumn}% \set@Normal@Bottom@Caption \do@hvFloat@doubleFULLPAGE@CaptionBefore \fi \or % =1 Caption after - \hv@typeout{do@hvFloat@doubleFULLPAGE: caption after}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after (1)}% \ifhv@twoColumnCaption - \hv@typeout{do@hvFloat@doubleFULLPAGE: twoColumnCaption=true}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after/twoColCaption (1)}% \if@firstcolumn - \hv@typeout{do@hvFloat@doubleFULLPAGE: firstcolumn=true}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after/firstcolumn (1)}% \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol}% \else - \hv@typeout{do@hvFloat@doubleFULLPAGE: firstcolumn=false}% + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after/secondcolumn (1)}% \do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol \fi \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after/oneColCaption (1)}% \if@twocolumn + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after/twoColCaption/twocolumn (1)}% \if@firstcolumn + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage -> oddpage/caption after/twoColCaption/twocolumn/firstcolumn (1)}% \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after/twoColCaption/twocolumn/secondcolumn (1)}% \do@hvFloat@doubleFULLPAGE@CaptionAfter \fi \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage/caption after/twoColCaption/onecolumn (1)}% \do@hvFloat@doubleFULLPAGE@CaptionAfter \fi \fi @@ -1698,36 +1814,53 @@ \fi \fi% \ifcase \else% we have an even page + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage (1 -- \thepage)}% \ifcase\hv@@capPos% Before + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage/caption before (0 -- \thepage)}% \if@twocolumn + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage/caption before/twocolumn (0 -- \thepage)}% \if@firstcolumn + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage/caption before/twocolumn/firstcolumn (0 -- \thepage)}% \ifhv@twoColumnCaption + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage^2->evenpage/caption before/twocolumn/firstcolumn/twocolCap (0 -- \thepage)}% \afterpage{\afterpage\set@Normal@Bottom@Caption*\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}% \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage^2 -> evenpage/caption before/twocolumn/firstcolumn/oneColCap (0 -- \thepage)}% \afterpage{\afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}}% \fi \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage^2->evenpage/caption before/twocolumn/secondcolumn (0 -- \thepage)}% \afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}% \fi - \else% \if@twocolumn + \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage -> evenpage/caption before/onecolumn (0 -- \thepage)}% \afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}% \fi \or % capPos after + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage/caption after (1 -- \thepage)}% \if@twocolumn + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage/caption after/twocolumn (1 -- \thepage)}% \if@firstcolumn + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage/caption after/twocolumn/firstcolumn (1 -- \thepage)}% \ifhv@twoColumnCaption + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage -> evenpage/caption after/twocolumn/firstcolumn/twoColCaption (1 -- \thepage)}% \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{#1}}}% \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage -> evenpage/caption after/twocolumn/firstcolumn/oneColCaption (1 -- \thepage)}% \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% \fi \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: evenpage/caption after/twocolumn/secondcolumn (1 -- \thepage)}% \ifhv@twoColumnCaption + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage1 2 -> evenpage/caption after/twocolumn/secondcolumn/twoColCaption (1 -- \thepage)}% \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{#1}}}% \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage1 2 -> evenpage/caption after/twocolumn/secondcolumn/oneColCaption (1 -- \thepage)}% \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% \fi \fi - \else% \if@twocolumn + \else + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: afterpage -> evenpage/caption after/onecolumn (1 -- \thepage)}% \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% \fi \else % \ifcase Any other caption @@ -1861,9 +1994,9 @@ } \def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{% - \hv@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: start} % + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: start} % \afterpage{% - \hv@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: afterpage start} % + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: afterpage start} % \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% @@ -1876,7 +2009,7 @@ \ifx\hv@label\@empty\else\label{\hv@label}\fi \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \newpage\if@twocolumn\null\newpage\fi - \hv@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: insert newpage} % + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: insert newpage} % \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \thispagestyle{empty}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip-\parskip+1.5\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox @@ -1906,7 +2039,7 @@ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \end{\hv@floatType*}% }% - \hv@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: afterpage done} % + \hvfloat@typeout{do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol: afterpage done} % } \def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{% @@ -2013,6 +2146,8 @@ } \def\setPageObject{% + \hvfloat@typeout{>>>> setPageObject/start environment ...}% + \afterpage{\checkoddpage}% \ifhv@star \begin{\hv@floatType*}[p]% \else @@ -2021,25 +2156,32 @@ \hv@tempcnt=\@floatpenalty% suppress "float too big" message \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% - \ifhv@FULLPAGE + \ifhv@FULLPAGE + \hvfloat@typeout{>>>> setPageObject/FULLPAGE}% \@floatpenalty=\z@% no message that float too large \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip% - \checkoddpage \if@twoside + \hvfloat@typeout{>>>> setPageObject/FULLPAGE/twoside}% \ifoddpage + \hvfloat@typeout{>>>> setPageObject/FULLPAGE/twoside/oddpage (\thepage)}% \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% \else + \hvfloat@typeout{>>>> setPageObject/FULLPAGE/twoside/evenpage (\thepage)}% \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \fi \else + \hvfloat@typeout{>>>> setPageObject/FULLPAGE/oneside}% \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% \fi + \hvfloat@typeout{>>>> setPageObject/FULLPAGE/set pagestyle empty}% \AtBeginShipoutNext{\thispagestyle{empty}}% to prevent heading/footer % \afterpage{\AddToHookNext{shipout/after}{\thispagestyle{empty}}}% \usebox\hvObjectBox \else + \hvfloat@typeout{>>>> setPageObject/NO FULLPAGE}% \usebox\hvObjectBox \fi + \hvfloat@typeout{>>>> setPageObject/stop environment}% \ifhv@star \end{\hv@floatType*}% \else -- cgit v1.2.3