From aac785f6c46081d4ec382ebb08c31b71064fc863 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 13 May 2021 21:12:21 +0000 Subject: hvfloat (13may21) git-svn-id: svn://tug.org/texlive/trunk@59181 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/hvfloat/Changes | 4 + .../doc/latex/hvfloat/doublepage2s1c.pdf | Bin 0 -> 2356868 bytes .../doc/latex/hvfloat/doublepage2s1c.tex | 967 +++++++++++++++++++++ Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | Bin 18373761 -> 7067733 bytes Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 137 ++- Master/texmf-dist/doc/latex/hvfloat/missing.txt | 2 +- Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty | 479 ++++++---- 7 files changed, 1368 insertions(+), 221 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf create mode 100644 Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index c2e191ac47b..0ac4371d388 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,8 @@ hvfloat.sty: +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 +2.23a 2021-05-07 - fix for caption number in multifloat pages 2.22 2021-05-06 - fix for default placement and vertical space for full page images 2.21 2021-05-04 - fix for several bugs (onlyText, spaces,...) diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf new file mode 100644 index 00000000000..6728d631fdb Binary files /dev/null and b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex new file mode 100644 index 00000000000..4f95b4b67ba --- /dev/null +++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex @@ -0,0 +1,967 @@ +\documentclass[twoside]{scrartcl} +%% $Id: doublepage2s1c.tex 86 2021-05-12 19:25:56Z 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 + + +%\listoffigures + +\newpage + + +\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 + +\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 + +\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} + +\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: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 + +\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 + +\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} + +\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 + +\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 + + +\clearpage + +\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[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:doubleFULLPAGE0} +\end{lstlisting} + + +\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}}% + [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 + + +\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[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:doubleFULLPAGE0before} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0before-cap}} +\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:doubleFULLPAGE0before} + +\Blindtext + +\Blindtext + + +\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[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:doubleFULLPAGE0after} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0after-cap}} +\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:doubleFULLPAGE0after} + +\Blindtext + +\hvblindtext + +\hvblindtext + + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,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:doubleFULLPAGE1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1}} +\hvFloat[doubleFULLPAGE,capWidth=n,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:doubleFULLPAGE1} + +\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:doubleFULLPAGE2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2}} +\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:doubleFULLPAGE2} + + + +\Blindtext + +\Blindtext + +%\hvblindtext +%\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:doubleFULLPAGE3} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE3}} +\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:doubleFULLPAGE3} + + +\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 + + +\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-cap}} +\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 + +\hvblindtext + +\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-cap}} +\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 + + + +\end{document} \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf index 2c642cae21b..2f71b515f97 100644 Binary files a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf and b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf differ diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex index 1082bb1334d..4d546a3f633 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 75 2021-05-04 19:52:22Z herbert $ +%% $Id: hvfloat.tex 86 2021-05-12 19:25:56Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,]{scrartcl} @@ -2477,7 +2477,7 @@ rotated and written \emph{over} the object, or if possible, at the right. The us \end{description} \subsection{\Lkeyword{doubleFULLPAGE}} -The scaling of the image is leave to the user. If the proportion of the object doesn't fit 2*paperwidth/paperheight, +The scaling of the image is left to the user. If the proportion of the object doesn't fit 2*paperwidth/paperheight, then there can be a white part on the top or bottom of the object. A pagenumber will not be printed. In this documentation you'll find a marginnote where the following full doublepage image is defined. It appears on the the next following even page and following text will be placed \emph{before} the object. @@ -2485,8 +2485,6 @@ even page and following text will be placed \emph{before} the object. \begin{lstlisting} -\Blindtext - \hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]% {figure}% {\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}% @@ -2496,11 +2494,8 @@ even page and following text will be placed \emph{before} the object. No further text is placed on the pages. A short form is used for the LOF. The parameter is \texttt{doubleFULLPAGE}}% {fig:doubleFULLPAGE0} - -\Blindtext \end{lstlisting} -\Blindtext \marginnote{Fig.~\ref{fig:doubleFULLPAGE0}} \hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]% {figure}% @@ -2516,10 +2511,45 @@ even page and following text will be placed \emph{before} the object. \Blindtext +\Blindtext + + +It is also possible to take a bind correction into account with e.g. \texttt{binCorr=5mm}, which reserves whitespace of 5mm +in the inner margin on both pages. + \begin{lstlisting} -\Blindtext +\hvFloat[doubleFULLPAGE,capPos=right,bindCorr=5mm]% + {figure}% + {\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}% + [A doublepage image with a caption on the image.]% + {A caption for a double-sided image that will be placed below the right-hand + part of the illustration. The illustration begins on the left edge of the paper. + No further text is placed on the pages. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} +\end{lstlisting} +\marginnote{Fig.~\ref{fig:doubleFULLPAGE0a}} + \hvFloat[doubleFULLPAGE,capPos=right,bindCorr=5mm]% + {figure}% + {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}% + [A doublepage image with a caption on the image.]% + {A caption for a double-sided image that will be placed on the right-hand + part of the illustration. The illustration begins on the left edge of the paper. + No further text is placed on the pages. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} + +\Blindtext + +\Blindtext + +%\Blindtext + + + +\begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=right]% {figure}% {\includegraphics[height=\paperheight]{images/rheinsberg}}% @@ -2528,12 +2558,9 @@ even page and following text will be placed \emph{before} the object. No further text is placed on the pages. A short form is used for the LOF. The parameter is \texttt{doubleFULLPAGE}}% {fig:doubleFULLPAGE1} - -\Blindtext \Blindtext \end{lstlisting} \marginnote{Fig.~\ref{fig:doubleFULLPAGE1}} - \hvFloat[doubleFULLPAGE,capPos=right]% {figure}% {\includegraphics[height=\paperheight]{images/rheinsberg}}% @@ -2546,33 +2573,92 @@ even page and following text will be placed \emph{before} the object. \Blindtext \Blindtext +Placing the caption on the image itself is not the best solution. With the optional arguments +\Lkeyval{before} and \Lkeyval{after} for \Lkeyword{capPos}, the caption can be placed on the bottom +of the preceding or follwing page of the doublepage object. A givel label, e.g. \texttt{foo} will always point to the +page with the left part of the object. Internally are two additional labels defined: \texttt{foo-cap} points to the +caption and \texttt{foo-2} points to the right part of the doublepage object. + +In the follwoing example~\ref{foo} the caption is on page~\pageref{foo-cap}, the left image part on page~\pageref{foo} +and the right part on page~\pageref{foo-2}. In the follwoing example~\ref{bar} the caption is on page~\pageref{bar-cap}, the left image part on page~\pageref{bar} +and the right part on page~\pageref{bar-2}. All three labels points to the same figure or table number: + +\verb/\ref{foo} | \ref{foo-cap} | \ref{foo-2}/ $\rightarrow$ \ref{foo} | \ref{foo-cap} | \ref{foo-2} + + +\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 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}}% + {foo} +\end{lstlisting} + +\marginnote{Fig.~\ref{foo}} + \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 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}}% + {foo} + +\Blindtext \Blindtext + + +\begin{lstlisting} + \hvFloat[doubleFULLPAGE,capPos=after]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth, + keepaspectratio=false]{images/rheinsberg}}% + {A caption for a double-sided image that will be placed 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}}% + {foo} +\end{lstlisting} + +\marginnote{Fig.~\ref{bar}} + \hvFloat[doubleFULLPAGE,capPos=after]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + {A caption for a double-sided image that will be placed 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}}% + {bar} +\Blindtext + +\Blindtext + +\hvblindtext \subsection{\Lkeyword{doublePAGE}} With this option the object also starts at the left paper margin but on the top of the text area. There will be pagenumbers and a caption can be rotated on the right of the object or under it. \begin{lstlisting} -\Blindtext - \hvFloat[doublePAGE]% {figure}% - {\includegraphics[width=2\paperwidth]{images/seiser}}% + {\includegraphics[width=\dimexpr2\textwidth+2in]{images/seiser}}% [A doublepage image with a caption below the right part.]% {A caption for a double-sided image that will be placed below the right-hand part of the illustration. The illustration begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. The parameter is \texttt{doublePAGE}}% {fig:doublePAGE0} - -\Blindtext \end{lstlisting} -\blindtext \marginnote{Fig. \ref{fig:doublePAGE0}} \hvFloat[doublePAGE]% {figure}% - {\includegraphics[width=2\paperwidth]{images/seiser}}% + {\includegraphics[width=\dimexpr2\textwidth+2in]{images/seiser}}% [A doublepage image with a caption below the right part.]% {A caption for a double-sided image that will be placed below the right-hand part of the illustration. The illustration begins on the left edge of the paper. @@ -2580,6 +2666,8 @@ There will be pagenumbers and a caption can be rotated on the right of the objec The parameter is \texttt{doublePAGE}}% {fig:doublePAGE0} +\hvblindtext + \Blindtext @@ -2589,8 +2677,6 @@ There will be pagenumbers and a caption can be rotated on the right of the objec and the rest of the text area is filled with text. \begin{lstlisting} -\Blindtext - \hvFloat[doublePage,capWidth=n,capPos=right]% {figure}% {\includegraphics[width=2\textwidth]{images/sonne-meer}}% @@ -2600,11 +2686,8 @@ and the rest of the text area is filled with text. the paper. A short form is used for the LOF. The parameter is \texttt{doublePage}}% {fig:doublePage0} - -\Blindtext \end{lstlisting} -\Blindtext \marginnote{Fig. \ref{fig:doublePage0}} \hvFloat[doublePage,capWidth=n,capPos=right]% @@ -2619,6 +2702,8 @@ and the rest of the text area is filled with text. \Blindtext +\Blindtext + \hvblindtext \subsection{Tabulars} @@ -2659,6 +2744,8 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \bottomrule \end{tabular}} +\Blindtext + \hvFloat[doublePage,capWidth=n,capPos=right]% {table}% {\usebox\hvOBox}%%%%%%%%%%%%%% @@ -2668,11 +2755,8 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 the paper. A short form is used for the LOF. The parameter is \texttt{doublePage}}% {tab:doublePage3} - -\Blindtext \end{lstlisting} -\Blindtext \marginpar{Tab.~\ref{tab:doublePage3}} \global\savebox\hvOBox{% @@ -2718,7 +2802,6 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 - \section{References to the page}\label{varioref} %Whith loading package \texttt{hyperref} references to floating objects with a caption left or right of the object %are no problem in difference to captions below othe object or on another page (using \texttt{fullpage} option). diff --git a/Master/texmf-dist/doc/latex/hvfloat/missing.txt b/Master/texmf-dist/doc/latex/hvfloat/missing.txt index 4d557d45b45..c10e55ce9ce 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/missing.txt +++ b/Master/texmf-dist/doc/latex/hvfloat/missing.txt @@ -1,4 +1,4 @@ Not all images of the documentation are listed here, because -some are not for public use. You can use any other imgae if you +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/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty index 61222e4aca1..1f56977f93e 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 75 2021-05-04 19:52:22Z herbert $ +%% $Id: hvfloat.sty 86 2021-05-12 19:25:56Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -15,8 +15,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.22} -\def\filedate{2021/05/06} +\def\fileversion{2.24} +\def\filedate{2021/05/09} \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects] \let\hvFloatFileVersion\fileversion @@ -151,21 +151,28 @@ \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@]{debug}[true]{}% give more infos in the terminal +\define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal -\newcommand\hv@typeout[1]{\ifhv@debug\typeout{#1}\fi} +\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{#1}\fi} \newif\ifhv@fullpage \newif\ifhv@FULLPAGE \newif\ifhv@doubleFULLPAGE \newif\ifhv@doublePAGE \newif\ifhv@doublePage +\newif\ifhv@setObjectLabel -\define@key{hvSet}{fullpage}[true]{\global\@nameuse{hv@fullpage#1}}% wegen \afterpage problem +\newlength\hvSet@bindCorrection +\newlength\hv@leftPageObjectWidth% for doublepage images +\newlength\hv@tempWidthA +\newlength\hv@tempWidthB + +\define@key{hvSet}{fullpage}[true]{\global\@nameuse{hv@fullpage#1}}% \define@key{hvSet}{FULLPAGE}[true]{\global\@nameuse{hv@FULLPAGE#1}} \define@key{hvSet}{doubleFULLPAGE}[true]{\global\@nameuse{hv@doubleFULLPAGE#1}\hv@doublePagefalse\hv@doublePAGEfalse} \define@key{hvSet}{doublePAGE}[true]{\global\@nameuse{hv@doublePAGE#1}\hv@doublePagefalse\hv@doubleFULLPAGEfalse} \define@key{hvSet}{doublePage}[true]{\global\@nameuse{hv@doublePage#1}\hv@doublePAGEfalse\hv@doubleFULLPAGEfalse} +\define@key{hvSet}{bindCorr}[\z@]{\setlength\hvSet@bindCorrection{#1}}% for doublepage objects \define@boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats \ifhv@subFloat\setkeys{hvSet}{multiFloat=false}\fi% @@ -181,8 +188,8 @@ {\begingroup \edef\x{\endgroup\noexpand\setkeys{hvSet}{\@nameuse{hv@#1}}}\x}% use a defined style } -\define@key{hvSet}{capFormat}[]{\def\hv@caption@format{#1}}% -\define@key{hvSet}{subcapFormat}[]{\def\hv@subcaption@format{#1}}% +\define@key{hvSet}{capFormat}{\def\hv@caption@format{#1}}% +\define@key{hvSet}{subcapFormat}{\def\hv@subcaption@format{#1}}% \def\hv@set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x} \let\hvFloatSet\hv@set @@ -200,7 +207,7 @@ multiFloat=false,subFloat=false, separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip, capFormat={}, subcapFormat={}, - floatRef=object, + floatRef=object, bindCorr=\z@, }% } @@ -517,7 +524,7 @@ \saveCaptionSkip% we put this space ourselve \ifx\hvSet@capAngle\hv@Zero% need rotation? \savebox\hvCaptionBox{% NO rotation - \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation + \begin{minipage}[b]{\hvCapWidth}%% minipage, to get hyphenation \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifhv@nonFloat \ifhv@onlyText @@ -556,7 +563,7 @@ \else \savebox\hvCaptionBox{% Rotation \rotatebox{\hvSet@capAngle}{% - \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation + \begin{minipage}[b]{\hvCapWidth}%% minipage, to get hyphenation \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifhv@nonFloat \ifhv@onlyText @@ -907,300 +914,381 @@ \endgroup% startet at main \hvFloat } % +%% ||1in+evenside --- |1in+oddside ---|| % -\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right ---------------------------------- +\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\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \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}% \ifoddpage - \afterpage{% - \noindent - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \global\@tempdima=\dimexpr\paperwidth-1in-\evensidemargin\relax - \clipbox*{0 -\depth{} \@tempdima{} \height}{\usebox\hvObjectBox}% - \par\bigskip + \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{% - \newpage - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\dimexpr-1in-\oddsidemargin-\parindent}% - \clipbox*{\@tempdima{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% \fi \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}% \afterpage{% \afterpage{% - \newpage -% \noindent\null - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \global\@tempdima=\dimexpr\paperwidth-1in-\evensidemargin\relax{} - \hspace*{\@tempdima}% - \clipbox*{0 -\depth{} \@tempdima{} \height}{\usebox\hvObjectBox}% - \par\bigskip - \afterpage{% + \let\hv@fptop\c@fptop + \global\setlength{\@fptop}{0pt}% + \let\hv@c@topnumber\c@topnumber + \setcounter{topnumber}{1}% + \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] \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \hspace*{\hv@tempWidthA}% \noindent - \hspace*{\dimexpr-1in-\marginparwidth}% - \clipbox*{\@tempdima{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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}% + \let\c@topnumber\hv@c@topnumber + \let\c@fptop\hv@fptop + }}% \fi - \endgroup + \endgroup% started at main macro \hvFloat } - +\newsavebox\hv@boxLeftPage +\newsavebox\hv@boxRightPage +% +%% ||1in+evenside --- |1in+oddside ---|| +% \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}% + \expandafter\global\expandafter\savebox\expandafter\hv@boxLeftPage\expandafter{\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% + \expandafter\global\expandafter\savebox\expandafter\hv@boxRightPage\expandafter{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}% \checkoddpage \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{% - \newpage - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% - \clipbox*{0 -\depth{} \paperwidth{} \height}{\usebox\hvObjectBox}% - \newpage - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% - \clipbox*{\paperwidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% - \ifnum#1>0 + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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 - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \fi + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% \fi + \fi \newpage - }% + }% \else \afterpage{% - \AddToHookNext{shipout/before}{% -% \newpage - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\dimexpr-\evensidemargin-1in-\parindent}% - \clipbox*{0 -\depth{} \paperwidth{} \height}{\usebox\hvObjectBox}% - \newpage - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\the\dimexpr-1in-\oddsidemargin-\parindent\relax}% - \clipbox*{\paperwidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% - \ifnum#1>0 % caption right and rotated + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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\expandafter\label\expandafter{\hv@label}}% + \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 - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \fi + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% \fi - \newpage + \fi + \newpage }}% \fi \endgroup } % -\def\do@hvFloat@doubleFULLPAGE#1{% image on left and right page with caption on the right ---------------------------------- +%% ||1in+evenside --- |1in+oddside ---|| +% +\def\do@hvFloat@doubleFULLPAGE#1{% image on left and right page with caption before/below/right/after % #1-> 0/1 caption under/right - \hv@typeout{>>>>do@hvFloat@doubleFULLPAGE}% + \ifx\hvSet@capPos\hv@After \hv@@capPos=1 + \else + \ifx\hvSet@capPos\hv@Before \hv@@capPos=0 + \else + \hv@@capPos=2 % other caption type + \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@leftPageObjectWidth{\the\dimexpr\paperwidth-\hvSet@bindCorrection}% + \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifoddpage - \hv@typeout{>>>>>doubleFULLPAGE->oddpage}% + \ifcase\hv@@capPos + \do@hvFloat@doubleFULLPAGE@CaptionBefore + \or + \do@hvFloat@doubleFULLPAGE@CaptionAfter + \else + \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% + \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}% + \else % Any other caption + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% + \fi%% \ifcase + \fi% main ifoddpage + \endgroup% started at main macro \hvFloat +} + +\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}% + \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{% - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \begingroup - \nointerlineskip - \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip - \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% - \endgroup - \AtBeginShipoutNext{\thispagestyle{empty}}% - \clipbox*{0 0 \paperwidth{} \height}{\usebox\hvObjectBox}% - \newpage - \AtBeginShipoutNext{\thispagestyle{empty}}% - \begingroup - \nointerlineskip - \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox - \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% - \endgroup - \clipbox*{\paperwidth{} 0 \wd\hvObjectBox{} \paperheight{}}{\usebox\hvObjectBox}% - \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{% - \captionof*{\hv@floatType}{\hv@longCap}}}% -% \captionof*{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}% - \ifnum#1>0 - \ifdim\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox\relax < 2\paperwidth - \hv@typeout{>>>>>doubleFULLPAGE->oddpage->floatRefToObject=false}% - \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{% - \if$\hv@shortCap$ - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \fi - }}% -% \fi - \else - \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering - \parbox{0.8\textwidth}{% - \hv@typeout{>>>>>doubleFULLPAGE->oddpage->#1<0->floatRefToObject=false}% - \ifx\relax\hv@shortCap\relax - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \fi - }% - \endminipage}}}% - \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}% + \expandafter\label\expandafter{\hv@label-2}% + \newpage + }}% +} + +\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}% + \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{% + \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}% + \expandafter\label\expandafter{\hv@label-2}% + \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap + \newpage + \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 - \ifx\relax\hv@shortCap\relax - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% + \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}% + \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% + \refstepcounter{\hv@floatType}% + \expandafter\label\expandafter{\hv@label}% + \global\addtocounter{\hv@floatType}{-1}% to get the same -ref as "label"-cap + \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}% + \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}% + \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 + \setlength\hv@tempWidthA{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}% + \ifdim\hv@tempWidthA < 2\paperwidth + \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{% + \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}}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% \fi + }}% rotatebox + \else% ifdim: no space left on page + \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering + \parbox{0.8\textwidth}{% + \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 + }% + \endminipage}}}% \fi - \newpage - }% - \else - \hv@typeout{>>>>>doubleFULLPAGE->evenpage}% - \afterpage{% - \AddToHookNext{shipout/before}{% - \newpage - \AddToHook{begin/page}{\thispagestyle{empty}} - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \begingroup - \nointerlineskip - \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip - \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% - \endgroup - \AtBeginShipoutNext{\thispagestyle{empty}}% - \clipbox*{0 0 \paperwidth{} \paperheight}{\usebox\hvObjectBox}% - \newpage - \begingroup - \nointerlineskip - \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip - \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% - \endgroup - \clipbox*{\paperwidth{} 0 \wd\hvObjectBox{} \paperheight{}}{\usebox\hvObjectBox}% - \AtBeginShipoutNext{\thispagestyle{empty}}% - \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv@floatType}[\hv@shortCap]{\hv@longCap}}}% -% \captionof*{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}% - \ifnum#1>0 - \ifdim\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox\relax < 2\paperwidth - \rotatebox{90}{\minipage{\the\ht\hvObjectBox}\centering\parbox{0.75\textwidth}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \fi - }% - \endminipage}% - \else% no space on the right, put it over the imag - \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\the\dimexpr\ht\hvObjectBox}% - \centering\parbox{0.8\textwidth}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \fi - }% - \endminipage}}}% - \fi - \else + \else% ifnum, caption not rotated, under or over the right page + \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}{%% + \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}% + \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% \fi + }}}% \fi - \newpage - }% + \fi% end \ifnum#1>0 + \newpage }% - \fi - \endgroup + }% } + \def\setBottomCaption{% \begin{\hv@floatType}[!b]% \ifhv@separatorLine\drawSepLine\fi @@ -1295,7 +1383,7 @@ \def\getMultiSubCaptionAndLabel{% \global\sbox\hvCaptionBox{\minipage{\linewidth}% - \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi + \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \setlength\belowcaptionskip{5pt}% \setlength\abovecaptionskip{0pt}% \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats @@ -1312,7 +1400,11 @@ \def\getMultiSubObjectAndLabel{% \global\sbox\hvObjectBox{\minipage{\linewidth}% - \ifx\relax\hv@subcaption@format\relax\else\captionsetup[sub]{\hv@subcaption@format}\fi + \ifx\hv@subcaption@format\@empty\else + \expandafter + \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter + {\hv@subcaption@format}% + \fi \ifx\hvSet@objectPos\hv@Right\raggedleft\else \ifx\hvSet@objectPos\hv@Left\raggedleft\else \ifx\hvSet@objectPos\hv@Center\centering @@ -1339,12 +1431,13 @@ \endgroup \ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi \advance\hv@cnta by \@ne - \ifnum\hv@cnta<\hv@cntb + \ifnum\hv@cnta<\hv@cntb \repeat \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}% the main label at the end \ifx\@tempa\@empty \else - \refstepcounter{\@captype} + \addtocounter{\@captype}{-1}% to get the same -ref as "label"-cap + \refstepcounter{\@captype}% \expandafter\label\expandafter{\@tempa}% \fi \endminipage}% -- cgit v1.2.3