From 530f71fe4b320a38b22fc3a03b0eb3960b785f48 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 21 Jul 2022 20:14:53 +0000 Subject: hvfloat (21jul22) git-svn-id: svn://tug.org/texlive/trunk@63953 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvfloat/Changes | 2 + Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf | Bin 80294 -> 79855 bytes Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf | Bin 86722 -> 86559 bytes Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/capPos.pdf | Bin 95389 -> 98061 bytes Master/texmf-dist/doc/latex/hvfloat/capVPos.inc | 32 +- .../texmf-dist/doc/latex/hvfloat/default1s1c.pdf | Bin 81991 -> 81685 bytes .../texmf-dist/doc/latex/hvfloat/default1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/default1s2c.pdf | Bin 83275 -> 83180 bytes .../texmf-dist/doc/latex/hvfloat/default1s2c.tex | 6 +- .../texmf-dist/doc/latex/hvfloat/default2s1c.pdf | Bin 79445 -> 78954 bytes .../texmf-dist/doc/latex/hvfloat/default2s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/default2s2c.pdf | Bin 85824 -> 85642 bytes .../texmf-dist/doc/latex/hvfloat/default2s2c.tex | 10 +- .../doc/latex/hvfloat/doublefullpage2s2c.pdf | Bin 0 -> 1759143 bytes .../doc/latex/hvfloat/doublefullpage2s2c.tex | 802 +++++++++++++++++++++ .../doc/latex/hvfloat/doublepage2s1c.pdf | Bin 2314853 -> 2317480 bytes .../doc/latex/hvfloat/doublepage2s1c.tex | 7 +- .../doc/latex/hvfloat/doublepage2s2c.pdf | Bin 619030 -> 616570 bytes Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf | Bin 77658 -> 77202 bytes Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf | Bin 86404 -> 86195 bytes Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf | Bin 84813 -> 84135 bytes Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf | Bin 85098 -> 84895 bytes Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf | Bin 0 -> 86549 bytes .../texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex | 64 ++ .../texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf | Bin 86773 -> 87033 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | Bin 5039170 -> 5037834 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 8 +- Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf | Bin 84020 -> 83734 bytes Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf | Bin 83977 -> 83699 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf | Bin 84013 -> 83924 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf | Bin 85512 -> 85326 bytes Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-after1s1c.pdf | Bin 142624 -> 142146 bytes .../doc/latex/hvfloat/multi-after1s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default1s1c.pdf | Bin 146172 -> 145886 bytes .../doc/latex/hvfloat/multi-default1s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default1s2c.pdf | Bin 94586 -> 102871 bytes .../doc/latex/hvfloat/multi-default1s2c.tex | 10 +- .../doc/latex/hvfloat/multi-default2s1c.pdf | Bin 146343 -> 146064 bytes .../doc/latex/hvfloat/multi-default2s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default2s2c.pdf | Bin 92182 -> 100507 bytes .../doc/latex/hvfloat/multi-default2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-inner2s2c.pdf | Bin 89784 -> 98070 bytes .../doc/latex/hvfloat/multi-inner2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-outer2s2c.pdf | Bin 92984 -> 101319 bytes .../doc/latex/hvfloat/multi-outer2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-right1s1c.pdf | Bin 145736 -> 145453 bytes .../doc/latex/hvfloat/multi-right1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf | Bin 77805 -> 77375 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf | Bin 86523 -> 86322 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf | Bin 174218 -> 173604 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf | Bin 85566 -> 85385 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf | Bin 86318 -> 86224 bytes Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf | Bin 84292 -> 84006 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf | Bin 84680 -> 84587 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex | 10 +- .../doc/latex/hvfloat/paper-after1s1c.pdf | Bin 79267 -> 78903 bytes .../doc/latex/hvfloat/paper-after1s1c.tex | 10 +- .../doc/latex/hvfloat/paper-after2s2c.pdf | Bin 0 -> 89620 bytes .../doc/latex/hvfloat/paper-after2s2c.tex | 81 +++ .../doc/latex/hvfloat/paper-default1s1c.pdf | Bin 79967 -> 81195 bytes .../doc/latex/hvfloat/paper-default1s1c.tex | 13 +- .../doc/latex/hvfloat/paper-default1s2c.pdf | Bin 90508 -> 90436 bytes .../doc/latex/hvfloat/paper-default1s2c.tex | 10 +- .../doc/latex/hvfloat/paper-default2s1c.pdf | Bin 87935 -> 87873 bytes .../doc/latex/hvfloat/paper-default2s1c.tex | 8 +- .../doc/latex/hvfloat/paper-default2s2c.pdf | Bin 90332 -> 90257 bytes .../doc/latex/hvfloat/paper-default2s2c.tex | 10 +- .../doc/latex/hvfloat/paper-even2s1c.pdf | Bin 0 -> 87165 bytes .../doc/latex/hvfloat/paper-even2s1c.tex | 81 +++ .../doc/latex/hvfloat/paper-inner2s2c.pdf | Bin 87855 -> 87776 bytes .../doc/latex/hvfloat/paper-inner2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf | Bin 0 -> 87061 bytes .../texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex | 81 +++ .../doc/latex/hvfloat/paper-right1s1c.pdf | Bin 80290 -> 81371 bytes .../doc/latex/hvfloat/paper-right1s1c.tex | 10 +- .../hvfloat/paper-twocolcaption-after2s2c.pdf | Bin 0 -> 1615381 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 -> 79681 bytes Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf | Bin 89340 -> 89151 bytes Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf | Bin 81033 -> 78955 bytes Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf | Bin 85585 -> 85418 bytes Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/runAll.sh | 2 +- .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf | Bin 143952 -> 143688 bytes .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf | Bin 144771 -> 144612 bytes .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex | 10 +- .../doc/latex/hvfloat/sub-default1s1c.pdf | Bin 144003 -> 143725 bytes .../doc/latex/hvfloat/sub-default1s1c.tex | 10 +- .../doc/latex/hvfloat/sub-default1s2c.pdf | Bin 144217 -> 144030 bytes .../doc/latex/hvfloat/sub-default1s2c.tex | 10 +- .../doc/latex/hvfloat/sub-default2s2c.pdf | Bin 143517 -> 143328 bytes .../doc/latex/hvfloat/sub-default2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf | Bin 143873 -> 143611 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf | Bin 144879 -> 144711 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf | Bin 144315 -> 144144 bytes .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf | Bin 120949 -> 120832 bytes Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf | Bin 121917 -> 121819 bytes Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty | 59 +- 122 files changed, 1494 insertions(+), 286 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 9976f84d270..85e1f31fbee 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,6 @@ hvfloat.sty: +2.40 2022-07-20 - fix full page floats without pagenumber. We now use + package floatpag and \thisfloatpagestyle 2.39 2022-05-01 - fix for using package calc and global length setting 2.38 2022-04-02 - added option l for capWidth to get a caption with linewidth, if also using the option wide for the object diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf index 40854d1f723..92a1d4d54c9 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..d1c3b2d8755 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..c527cfd980c 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..ac6eb73113a 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..80402bdde40 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..75436d0f01d 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..95b0cf19fb4 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..7c52645880f 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..bb31028bef9 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..040449a0173 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..79c403fd392 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..6dcc088e0d1 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..bcd7e34b43a 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..1be9492a91f 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..250833bf54f 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..074ceff1ebc 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/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf index 83ad56d4727..65487377e39 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 116141dec66..fb50aa09417 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 530 2022-05-01 11:01:31Z herbert $ +%% $Id: hvfloat.tex 584 2022-07-20 18:29:58Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,usegeometry]{scrartcl} @@ -241,6 +241,7 @@ The following packages are loaded by \Lpack{hvfloat} and the optional argument \Lpack{subcaption}, \Lpack{atbegshi}, \Lpack{stfloats}, +\Lpack{floatpag}, \Lpack{expl3}, \Lpack{multido}, \Lpack{graphicx}, \Lpack{xkeyval}, @@ -2666,11 +2667,12 @@ in the inner margin on both pages. Placing the caption on the image itself is not the best solution. With the optional arguments \Lkeyval{before} and \Lkeyval{after} for \Lkeyword{capPos}, the caption can be placed on the bottom -of the preceding or follwing page of the doublepage object. A givel label, e.g. \texttt{foo} will always point to the +of the preceding or following page of the doublepage object. A givel label, e.g. \texttt{foo} will always point to the page with the left part of the object. Internally are two additional labels defined: \texttt{foo-cap} points to the caption and \texttt{foo-2} points to the right part of the doublepage object. -In the follwoing example~\ref{foo} the caption is on page~\pageref{foo-cap}, the left image part on page~\pageref{foo} +In the follwoing example~\ref{foo} the caption is on page~\pageref{foo-cap}, the left image part on +page~\pageref{foo} and the right part on page~\pageref{foo-2}. In the follwoing example~\ref{bar} the caption is on page~\pageref{bar-cap}, the left image part on page~\pageref{bar} and the right part on page~\pageref{bar-2}. All three labels points to the same figure or table number: diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf index 73a49d0a073..8a9972eb2ff 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..3a73ceb98b0 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..420038d756b 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..0ed39212023 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..bda39bf1420 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..663ef48f3a7 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..b2a9f1cfbd4 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..68a05d99a68 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..f2c2b955e50 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..409a42e8840 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..007311ba407 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..b7241dabae2 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..5e9f30293d8 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..675f2499a88 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..a1e777fe523 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..6e736f1a978 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..54d63e7e7c8 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..2ecc0080d59 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..80c32239b7e 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..a48bdeff128 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..efdf0c08f9a 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..a0091c6cd0c 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..139b9f6a0ac 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..96bf69e5886 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..80206968802 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..4146e7e1825 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..93208e62a9b 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..bb684902308 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..e478ced583e 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..76fec026a9b 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..79abdb9d112 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..7bd72cb3ad7 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..8dc456d441c 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..d1904cada66 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..7b1ecfb77ef 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 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..edec7c4ddaf 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..3a7d78069e3 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..22f84d81d6d 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..39e03772605 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..68205759a48 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..8f71ca5fc2b 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..0faebe2324a 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..f7224bc6d82 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..32af056a0e9 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..ce2bc459b0d 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 ec23f2c3181..7c1e23111ac 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 530 2022-05-01 11:01:31Z herbert $ +%% $Id: hvfloat.sty 584 2022-07-20 18:29:58Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -16,8 +16,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.39} -\def\filedate{2022/05/01} +\def\fileversion{2.40} +\def\filedate{2022/07/20} %\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)] \let\hvFloatFileVersion\fileversion @@ -27,7 +27,7 @@ \newif\ifhv@nostfloats \hv@nostfloatsfalse \newif\ifhv@tugboat \hv@tugboatfalse -\DeclareOption{fbox}{\hv@fboxtrue\setlength{\fboxsep}{1pt}} +\DeclareOption{fbox}{\hv@fboxtrue\setlength\fboxsep{1pt}} \DeclareOption{hyperref}{\hv@hyperreftrue} \DeclareOption{nostfloats}{\hv@nostfloatstrue} \DeclareOption{no-stfloats}{\hv@nostfloatstrue} @@ -56,8 +56,12 @@ \ifhv@hyperref \RequirePackage{hyperref} \fi -\ifhv@nostfloats\else +\ifhv@nostfloats + \def\thisfloatpagestyle#1{% + \global\@namedef{\number\@currbox @float}{\thispagestyle{#1}}} +\else \RequirePackage{stfloats}% for bottom floats in a twocolumn mode + \RequirePackage{floatpag}% for bottom floats in a twocolumn mode \fi % \providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} @@ -67,10 +71,9 @@ \newlength\hvWideWidth \newlength\hvMultiFloatSkip \newlength\hvMaxCapWidth -%\AtBeginDocument{% -% \setlength\hv@BottomSpace{\dimexpr\paperheight-1in-\topmargin-\headheight-\headsep-\textheight}} -\newlength\hvFullWidth % only for user purpose -\setlength\hvFullWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep} +\newlength\hvFloatFullWidth % only for user purpose +\AtBeginDocument{\hvFloatFullWidth=\the\dimexpr\textwidth+\marginparwidth+\marginparsep\relax} + \newsavebox\hvObjectBox \newsavebox\hvCaptionBox @@ -186,6 +189,7 @@ \newif\ifhv@global@sameHeight \newif\ifhv@forceOutput + \newlength\hvSet@bindCorrection \newlength\hvSet@sepLineskip \newlength\hv@leftPageObjectWidth% for doublepage images @@ -203,7 +207,7 @@ \define@key{hvSet}{bindCorr}[0pt]{% \def\hv@temp{#1}% \ifx\hv@temp\hv@Inner - \setlength\hvSet@bindCorr{\dimexpr1in+\oddsidemargin}% + \hvSet@bindCorr=\the\dimexpr1in+\oddsidemargin\relax \else \setlength\hvSet@bindCorr{#1}% \fi @@ -259,7 +263,7 @@ \let\hvFloatSetDefaults\setDefaults \hvFloatSetDefaults% onyl for first loading of the package -\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi} +\providecommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi} \providecommand\@tugclass{\@empty} \ifx\@tugclass\@empty @@ -283,8 +287,9 @@ \newlength\fboxlinewidth \AtBeginDocument{% - \setlength\fboxlinewidth{\dimexpr\linewidth-2\fboxrule-2\fboxsep}% + \fboxlinewidth=\the\dimexpr\linewidth-2\fboxrule-2\fboxsep\relax } + \setlength\belowcaptionskip{\abovecaptionskip}% it is in latex.ltx = 0pt \newcommand\saveCaptionSkip{% \setlength{\hvAboveCaptionSkip}{\abovecaptionskip}% @@ -331,9 +336,10 @@ \expandafter\captionsetup\expandafter{\hv@caption@format,position=below} \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi \endgroup} + % \newlength\hv@maxImageWidth -\AtBeginDocument{\hv@maxImageWidth=\columnwidth} +\AtBeginDocument{\setlength\hv@maxImageWidth{\columnwidth}} \define@key{Gin}{columnWidth}[true]{% \def\Gin@ewidth{\columnwidth}% @@ -361,7 +367,7 @@ \Gin@boolkey{false}{iso}% } \define@key{Gin}{doublefullPage}[true]{% - \def\Gin@ewidth{\dimexpr2\paperwidth-2in-2\evensidemargin}% + \def\Gin@ewidth{\the\dimexpr2\paperwidth-2in-2\evensidemargin}% % \def\Gin@eheight{\paperheight}% \Gin@boolkey{true}{iso}% } @@ -423,7 +429,6 @@ \fi } - \def\drawSepLine{% \par\noindent \if@twocolumn @@ -470,7 +475,7 @@ \def\hvFloat@i*{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}} \def\do@hvFloat[#1]{% \begingroup - \setlength\hvWideWidth{\dimexpr\columnwidth+\marginparwidth+\marginparsep}% + \hvWideWidth=\the\dimexpr\columnwidth+\marginparwidth+\marginparsep\relax% % \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}% % \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}% \hv@maxImageWidth=\textwidth @@ -630,12 +635,12 @@ \ifx\hvSet@capWidth\hv@Natural% captionwidth=\linewidth-\objectwidth-separation \ifhv@capbeside \ifhv@wide - \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax}% + \hvCapWidth=\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax \else \ifhv@star - \setlength\hvCapWidth{\the\dimexpr\textwidth-\hvObjectWidth-\hv@floatCapSep\relax}% + \hvCapWidth=\the\dimexpr\textwidth-\hvObjectWidth-\hv@floatCapSep\relax \else - \setlength\hvCapWidth{\the\dimexpr\linewidth-\hvObjectWidth-\hv@floatCapSep\relax}% + \hvCapWidth=\the\dimexpr\linewidth-\hvObjectWidth-\hv@floatCapSep\relax \fi \fi \else @@ -645,13 +650,13 @@ \ifhv@capbeside \ifhv@wide \setlength\hvCapWidth{\hvSet@capWidth\hvWideWidth}% - \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax}% + \@tempdima=\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax \else \setlength\hvCapWidth{\hvSet@capWidth\columnwidth}% - \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hv@floatCapSep\relax}% + \@tempdima=\the\dimexpr\columnwidth-\hvObjectWidth-\hv@floatCapSep\relax \fi \ifdim\hvCapWidth>\@tempdima - \setlength\hvCapWidth{\@tempdima}% + \hvCapWidth=\@tempdima \fi \else \ifhv@wide @@ -1101,7 +1106,7 @@ \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}% - \global\hv@leftPageObjectWidth=\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax + \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 \@dblfpbot=0\p@ \@plus 1fil% @@ -1749,7 +1754,7 @@ \endminipage}}}% \fi \else% ifnum, caption not rotated, under or over the right page - \setlength\hv@tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}% + \hv@tempWidthA=\the\dimexpr\paperheight-\ht\hvObjectBox\relax \ifdim\hv@tempWidthA > \ht\hvCaptionBox \else \put(\the\dimexpr1.5\paperwidth-\wd\hvObjectBox-\hvSet@bindCorrection,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][c]{\parbox{\textwidth}{%% @@ -1782,12 +1787,15 @@ \end{\hv@floatType}% } + + \def\setPageObject{% \ifhv@star \begin{\hv@floatType*}[p]% \else \begin{\hv@floatType}[p]% \fi + \thisfloatpagestyle{empty}% \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \ifhv@FULLPAGE @@ -1802,7 +1810,8 @@ \else \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% \fi - \AtBeginShipoutNext{\thispagestyle{empty}}% +% \AtBeginShipoutNext{\thispagestyle{empty}}% +% \afterpage{\AddToHookNext{shipout/after}{\thispagestyle{empty}}}% \usebox\hvObjectBox \else \usebox\hvObjectBox -- cgit v1.2.3