From 94c996b5f40175b4a858ddd1f19e3947198b9bd0 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 19 May 2021 03:01:49 +0000 Subject: CTAN sync 202105190301 --- macros/latex/contrib/hvfloat/Changes | 1 + .../hvfloat/doc/examples/doublepage2s1c.pdf | Bin 2356868 -> 2355469 bytes .../hvfloat/doc/examples/doublepage2s1c.tex | 15 +- .../hvfloat/doc/examples/doublepage2s2c.pdf | Bin 0 -> 2397912 bytes .../hvfloat/doc/examples/doublepage2s2c.tex | 1054 ++++++++++++++++++++ macros/latex/contrib/hvfloat/doc/hvfloat.pdf | Bin 7067733 -> 7070591 bytes macros/latex/contrib/hvfloat/doc/hvfloat.tex | 4 +- macros/latex/contrib/hvfloat/latex/hvfloat.sty | 440 ++++---- 8 files changed, 1332 insertions(+), 182 deletions(-) create mode 100644 macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf create mode 100644 macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex (limited to 'macros/latex/contrib/hvfloat') diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes index 0ac4371d38..c6fc9698b4 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -1,4 +1,5 @@ hvfloat.sty: +2.25 2021-05-18 - support of \twocolumn mode 2.24 2021-05-12 - allow a caption on the bottom of a preceding or a following page of double page floats (left-right) - new option for a binding correction of doublepage floats diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf index 6728d631fd..84a90a4282 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex index 4f95b4b67b..656cbe68c8 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: doublepage2s1c.tex 86 2021-05-12 19:25:56Z herbert $ +%% $Id: doublepage2s1c.tex 92 2021-05-18 09:46:55Z herbert $ \input{preamble.ltx} \usepackage{blindtext,xcolor,marginnote} @@ -65,6 +65,7 @@ \Blindtext + \subsubsection{\texttt{bindCorr=1cm}} \begin{lstlisting} @@ -159,11 +160,13 @@ \Blindtext -\Blindtext - -\subsection{Definition on an even page} +%\Blindtext +\hvblindtext \hvblindtext +\hvblindtext + +\subsection{Definition on an even page} \subsubsection{The default} \begin{lstlisting} @@ -575,7 +578,7 @@ \begin{lstlisting} \hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% [A doublepage image with a caption on the right side of the right part.]% {A caption for a double-sided image that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of @@ -588,7 +591,7 @@ \marginnote{Fig. \ref{fig:doubleFULLPAGE0}} \hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% [A doublepage image with a caption on the right side of the right part.]% {A caption for a double-sided image that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf new file mode 100644 index 0000000000..3099998bdf Binary files /dev/null and b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex new file mode 100644 index 0000000000..5c579160cc --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex @@ -0,0 +1,1054 @@ +\documentclass[twoside,twocolumn]{scrartcl} +%% $Id: doublepage2s2c.tex 92 2021-05-18 09:46:55Z herbert $ + +\input{preamble.ltx} +\usepackage{blindtext,xcolor,marginnote} + +\let\hvBlindtext\Blindtext +\def\Blindtext{\par\color{black!40}\hvBlindtext\par\normalcolor} +\makeatletter +\def\hvblindtext{\textcolor{black!40}{\blindtext@text}} +\makeatother +\usepackage{marginnote,showframe} +\setcounter{tocdepth}{2} + +\begin{document} +\title{Examples for doublepage floats \newline with bind correction} +\author{Herbert Voß} +\maketitle + +\tableofcontents + + +\onecolumn +\listoffigures + +\newpage\null +\twocolumn +\section{Argument \texttt{doublePage}} +\subsection{Definition on an odd page} + +\Blindtext\hvblindtext + +\hvblindtext + +\subsubsection{The default} + + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePage0}} +\hvFloat[doublePage,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0} + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage1}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1} + +\hvblindtext + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=3mm}} +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage2}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2} + + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage3}} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3} + + +\Blindtext + +\Blindtext + +\subsection{Definition on an even page} + + +\subsubsection{The default} +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0a} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePage0a}} +\hvFloat[doublePage,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0a} + + +\hvblindtext + +\Blindtext + +\Blindtext + +\Blindtext + + + + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage1a}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1a} + +\hvblindtext + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage2a}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2a} + + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage3a}} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3a} + + +\Blindtext + +\Blindtext + +\Blindtext + + + +\clearpage + +\section{Argument \texttt{doublePAGE}} +\subsection{Definition on an odd page} + +\Blindtext + +\hvblindtext + +\subsubsection{The default} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePAGE0}} +\hvFloat[doublePAGE,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE1}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE2}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2} + + + +\Blindtext + +\Blindtext + +\hvblindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE3}} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3} + + +%\hvblindtext + +\Blindtext + + +\subsection{Definition on an even page} + + +\subsubsection{The default} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right]{figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0a} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePAGE0a}} +\hvFloat[doublePAGE,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0a} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE1a}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1a} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE2a}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2a} + + + +\Blindtext + +\Blindtext + +\hvblindtext +\subsubsection{\texttt{bindCorr=}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE3a}} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3a} + + +\Blindtext + +\Blindtext + + +\section{Argument \texttt{doubleFULLPAGE}} +\subsection{Definition on an odd page} + +\Blindtext +\hvblindtext + +\subsubsection{The default} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0} + +\Blindtext + +\Blindtext + +\hvblindtext + + +\subsubsection{Caption \emph{before} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0before-cap} (internal label \texttt{fig:doubleFULLPAGE0before-cap}) is on +page~\pageref{fig:doubleFULLPAGE0before-cap} and the first page of the image +is on the page~\pageref{fig:doubleFULLPAGE0before} (main label \texttt{fig:doubleFULLPAGE0before}) and the +second (right) part is on page~\pageref{fig:doubleFULLPAGE0before-2} (internal label \texttt{fig:doubleFULLPAGE0before-2}). + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0before}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before} + +\Blindtext + +\Blindtext + +%\hvblindtext + +%\hvblindtext + + + +\subsubsection{Double column caption \emph{before} doublepage image } + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=before,twoColumnCaption,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before2col} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0before2col}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=before,twoColumnCaption,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before2col} + +\Blindtext + +\Blindtext + +\hvblindtext + +\hvblindtext + + +\subsubsection{Caption \emph{after} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0after-cap} is on page~\pageref{fig:doubleFULLPAGE0after-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0after}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0after}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after} + +\Blindtext + +%\hvblindtext + +\hvblindtext +\Blindtext + + +\subsubsection{Two column caption \emph{after} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0after2col-cap} is on page~\pageref{fig:doubleFULLPAGE0after2col-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0after2col}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,twoColumnCaption,capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after2col} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0after2col}} +\hvFloat[doubleFULLPAGE,capWidth=n,twoColumnCaption,capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after2col} + +\Blindtext + +%\hvblindtext + +%\hvblindtext +\Blindtext + + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2} + + + +\Blindtext + +\Blindtext + +%\hvblindtext +%\hvblindtext + + +\subsubsection{\texttt{bindCorr=}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE33} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE33}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE33} + + +\Blindtext + +\subsection{Definition on an even page} +\subsubsection{The default} + + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{Caption \emph{before} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0beforeA-cap} is on page~\pageref{fig:doubleFULLPAGE0beforeA-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0beforeA}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0beforeA} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0beforeA}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0beforeA} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{Caption \emph{after} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0afterA-cap} is on page~\pageref{fig:doubleFULLPAGE0afterA-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0afterA}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0afterA} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0afterA}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0afterA} + +\Blindtext + +\hvblindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a} + + + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE3a}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a} + + +\Blindtext + +\Blindtext + +\Blindtext + +\end{document} \ No newline at end of file diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf index 2f71b515f9..fe878066ec 100644 Binary files a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf and b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex index 4d546a3f63..902f9c0754 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 86 2021-05-12 19:25:56Z herbert $ +%% $Id: hvfloat.tex 90 2021-05-14 09:08:46Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,]{scrartcl} @@ -56,7 +56,6 @@ \usepackage{hvindex} \usepackage[all=!htb]{hvfloat-fps} \usepackage[fbox,hyperref]{hvfloat} -\hvFloatSet{floatRef=caption} \captionsetup{format=plain,font=sf,labelfont={sf,bf}} @@ -2585,6 +2584,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \verb/\ref{foo} | \ref{foo-cap} | \ref{foo-2}/ $\rightarrow$ \ref{foo} | \ref{foo-cap} | \ref{foo-2} +\verb/\pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}/ $\rightarrow$ \pageref{foo} | \pageref{foo-cap} | \pageref{foo-2} \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=before]% diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty index 1f56977f93..59bfd20a45 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty +++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty @@ -1,4 +1,4 @@ -%% $Id: hvfloat.sty 86 2021-05-12 19:25:56Z herbert $ +%% $Id: hvfloat.sty 92 2021-05-18 09:46:55Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -15,16 +15,19 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.24} -\def\filedate{2021/05/09} +\def\fileversion{2.25} +\def\filedate{2021/05/18} \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects] \let\hvFloatFileVersion\fileversion % \newif\ifhv@fbox \hv@fboxfalse \newif\ifhv@hyperref \hv@hyperreffalse +\newif\ifhv@stfloats \hv@stfloatsfalse + \DeclareOption{fbox}{\hv@fboxtrue\setlength{\fboxsep}{1pt}} \DeclareOption{hyperref}{\hv@hyperreftrue} +\DeclareOption{stfloats}{\hv@stfloatstrue} \ProcessOptions @@ -32,7 +35,7 @@ \RequirePackage{caption} \PassOptionsToPackage{hypcap}{subcaption} \RequirePackage{subcaption} -\RequirePackage{atbegshi,picture,trimclip} +\RequirePackage{picture,trimclip} \RequirePackage{expl3,multido} \RequirePackage{graphicx} @@ -40,14 +43,14 @@ \RequirePackage{xkeyval} \RequirePackage{ifoddpage} \RequirePackage{afterpage} -%\RequirePackage{zref-abspos} \ifhv@hyperref \RequirePackage{hyperref} -% \RequirePackage{hypcap} +\fi +\ifhv@stfloats + \RequirePackage{stfloats}% for bottom floats in a twocolumn mode \fi % -%\unitlength=1cm \providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} \newlength\hvObjectWidth @@ -127,16 +130,16 @@ \def\hvSet@capVPos{center}% it is relativ to the object } -\newif\ifhv@floatRefToObject -\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to (inactive) - \ifcase\nr\relax - \hv@floatRefToObjectfalse - \else - \hv@floatRefToObjecttrue - \fi -}{\PackageWarning{hvfloat}{erroneous input (#1) for floatRef ignored. Using option object.}% - \hv@floatRefToObjecttrue - } +%\newif\ifhv@floatRefToObject +%\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to (inactive) +% \ifcase\nr\relax +% \hv@floatRefToObjectfalse +% \else +% \hv@floatRefToObjecttrue +% \fi +%}{\PackageWarning{hvfloat}{erroneous input (#1) for floatRef ignored. Using option object.}% +% \hv@floatRefToObjecttrue +% } \define@key{hvSet}{objectAngle}[0]{% -360..+360 \def\hvSet@objectAngle{#1}% @@ -151,6 +154,14 @@ \define@boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment \define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text +\define@boolkey{hvSet}[hv@]{twoColumnCaption}[true]{% Write the caption only as text +% \ifhv@stfloats +% \global\@nameuse{hv@twoColumnCaption#1}% +% \else +% \PackageWarning{hvfloat}{Please use the package option stfloats!}% +% \global\hv@twoColumnCaptionfalse +% \fi +} \define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal \newcommand\hv@typeout[1]{\ifhv@Debug\typeout{#1}\fi} @@ -163,6 +174,7 @@ \newif\ifhv@setObjectLabel \newlength\hvSet@bindCorrection +\newlength\hvSet@sepLineskip \newlength\hv@leftPageObjectWidth% for doublepage images \newlength\hv@tempWidthA \newlength\hv@tempWidthB @@ -181,6 +193,7 @@ \ifhv@multiFloat\setkeys{hvSet}{subFloat=false}\fi% }% \define@boolkey{hvSet}[hv@]{separatorLine}[true]{}% separator line for caption of a full page float +\define@key{hvSet}{sepLineskip}{\def\hv@sepLineskip{#1}}% \define@boolkey{hvSet}[hv@]{objectFrame}[true]{}% a frame around the object with no separation \define@key{hvSet}{style}{% \@ifundefined{hv@#1}% @@ -197,7 +210,7 @@ \def\defhvstyle#1#2{\@namedef{hv@#1}{#2}} \let\hvDefFloatStyle\defhvstyle % better name % -\newcommand{\setDefaults}{% +\newcommand\setDefaults{% \hv@set{% floatPos=, rotAngle=0, capWidth=n, capAngle=0, capPos=bottom, capVPos=center, objectPos=center, objectAngle=0, @@ -206,8 +219,9 @@ doubleFULLPAGE=false, doublePage=false, doublePAGE=false, multiFloat=false,subFloat=false, separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip, - capFormat={}, subcapFormat={}, - floatRef=object, bindCorr=\z@, + capFormat={}, subcapFormat={}, twoColumnCaption=false, +% floatRef=object, + bindCorr=\z@,sepLineskip=0pt, }% } @@ -236,7 +250,7 @@ \setlength{\abovecaptionskip}{0pt}% \setlength{\belowcaptionskip}{0pt}% } -\newcommand{\restoreCaptionSkip}{% +\newcommand\restoreCaptionSkip{% \setlength\abovecaptionskip{\hvAboveCaptionSkip}% \setlength\belowcaptionskip{\hvBelowCaptionSkip}% } @@ -271,6 +285,17 @@ \def\Gin@eheight{\paperheight}% \Gin@boolkey{false}{iso}% } +\define@key{Gin}{doubleFULLPAGE}[true]{% + \def\Gin@ewidth{2\paperwidth}% + \def\Gin@eheight{\paperheight}% + \Gin@boolkey{false}{iso}% +} +\define@key{Gin}{doubleFULLPAGEbindCorr}[true]{% + \def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection}% + \def\Gin@eheight{\paperheight}% + \Gin@boolkey{false}{iso}% +} + \newcommand\IncludeGraphics[2][]{% \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}% \leavevmode\checkoddpage @@ -400,6 +425,10 @@ \ExplSyntaxOff +\newcounter{hv@tempCNTa}\setcounter{hv@tempCNTa}{0}% defined after \refstepcounter{figure} +\newcounter{hv@tempCNTb}\setcounter{hv@tempCNTb}{0}% defined before \refstepcounter{figure} +\def\thehv@tempCNTa{\arabic{figure}} +\def\thehv@tempCNTb{\the\numexpr\arabic{figure}+1} \newcounter{hv@pfigure} \newcounter{hv@ptable} \newcounter{subhv@pfigure} @@ -407,8 +436,16 @@ \def\drawSepLine{% \par\noindent - \if@twocolumn\rule{\columnwidth}{0.4pt}\else\rule{\linewidth}{0.4pt}\fi - \vspace{0pt}% + \if@twocolumn + \ifhv@twoColumnCaption + \rule{\linewidth}{0.4pt}\\[-2.5ex] + \else + \rule{\columnwidth}{0.4pt}\\[-2.5ex] + \fi + \else + \rule{\linewidth}{0.4pt}\\[-2.5ex] + \fi + \vspace{\hv@sepLineskip}% } \newcount\hv@cnta @@ -914,74 +951,50 @@ \endgroup% startet at main \hvFloat } % +%% ------------------------------------- the doublepage obejcts --------------------------- %% ||1in+evenside --- |1in+oddside ---|| % -\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page ---------------------------------- +\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page % #1-> 0/1 caption under/right - \checkoddpage \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% - \global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection-\parindent}% - \hv@typeout{>>>>do@hvFloat@doublePage #1}% +% \global\setlength\hv@tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset + \global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection}% + \checkoddpage \ifoddpage - \hv@typeout{>>>>do@hvFloat@doublePage->oddpage}% - \hv@typeout{>>>>do@hvFloat@doublePage->oddpage->bindCorr=\the\hvSet@bindCorrection}% - \hv@typeout{>>>>do@hvFloat@doublePage->oddpage->hv@leftPageObjectWidth=\the\hv@leftPageObjectWidth}% - \afterpage{% - \noindent - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \par\bigskip - \afterpage{% - \newpage - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\hv@tempWidthA}% - \noindent - \clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% - \ifnum#1>0 - \medskip - \ifdim\dp\hvObjectBox > \z@ - \rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - }}% - \else - \rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - }}% - \fi - \else - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - \fi - }% - }% + \if@twocolumn + \if@firstcolumn + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \else + \do@hvFloat@doublePageCaptionRight{#1}% + \fi + \else + \do@hvFloat@doublePageCaptionRight{#1}% + \fi \else - \hv@typeout{>>>>do@hvFloat@doublePage->evenpage}% - \hv@typeout{>>>>do@hvFloat@doublePage->evenpage->bindCorr=\the\hvSet@bindCorrection}% - \hv@typeout{>>>>do@hvFloat@doublePage->evenpage->hv@leftPageObjectWidth=\the\hv@leftPageObjectWidth}% - \global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection}% - \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi + \fi + \endgroup% started at main macro \hvFloat +} +% +\def\do@hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ---------------------------------- \afterpage{% - \afterpage{% \let\hv@fptop\c@fptop \global\setlength{\@fptop}{0pt}% \let\hv@c@topnumber\c@topnumber \setcounter{topnumber}{1}% - \begin{\hv@floatType}[t] + \begin{\hv@floatType*}[t] \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \end{\hv@floatType}% - \begin{\hv@floatType}[t] + \end{\hv@floatType*}% + \begin{\hv@floatType*}[t] \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \hspace*{\hv@tempWidthA}% \noindent @@ -1012,21 +1025,21 @@ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% \fi \fi - \end{\hv@floatType}% + \end{\hv@floatType*}% \let\c@topnumber\hv@c@topnumber \let\c@fptop\hv@fptop - }}% - \fi - \endgroup% started at main macro \hvFloat + }% } +% \newsavebox\hv@boxLeftPage \newsavebox\hv@boxRightPage % %% ||1in+evenside --- |1in+oddside ---|| % +\newif\ifhv@save@twocolumn + \def\do@hvFloat@doublePAGE#1{% image on left and right page with caption on the right ---------------------------------- % #1-> 0/1 caption under/right - \hv@typeout{>>>>do@hvFloat@doublePAGE}% \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection+\parindent}% \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% @@ -1034,58 +1047,36 @@ \expandafter\global\expandafter\savebox\expandafter\hv@boxRightPage\expandafter{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}% \checkoddpage \ifoddpage - \hv@typeout{>>>>do@hvFloat@doublePAGE->oddpage}% - \hv@typeout{>>>>do@hvFloat@doublePAGE->oddpage->bindCorr=\the\hvSet@bindCorrection}% - \hv@typeout{>>>>do@hvFloat@doublePAGE->oddpage->hv@leftPageObjectWidth=\the\hv@leftPageObjectWidth}% - \afterpage{% - \noindent - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \null - \global\savebox\hv@boxLeftPage{\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% - \usebox\hv@boxLeftPage - \newpage - \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{-\dimexpr\hv@tempWidthA}% - \noindent -% \usebox\hv@boxRightPage - \clipbox*{\the\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% - \ifnum#1>0 - \medskip - \ifdim\dp\hvObjectBox > \z@ - \rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - }}% - \else - \rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - }}% - \fi - \else - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - \fi - \newpage - }% + \if@twocolumn + \if@firstcolumn + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \fi + \else + \do@hvFloat@doublePAGECaptionRight{#1}% + \fi \else + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}}% + \else + \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% + \fi + \else + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \fi + \fi + \endgroup +} +% +\def\do@hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ---------------------------------- + % #1-> 0/1 caption under/right \afterpage{% - \afterpage{% \noindent \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \null \global\savebox\hv@boxLeftPage{\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% \usebox\hv@boxLeftPage - \newpage + \newpage\if@twocolumn\null\newpage\fi \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \hspace*{-\dimexpr\hv@tempWidthA}% \noindent @@ -1117,10 +1108,8 @@ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% \fi \fi - \newpage - }}% - \fi - \endgroup + \newpage\if@twocolumn\null\newpage\fi + }% } % %% ||1in+evenside --- |1in+oddside ---|| @@ -1135,86 +1124,157 @@ \fi\fi \checkoddpage \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \global\setlength\hv@tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% + \global\setlength\hv@tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-\hvSet@bindCorrection}% \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifoddpage - \ifcase\hv@@capPos - \do@hvFloat@doubleFULLPAGE@CaptionBefore - \or - \do@hvFloat@doubleFULLPAGE@CaptionAfter - \else - \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% + \ifcase\hv@@capPos % =0 Caption before + \if@twocolumn + \if@firstcolumn + \ifhv@twoColumnCaption + \set@Normal@Bottom@Caption* + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore}% + \else + \afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}% + \fi + \else + \set@Normal@Bottom@Caption + \do@hvFloat@doubleFULLPAGE@CaptionBefore + \fi + \else + \set@Normal@Bottom@Caption + \do@hvFloat@doubleFULLPAGE@CaptionBefore + \fi + \or % =1 Caption after + \ifhv@twoColumnCaption + \do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol + \else + \do@hvFloat@doubleFULLPAGE@CaptionAfter + \fi + \else% >1 all other Captions + \if@twocolumn + \if@firstcolumn +% \global\setlength\hv@tempWidthA{\the\dimexpr-\evensidemargin-1in-\parindent+\hvSet@bindCorrection}% + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% + \else + \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% + \fi + \else % >1 Caption right/bottom + \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% + \fi \fi% \ifcase \else% we have an even page - \hv@typeout{>>>>>doubleFULLPAGE->evenpage}% \ifcase\hv@@capPos% Before - \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore}% - \or - \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% + \if@twocolumn + \if@firstcolumn + \ifhv@twoColumnCaption + \afterpage{\afterpage\set@Normal@Bottom@Caption*\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}% + \else + \afterpage{\afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}}% + \fi + \else + \afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}% + \fi + \else + \afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}% + \fi + \or % capPos after + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% + \else + \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% + \fi + \else + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% + \fi \else % Any other caption - \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% - \fi%% \ifcase + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}}}% + \else + \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}}% + \fi + \else + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% + \fi + \fi%% \ifcase \fi% main ifoddpage \endgroup% started at main macro \hvFloat } +\def\set@Normal@Bottom@Caption{\@ifnextchar*\set@Normal@Bottom@CaptionStar\set@Normal@Bottom@Caption@} +\def\set@Normal@Bottom@Caption@{% + \begin{\hv@floatType}[!b] + \ifhv@separatorLine\drawSepLine\fi + \expandafter\captionsetup\expandafter{\hv@caption@format}% + \ifx\hv@shortCap\@empty + \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \else + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \fi + \end{\hv@floatType}% +} +\def\set@Normal@Bottom@CaptionStar*{% + \begin{\hv@floatType*}[!b] + \ifhv@separatorLine\drawSepLine\fi + \expandafter\captionsetup\expandafter{\hv@caption@format}% + \ifx\hv@shortCap\@empty + \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \else + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \fi + \end{\hv@floatType*}% +} + \def\do@hvFloat@doubleFULLPAGE@CaptionBefore{% - \begin{\hv@floatType}[b] - \ifhv@separatorLine\drawSepLine\vspace{\smallskipamount}\fi - \expandafter\captionsetup\expandafter{\hv@caption@format}% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% - \fi - \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap - \end{\hv@floatType}% \afterpage{% \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}% \thispagestyle{empty}% - \refstepcounter{\hv@floatType}% + \refstepcounter{hv@tempCNTa}% \expandafter\label\expandafter{\hv@label}% - \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap +%%% \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \afterpage{% + \if@twocolumn\newpage\null\newpage\fi \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 \hspace*{\hv@tempWidthA}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% - \refstepcounter{\hv@floatType}% + \refstepcounter{hv@tempCNTa}% \expandafter\label\expandafter{\hv@label-2}% - \newpage + \newpage\if@twocolumn\null\newpage\fi }}% } +\newif\ifhv@temp + \def\do@hvFloat@doubleFULLPAGE@CaptionAfter{% \afterpage{% \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}% \thispagestyle{empty}% - \refstepcounter{\hv@floatType}% + \refstepcounter{hv@tempCNTb}% \expandafter\label\expandafter{\hv@label}% - \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \afterpage{% + \newpage\if@twocolumn\null\newpage\fi \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 \hspace*{\hv@tempWidthA}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% - \refstepcounter{\hv@floatType}% + \refstepcounter{hv@tempCNTb}% \expandafter\label\expandafter{\hv@label-2}% - \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap - \newpage + \newpage\if@twocolumn\null\newpage\fi \begin{\hv@floatType}[b] - \ifhv@separatorLine\drawSepLine\vspace{\smallskipamount}\fi + \ifhv@separatorLine\drawSepLine\fi \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifx\hv@shortCap\@empty \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% @@ -1225,29 +1285,60 @@ }}% } +\def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{% + \afterpage{% + \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}% + \thispagestyle{empty}% + \refstepcounter{hv@tempCNTb}% + \expandafter\label\expandafter{\hv@label}% + \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% + \afterpage{% + \newpage\if@twocolumn\null\newpage\fi + \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 + \hspace*{\hv@tempWidthA}% + \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% + \refstepcounter{hv@tempCNTb}% + \expandafter\label\expandafter{\hv@label-2}% + \newpage\if@twocolumn\null\newpage\fi + \begin{\hv@floatType*}[b] + \hv@twoColumnCaptiontrue + \ifhv@separatorLine\drawSepLine\fi + \expandafter\captionsetup\expandafter{\hv@caption@format}% + \ifx\hv@shortCap\@empty + \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \else + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \fi + \end{\hv@floatType*}% + }}% +} + \def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{% \afterpage{% \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 - \hspace*{\hv@tempWidthA}% + \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \refstepcounter{\hv@floatType}% + \refstepcounter{hv@tempCNTb} \expandafter\label\expandafter{\hv@label}% - \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap \afterpage{% + \if@twocolumn\newpage\if@firstcolumn\else\null\newpage\fi\fi \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 \hspace*{\hv@tempWidthA}% - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% - \refstepcounter{\hv@floatType}% + \refstepcounter{hv@tempCNTb}% \expandafter\label\expandafter{\hv@label-2}% - \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv@floatType}{\hv@longCap}}}% - \ifnum#1 > 0 + \ifnum#1 > 0\relax % rotation with 90° \setlength\hv@tempWidthA{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}% \ifdim\hv@tempWidthA < 2\paperwidth \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{% @@ -1273,7 +1364,8 @@ \setlength\hv@tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}% \ifdim\hv@tempWidthA > \ht\hvCaptionBox \else - \put(\the\dimexpr-\textwidth-1in,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%% +% \refstepcounter{hv@temp}%% + \put(\the\dimexpr-\textwidth-2in-\oddsidemargin,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%% \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifx\hv@shortCap\@empty \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% @@ -1283,7 +1375,7 @@ }}}% \fi \fi% end \ifnum#1>0 - \newpage + \newpage\if@twocolumn\null\newpage\fi }% }% } -- cgit v1.2.3