From d0db1dd18e13db50d0ececacde9ec66069b149cf Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 21 Nov 2022 20:50:01 +0000 Subject: hvfloat (21nov22) git-svn-id: svn://tug.org/texlive/trunk@65069 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvfloat/Changes | 1 + Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf | Bin 80285 -> 80294 bytes Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf | Bin 86639 -> 86722 bytes Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/capPos.pdf | Bin 98061 -> 95389 bytes Master/texmf-dist/doc/latex/hvfloat/capVPos.inc | 32 +- .../texmf-dist/doc/latex/hvfloat/default1s1c.pdf | Bin 81892 -> 81991 bytes .../texmf-dist/doc/latex/hvfloat/default1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/default1s2c.pdf | Bin 83094 -> 83275 bytes .../texmf-dist/doc/latex/hvfloat/default1s2c.tex | 6 +- .../texmf-dist/doc/latex/hvfloat/default2s1c.pdf | Bin 79336 -> 79445 bytes .../texmf-dist/doc/latex/hvfloat/default2s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/default2s2c.pdf | Bin 85649 -> 85824 bytes .../texmf-dist/doc/latex/hvfloat/default2s2c.tex | 10 +- .../doc/latex/hvfloat/doublefullpage2s2c.pdf | Bin 1759178 -> 0 bytes .../doc/latex/hvfloat/doublefullpage2s2c.tex | 802 --------------------- .../doc/latex/hvfloat/doublepage2s1c.pdf | Bin 2317533 -> 2314853 bytes .../doc/latex/hvfloat/doublepage2s1c.tex | 7 +- .../doc/latex/hvfloat/doublepage2s2c.pdf | Bin 616639 -> 619030 bytes Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf | Bin 77579 -> 77658 bytes Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf | Bin 86239 -> 86404 bytes Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf | Bin 84343 -> 84813 bytes Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf | Bin 84927 -> 85098 bytes Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf | Bin 85992 -> 0 bytes .../texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex | 64 -- .../texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf | Bin 86818 -> 86773 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | Bin 5044788 -> 7372289 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 43 +- Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf | Bin 83946 -> 84020 bytes Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf | Bin 83912 -> 83977 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf | Bin 83952 -> 84013 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf | Bin 85349 -> 85512 bytes Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-after1s1c.pdf | Bin 142469 -> 142624 bytes .../doc/latex/hvfloat/multi-after1s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default1s1c.pdf | Bin 146015 -> 146172 bytes .../doc/latex/hvfloat/multi-default1s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default1s2c.pdf | Bin 102882 -> 94586 bytes .../doc/latex/hvfloat/multi-default1s2c.tex | 10 +- .../doc/latex/hvfloat/multi-default2s1c.pdf | Bin 146186 -> 146343 bytes .../doc/latex/hvfloat/multi-default2s1c.tex | 10 +- .../doc/latex/hvfloat/multi-default2s2c.pdf | Bin 100486 -> 92182 bytes .../doc/latex/hvfloat/multi-default2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-inner2s2c.pdf | Bin 98074 -> 89784 bytes .../doc/latex/hvfloat/multi-inner2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-outer2s2c.pdf | Bin 101272 -> 92984 bytes .../doc/latex/hvfloat/multi-outer2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-right1s1c.pdf | Bin 145576 -> 145736 bytes .../doc/latex/hvfloat/multi-right1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf | Bin 77738 -> 77805 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf | Bin 86363 -> 86523 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf | Bin 173797 -> 174218 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf | Bin 85385 -> 85566 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf | Bin 86249 -> 86318 bytes Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf | Bin 84211 -> 84292 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf | Bin 84615 -> 84680 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex | 10 +- .../doc/latex/hvfloat/paper-after1s1c.pdf | Bin 78880 -> 79267 bytes .../doc/latex/hvfloat/paper-after1s1c.tex | 10 +- .../doc/latex/hvfloat/paper-after2s2c.pdf | Bin 89536 -> 0 bytes .../doc/latex/hvfloat/paper-after2s2c.tex | 81 --- .../doc/latex/hvfloat/paper-default1s1c.pdf | Bin 81131 -> 79967 bytes .../doc/latex/hvfloat/paper-default1s1c.tex | 13 +- .../doc/latex/hvfloat/paper-default1s2c.pdf | Bin 90351 -> 90508 bytes .../doc/latex/hvfloat/paper-default1s2c.tex | 10 +- .../doc/latex/hvfloat/paper-default2s1c.pdf | Bin 87795 -> 87935 bytes .../doc/latex/hvfloat/paper-default2s1c.tex | 8 +- .../doc/latex/hvfloat/paper-default2s2c.pdf | Bin 90171 -> 90332 bytes .../doc/latex/hvfloat/paper-default2s2c.tex | 10 +- .../doc/latex/hvfloat/paper-even2s1c.pdf | Bin 87203 -> 0 bytes .../doc/latex/hvfloat/paper-even2s1c.tex | 81 --- .../doc/latex/hvfloat/paper-inner2s2c.pdf | Bin 87688 -> 87855 bytes .../doc/latex/hvfloat/paper-inner2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf | Bin 86991 -> 0 bytes .../texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex | 81 --- .../doc/latex/hvfloat/paper-right1s1c.pdf | Bin 81295 -> 80290 bytes .../doc/latex/hvfloat/paper-right1s1c.tex | 10 +- .../hvfloat/paper-twocolcaption-after2s2c.pdf | Bin 1615276 -> 0 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 80109 -> 80126 bytes Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf | Bin 89180 -> 89340 bytes Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf | Bin 80963 -> 81033 bytes Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf | Bin 85501 -> 85585 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 143794 -> 143952 bytes .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf | Bin 144615 -> 144771 bytes .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex | 10 +- .../doc/latex/hvfloat/sub-default1s1c.pdf | Bin 143843 -> 144003 bytes .../doc/latex/hvfloat/sub-default1s1c.tex | 10 +- .../doc/latex/hvfloat/sub-default1s2c.pdf | Bin 144039 -> 144217 bytes .../doc/latex/hvfloat/sub-default1s2c.tex | 10 +- .../doc/latex/hvfloat/sub-default2s2c.pdf | Bin 143329 -> 143517 bytes .../doc/latex/hvfloat/sub-default2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf | Bin 143721 -> 143873 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf | Bin 144719 -> 144879 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf | Bin 144151 -> 144315 bytes .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex | 10 +- Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf | Bin 120903 -> 120949 bytes Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf | Bin 121871 -> 121917 bytes Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty | 222 +++++- 122 files changed, 517 insertions(+), 1460 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.tex delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex delete mode 100644 Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf delete 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 2987bc5ebbf..bd624f8ca0c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,5 @@ hvfloat.sty: +2.44 2022-11-21 - support "floats" with caption in the margin 2.43 2022-11-07 - fix for empty caption: don't use \caption 2.42 2022-10-02 - fix for twoColumnCaption and multi(sub)floats 2.41 2022-09-01 - another fix full page floats without pagenumber and diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf index f295370a5d1..40854d1f723 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 3a1f4a581ee..bdb9db7170e 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: after1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf index f8158e5bac6..6a3f002998d 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 a8b363d559a..8c9f9989316 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: after2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf index 39dbf5b8e89..630a337a539 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 5e76aaface7..10ef70e88c0 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~\protect\parencite{aksin}}{} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{} \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~\protect\parencite{aksin}}{} +\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{} \blindtext \begin{lstlisting} -\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText~\protect\parencite{aksin}}{} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{} \end{lstlisting} -\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText~\protect\parencite{aksin}}{} +\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{} \blindtext @@ -47,10 +47,10 @@ justification= \subsection{\texttt{capVPos=top}} \begin{lstlisting} -\hvFloat[capPos=outer,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=outer,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText~\protect\parencite{aksin}}{} +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{} \blindtext @@ -65,10 +65,10 @@ justification= \begin{lstlisting} -\hvFloat[capPos=inner,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} \end{lstlisting} -\hvFloat[capPos=inner,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{} \blindtext @@ -78,10 +78,10 @@ justification= \subsection{\texttt{capVPos=bottom}} \begin{lstlisting} -\hvFloat[capPos=outer,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=outer,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{} \blindtext @@ -95,10 +95,10 @@ justification= \blindtext \begin{lstlisting} -\hvFloat[capPos=inner,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} \end{lstlisting} -\hvFloat[capPos=inner,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{} \blindtext \NewColumn @@ -107,10 +107,10 @@ justification= \subsection{\texttt{capPos=center}} \begin{lstlisting} -\hvFloat[capPos=outer,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} \end{lstlisting} -\hvFloat[capPos=outer,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} +\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{} \blindtext @@ -123,10 +123,10 @@ justification= \blindtext \begin{lstlisting} -\hvFloat[capPos=inner,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} \end{lstlisting} -\hvFloat[capPos=inner,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{} +\hvFloat[capPos=right,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 0b3a5074cc0..861efc9ac7a 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 a974d118a39..357a8c75432 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: default1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf index 5e8c61eccc2..60e3cb94ca5 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 79f9f8b101b..86c3b0a8981 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: default1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig: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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:0} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf index 23465bbc93a..33ac8dd8769 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 449cb5d9c18..282925826d9 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: default2s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf index 12e0c446d2b..1291839ce84 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 0055c3c5701..45278e1e8d2 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: default2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf deleted file mode 100644 index 90643a95260..00000000000 Binary files a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex deleted file mode 100644 index 46ae9406ba1..00000000000 --- a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.tex +++ /dev/null @@ -1,802 +0,0 @@ -\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 cc83480ffa1..0d3e2713ef6 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 ebd703e964a..656cbe68c8f 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 299 2021-10-09 14:05:35Z herbert $ +%% $Id: doublepage2s1c.tex 92 2021-05-18 09:46:55Z herbert $ \input{preamble.ltx} \usepackage{blindtext,xcolor,marginnote} @@ -166,11 +166,10 @@ \hvblindtext \hvblindtext -\hvblindtext \subsection{Definition on an even page} \subsubsection{The default} -\begin{verbatim} +\begin{lstlisting} \hvFloat[doublePage,capWidth=n,capPos=right]% {figure}% {\includegraphics[width=2\textwidth]{images/sonne-meer}}% @@ -180,7 +179,7 @@ the paper. A short form is used for the LOF. The parameter is \texttt{doublePage}}% {fig:doublePage0a} -\end{verbatim} +\end{lstlisting} \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 8073f151f8b..1578d673ffd 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 bfb57aa7a58..7be7a1cb5b6 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 d042b908635..75eb2bf8722 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: even1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf index 0c34e896f0b..e98663ed098 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 2965b475020..da5d013c400 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: even1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf index 7a35f756753..09a417c0310 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 0e794a30e74..1ee584c81af 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: even2s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf index b11011009df..e2898a14ae0 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 6952e4e45e4..ce3206c0754 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: even2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf deleted file mode 100644 index 9256a6d997c..00000000000 Binary files a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex deleted file mode 100644 index 1b95fbaa034..00000000000 --- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.tex +++ /dev/null @@ -1,64 +0,0 @@ -\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 3eaf4f661e0..e0e787f9941 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 49c502e55e8..4322700b01d 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 fb50aa09417..8b5da275916 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 584 2022-07-20 18:29:58Z herbert $ +%% $Id: hvfloat.tex 653 2022-11-20 21:54:52Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,usegeometry]{scrartcl} @@ -10,7 +10,7 @@ \usepackage{microtype} \usepackage[english]{babel} -\usepackage[marginparwidth=3cm,bottom=2cm,top=1cm,includeheadfoot]{geometry} +\usepackage[marginparwidth=3cm,bottom=2cm,top=1cm,includeheadfoot,showframe]{geometry} \usepackage[automark]{scrlayer-scrpage} @@ -383,6 +383,7 @@ There are the following keywords: \rownl The float counter is increased as usual and can be referenced.\\ \Lkeyword{wide} & false & \rowvsp The float can use \Ldim{textwidth}$\,+\,$\Ldim{marginparwidth} as horizontal width.\\ +\Lkeyword{inMargin} & false & \rowvsp Put object and frame into the margin.\\ \Lkeyword{objectFrame} & false & \rowvsp Put a frame with no separation around the float object.\\ \Lkeyword{style} & \none & \rowvsp Use a defined style.\\ @@ -1107,6 +1108,44 @@ the caption to the left, center, or right of the full width which is linewidth a {label} +%\hvblindtext + +\section{Margin floats} + +With the optional argument \Lkeyword{inMargin} the opject and the caption can be placed into +the margin. This is done internally with the command \Lcs{marginnote} from the package of the same name. + +%\marginnote{Fig.~\ref{thea}} +\hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}} + {An image in the margin of the document.} + {thea} + + +\begin{lstlisting} +\hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}} + {An image in the margin of the document.} + {thea} + +... + +\hvFloat[inMargin]{table}{\small\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ + Dienst & Dienst & Frei\\\hline \end{tabular}} + {A tabular in the margin just like the image.} + {thea2} +\end{lstlisting} + + +\hvblindtext + + +%\marginnote{Fig.~\ref{thea2}} +\hvFloat[inMargin]{table}{\small\tabcolsep=3pt\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ + Dienst & Dienst & Frei\\\hline \end{tabular}} + {A tabular in the margin just like the image.} + {thea2} + +The same is possible with a short tabular, dependent to the width of the margin. + \hvblindtext diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf index 4798790bb87..73a49d0a073 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 eae3c5ce675..6960658c3bc 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: inner1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf index 4431c1409ff..3cd80ae1316 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 60b226c085a..15b65081111 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: inner2s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf index d24b1e8c863..6b794b37320 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 04627efaa86..0f4a3856c8e 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: inner2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.} {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf index 8190e9efd28..4e6b0cfae72 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 56ea72912e7..d415c7e3433 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: left2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf index 2652ee4f2e9..bc345dc15bf 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 6238a6f9106..a01561d8404 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-after1s1c.tex 112 2021-06-14 08:01:42Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 f2f05a4473c..e37e60e6263 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 655d8fd0623..1c4e98195f1 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-default1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 cfc36224a10..614b2fcf30f 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 a46ae569381..f42bc85ae59 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-default1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 42461f58705..e2ec474cb79 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 8ceae45750c..8725520a265 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-default2s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 b73dfc60323..23fdd5f04f1 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 3848015a925..4ce8149cdae 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-default2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 67864435991..3f79249b521 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 ee91984d4ab..668da0a1471 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-inner2s2c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 0458923e8f3..7ebd9bd69a9 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 306762846e8..fef798e1e96 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-outer2s2c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 39f2c1a6ca0..23f3c0b60c6 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 fae07fc3643..1b78f0fba64 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: multi-right1s1c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {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 91fa3f18318..9a8f796d025 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 bc70f79b05a..2d93d7b2b5c 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: odd1s1c.tex 119 2021-06-20 13:28:09Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf index 9a565553e29..eae0be6b8d9 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 636a8366d56..8454f4198bb 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: odd1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf index 08aed5e77c3..ef5b9fd7ab4 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 d14f499615c..ee0e69c74e9 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: odd2s1c.tex 107 2021-06-09 06:43:25Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf index cc7e9874283..6aa3ac83cfe 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 98dfd6c84ba..f044fa127c7 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: odd2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf index 6fe46d5e726..c6676e12913 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 e0302a6b77d..f6444f614c3 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: outer1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig: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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig: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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf index be113b20f12..a7d55f4c80c 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 68cd5109766..d30d66e8fae 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: outer2s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig: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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig: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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf index 7cf31ae0b28..204d0dad654 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 4ac33b74785..84b3dc0cf5f 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: outer2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig: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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig: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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf index 981d33a2dd3..a65718b90a9 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 c847c531c5f..90e4ac91968 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: paper-after1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf deleted file mode 100644 index 7b7d9db2c66..00000000000 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex deleted file mode 100644 index ab7faa4b9d7..00000000000 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.tex +++ /dev/null @@ -1,81 +0,0 @@ -\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 39e65a2f655..fd27f7ca548 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 a6304754cb7..bb789ab5937 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex @@ -1,10 +1,9 @@ \documentclass{scrartcl} -%% $Id: paper-default1s1c.tex 584 2022-07-20 18:29:58Z herbert $ +%% $Id: paper-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \usepackage{pdfpages} \input{preamble.ltx} - \begin{document} \title{Example for fullpage floats} \author{Herbert Voß} @@ -13,7 +12,7 @@ \tableofcontents \Blindtext -\Blindtext +\blindtext \section{File \texttt{\jobname}} @@ -30,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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -43,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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -58,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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -71,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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf index 4756fade57e..6e06341ad56 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 61cc0278641..73701e6c1ee 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: paper-default1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf index 575b91a7e05..c9cd842897c 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 20cea7741e7..4db02204812 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf index 33cd162ca91..330a7425ca1 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 a9b5b15bef2..64b430652b1 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf deleted file mode 100644 index f52b0c67e3f..00000000000 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.tex deleted file mode 100644 index 9b8436d6971..00000000000 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.tex +++ /dev/null @@ -1,81 +0,0 @@ -\documentclass{scrartcl} -%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ - -\input{preamble.ltx} -\setlength\columnseprule{0.4pt} - -\begin{document} -\title{Example for FULLPAGE floats} -\author{Herbert Voß} -\maketitle - -\tableofcontents - -\blinddocument - -\section{File \texttt{\jobname}} - -\begin{lstlisting} -The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. -\end{lstlisting} - -The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. - -\begin{lstlisting} -\hvFloat[FULLPAGE,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 8305336330e..b0792355fbd 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 b7a6880d363..1cb218ac795 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: paper-inner2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:FULLPAGE1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf deleted file mode 100644 index 22cdf1967e5..00000000000 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf and /dev/null differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex deleted file mode 100644 index be6c896aa8f..00000000000 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.tex +++ /dev/null @@ -1,81 +0,0 @@ -\documentclass{scrartcl} -%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ - -\input{preamble.ltx} -\setlength\columnseprule{0.4pt} - -\begin{document} -\title{Example for FULLPAGE floats} -\author{Herbert Voß} -\maketitle - -\tableofcontents - -\blinddocument - -\section{File \texttt{\jobname}} - -\begin{lstlisting} -The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. -\end{lstlisting} - -The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. - -\begin{lstlisting} -\hvFloat[FULLPAGE,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 ea35869de91..5ed8ec5a710 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 41595db2244..f2857044961 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: paper-right1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf deleted file mode 100644 index 185cae64793..00000000000 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf and /dev/null 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 deleted file mode 100644 index 9da31571a34..00000000000 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.tex +++ /dev/null @@ -1,81 +0,0 @@ -\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 075d72bba0f..525725c6c02 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx +++ b/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx @@ -41,9 +41,6 @@ \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 05e8ddca639..c6c6bd27bdb 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 58dbd7869e6..4ad53de6b9d 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: right1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf index 97998938793..dfd03e566cc 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 26de3dc0bc9..ada1d0b1864 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: right1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf index 352abc68168..dbb63e5fac8 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 f1a07efd74c..6672586390f 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: right2s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf index 6e5b847ba1d..e269a747a3b 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 7c7cf4e67d1..eaaed1d57cb 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: right2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage0} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} \end{lstlisting} @@ -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 which has no + This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:fullpage1} diff --git a/Master/texmf-dist/doc/latex/hvfloat/runAll.sh b/Master/texmf-dist/doc/latex/hvfloat/runAll.sh index 7b1ecfb77ef..0cecd6a0c25 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 $MAIN.lof + rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc done diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf index e8ff0570fe0..f75bb23f56f 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 a0cdbcde186..660e942090f 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-after1s1c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 d481899c0e3..00554afc00b 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 d610aff9cd5..761faa2c4b7 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-after2s2c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 fbd632cc45c..efea15759ce 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 374a2fa0f1c..ec371418a7e 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-default1s1c.tex 72 2021-05-02 11:40:10Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 de2d9301069..8d48919902c 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 33c1c8ad408..c9307aecefc 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-default1s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 aaadf059d86..84ab3d56ccb 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 9ecb8918368..cd6d370b80f 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-default2s2c.tex 72 2021-05-02 11:40:10Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 edef7ff0a95..b3192656303 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 5717edc39e9..e4fea435069 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-right1s1c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 8f655342c96..72ca9190457 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 0e085d56da8..d1073b78385 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-right1s2c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 fbaca2f5bd1..23e0a03ee7a 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 0e8b0b67447..a6e556161cf 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 318 2021-11-20 07:30:54Z herbert $ +%% $Id: sub-right2s2c.tex 103 2021-05-31 12:37:11Z 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 which has no + right column. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% 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 631594b5ed8..b81fedc701c 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 0cf40abb922..a95470d1eb5 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 b22e5f01985..c1d78c0db73 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 651 2022-11-07 07:04:33Z herbert $ +%% $Id: hvfloat.sty 653 2022-11-20 21:54:52Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -16,8 +16,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.43} -\def\filedate{2022/11/07} +\def\fileversion{2.44} +\def\filedate{2022/11/21} \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)] \let\hvFloatFileVersion\fileversion % @@ -43,6 +43,7 @@ \RequirePackage{subcaption} \RequirePackage{atbegshi} \RequirePackage{picture,trimclip} +\RequirePackage{etoolbox,marginnote}% for "floats" in the margin \RequirePackage{expl3,multido} \RequirePackage{graphicx} @@ -176,6 +177,7 @@ } \define@boolkey{hvSet}[hv@]{useOBox}[true]{}% use of the hvOBox contents \define@boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment +\define@boolkey{hvSet}[hv@]{inMargin}[true]{}% use of the hvOBox contents \define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{twoColumnCaption}[true]\global\@nameuse{hv@twoColumnCaption#1}{}% Write the caption only as text @@ -252,7 +254,7 @@ floatCapSep=5pt, useOBox=false, onlyText=false, wide=false, fullpage=false, FULLPAGE=false, doubleFULLPAGE=false, doublePage=false, doublePAGE=false, - multiFloat=false,subFloat=false, + multiFloat=false,subFloat=false,inMargin=false, separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip, capFormat={}, subcapFormat={}, twoColumnCaption=false, sameHeight=false, @@ -590,7 +592,11 @@ \ifhv@doublePage \expandafter\do@hvFloat@doublePage\@@temp% fullpage with caption rotated or under on an odd page \else - \do@@@hvFloat + \ifhv@inMargin + \do@@@hvFloatInMargin + \else + \do@@@hvFloat + \fi \fi \fi \fi @@ -946,6 +952,212 @@ \fi \endgroup% startet at main \hvFloat } + + +\def\do@@@hvFloatInMargin{% no special float page, caption and image on top of each other or side by side + \def\@tempa{90}% + \ifx\hvSet@rotAngle\@tempa \setlength\hvMaxCapWidth{\textheight}\else\setlength\hvMaxCapWidth{\marginparwidth}\fi +% +% First we save the object in \hvObjectBox +% + \ifnum\hvSet@objectAngle=0 % rotate the object? + \ifhv@useOBox\let\hvObjectBox\hvOBox\else\savebox\hvObjectBox{\hv@floatObject}\fi + \else + \savebox\hvObjectBox{\rotatebox{\hvSet@objectAngle}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}}% + \fi + \setlength\hvObjectWidth{\wd\hvObjectBox}% +% +% Now we save the caption with its defined \hvCapWidth +% + \renewcommand*{\raggedleftmarginnote}{}% + \renewcommand*{\raggedrightmarginnote}{}% + \marginnote{% + \ifx\hvSet@capWidth\hv@Width \setlength\hvCapWidth{\hvObjectWidth}% + \else + \ifx\hvSet@capWidth\hv@Height \setlength\hvCapWidth{\ht\hvObjectBox}% + \else + \ifx\hvSet@capWidth\hv@LineWidth \setlength\hvCapWidth{\marginparwidth}% + \else + \ifx\hvSet@capWidth\hv@Natural% captionwidth=\linewidth-\objectwidth-separation + \ifhv@capbeside + \hvCapWidth=\the\dimexpr\marginparwidth-\hvObjectWidth-\hv@floatCapSep\relax + \else + \setlength\hvCapWidth{\marginparwidth}% + \fi + \else + \ifhv@capbeside + \setlength\hvCapWidth{\hvSet@capWidth\marginparwidth}% + \@tempdima=\the\dimexpr\marginparwidth-\hvObjectWidth-\hv@floatCapSep\relax + \ifdim\hvCapWidth>\@tempdima \hvCapWidth=\@tempdima \fi + \else + \setlength\hvCapWidth{\hvSet@capWidth\marginwidth}% + \fi + \fi + \fi + \fi + \fi + \saveCaptionSkip% we put this space ourselve + \ifnum\hvSet@capAngle=0 % need rotation? + \savebox\hvCaptionBox{% NO rotation + \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation + \ifx\hv@floatType\hv@figure + \ifx\relax\hv@shortCap\relax + \figcaption{\hv@longCap\ifx\hv@label\@empty\else\label{\hv@label}\fi}% + \else + \figcaption[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\label{\hv@label}\fi}% + \fi + \else + \ifx\relax\hv@shortCap\relax + \tabcaption{\hv@longCap\ifx\hv@label\@empty\else\label{\hv@label}\fi}% + \else + \tabcaption[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\label{\hv@label}\fi}% + \fi + \fi + \endminipage + }% end CaptionBox without rotation + \else + \savebox\hvCaptionBox{% with Rotation + \rotatebox{\hvSet@capAngle}{% + \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation + \ifx\hv@floatType\hv@figure + \ifx\hv@shortCap\@empty \figcaption{\hv@longCap}\else\figcaption[\hv@shortCap]{\hv@longCap}\fi + \else + \ifx\hv@shortCap\@empty \tabcaption{\hv@longCap}\else\tabcaption[\hv@shortCap]{\hv@longCap}\fi + \fi + \ifx\hv@label\@empty\else\label{\hv@label}\fi + \endminipage + }% rotatebox + }% end \avesbox + \fi +% +% now we have the object and the caption with the right +% rotated angles saved in different boxes +%% + \restoreCaptionSkip% save old values +% \def\fps@figure{\hvSet@floatPos}% + \ifx\hvSet@floatPos\@empty \else\@namedef{fps@\hv@floatType}{\hvSet@floatPos}\fi + \noindent + \begingroup% Start the nonfloat part + \checkoddpage + \ifx\hvSet@objectPos\hv@Right \raggedleft\fi + \ifx\hvSet@objectPos\hv@Center \hspace*{\fill}\fi + \ifx\hvSet@objectPos\hv@Outer \ifoddpage\raggedleft\fi\fi + \ifx\hvSet@objectPos\hv@Inner \ifoddpage\else\raggedleft\fi\fi +% +% to rotate object and caption together, we save all in another box +% the caption comes first, if its on the left or the top +% 0 caption left, inner and odd page, oneside inner +% 1 caption top +% 2 caption right, inner and even page, oneside outer +% 3 caption bottom +% + \ifx\hvSet@capPos\hv@Left \hv@@capPos=0 + \else + \ifx\hvSet@capPos\hv@Top \hv@@capPos=1 + \else + \ifx\hvSet@capPos\hv@Right \hv@@capPos=2 + \else + \ifx\hvSet@capPos\hv@Bottom \hv@@capPos=3 + \else + \ifx\hvSet@capPos\hv@Inner \ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi + \else + \ifx\hvSet@capPos\hv@Outer \ifoddpage\hv@@capPos=2\else\hv@@capPos=0\fi +% \ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi + % even page (left=0) | odd page (oneside) (right=2) + \else + \ifx\hvSet@capPos\hv@Before \hv@@capPos=0% same as cappos=left + \else + \ifx\hvSet@capPos\hv@After \hv@@capPos=2% same as capPos=right + \fi + \fi + \fi + \fi + \fi + \fi + \fi + \fi +%%%% +%\typeout{>>>>>>>>>Pos: \the\hv@@capPos}% + \savebox{\@tempboxa}{% ***** @tempbox start + \expandafter\ifcase\the\hv@@capPos % 0 is LEFT START \ifcase + \ifx\hvSet@capVPos\hv@Center + \put@CaptionBox + \hspace{\hv@floatCapSep}% capfloatsep + \put@ObjectBox + \else + \ifx\hvSet@capVPos\hv@Top% caption and object at top aligned + \put@CaptionBox[1]% + \hspace{\hv@floatCapSep}% capfloatsep + \put@ObjectBox[1]% + \else% caption on bottom + \put@CaptionBox[2]% + \hspace{\hv@floatCapSep}% capfloatsep + \put@ObjectBox[2]% + \fi + \fi% end caption left + \or%1 is top + \ifdim\wd\hvCaptionBox>\wd\hvObjectBox + \begin{minipage}{\wd\hvCaptionBox}% + \else + \begin{minipage}{\wd\hvObjectBox}% + \fi + \ifx\hvSet@capHPos\hv@Left% horizontal justification + \raggedright + \else + \ifx\hvSet@capHPos\hv@Center \centering\else\raggedleft\fi + \fi + \ifhv@fbox + \fbox{\usebox{\hvCaptionBox}}\\[0.5\hvBelowCaptionSkip]% + \fbox{\usebox{\hvObjectBox}}% + \else + \usebox{\hvCaptionBox}\\[0.5\hvBelowCaptionSkip]% + \usebox{\hvObjectBox}% + \fi + \end{minipage}% + \or%2 is right + \ifx\hvSet@capVPos\hv@Center + \put@ObjectBox + \hspace{\hv@floatCapSep}% + \put@CaptionBox + \else + \ifx\hvSet@capVPos\hv@Top + \put@ObjectBox[1]% + \hspace{\hv@floatCapSep}% capfloatsep + \put@CaptionBox[1]% + \else + \put@ObjectBox[2]% bottom + \hspace{\hv@floatCapSep}% capfloatsep + \put@CaptionBox[2]% + \fi + \fi + \or%3 bottom + \ifdim\wd\hvCaptionBox>\wd\hvObjectBox\begin{minipage}{\wd\hvCaptionBox}\else\begin{minipage}{\wd\hvObjectBox}\fi + \ifx\hvSet@capHPos\hv@Left% horizontal justification + \raggedright + \else + \ifx\hvSet@capHPos\hv@Center \centering\else\raggedleft\fi + \fi + \ifhv@fbox + \fbox{\usebox{\hvObjectBox}}\\[0.5\hvAboveCaptionSkip]% + \fbox{\usebox{\hvCaptionBox}}% + \else + \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi\\[0.5\hvAboveCaptionSkip]% + \usebox{\hvCaptionBox}% + \fi + \end{minipage}% + \fi% \ifcase\the\hv@@capPos + }% End savebox Object and caption %%%%%%%%%%%%%%%%% @tempboxa +% +% now we rotate the object and caption, if needed +% + \ifx\hvSet@rotAngle\hv@Zero\usebox{\@tempboxa}\else\rotatebox{\hvSet@rotAngle}{\usebox{\@tempboxa}}\fi + \ifx\hvSet@objectPos\hv@Center \hspace{\fill}\fi + \endgroup% End the nonfloat part +}% end marginnote +\endgroup}% end of \marginnote and \@@@hvFloatInMargin + + + % \newenvironment{hvFloatEnv}[1][\textwidth] {\minipage{#1}} -- cgit v1.2.3