diff options
| author | Karl Berry <karl@freefriends.org> | 2021-06-26 20:39:12 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-06-26 20:39:12 +0000 |
| commit | 2e8f40cf57c53c3b18cd813e2f3fdde0c532b592 (patch) | |
| tree | c678d163a47b1cfaf73b5fbbcf1b1f3619a6d406 /Master/texmf-dist | |
| parent | 141d53114fcd8326cab3c8c2bcd11f1b8eebd763 (diff) | |
hvfloat (26jun21)
git-svn-id: svn://tug.org/texlive/trunk@59721 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
62 files changed, 254 insertions, 91 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index d3e0318635b..676ac9822c1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,6 @@ hvfloat.sty: +2.31 2021-06-26 - suppress "Overful hbox" message for full page or + double page floats 2.30 2021-06-20 - fix for introduced bug for multifloats 2.29 2021-06-15 - some more fixes for doublepage objects - added option sameHeight for same text height on left diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf Binary files differindex d74d1e268e4..40854d1f723 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf Binary files differindex 9567c26d366..6a3f002998d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf Binary files differindex 072c584f82f..630a337a539 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf Binary files differindex ff8eec9e741..861efc9ac7a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf Binary files differindex 752c54810d3..60e3cb94ca5 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf Binary files differindex 6ac3baf5ad2..33ac8dd8769 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf Binary files differindex 388cf976451..1291839ce84 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf Binary files differindex dd444dd08a4..0d3e2713ef6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf Binary files differindex 7aa01b02f84..1578d673ffd 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf Binary files differindex cc6273ead85..7be7a1cb5b6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf Binary files differindex eb062f70e23..e98663ed098 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf Binary files differindex 4f86812e098..09a417c0310 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf Binary files differindex 263b9afc8a0..e2898a14ae0 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf Binary files differindex 9cdd2ea8822..e0e787f9941 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf Binary files differindex 6ddf3c1f561..918e5f5f679 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex index 90bea8a9eb6..5382371f7e9 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -1,7 +1,7 @@ -%% $Id: hvfloat.tex 114 2021-06-15 13:20:03Z herbert $ +%% $Id: hvfloat.tex 122 2021-06-26 12:35:53Z herbert $ \listfiles \errorcontextlines=100 -\documentclass[twoside,paper=a4,]{scrartcl} +\documentclass[twoside,paper=a4,usegeometry]{scrartcl} \usepackage{fontspec} \usepackage{libertinus} %\usepackage[scaled=0.85]{beramono} @@ -10,25 +10,29 @@ \usepackage{microtype} \usepackage[english]{babel} +\usepackage[marginparwidth=3cm,bottom=2cm,top=1cm,includeheadfoot]{geometry} + + \usepackage[automark]{scrlayer-scrpage} \pagestyle{scrheadings} -\usepackage[showframe=false]{geometry} \usepackage{listings} % \lstset{% language=[LaTeX]TeX,% showstringspaces=false,% tabsize=5,% + backgroundcolor=\color{black!15}, % frame={tb},% -% lineskip=-1pt,% + lineskip=-1pt,% extendedchars=true,% basicstyle={\small\ttfamily},% -% numbers=left,% -% stepnumber=1,% -% numberstyle=\tiny,% -% xleftmargin=2em,% - breaklines=true} + numbers=left,% + stepnumber=1,% + numberstyle=\tiny,% + xleftmargin=2em,% + breaklines=true, + } % \usepackage{graphicx} @@ -86,8 +90,6 @@ \index{#1@\texttt{#1} (keyword)}\index{Keyword!#1@\texttt{#1}} \index{#2@\texttt{#2} (value)}\index{Value!#2@\texttt{#2}}} - - \newsavebox\boxdef \newenvironment{BDef} {\begin{lrbox}{\boxdef} @@ -160,6 +162,13 @@ \let\CMD\Lcs \let\ENV\Lenv +\newdimen\normalparindent +\normalparindent=20pt +\def\NormalParIndent{\global\parindent=\normalparindent} +\NormalParIndent + + + \newcommand\Float[1][]{\ifx\relax#1\relax\marginnote{\fbox{float}}\else \marginnote{\fbox{\shortstack{float\\#1}}}\fi } @@ -301,57 +310,106 @@ Internally the style is saved in a macro named \verb|\hv@<name>|. There are the following keywords: +%\begin{lrbox}\hvOBox +\begingroup +\small + \def\rowvsp{\rule{0pt}{9pt}}% + \def\rowhsp{\hspace*{\normalparindent}}% + \def\rownl{\newline\rowhsp}% + \def\none{{\itshape none}}% + \def\arraystretch{0.96}% \begin{xltabular}{\textwidth}{@{} l>{\small\ttfamily}cX @{}} \caption{The optional keywords for the macro \nxLcs{hvFloat}}\label{tab:options}\\\toprule -\emph Keyword & \emph Default & \emph Description\\\midrule +\emph{K\kern-.1em eyword} & \rmfamily\emph{Default} & \emph{Description}\\\midrule \endfirsthead \midrule -\emph Keyword & \emph Default & \emph Description\\\midrule +\emph{K\kern-.1em eyword} & \rmfamily\emph{Default} & \emph{Description}\\\midrule \endhead \midrule \endfoot \bottomrule \endlastfoot -\Lkeyword{floatPos} & \texttt{tbp} & This is the same default placement setting like the one from standard \LaTeX, but maybe not always -the best setting. \\ -\Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption, should be rotated together.\\ -\Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width given by the current linewidth, - »\texttt{w}« for the width of the object, »\texttt{h}« for the height of the object, or a scale for \verb|\columnwidth|.\\ -\Lkeyword{capAngle} & 0 & The integer value for the angle if the caption should be rotated. Counted counter clockwise.\\ -\Lkeyword{capPos} & bottom& The position of the caption relative to the object. Possible values are\\ - & & \Lkeyval{before}: \emph{always} before (left) from the object.\\ - & & \Lkeyval{top}: \emph{always} on top of the object.\\ - & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in twocolumn mode.\\ - & & \Lkeyval{after}: \emph{always} after (right) from the object.\\ - & & \Lkeyval{bottom}: \emph{always} on the bottom of the object.\\ - & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in twocolumn mode.\\ - & & \Lkeyval{inner}: in twoside mode always typeset at the inner margin.\\ - & & \Lkeyval{outer}: in twoside mode always typeset at the outer margin.\\ - & & \Lkeyval{evenPage}: in twoside mode with fullpage objects always on an even page.\\ - & & \Lkeyval{oddPage}: in twoside mode with fullpage objects always on an odd page.\\ -\Lkeyword{capVPos}& center& This is only important for \texttt{capPos=left|right}. Only in this case the - caption can vertically placed at the \Lkeyval{bottom}, \Lkeyval{center} and \Lkeyval{top}.\\ -\Lkeyword{objectPos} & center & The horizontal placement of the object relative to the document. -Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\ -\Lkeyword{objectAngle} & 0 & The integer value for the angle if the object should be rotated. Counted counter clockwise.\\ -\Lkeyword{floatCapSep} & 5pt & The additional space between the object and a left or right placed caption.\\ -\Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \Lcs{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\ -\Lkeyword{onlyText} & false & The caption will be printed as normal text and there is no entry in the list of \ldots.\\ -\Lkeyword{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counter is increased as usual and can be referenced.\\ -\Lkeyword{wide} & false & The float can use \Ldim{textwidth}+\Ldim{marginparwidth} as horizontal width.\\ -\Lkeyword{objectFrame} & false & put a frame with no separation around the float object.\\ -\Lkeyword{style} & --- & Use a defined style\\ -\Lkeyword{capFormat} & --- & Define formatting options for \Lcs{caption} (see documentation of package \Lpack{caption}).\\ -\Lkeyword{subcapFormat} & --- & Define formatting options for \Lcs{subcaption}.\\ -\Lkeyword{fullpage} & false & Use a complete column in twocolumn mode.\\ -\Lkeyword{FULLPAGE} & false & Use the complete paper width/height for the object.\\ -\Lkeyword{FullPage} & false & Use the complete text area for the object.\\ -\Lkeyword{doublePage} & false & Use the textarea on a doublepage with additional text.\\ -\Lkeyword{doublePAGE} & false & Use the textarea on a doublepage without additional text.\\ -\Lkeyword{doubleFULLPAGE} & false & Use the paperwidth on a doublepage without additional text.\\ -\Lkeyword{vFill} & false & Put a \Lcs{vfill} between every two objects in a multi- or subfloat.\\ -\end{xltabular} +\Lkeyword{floatPos} & \texttt{tbp} & This is the same default placement + setting as in standard \LaTeX; maybe not always the best setting.\\ +\Lkeyword{rotAngle} & 0& \rowvsp The value for the angle if both the object and + the caption should be rotated together.\\ +\Lkeyword{capWidth} & n& \rowvsp The width of the caption. Can be \texttt{n} + for a natural width given by the current linewidth, + \texttt{w} for the width of the object, + \rownl\texttt{h} for the height of the object, + or a scale factor for \Lcs{columnwidth}.\\ +\Lkeyword{capAngle} & 0 & \rowvsp The integer value for the angle if the caption + should be rotated. Positive is counter-clockwise.\\ +% +\Lkeyword{capPos} & bottom& \rowvsp The position of the caption relative to the + object. Possible values:\\ + & & \rowhsp\Lkeyval{before}: \emph{always} before (left) from the object.\\ + & & \rowhsp\Lkeyval{top}: \emph{always} on top of the object.\\ + & & \rowhsp\Lkeyval{left}: \emph{always} before (left) from the object, + but on the same page in twocolumn mode.\\ + & & \rowhsp\Lkeyval{after}: \emph{always} after (right) from the object.\\ + & & \rowhsp\Lkeyval{bottom}: \emph{always} on the bottom of the object.\\ + & & \rowhsp\Lkeyval{right}: \emph{always} after (right) from the + object, but on the same page in twocolumn mode.\\ + & & \rowhsp\Lkeyval{inner}: in twoside mode always typeset at the inner + margin.\\ + & & \rowhsp\Lkeyval{outer}: in twoside mode always typeset at the outer + margin.\\ + & & \rowhsp\Lkeyval{evenPage}: in twoside mode with fullpage objects + always on an even page.\\ + & & \rowhsp\Lkeyval{oddPage}: in twoside mode with fullpage objects + always on an odd page.\\ +% +\Lkeyword{capVPos}& center& \rowvsp Only used when + \texttt{capPos=left$\,|\,$right}; in these cases, the caption can + be vertically placed at the \Lkeyval{bottom}, \Lkeyval{center} or + \Lkeyval{top}.\\ +\Lkeyword{objectPos} & center & \rowvsp Horizontal placement of the object + relative to the document. Possible values are + (\textbf{l})eft, (\textbf{c})enter, (\textbf{r})ight.\\ +\Lkeyword{objectAngle} & 0 & \rowvsp Integer value for the angle if + the object should be rotated. Positive is counter-clockwise.\\ +\Lkeyword{floatCapSep} & 5pt & \rowvsp Additional space between the + object and a left- or right-placed caption.\\ +\Lkeyword{useOBox} & false & \rowvsp Instead of passing the object as a + parameter to \Lcs{hvFloat}, with \texttt{useOBox=true} the contents + of the predefined box \texttt{\textbackslash hvOBox} is used.\\ +\Lkeyword{onlyText} & false & \rowvsp The caption is printed as normal + text with no entry in any list of \ldots\\ +\Lkeyword{nonFloat} & false & \rowvsp The object isn't put in a floating + environment, but printed as standard text with an additional caption. + \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{objectFrame} & false & \rowvsp Put a frame with no separation + around the float object.\\ +\Lkeyword{style} & \none & \rowvsp Use a defined style.\\ +\Lkeyword{capFormat} & \none & \rowvsp Define formatting options for + \Lcs{caption}; see documentation of package \Lpack{caption}.\\ +\Lkeyword{subcapFormat} & \none & \rowvsp Define formatting options for + \Lcs{subcaption}.\\ +\Lkeyword{fullpage} & false & \rowvsp Use a complete column in twocolumn mode.\\ +\Lkeyword{FullPage} & false & \rowvsp Use the full text area for the object.\\ +\Lkeyword{FULLPAGE} & false & \rowvsp Use the full paper width/height for the object.\\ +\Lkeyword{doublePage} & false & \rowvsp Use the text area on a doublepage with additional text.\\ +\Lkeyword{doublePAGE} & false & \rowvsp Use the text area on a doublepage without additional text.\\ +\Lkeyword{doubleFULLPAGE} & false & \rowvsp Use the paperwidth on a doublepage without additional text.\\ +\Lkeyword{vFill} & false & \rowvsp Put a \Lcs{vfill} between every two objects in a multi- or subfloat.\\ +\Lkeyword{sameHeight} & false & \rowvsp use the same text height on both pages for a \Lkeyword{doublePage} object.\\ +\end{xltabular} +%\end{lrbox} +\endgroup + +%\hvFloat*[floatPos=p,rotAngle=90,capPos=top,capWidth=w,useOBox=true] +% {table} +% {} +% [The optional keywords for the \newline\Lcs{hvFloat} macro] +% {The optional keywords for the \protect\Lcs{hvFloat} macro.} +% {tab:options} + + + @@ -786,10 +844,12 @@ The code for figure \ref{fig:5}: The code for figure \ref{fig:6}: \begin{lstlisting} \hvFloat[% - capWidth=0.25, - capPos=right, + capWidth=0.25,% + capPos=right,% capVPos=center,% the default -]{figure}{\frame{\includegraphics{images/rose}}}{Caption centered right beside the float}{fig:6} +]{figure}{\frame{\includegraphics{images/rose}} + \frame{\includegraphics[origin=c,angle=180]{images/rose}}}% + {Caption centered right beside the float}{fig:6} \end{lstlisting} @@ -798,7 +858,9 @@ The code for figure \ref{fig:6}: capWidth=0.25,% capPos=right,% capVPos=center,% the default -]{figure}{\frame{\includegraphics{images/rose}}}{Caption centered right beside the float}{fig:6} +]{figure}{\frame{\includegraphics{images/rose}} + \frame{\includegraphics[origin=c,angle=180]{images/rose}}}% + {Caption centered right beside the float}{fig:6} \section{Caption format} @@ -1633,6 +1695,9 @@ which is before the caption. \end{figure} \fi + + + \FloatBarrier @@ -1641,6 +1706,11 @@ which is before the caption. These settings make no sense in \Index{onecolumn} mode. +\clearpage + + + + \subsection{Using the paper size} It belongs to the user to create an object which fills the complete page. However, with the @@ -1695,6 +1765,8 @@ the paper dimensions \Ldim{paperwidth} and \FloatBarrier +\clearpage + \subsection{Multifloats}\label{sec:multifloats} Multifloats is the name for more than one image and/or tabular in \emph{one} floating @@ -2542,7 +2614,7 @@ in the inner margin on both pages. \Blindtext -%\Blindtext +\Blindtext @@ -2589,7 +2661,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same {figure}% {\includegraphics[doubleFULLPAGE, keepaspectratio=false]{images/rheinsberg}}% - {A caption for a double-sided image that will be placed before + {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. The parameter is \texttt{doubleFULLPAGE}}% @@ -2602,7 +2674,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \hvFloat[doubleFULLPAGE,capPos=after]% {figure}% {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% - {A caption for a double-sided image that will be placed before + {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. The parameter is \texttt{doubleFULLPAGE}}% @@ -2613,14 +2685,17 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \hvblindtext \hvblindtext -\hvblindtext + +\Blindtext + +\Blindtext \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=before]% {figure}% {\includegraphics[height=\paperheight,width=2\paperwidth, keepaspectratio=false]{images/rheinsberg}}% - {A caption for a double-sided image that will be placed after + {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. The parameter is \texttt{doubleFULLPAGE}}% @@ -2631,7 +2706,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}}% - {A caption for a double-sided image that will be placed after + {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. The parameter is \texttt{doubleFULLPAGE}}% @@ -2673,7 +2748,7 @@ There will be pagenumbers and a caption can be rotated on the right of the objec The parameter is \texttt{doublePAGE}}% {fig:doublePAGE0} -%\hvblindtext +\hvblindtext \Blindtext @@ -2697,7 +2772,7 @@ and the rest of the text area is filled with text. \end{lstlisting} -%\hvFloatSetDefaults +\hvFloatSetDefaults \marginnote{Fig. \ref{fig:doublePage0sH}} \hvFloat[doublePage,sameHeight]% @@ -2717,6 +2792,8 @@ and the rest of the text area is filled with text. \hvblindtext + + \begin{lstlisting} \hvFloat[doublePage,capPos=right,capVPos=top]% {figure}% @@ -2730,7 +2807,7 @@ and the rest of the text area is filled with text. \end{lstlisting} -%\hvFloatSetDefaults +\hvFloatSetDefaults \marginnote{Fig. \ref{fig:doublePage0}} \hvFloat[doublePage,capPos=right,capVPos=top]% @@ -2747,7 +2824,7 @@ and the rest of the text area is filled with text. \Blindtext -\hvblindtext +\Blindtext @@ -2765,7 +2842,7 @@ and the rest of the text area is filled with text. \end{lstlisting} -%\hvFloatSetDefaults +\hvFloatSetDefaults \marginnote{Fig. \ref{fig:doublePage0sH2}} \hvFloat[doublePage,,bindCorr=inner]% @@ -2782,7 +2859,7 @@ and the rest of the text area is filled with text. \Blindtext -\hvblindtext +\Blindtext @@ -2947,12 +3024,10 @@ With \Lcs{hvDefFloatStyle} one can define a special style to get rid of the indi \end{BDef} For example: -\begin{verbatim} -\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} -\end{verbatim} - - \begin{lstlisting} +\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, + capVPos=bottom, objectPos=center} + \hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}% {Caption vertically centered right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth}.}{fig:style} @@ -2967,10 +3042,6 @@ For example: \texttt{0.5\textbackslash columnwidth}.}{fig:style} -\Blindtext - -\Blindtext - \section{Global float setting} Instead of writing the following sequence into the preamble: @@ -2990,7 +3061,7 @@ optional package options to set the global placement: \usepackage[figure=tb,table=t]{hvfloat-fps} \end{verbatim} -\Blindtext +%\Blindtext \Blindtext diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf Binary files differindex 05ac77f5ddf..73a49d0a073 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf Binary files differindex 200ac470d68..3cd80ae1316 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf Binary files differindex 94d1d37488e..6b794b37320 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf Binary files differindex 406285913d2..4e6b0cfae72 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/missing.txt b/Master/texmf-dist/doc/latex/hvfloat/missing.txt new file mode 100644 index 00000000000..c10e55ce9ce --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/missing.txt @@ -0,0 +1,4 @@ +Not all images of the documentation are listed here, because +some are not for public use. You can use any other image if you +want to run the documentation by yourselve. + diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf Binary files differindex 6db4613d89e..bc345dc15bf 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf Binary files differindex 16b1cbfb19b..e37e60e6263 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf Binary files differindex a4c58d96b95..614b2fcf30f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf Binary files differindex b9558070711..e2ec474cb79 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf Binary files differindex 75107f1a349..23fdd5f04f1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf Binary files differindex 4370c39d847..3f79249b521 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf Binary files differindex 164dc77f647..7ebd9bd69a9 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf Binary files differindex 1c3c610031a..23f3c0b60c6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf Binary files differindex fe0ca31256d..9a8f796d025 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex index dfce04c36b1..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 72 2021-05-02 11:40:10Z herbert $ +%% $Id: odd1s1c.tex 119 2021-06-20 13:28:09Z herbert $ \input{preamble.ltx} diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf Binary files differindex c24ac2fa55b..eae0be6b8d9 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf Binary files differindex a357bdc1e1a..ef5b9fd7ab4 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf Binary files differindex d7a49ea30da..6aa3ac83cfe 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf Binary files differindex ca7e1e56ec7..c6676e12913 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf Binary files differindex 323011e26fd..a7d55f4c80c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf Binary files differindex 11003f09dac..204d0dad654 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf Binary files differindex 495d644d556..a65718b90a9 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf Binary files differindex 443aae8d5f1..fd27f7ca548 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf Binary files differindex bba76eb3202..6e06341ad56 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf Binary files differnew file mode 100644 index 00000000000..c9cd842897c --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex new file mode 100644 index 00000000000..4db02204812 --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex @@ -0,0 +1,81 @@ +\documentclass{scrartcl} +%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ + +\input{preamble.ltx} +\setlength\columnseprule{0.4pt} + +\begin{document} +\title{Example for FULLPAGE floats} +\author{Herbert Voß} +\maketitle + +\tableofcontents + +\blinddocument + +\section{File \texttt{\jobname}} + +\begin{lstlisting} +The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. +\end{lstlisting} + +The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. + +\begin{lstlisting} +\hvFloat*[FULLPAGE]% + {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 whch has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE0} +\end{lstlisting} + + +\Float[default] +\hvFloat*[FULLPAGE]% + {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 whch has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE0} + +\blinddocument + +\begin{lstlisting} +\hvFloat*[FULLPAGE]% + {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 whch has no + real meaning because it fills only the space for a long caption.}% + {fig:FULLPAGE1} +\end{lstlisting} + + +\Float[default] +\hvFloat*[FULLPAGE]% + {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 whch 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-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf Binary files differindex e86b9e6674a..330a7425ca1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf Binary files differindex 56253d38e26..b0792355fbd 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf Binary files differindex daca3967b61..5ed8ec5a710 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf Binary files differindex 8c43e8c1f05..c6c6bd27bdb 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf Binary files differindex 954f63954d3..dfd03e566cc 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf Binary files differindex 037f72ae104..dbb63e5fac8 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf Binary files differindex 2fecbfbe051..e269a747a3b 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf Binary files differindex d2391f0870b..f75bb23f56f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf Binary files differindex a23af6e14d8..00554afc00b 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf Binary files differindex 83d13d78247..efea15759ce 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf Binary files differindex b5e7ae13b85..8d48919902c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf Binary files differindex 026910949fe..84ab3d56ccb 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf Binary files differindex 68d689fca00..b3192656303 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf Binary files differindex d67a0f806a6..72ca9190457 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf Binary files differindex 6456d856289..23e0a03ee7a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf Binary files differindex 6ee1ea42d17..b81fedc701c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf Binary files differindex a12ef0d594a..a95470d1eb5 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty index 0090e80f5f0..99b7cbfbab6 100644 --- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty +++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty @@ -1,6 +1,7 @@ -%% $Id: hvfloat-fps.sty 120 2021-06-20 13:31:02Z herbert $ +%% $Id: hvfloat-fps.sty 35 2020-10-31 07:41:00Z herbert $ %% \NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{hvfloat-fps}[2017/09/16 setting float objects] %% %% IMPORTANT NOTICE: %% @@ -15,10 +16,9 @@ %% DESCRIPTION: %% `hvfloat-fps' offers global placement of floats %% -\def\fileversion{0.03} -\def\filedate{2020/06/20} -\ProvidesPackage{hvfloat-fps}[\filedate\space v\fileversion\space global float position setting (hv)] -%\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)} +\def\fileversion{0.02} +\def\filedate{2017/09/20} +\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)} % \RequirePackage{xkeyval} % diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty index 2159575d1c7..82bf238e6d7 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 119 2021-06-20 13:28:09Z herbert $ +%% $Id: hvfloat.sty 122 2021-06-26 12:35:53Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -15,8 +15,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.30} -\def\filedate{2021/06/20} +\def\fileversion{2.31} +\def\filedate{2021/06/26} %\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)] \let\hvFloatFileVersion\fileversion @@ -303,15 +303,13 @@ \renewcommand\tabcaption[2][]{% \begingroup \def\@captype{table}% - \edef\hv@caption@format{position=top,\hv@caption@format}% - \expandafter\captionsetup\expandafter{\hv@caption@format}% + \expandafter\captionsetup\expandafter{\hv@caption@format,position=top}% \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi \endgroup} \renewcommand\tabcaptionbelow[2][]{% \begingroup \def\@captype{table}% - \edef\hv@caption@format{position=below,\hv@caption@format}% - \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi + \expandafter\captionsetup\expandafter{\hv@caption@format,position=below} \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi \endgroup} % @@ -1138,6 +1136,7 @@ % \def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object \begin{\hv@floatType*}[!t] + \hfuzz=\maxdimen \let\c@hv@tempCNTfigA\c@figure \let\c@hv@tempCNTtabA\c@table \expandafter\hvFloatSet\expandafter{\hv@save@setting}% @@ -1163,6 +1162,7 @@ } \def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object \begin{\hv@floatType*}[!t] + \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \hspace*{-\hv@tempWidthA}% @@ -1272,6 +1272,7 @@ \def\do@hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ---------------------------------- % #1-> 0/1 caption under/right \afterpage{% + \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \noindent @@ -1463,6 +1464,7 @@ \def\do@hvFloat@doubleFULLPAGE@CaptionBefore{% \afterpage{% + \hfuzz=\maxdimen \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% @@ -1496,6 +1498,7 @@ \def\do@hvFloat@doubleFULLPAGE@CaptionAfter{% \afterpage{% + \hfuzz=\maxdimen \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% @@ -1578,6 +1581,7 @@ \def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{% \afterpage{% + \hfuzz=\maxdimen \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \thispagestyle{empty}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox @@ -1664,6 +1668,7 @@ \else \begin{\hv@floatType}[p]% \fi + \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \ifhv@FULLPAGE \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip% |