From 3f4c2e08d12d7b8c35be07082d59ff572cfac110 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Mar 2024 19:48:57 +0000 Subject: hvfloat (17mar24) git-svn-id: svn://tug.org/texlive/trunk@70675 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvfloat/Changes | 1 + Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf | Bin 80278 -> 80278 bytes Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf | Bin 86613 -> 86613 bytes Master/texmf-dist/doc/latex/hvfloat/capPos.pdf | Bin 98058 -> 98064 bytes .../texmf-dist/doc/latex/hvfloat/default1s1c.pdf | Bin 81968 -> 82047 bytes .../texmf-dist/doc/latex/hvfloat/default1s2c.pdf | Bin 83201 -> 83277 bytes .../texmf-dist/doc/latex/hvfloat/default2s1c.pdf | Bin 79342 -> 79342 bytes .../texmf-dist/doc/latex/hvfloat/default2s2c.pdf | Bin 85763 -> 85844 bytes .../doc/latex/hvfloat/doublepage2s1c.pdf | Bin 2353650 -> 2350647 bytes .../doc/latex/hvfloat/doublepage2s2c.pdf | Bin 617745 -> 618818 bytes .../doc/latex/hvfloat/doublepage2s2c.tex | 4 +- Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf | Bin 77785 -> 77810 bytes Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf | Bin 86361 -> 86582 bytes Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf | Bin 84419 -> 84620 bytes Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf | Bin 85033 -> 1825222 bytes Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf | Bin 84979 -> 85143 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | Bin 6393567 -> 11613770 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 104 ++++++++++++------ Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf | Bin 84016 -> 84100 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf | Bin 83984 -> 84068 bytes Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf | Bin 84071 -> 84149 bytes Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf | Bin 85470 -> 1825644 bytes Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex | 10 +- .../doc/latex/hvfloat/multi-after1s1c.pdf | Bin 142607 -> 142513 bytes .../doc/latex/hvfloat/multi-default1s1c.pdf | Bin 146068 -> 145980 bytes .../doc/latex/hvfloat/multi-default1s2c.pdf | Bin 94532 -> 94441 bytes .../doc/latex/hvfloat/multi-default2s1c.pdf | Bin 146241 -> 146159 bytes .../doc/latex/hvfloat/multi-default2s2c.pdf | Bin 92138 -> 92046 bytes .../doc/latex/hvfloat/multi-inner2s2c.pdf | Bin 89696 -> 89597 bytes .../doc/latex/hvfloat/multi-outer2s2c.pdf | Bin 92902 -> 92802 bytes .../doc/latex/hvfloat/multi-right1s1c.pdf | Bin 145635 -> 145541 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf | Bin 77734 -> 77734 bytes Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf | Bin 86529 -> 86601 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf | Bin 173858 -> 173938 bytes Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf | Bin 85527 -> 85726 bytes Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf | Bin 86353 -> 86554 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf | Bin 84291 -> 84373 bytes Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf | Bin 84725 -> 84940 bytes .../doc/latex/hvfloat/paper-after1s1c.pdf | Bin 79014 -> 79008 bytes .../doc/latex/hvfloat/paper-after2s2c.pdf | Bin 89655 -> 89736 bytes .../doc/latex/hvfloat/paper-default1s1c.pdf | Bin 81199 -> 81374 bytes .../doc/latex/hvfloat/paper-default1s2c.pdf | Bin 90470 -> 90548 bytes .../doc/latex/hvfloat/paper-default2s2c.pdf | Bin 90288 -> 90376 bytes .../doc/latex/hvfloat/paper-even2s1c.pdf | Bin 87273 -> 87492 bytes .../doc/latex/hvfloat/paper-inner2s2c.pdf | Bin 87843 -> 87903 bytes .../texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf | Bin 87055 -> 87144 bytes .../doc/latex/hvfloat/paper-right1s1c.pdf | Bin 81469 -> 81463 bytes Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf | Bin 80095 -> 80095 bytes Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf | Bin 89250 -> 89339 bytes Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf | Bin 80969 -> 80969 bytes Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf | Bin 85508 -> 1825612 bytes Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex | 10 +- .../texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf | Bin 143883 -> 143944 bytes .../texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf | Bin 144738 -> 144840 bytes .../doc/latex/hvfloat/sub-default1s1c.pdf | Bin 143745 -> 143825 bytes .../doc/latex/hvfloat/sub-default1s2c.pdf | Bin 144175 -> 144273 bytes .../doc/latex/hvfloat/sub-default2s2c.pdf | Bin 143455 -> 143556 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf | Bin 143804 -> 143873 bytes .../texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf | Bin 144842 -> 144946 bytes .../texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf | Bin 144282 -> 143003 bytes Master/texmf-dist/doc/latex/hvfloat/usa5.jpg | Bin 0 -> 1742387 bytes Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf | Bin 120972 -> 121991 bytes Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex | 3 +- Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf | Bin 121957 -> 122005 bytes Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex | 4 +- Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc | 2 +- Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc | 3 +- Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc | 2 +- Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc | 48 ++++++--- Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty | 118 ++++++++++++++------- 71 files changed, 217 insertions(+), 102 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/hvfloat/usa5.jpg (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index 541dc4d5c7f..ac9450c444d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,5 @@ hvfloat.sty: +2.49 2024-03-17 - bugfix for checkoddpage and FULLPAGE option 2.48 2024-03-03 - added option fboxLines to get patial lines of \fbox (package fbox) 2.47 2023-10-16 - added type doubleFullPage for images with a width diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf index b49623bceb0..565783ae52c 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/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf index 8d29f55e111..a38fc42fd85 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/capPos.pdf b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf index 8d12b64b0ca..4ec73b2369b 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/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf index 195d9900c15..727a5a64457 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/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf index 4cc1b307845..7a32ce70b0d 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/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf index 44e24d37992..d2e4aa44a0e 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/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf index 7e0151eed93..6e5bcf42552 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/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf index 3b897e3f914..28f72e8894c 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/doublepage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf index 282f48c3648..9d9afa8171b 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/doublepage2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex index f7abc397d49..f0b827f5b8a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex @@ -1,7 +1,7 @@ \errorcontextlines=100 %\documentclass[final]{ltugboat} \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: doublepage2s2c.tex 773 2023-10-16 12:29:28Z herbert $ +%% $Id: doublepage2s2c.tex 781 2023-10-19 19:57:50Z herbert $ \input{preamble.ltx} \usepackage{blindtext,xcolor,marginnote} @@ -69,6 +69,8 @@ \hvblindtext +\hvblindtext + \subsubsection{\texttt{bindCorr=1cm}} \begin{lstlisting} diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf index f5129e2fe11..b692c62cfd5 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/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf index 8842af5ebb7..147b01df2e1 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/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf index 4f361957fef..6c7bc87f200 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/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf index c02bd2d3225..5a0a113291b 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..7ed746dbe8d 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 878 2024-03-16 20:49:50Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=evenPage] \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=evenPage] \hvFloat[fullpage,capPos=evenPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf index 8abc361d7ba..684b4bf3051 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 30058a04750..eb14a418f5c 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 40bb098819c..169270c2d46 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 876 2024-03-03 14:04:56Z herbert $ +%% $Id: hvfloat.tex 878 2024-03-16 20:49:50Z herbert $ %\listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,usegeometry,index=totoc]{scrartcl} @@ -188,6 +188,8 @@ \marginnote{\fbox{\shortstack{float\\#1}}}\fi } +\graphicspath{{images/}} + \begin{document} \title{Package \texttt{hvfloat}\\ Controlling captions, fullpage and doublepage floats\\ver \hvFloatFileVersion} @@ -216,7 +218,10 @@ marginnote \fbox{float} is set into the margin. This is done also only for demon objectAngle=120, capAngle=-210, objectPos=center -]{figure}{\protect\fbox{\includegraphics[scale=0.9]{images/rose}}}{\protect\fbox{What a nice Caption :-)}}{fig:title} + objectFrame, +]{figure}{\includegraphics[scale=0.9]{images/rose}} + {\protect\fbox{What a nice Caption :-)}} + {fig:title} \vspace*{\fill} @@ -458,8 +463,7 @@ Code for figure \ref{fig:0}: \end{lstlisting} -\MarginNote{Tab.~\ref{tab:0}} -\hvFloat[capPos=top]{table}{% +\savebox\hvOBox{% \begin{tabularx}{\textwidth}{l|l|X} \rmfamily Name & Type & Description\\\hline \CMD{hvFloat} & command & places object and caption in different ways\\ @@ -468,23 +472,30 @@ Code for figure \ref{fig:0}: \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\ \CMD{hvDefFloatStyle} & command & define a user style -\end{tabularx}% -}{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}{tab:0} +\end{tabularx}} + +\MarginNote{Tab.~\ref{tab:0}} +\hvFloat[capPos=top,useOBox]{table}{} + {With the only Option \texttt{capPos=top} to place the caption on + top of the table, which is often the default.} + {tab:0} Code for table \ref{tab:0}: \begin{lstlisting} -\hvFloat[capPos=top]{table}{% -\begin{tabularx}{\textwidth}{>{\ttfamily}l|l|X} +\savebox\hvOBox{% +\begin{tabularx}{\textwidth}{l|l|X} \rmfamily Name & Type & Description\\\hline \CMD{hvFloat} & command & places object and caption in different ways\\ - hvFloatEnv & environment & places object and caption exactly Here\\ + \Lenv{hvFloatEnv} & environment & places object and caption exactly Here\\ \CMD{figcaption} & command & writes a figure caption in a non floating environment\\ \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\ \CMD{hvDefFloatStyle} & command & define a user style -\end{tabularx}}% -{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}% -{tab:0} +\end{tabularx}} +\hvFloat[capPos=top,useOBox]{table}{} + {With the only Option \texttt{capPos=top} to place the caption on + top of the table, which is often the default.} + {tab:0} \end{lstlisting} See section~\ref{sec:tables} for some more informations about tabulars as objects. @@ -1147,26 +1158,29 @@ the caption to the left, center, or right of the full width which is linewidth a %\hvblindtext +\clearpage + \section{Margin floats} With the optional argument \Lkeyword{inMargin} the opject and the caption can be placed into the margin. This is done internally with the command \Lcs{marginnote} from the package of the same name. + + %\marginnote{Fig.~\ref{thea}} \hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}} {An image in the margin of the document.} {thea} - \begin{lstlisting} \hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}} {An image in the margin of the document.} {thea} - ... - -\hvFloat[inMargin]{table}{\small\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ +\savebox\hvOBox{\small\begin{tabular}{@{} + ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ Dienst & Dienst & Frei\\\hline \end{tabular}} +\hvFloat[inMargin,useOBox]{table}{} {A tabular in the margin just like the image.} {thea2} \end{lstlisting} @@ -1175,9 +1189,13 @@ the margin. This is done internally with the command \Lcs{marginnote} from the p \hvblindtext +\savebox\hvOBox{% + \small\begin{tabular}{@{}ccc@{}}\hline + Mon& Di& Mi\\ frei & Dienst & frei\\ + Dienst & Dienst & Frei\\\hline \end{tabular}% +} %\marginnote{Fig.~\ref{thea2}} -\hvFloat[inMargin]{table}{\small\tabcolsep=3pt\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\ - Dienst & Dienst & Frei\\\hline \end{tabular}} +\hvFloat[inMargin,useOBox]{table}{} {A tabular in the margin just like the image.} {thea2} @@ -1383,7 +1401,7 @@ The code for table \ref{table:1} and \ref{table:2} is: \hvFloat[% floatPos=!hb, capPos=top, - useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} + useOBox]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} \hvblindtext @@ -1403,14 +1421,14 @@ In this case leave the third parameter empty. \hvFloat[% floatPos=!hb, capPos=top, - useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} + useOBox]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1} \MarginNote{Tab.~\ref{table:2}} \hvFloat[% floatPos=!htb,% - useOBox=true,% + useOBox,% objectAngle=90,% capPos=right,% capVPos=top,% @@ -2730,7 +2748,7 @@ in the inner margin on both pages. \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=right]% {figure}% - {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% {A caption for a double-sided image that will be placed on the right-hand part of the illustration. The illustration begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. @@ -2741,7 +2759,7 @@ in the inner margin on both pages. \MarginNote{Fig.~\ref{fig:doubleFULLPAGE1}} \hvFloat[doubleFULLPAGE,capPos=right]% {figure}% - {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% {A caption for a double-sided image that will be placed on the right-hand part of the illustration. The illustration begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. @@ -2770,7 +2788,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \hvFloat[doubleFULLPAGE,capPos=after]% {figure}% {\includegraphics[doubleFULLPAGE, - keepaspectratio=false]{images/rheinsberg-1000}}% + keepaspectratio=false]{images/rheinsberg}}% {A caption for a double-sided image that will be placed \textbf{after} the image. The image begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. @@ -2783,7 +2801,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \MarginNote{Fig.~\ref{foo}} \hvFloat[doubleFULLPAGE,capPos=after]% {figure}% - {\includegraphics[doubleFULLPAGE]{images/rheinsberg-1000}}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% {A caption for a double-sided image that will be placed \textbf{after} the image. The image begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. @@ -2804,7 +2822,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \hvFloat[doubleFULLPAGE,capPos=before]% {figure}% {\includegraphics[height=\paperheight,width=2\paperwidth, - keepaspectratio=false]{images/rheinsberg-1000}}% + keepaspectratio=false]{images/rheinsberg}}% {A caption for a double-sided image that will be placed \textbf{before} the image. The image begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. @@ -2815,7 +2833,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \MarginNote{Fig.~\ref{bar}} \hvFloat[doubleFULLPAGE,capPos=before]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg-1000}}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% {A caption for a double-sided image that will be placed \textbf{before} the image. The image begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. @@ -3117,9 +3135,9 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \hvBlindtext -\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]% +\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt,useOBox]% {table}% - {\usebox\hvOBox}%%%%%%%%%%%%%% + {}%%%%%%%%%%%%%% [A doublepage tabular with a caption on the right side of the right part.]% {A caption for a double-sided tabular that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of @@ -3128,7 +3146,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \end{lstlisting} -\global\savebox\hvOBox{% +\savebox\hvOBox{% \begin{tabular}{l*{18}r} \toprule & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976} & \textbf{1977} & \textbf{1978} & \textbf{1979} & \textbf{1980} & \textbf{1981} & \textbf{1982} & \textbf{1983} & \textbf{1984} & \textbf{1985} @@ -3159,7 +3177,31 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \marginpar{Tab.~\ref{tab:doublePage3}}% \hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]% {table}% - {\usebox\hvOBox}%%%%%%%%%%%%%% + {\begin{tabular}{l*{18}r} \toprule + & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976} + & \textbf{1977} & \textbf{1978} & \textbf{1979} & \textbf{1980} & \textbf{1981} & \textbf{1982} & \textbf{1983} & \textbf{1984} & \textbf{1985} + & \textbf{1986} & \textbf{1987} & \textbf{1988} & \textbf{1989} + \\\midrule +\addlinespace[3pt] +Zeile 1 & 1 & 3 & 1 & 1 & 1 & 0 & 1 & 1 & 0 & 0 & 0 & 0 &20 & 0 & 2 & 2 & 2 & 1\\\addlinespace[3pt] +Zeile 2 & 1 & 1 & 3 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 2 & 1 & 3 & 4 & 4 & 6 & 4 & 2\\\addlinespace[3pt] +Zeile 3 & 2 & 1 & 2 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 5 & 3 & 1 & 7 & 7 & 3\\\addlinespace[3pt] +Zeile 4 & 1 & 0 & 5 & 1 & 2 & 0 & 0 & 0 & 0 & 2 & 1 & 0 & 1 & 0 & 3 & 7 & 2 & 1\\\addlinespace[3pt] +Zeile 6 & 2 & 1 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 2 & 0 & 5 & 2 & 2 & 5 & 4 & 2\\\addlinespace[3pt] +Zeile 5 & 0 & 0 & 4 & 2 & 1 & 2 & 2 & 1 & 0 & 0 & 0 & 1 & 1 & 0 & 2 & 5 & 4 & 3\\\addlinespace[3pt] +Zeile 8 & 0 & 1 & 1 & 0 & 0 & 0 & 1 & 1 & 0 & 3 & 2 & 1 & 2 & 1 & 3 & 5 & 3 & 4\\\addlinespace[3pt] +Zeile 9 & 0 & 0 & 0 & 0 & 0 & 1 & 2 & 1 & 0 & 0 & 0 & 0 & 4 & 2 & 1 & 4 & 5 & 2\\\addlinespace[3pt] +Zeile10 & 0 & 1 & 3 & 0 & 1 & 0 & 1 & 0 & 0 & 1 & 1 & 0 & 1 & 1 & 1 & 4 & 4 & 1\\\addlinespace[3pt] +Zeile11 & 0 & 2 & 2 & 1 & 1 & 0 & 1 & 0 & 0 & 0 & 0 & 2 & 6 & 1 & 0 & 2 & 1 & 1 \\\addlinespace[3pt] +Zeile12 & 2 & 0 & 2 & 4 & 1 & 0 & 4 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 3\\\addlinespace[3pt] +Lärm & 2 & 3 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 2 & 0 & 0 & 2 & 2 & 2\\\addlinespace[3pt] +Zeile13 & 0 & 1 & 0 & 0 & 1 & 0 & 3 & 0 & 0 & 0 & 0 & 0 & 2 & 0 & 1 & 3 & 0 & 2\\\addlinespace[3pt] +Zeile14 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 3 & 3 & 2 & 1 & 1 & 0\\\addlinespace[3pt] +Zeile15 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 4 & 0 & 0 & 3 & 1 & 1\\\addlinespace[3pt] +Zeile16 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 3 & 5 & 0 & 1\\\addlinespace[3pt]\midrule +Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 & 13 &1 \\ +\bottomrule +\end{tabular}}%%%%%%%%%%%%%% [A doublepage tabular with a caption on the right side of the right part.]% {A caption for a double-sided tabular that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf index 7cf579e2b80..9916c10edb4 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/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf index c9364feb7a8..909a9cec69d 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/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf index 163ed2b8eed..b15bbe471d9 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/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf index b5fe92532b2..4a1ca31be2c 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..edebc7b6451 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 878 2024-03-16 20:49:50Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[default] \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[default] \hvFloat[fullpage,capPos=left]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf index 4ecf842042f..1e4aa687e97 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-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf index 847f10ef7db..960db67b001 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-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf index 74776bd2eae..80f1fad09f3 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-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf index c84effcb2b1..a71f936e33b 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-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf index 214edd0ef74..15f0f07c4b7 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-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf index 3664e14647b..ba5a21c9191 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-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf index 8b12502d6fd..250ff6b5112 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-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf index 39fbfbf793c..5d1e40727d1 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/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf index 2cc3a2f1b63..90cd8e5a6b1 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/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf index ea14d642b32..ebaa94bdd42 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/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf index fdfe911f308..308f3dfcf7d 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/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf index 8916a62dea8..ebce9ce19da 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/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf index 20b93090532..f655d323452 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/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf index 449a372b496..d27d74a3193 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/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf index f092b614a14..46c50b5293c 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/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf index 7b0e2c3f585..473a50c75a6 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-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf index fa884c9d46f..8cb352fd40f 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf index 6acb89ccd14..ac28f4f9529 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-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf index d1c7d7b0d08..6d5c0b9de1a 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-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf index 06cb4d9dc5a..27405876d0f 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-even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf index c1fb0fc94d0..ca44b7e794a 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf index 8e4ebfe2ff2..dce41271bdd 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-odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf index 60a73caf48e..e32f14a8a38 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf and b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf index f0b80bcd5cd..ec63ec4cf6a 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/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf index 7f05564f49e..abf1c34521d 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/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf index 1c117348a04..bb0c11a14d6 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/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf index 17f23781682..74658615368 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/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf index fae4047e16b..007db028712 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..ced8b9cdfb9 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 878 2024-03-16 20:49:50Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -37,7 +37,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=right] \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=right] \hvFloat[fullpage,capPos=right]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa5}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf index 04d809ad3d2..c40eb0d2327 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-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf index 55d63a81c95..f77ebf3cca1 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-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf index c5ff14df2a7..9b4874dd73f 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-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf index cf3eeb2e372..1aa9ff594aa 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-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf index 2e264d6fefb..c7bec6d8bbd 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-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf index 591ffc1f245..225b3f84c94 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-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf index 678fa315a97..f8a4378e252 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-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf index 7732433c50e..cdbb8426a04 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/usa5.jpg b/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg new file mode 100644 index 00000000000..6c0aa69013e Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf index 198249a15bd..c73f885eb4d 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/wide1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex index f7c4f36b5ef..fc4298cba9d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex @@ -47,8 +47,7 @@ the option \texttt{wide}.}{fig:70} Caption at top right beside the float and object position left and the option \texttt{wide}.}{fig:70} -\textcolor{black!40}{\blindtext} -%\blindtext +\textcolor{black!40}{\blindtext\blindtext} The code for figure \ref{fig:80}: diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf index fb2b1ca1e92..3cbc36a53c0 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/doc/latex/hvfloat/wide2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex index 46c8182cb9a..35b245c6d4e 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex @@ -60,8 +60,10 @@ The code for figure \ref{fig:80}: \end{lstlisting} +\newpage + \hvFloat[wide,nonFloat, - capPos=left,% + capPos=right,% capVPos=top,% ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% {Caption at top left beside the object and object position left and diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc index c461aa6fca8..e4d8b07cf0e 100644 --- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc +++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc @@ -24,7 +24,7 @@ \fi \let\c@hv@tempCNTfigA\c@figure \let\c@hv@tempCNTtabA\c@table -% \checkoddpage + \checkoddpage \ifoddpage \if@twocolumn \if@firstcolumn diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc index 258bfbfaf7d..effd6aec611 100644 --- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc +++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc @@ -24,7 +24,6 @@ \else \global\hv@@capPos=2 % other caption type \fi\fi - %\checkoddpage \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \global\hv@tempWidthA=\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection% the width of the right side offset \global\hv@tempWidthB=\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection% @@ -32,6 +31,7 @@ % \savebox\hv@leftBox{\clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% % \savebox\hv@rightBox{\clipbox*{\the\hv@leftPageObjectWidth{} \depth{} \width{} \height}{\usebox\hvObjectBox}}% % \expandafter\captionsetup\expandafter{\hv@caption@format}% + \checkoddpage \ifoddpage \hvfloat@typeout{do@hvFloat@doubleFULLPAGE: oddpage}% \ifcase\hv@@capPos % =0 Caption before @@ -451,6 +451,7 @@ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip% \if@twoside \hvfloat@typeout{>>>> setPageObject/FULLPAGE/twoside}% + \checkoddpage \ifoddpage \hvfloat@typeout{>>>> setPageObject/FULLPAGE/twoside/oddpage (\thepage)}% \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc index 9c27dc88b45..a6c498e2b3e 100644 --- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc +++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc @@ -16,7 +16,7 @@ \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \expandafter\global\expandafter\savebox\expandafter\hv@boxLeftPage\expandafter{\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% \expandafter\global\expandafter\savebox\expandafter\hv@boxRightPage\expandafter{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}% - %\checkoddpage + \checkoddpage \ifoddpage \hvfloat@typeout{do@hvFloat@doublePAGE: oddpage}% \if@twocolumn diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc index 8b394e4fe9b..d3544cbe3e4 100644 --- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc +++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc @@ -45,7 +45,7 @@ \ifhv@forceOutput \do@hvFloat@doublePAGECaptionRight{#1}% no cheque \else - %\checkoddpage + \checkoddpage \ifoddpage \hvfloat@typeout{do@hvFloat@doublePage:oddpage}% \if@twocolumn @@ -54,11 +54,15 @@ \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->firstcolumn}% \ifhv@switchType \hvfloat@typeout{hvfloat: switched to floattype p}% - \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePAGECaptionRight{#1}}% \else \hvfloat@typeout{calling do@hvFloat@doublePageCaptionRight}% - %\afterpage{ - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%}% + %\afterpage{% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePageCaptionRight{#1}}%}% \fi \else % \hvfloat@typeout{do@hvFloat@doublePage:oddpage->twocolumn->secondcolumn}% @@ -68,7 +72,9 @@ \ifhv@switchType \do@hvFloat@doublePAGECaptionRight{#1}% \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePageCaptionRight{#1}}% \fi \fi \fi @@ -82,7 +88,9 @@ \ifhv@forceLeft \do@hvFloat@doublePageCaptionRight{#1}% no \afterpage \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePageCaptionRight{#1}}% \fi \fi \fi @@ -112,30 +120,44 @@ \if@twocolumn \if@firstcolumn \ifhv@switchType - \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% + \afterpage{\afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePAGECaptionRight{#1}}}% \else - \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}}% + \afterpage{\afterpage{\afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePageCaptionRight{#1}}}}% \fi \else% second column \ifhv@switchType - \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePAGECaptionRight{#1}}% \else %\afterpage{ - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}%}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePageCaptionRight{#1}}%}% \fi \fi \else% onecolumn \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn -> (\thepage)}% \ifhv@switchType \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/switchType -> (\thepage)}% - \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePAGECaptionRight{#1}}% \else \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType -> (\thepage)}% \ifhv@forceLeft \hvfloat@typeout{do@hvFloat@doublePage:evenpage/onecolumn/noSwitchType/forceLeft -> (\thepage)}% - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePageCaptionRight{#1}}% \else - \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \afterpage{\afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \do@hvFloat@doublePageCaptionRight{#1}}}% \fi \fi \fi diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty index a5a5e51c653..5c4539a9b25 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 876 2024-03-03 14:04:56Z herbert $ +%% $Id: hvfloat.sty 879 2024-03-17 10:44:09Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -16,8 +16,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.48} -\def\filedate{2024/03/03} +\def\fileversion{2.49} +\def\filedate{2024/03/17} \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)] \let\hvFloatFileVersion\fileversion % @@ -58,6 +58,7 @@ \RequirePackage{zref-savepos} \newdimen\@tempx \newdimen\@tempy +\newcounter{hvfloat@testCtr} \newcounter{hvfloat@ref} \renewcommand\thehvfloat@ref{tmp@\arabic{hvfloat@ref}} \setcounter{hvfloat@ref}{0} @@ -196,6 +197,9 @@ \define@boolkey{hvSet}[hv@]{twoColumnCaption}[true]\global\@nameuse{hv@twoColumnCaption#1}{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{sameHeight}[true]{\@nameuse{hv@sameHeight#1}}% Write the caption only as text \define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal +\define@boolkey{hvSet}[hv@]{test}[true]{}% use of the hvOBox contents + +\def\test@typeout#1{\ifhv@test\typeout{>>>test\thehvfloat@testCtr:>#1}\fi} \newif\ifhv@fullpage \newif\ifhv@FULLPAGE @@ -531,12 +535,13 @@ \def\hvFloat{\@ifnextchar*% Main macro - {\checkoddpage\global\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}% - {\checkoddpage\global\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}% + {\global\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}% + {\global\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}% } \def\hvFloat@i*{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}} \def\do@hvFloat[#1]{% + \ifhv@Debug\marginnote{\textbf{hvFloat}}\fi% %\marginnote{\textbf{hvFloat}}% \savebox\hvObjectBox{}% \begingroup @@ -553,6 +558,9 @@ \setcounter{hv@tempCNTtabB}{\value{table}}% \gdef\hv@save@setting{#1}% for later use after \endgroup inside figure/table env \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi + \global\stepcounter{hvfloat@ref}% + \test@typeout{>>>test:>hvfloat@ref \thehvfloat@ref}% + \global\stepcounter{hvfloat@testCtr}% use anyway, it's only for debugging \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifx\hv@subcaption@format\@empty\else \expandafter @@ -608,7 +616,6 @@ } \ExplSyntaxOff - \newcount\hv@cnta \newcount\hv@cntb @@ -623,7 +630,8 @@ \xdef\hv@save@setting{\hv@save@setting}% for later use after \endgroup inside figure/table env \fi % \xdef\hv@floatListOfExt{\@nameuse{ext@\hv@floatType}}% - \gdef\hv@floatObject{#3}% + \ifhv@useOBox\gdef\hv@floatObject{\usebox\hvOBox}\else\gdef\hv@floatObject{#3}\fi +% \gdef\hv@floatObject{#3}% \@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}% } @@ -644,7 +652,7 @@ \ifhv@FULLPAGE \hvfloat@typeout{>>>> do@@hvFloat: FULLPAGE true}% \def\hvSet@CapWidth{n}% relative value - \do@@@@hvFloat% fullpage with caption on other page + \do@@@@hvFloat% FULLPAGE with caption on other page \else \ifhv@doubleFULLPAGE \hvfloat@typeout{>>>> do@@hvFloat: doubleFULLPAGE true}% @@ -702,7 +710,7 @@ }% }% \fi - \ifhv@useOBox\global\savebox\hvOBox{}\fi +% \ifhv@useOBox\global\savebox\hvOBox{}\fi%%%%%%%%%%%%% \setlength\hvObjectWidth{\wd\hvObjectBox}% % % Now we save the caption with its defined \hvCapWidth @@ -844,15 +852,16 @@ \begin{\hv@floatType}% Start the floating environment \fi \fi - \checkoddpage \ifx\hvSet@objectPos\hv@Right\raggedleft\fi \ifx\hvSet@objectPos\hv@Center \ifhv@nonFloat\hspace*{\fill}\else\centering\fi \fi \ifx\hvSet@objectPos\hv@Outer + \checkoddpage \ifoddpage\raggedleft\fi \fi \ifx\hvSet@objectPos\hv@Inner + \checkoddpage \ifoddpage\else\raggedleft\fi \fi % @@ -876,9 +885,11 @@ \hv@@capPos=3 \else \ifx\hvSet@capPos\hv@Inner + \checkoddpage \ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi \else \ifx\hvSet@capPos\hv@Outer + \checkoddpage \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) @@ -897,7 +908,7 @@ \fi \fi %%%% -%\typeout{>>>>>>>>>Pos: \the\hv@@capPos}% +\test@typeout{>>>>>>>>>Pos: \the\hv@@capPos}% \savebox{\@tempboxa}{% ***** @tempbox start \expandafter% \ifcase\the\hv@@capPos % 0 is LEFT START \ifcase @@ -984,6 +995,7 @@ % now we rotate the object and caption, if needed % \ifhv@wide + \checkoddpage \ifoddpageoroneside \if@twocolumn \if@firstcolumn @@ -992,6 +1004,7 @@ \fi \fi \else + \checkoddpage \ifoddpage \if@twocolumn \if@firstcolumn @@ -1042,7 +1055,7 @@ \global\savebox\hvObjectBox{\rotatebox{\hvSet@objectAngle}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}}% \fi \setlength\hvObjectWidth{\wd\hvObjectBox}% - \ifhv@useOBox\global\savebox\hvOBox{}\fi + %%%\ifhv@useOBox\global\savebox\hvOBox{}\fi%%%%%%%%%%%%%%%%%%% % % Now we save the caption with its defined \hvCapWidth % @@ -1115,11 +1128,10 @@ \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 + \ifx\hvSet@objectPos\hv@Outer \checkoddpage\ifoddpage\raggedleft\fi\fi + \ifx\hvSet@objectPos\hv@Inner \checkoddpage\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 @@ -1128,6 +1140,7 @@ % 2 caption right, inner and even page, oneside outer % 3 caption bottom % +% \checkoddpage \ifx\hvSet@capPos\hv@Left \hv@@capPos=0 \else \ifx\hvSet@capPos\hv@Top \hv@@capPos=1 @@ -1136,9 +1149,9 @@ \else \ifx\hvSet@capPos\hv@Bottom \hv@@capPos=3 \else - \ifx\hvSet@capPos\hv@Inner \ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi + \ifx\hvSet@capPos\hv@Inner \checkoddpage\ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi \else - \ifx\hvSet@capPos\hv@Outer \ifoddpage\hv@@capPos=2\else\hv@@capPos=0\fi + \ifx\hvSet@capPos\hv@Outer \checkoddpage\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 @@ -1154,7 +1167,7 @@ \fi \fi %%%% -%\typeout{>>>>>>>>>Pos: \the\hv@@capPos}% +\test@typeout{>>>>>>>>>Pos: \the\hv@@capPos}% \savebox{\@tempboxa}{% ***** @tempbox start \expandafter\ifcase\the\hv@@capPos % 0 is LEFT START \ifcase \ifx\hvSet@capVPos\hv@Center @@ -1247,7 +1260,8 @@ \let\clist@count@N\clist_count:N \ExplSyntaxOff -\def\do@@@@hvFloat{% special float page: caption <-> fullpage images +\def\do@@@@hvFloat{% special float page: caption <-> FULLPAGE images +% \ifhv@useOBox\gdef\hv@floatObject{\usebox\hvOBox}\fi \hvfloat@typeout{>>>do@@@@hvFloat: special float page}% \ifx\hvSet@capPos\hv@After \global\hv@@capPos=1 \else @@ -1259,9 +1273,9 @@ \else \ifx\hvSet@capPos\hv@Outer \global\hv@@capPos=5 \else - \ifx\hvSet@capPos\hv@Right \global\hv@@capPos=6% only for twocolumn mode + \ifx\hvSet@capPos\hv@Right \global\hv@@capPos=6 % only for twocolumn mode \else - \ifx\hvSet@capPos\hv@Left \global\hv@@capPos=7% only for twocolumn mode + \ifx\hvSet@capPos\hv@Left \global\hv@@capPos=7 % only for twocolumn mode \else \global\hv@@capPos=0 \fi @@ -1272,9 +1286,10 @@ \fi \fi \hvfloat@typeout{>>>do@@@@hvFloat: hv@capPos is \the\hv@@capPos}% - %\checkoddpage +% \checkoddpage \hvfloat@typeout{>>>do@@@@hvFloat: set floattype}% \set@caption@object{\hv@floatType}% set caption and object into a box +% \ifcase\hv@@capPos% caption before object 0-> _always_ left \hvfloat@typeout{>>>do@@@@hvFloat: setBottomCaption and setPageObject (0)}% \setBottomCaption\setPageObject @@ -1282,9 +1297,13 @@ \hvfloat@typeout{>>>do@@@@hvFloat: setPageObject and setBottomCaption (1)}% \setPageObject\setBottomCaption \or% caption on even page 2-> left page + \checkoddpage \ifoddpage \hvfloat@typeout{>>>do@@@@hvFloat: afterpage-> oddpage/setBottomCaption and setPageObject (2)}% - \afterpage{\setBottomCaption\setPageObject}% + \afterpage{% + \setBottomCaption + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject}% \else% we are on an even page \hvfloat@typeout{>>>do@@@@hvFloat: evenpage/setBottomCaption and setPageObject (2)}% \setBottomCaption\setPageObject @@ -1294,6 +1313,7 @@ \hvfloat@typeout{>>>do@@@@hvFloat: twoside and caption on oddpage (3)}% \if@twocolumn \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn and caption on oddpage (3)}% + \checkoddpage \ifoddpage \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn/oddpage and caption on oddpage (3)}% \if@firstcolumn% on right side @@ -1301,13 +1321,16 @@ \setBottomCaption\setPageObject \else \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->twoside/twocolumn/oddpage/secondcolumn and caption on oddpage (3)}% - \afterpage{\setPageObject\setBottomCaption}% start next column + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject\setBottomCaption}% start next column \fi \else% left (even) page \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn/oddpage and caption on evenpage (3)}% \if@firstcolumn \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->twoside/twocolumn/evenpage/firstcolumn and caption on oddpage (3)}% - \afterpage{\setPageObject\setBottomCaption}% start next column + \afterpage{\global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject\setBottomCaption}% start next column \else \hvfloat@typeout{>>>do@@@@hvFloat: twoside/twocolumn/evenage/secondcolumn and caption on oddpage (3)}% \setPageObject\setBottomCaption @@ -1315,18 +1338,22 @@ \fi \else% onecolumn \hvfloat@typeout{>>>do@@@@hvFloat: twoside/onecolumn and caption on oddpage (3)}% + \checkoddpage \ifoddpage \hvfloat@typeout{>>>do@@@@hvFloat: twoside/onecolumn/oddpage and caption on oddpage (3)}% \setPageObject\setBottomCaption \else% even page \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->twoside/onecolumn/evenpage and caption on oddpage (3)}% - \afterpage{\setPageObject\setBottomCaption}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject\setBottomCaption}% \fi \fi \else% oneside \hvfloat@typeout{>>>do@@@@hvFloat: oneside and caption on oddpage (3)}% \if@twocolumn \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn and caption on oddpage (3)}% + \checkoddpage \ifoddpage \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/oddpage and caption on oddpage (3)}% \if@firstcolumn% on right side @@ -1340,7 +1367,9 @@ \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/evenpage and caption on oddpage (3)}% \if@firstcolumn% on left side \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->oneside/twocolumn/evenpage/firstcolumn and caption on oddpage (3)}% - \afterpage{\setPageObject\setBottomCaption}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject\setBottomCaption}% \else \hvfloat@typeout{>>>do@@@@hvFloat: oneside/twocolumn/evenpage/secondcolumn and caption on oddpage (3)}% \setPageObject\setBottomCaption @@ -1348,12 +1377,15 @@ \fi \else % onecolumn \hvfloat@typeout{>>>do@@@@hvFloat: oneside/onecolumn and caption on oddpage (3)}% + \checkoddpage \ifoddpage \hvfloat@typeout{>>>do@@@@hvFloat: oneside/onecolumn/oddpage and caption on oddpage (3)}% - \setBottomCaption\setPageObject + \setBottomCaption\setPageObject% \else \hvfloat@typeout{>>>do@@@@hvFloat: afterpage->oneside/onecolumn/evenpage and caption on oddpage (3)}% - \afterpage{\setBottomCaption\setPageObject}% + \afterpage{\setBottomCaption + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject}% \fi \fi \fi @@ -1361,11 +1393,12 @@ % \set@caption@object \if@twocolumn \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn and caption on inner column (4)}% + \checkoddpage \ifoddpage \hvfloat@typeout{>>>do@@@@hvFloat: twoside/oddpage and caption on inner column (4)}% \if@firstcolumn% on right side \hvfloat@typeout{>>>do@@@@hvFloat: twoside/oddpage/firstcolumn and caption on inner column (4)}% - \setBottomCaption\setPageObject + \setBottomCaption\setPageObject \else % right column on right side \hvfloat@typeout{>>>do@@@@hvFloat: twoside/oddpage/secondcolumn and caption on inner column (4)}% \setPageObject\setBottomCaption% start next firstcolumn next page @@ -1374,7 +1407,10 @@ \hvfloat@typeout{>>>do@@@@hvFloat: twoside/evenpage and caption on inner column (4)}% \if@firstcolumn% on left side \hvfloat@typeout{>>>do@@@@hvFloat: afterpage^2 -> twoside/evenpage/firstcolumn and caption on inner column (4)}% - \afterpage{\afterpage{\setBottomCaption\setPageObject}}% start next page/first column + \afterpage{\afterpage{% + \setBottomCaption + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject}}% start next page/first column \else% left page/column \hvfloat@typeout{>>>do@@@@hvFloat: twoside/evenpage/secondcolumn and caption on inner column (4)}% \setBottomCaption\setPageObject% start on same page/column @@ -1388,14 +1424,20 @@ % \set@caption@object \if@twocolumn \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn and caption on outer column (5)}% + \checkoddpage \ifoddpage \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/oddpage and caption on outer column (5)}% \if@firstcolumn \hvfloat@typeout{>>>do@@@@hvFloat: afterpage^2 -> firstcolumn/oddpage/twocolumn and caption on outer column (5)}% - \afterpage{\afterpage{\setBottomCaption\setPageObject}}% + \afterpage{\afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setBottomCaption\setPageObject}}% \else \hvfloat@typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/oddpage/secondcolumn and caption on outer column (5)}% - \afterpage{\setBottomCaption\setPageObject}% + \afterpage{% + \setBottomCaption + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject}% \fi \else% even page (left) \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/evenpage and caption on outer column (5)}% @@ -1415,7 +1457,9 @@ \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn and caption after object (6)}% \if@firstcolumn \hvfloat@typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/firstcolumn and caption after object (6)}% - \afterpage{\setPageObject\setBottomCaption}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setPageObject\setBottomCaption}% \else \hvfloat@typeout{>>>do@@@@hvFloat: twocolumn/secondcolumn and caption after object (6)}% \setPageObject\setBottomCaption @@ -1432,7 +1476,10 @@ \setBottomCaption\setPageObject \else \hvfloat@typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/secondcolumn and caption before object (7)}% - \afterpage{\setBottomCaption\setPageObject}% +% \global\savebox\hvObjectBox{\hv@floatObject}% + \afterpage{% + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \setBottomCaption\setPageObject}% \fi \else% onecolumn -> same as before \hvfloat@typeout{>>>do@@@@hvFloat: onecolumn and caption before object (7)}% @@ -1441,7 +1488,6 @@ \fi \endgroup% startet at main \hvFloat } -% \newsavebox\hv@boxLeftPage \newsavebox\hv@boxRightPage -- cgit v1.2.3