texlive[59181] Master/texmf-dist: hvfloat (13may21)
commits+karl at tug.org
commits+karl at tug.org
Thu May 13 23:12:22 CEST 2021
Revision: 59181
http://tug.org/svn/texlive?view=revision&revision=59181
Author: karl
Date: 2021-05-13 23:12:21 +0200 (Thu, 13 May 2021)
Log Message:
-----------
hvfloat (13may21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-05-13 21:11:51 UTC (rev 59180)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-05-13 21:12:21 UTC (rev 59181)
@@ -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,...)
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf 2021-05-13 21:11:51 UTC (rev 59180)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf 2021-05-13 21:12:21 UTC (rev 59181)
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex 2021-05-13 21:12:21 UTC (rev 59181)
@@ -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 at 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=<inside textwidth>}}
+
+\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=<inside textwidth>}}
+
+\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=<inside textwidth>}}
+
+\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=<inside textwidth>}}
+
+\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=<inside textwidth>}}
+
+\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=<inside textwidth>}}
+
+\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
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2021-05-13 21:11:51 UTC (rev 59180)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2021-05-13 21:12:21 UTC (rev 59181)
@@ -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 @@
\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 @@
\begin{lstlisting}
-\Blindtext
-
\hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]%
{figure}%
{\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}%
@@ -2496,11 +2494,8 @@
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 @@
\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 @@
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,17 +2573,79 @@
\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.
@@ -2563,16 +2652,13 @@
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 @@
The parameter is \texttt{doublePAGE}}%
{fig:doublePAGE0}
+\hvblindtext
+
\Blindtext
@@ -2589,8 +2677,6 @@
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 @@
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 @@
\Blindtext
+\Blindtext
+
\hvblindtext
\subsection{Tabulars}
@@ -2659,6 +2744,8 @@
\bottomrule
\end{tabular}}
+\Blindtext
+
\hvFloat[doublePage,capWidth=n,capPos=right]%
{table}%
{\usebox\hvOBox}%%%%%%%%%%%%%%
@@ -2668,11 +2755,8 @@
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 @@
-
\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).
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt 2021-05-13 21:11:51 UTC (rev 59180)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt 2021-05-13 21:12:21 UTC (rev 59181)
@@ -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.
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-05-13 21:11:51 UTC (rev 59180)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-05-13 21:12:21 UTC (rev 59181)
@@ -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,9 +151,9 @@
\define at boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment
\define at boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text
\define at boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text
-\define at boolkey{hvSet}[hv@]{debug}[true]{}% give more infos in the terminal
+\define at boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal
-\newcommand\hv at typeout[1]{\ifhv at debug\typeout{#1}\fi}
+\newcommand\hv at typeout[1]{\ifhv at Debug\typeout{#1}\fi}
\newif\ifhv at fullpage
\newif\ifhv at FULLPAGE
@@ -160,12 +160,19 @@
\newif\ifhv at doubleFULLPAGE
\newif\ifhv at doublePAGE
\newif\ifhv at doublePage
+\newif\ifhv at setObjectLabel
-\define at key{hvSet}{fullpage}[true]{\global\@nameuse{hv at fullpage#1}}% wegen \afterpage problem
+\newlength\hvSet at bindCorrection
+\newlength\hv at leftPageObjectWidth% for doublepage images
+\newlength\hv at tempWidthA
+\newlength\hv at tempWidthB
+
+\define at key{hvSet}{fullpage}[true]{\global\@nameuse{hv at fullpage#1}}%
\define at key{hvSet}{FULLPAGE}[true]{\global\@nameuse{hv at FULLPAGE#1}}
\define at key{hvSet}{doubleFULLPAGE}[true]{\global\@nameuse{hv at doubleFULLPAGE#1}\hv at doublePagefalse\hv at doublePAGEfalse}
\define at key{hvSet}{doublePAGE}[true]{\global\@nameuse{hv at doublePAGE#1}\hv at doublePagefalse\hv at doubleFULLPAGEfalse}
\define at key{hvSet}{doublePage}[true]{\global\@nameuse{hv at doublePage#1}\hv at doublePAGEfalse\hv at doubleFULLPAGEfalse}
+\define at key{hvSet}{bindCorr}[\z@]{\setlength\hvSet at bindCorrection{#1}}% for doublepage objects
\define at boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats
\ifhv at 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 at key{hvSet}{capFormat}[]{\def\hv at caption@format{#1}}%
-\define at key{hvSet}{subcapFormat}[]{\def\hv at subcaption@format{#1}}%
+\define at key{hvSet}{capFormat}{\def\hv at caption@format{#1}}%
+\define at key{hvSet}{subcapFormat}{\def\hv at subcaption@format{#1}}%
\def\hv at set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x}
\let\hvFloatSet\hv at 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 at capAngle\hv at 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 at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\ifhv at nonFloat
\ifhv at onlyText
@@ -556,7 +563,7 @@
\else
\savebox\hvCaptionBox{% Rotation
\rotatebox{\hvSet at capAngle}{%
- \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
+ \begin{minipage}[b]{\hvCapWidth}%% minipage, to get hyphenation
\ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\ifhv at nonFloat
\ifhv at onlyText
@@ -907,300 +914,381 @@
\endgroup% startet at main \hvFloat
}
%
+%% ||1in+evenside --- |1in+oddside ---||
%
-\def\do at hvFloat@doublePage#1{% image on left and right page with caption on the right ----------------------------------
+\def\do at 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 at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \global\setlength\hv at leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}%
+ \global\setlength\hv at tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet at bindCorrection-\parindent}%
+ \hv at typeout{>>>>do at hvFloat@doublePage #1}%
\ifoddpage
- \afterpage{%
- \noindent
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \global\@tempdima=\dimexpr\paperwidth-1in-\evensidemargin\relax
- \clipbox*{0 -\depth{} \@tempdima{} \height}{\usebox\hvObjectBox}%
- \par\bigskip
+ \hv at typeout{>>>>do at hvFloat@doublePage->oddpage}%
+ \hv at typeout{>>>>do at hvFloat@doublePage->oddpage->bindCorr=\the\hvSet at bindCorrection}%
+ \hv at typeout{>>>>do at hvFloat@doublePage->oddpage->hv at leftPageObjectWidth=\the\hv at leftPageObjectWidth}%
\afterpage{%
- \newpage
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \hspace*{\dimexpr-1in-\oddsidemargin-\parindent}%
- \clipbox*{\@tempdima{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
+ \noindent
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \par\bigskip
+ \afterpage{%
+ \newpage
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \hspace*{\hv at tempWidthA}%
+ \noindent
+ \clipbox*{\hv at 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 at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\fi
\else
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
\fi
}%
}%
\else
+ \hv at typeout{>>>>do at hvFloat@doublePage->evenpage}%
+ \hv at typeout{>>>>do at hvFloat@doublePage->evenpage->bindCorr=\the\hvSet at bindCorrection}%
+ \hv at typeout{>>>>do at hvFloat@doublePage->evenpage->hv at leftPageObjectWidth=\the\hv at leftPageObjectWidth}%
+ \global\setlength\hv at tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet at bindCorrection}%
+ \global\setlength\hv at leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}%
\afterpage{%
\afterpage{%
- \newpage
-% \noindent\null
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \global\@tempdima=\dimexpr\paperwidth-1in-\evensidemargin\relax{}
- \hspace*{\@tempdima}%
- \clipbox*{0 -\depth{} \@tempdima{} \height}{\usebox\hvObjectBox}%
- \par\bigskip
- \afterpage{%
+ \let\hv at fptop\c at fptop
+ \global\setlength{\@fptop}{0pt}%
+ \let\hv at c@topnumber\c at topnumber
+ \setcounter{topnumber}{1}%
+ \begin{\hv at floatType}[t]
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \end{\hv at floatType}%
+ \begin{\hv at floatType}[t]
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \hspace*{\hv at tempWidthA}%
\noindent
- \hspace*{\dimexpr-1in-\marginparwidth}%
- \clipbox*{\@tempdima{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
+ \clipbox*{\hv at 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 at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\fi
\else
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
\fi
- }}}%
+ \end{\hv at floatType}%
+ \let\c at topnumber\hv at c@topnumber
+ \let\c at fptop\hv at fptop
+ }}%
\fi
- \endgroup
+ \endgroup% started at main macro \hvFloat
}
-
+\newsavebox\hv at boxLeftPage
+\newsavebox\hv at boxRightPage
+%
+%% ||1in+evenside --- |1in+oddside ---||
+%
\def\do at hvFloat@doublePAGE#1{% image on left and right page with caption on the right ----------------------------------
% #1-> 0/1 caption under/right
\hv at typeout{>>>>do at hvFloat@doublePAGE}%
+ \global\setlength\hv at tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection+\parindent}%
+ \global\setlength\hv at leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}%
+ \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \expandafter\global\expandafter\savebox\expandafter\hv at boxLeftPage\expandafter{\clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
+ \expandafter\global\expandafter\savebox\expandafter\hv at boxRightPage\expandafter{\clipbox*{\hv at leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}%
\checkoddpage
\ifoddpage
+ \hv at typeout{>>>>do at hvFloat@doublePAGE->oddpage}%
+ \hv at typeout{>>>>do at hvFloat@doublePAGE->oddpage->bindCorr=\the\hvSet at bindCorrection}%
+ \hv at typeout{>>>>do at hvFloat@doublePAGE->oddpage->hv at leftPageObjectWidth=\the\hv at leftPageObjectWidth}%
\afterpage{%
- \newpage
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
- \clipbox*{0 -\depth{} \paperwidth{} \height}{\usebox\hvObjectBox}%
- \newpage
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
- \clipbox*{\paperwidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
- \ifnum#1>0
+ \noindent
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \null
+ \global\savebox\hv at boxLeftPage{\clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
+ \usebox\hv at boxLeftPage
+ \newpage
+ \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \hspace*{-\dimexpr\hv at tempWidthA}%
+ \noindent
+% \usebox\hv at boxRightPage
+ \clipbox*{\the\hv at 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 at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\fi
+ \else
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \fi
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
+ \fi
\newpage
- }%
+ }%
\else
\afterpage{%
- \AddToHookNext{shipout/before}{%
-% \newpage
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \hspace*{\dimexpr-\evensidemargin-1in-\parindent}%
- \clipbox*{0 -\depth{} \paperwidth{} \height}{\usebox\hvObjectBox}%
- \newpage
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at 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 at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \null
+ \global\savebox\hv at boxLeftPage{\clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
+ \usebox\hv at boxLeftPage
+ \newpage
+ \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \hspace*{-\dimexpr\hv at tempWidthA}%
+ \noindent
+% \usebox\hv at boxRightPage
+ \clipbox*{\the\hv at 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 at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
}}%
\fi
+ \else
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\else
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \fi
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
\fi
- \newpage
+ \fi
+ \newpage
}}%
\fi
\endgroup
}
%
-\def\do at hvFloat@doubleFULLPAGE#1{% image on left and right page with caption on the right ----------------------------------
+%% ||1in+evenside --- |1in+oddside ---||
+%
+\def\do at hvFloat@doubleFULLPAGE#1{% image on left and right page with caption before/below/right/after
% #1-> 0/1 caption under/right
- \hv at typeout{>>>>do at hvFloat@doubleFULLPAGE}%
+ \ifx\hvSet at capPos\hv at After \hv@@capPos=1
+ \else
+ \ifx\hvSet at capPos\hv at Before \hv@@capPos=0
+ \else
+ \hv@@capPos=2 % other caption type
+ \fi\fi
\checkoddpage
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \global\setlength\hv at tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet at bindCorrection}%
+ \global\setlength\hv at leftPageObjectWidth{\the\dimexpr\paperwidth-\hvSet at bindCorrection}%
+ \expandafter\captionsetup\expandafter{\hv at caption@format}%
\ifoddpage
- \hv at typeout{>>>>>doubleFULLPAGE->oddpage}%
+ \ifcase\hv@@capPos
+ \do at hvFloat@doubleFULLPAGE at CaptionBefore
+ \or
+ \do at hvFloat@doubleFULLPAGE at CaptionAfter
+ \else
+ \do at hvFloat@doubleFULLPAGE at CaptionOther{#1}%
+ \fi% \ifcase
+ \else% we have an even page
+ \hv at typeout{>>>>>doubleFULLPAGE->evenpage}%
+ \ifcase\hv@@capPos% Before
+ \afterpage{\do at hvFloat@doubleFULLPAGE at CaptionBefore}%
+ \or
+ \afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfter}%
+ \else % Any other caption
+ \afterpage{\do at hvFloat@doubleFULLPAGE at CaptionOther{#1}}%
+ \fi%% \ifcase
+ \fi% main ifoddpage
+ \endgroup% started at main macro \hvFloat
+}
+
+\def\do at hvFloat@doubleFULLPAGE at CaptionBefore{%
+ \begin{\hv at floatType}[b]
+ \ifhv at separatorLine\drawSepLine\vspace{\smallskipamount}\fi
+ \expandafter\captionsetup\expandafter{\hv at caption@format}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \fi
+ \global\addtocounter{\hv at floatType}{-1}% to get the same <object>-ref as "label"-cap
+ \end{\hv at floatType}%
+ \afterpage{%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at 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 at floatType}%
+ \expandafter\label\expandafter{\hv at label}%
+ \global\addtocounter{\hv at floatType}{-1}% to get the same <object>-ref as "label"-cap
+ \clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\afterpage{%
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at 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 at floatType}{\hv at longCap}}}%
-% \captionof*{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}}}%
- \ifnum#1>0
- \ifdim\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox\relax < 2\paperwidth
- \hv at typeout{>>>>>doubleFULLPAGE->oddpage->floatRefToObject=false}%
- \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{%
- \if$\hv at shortCap$
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \fi
- }}%
-% \fi
- \else
- \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
- \parbox{0.8\textwidth}{%
- \hv at typeout{>>>>>doubleFULLPAGE->oddpage->#1<0->floatRefToObject=false}%
- \ifx\relax\hv at shortCap\relax
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \fi
- }%
- \endminipage}}}%
- \fi
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \thispagestyle{empty}%
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \hspace*{\hv at tempWidthA}%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \clipbox*{\the\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
+ \refstepcounter{\hv at floatType}%
+ \expandafter\label\expandafter{\hv at label-2}%
+ \newpage
+ }}%
+}
+
+\def\do at hvFloat@doubleFULLPAGE at CaptionAfter{%
+ \afterpage{%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at 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 at floatType}%
+ \expandafter\label\expandafter{\hv at label}%
+ \global\addtocounter{\hv at floatType}{-1}% to get the same <object>-ref as "label"-cap
+ \clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \afterpage{%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \thispagestyle{empty}%
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \hspace*{\hv at tempWidthA}%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \clipbox*{\the\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
+ \refstepcounter{\hv at floatType}%
+ \expandafter\label\expandafter{\hv at label-2}%
+ \global\addtocounter{\hv at floatType}{-1}% to get the same <object>-ref as "label"-cap
+ \newpage
+ \begin{\hv at floatType}[b]
+ \ifhv at separatorLine\drawSepLine\vspace{\smallskipamount}\fi
+ \expandafter\captionsetup\expandafter{\hv at caption@format}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
\else
- \ifx\relax\hv at shortCap\relax
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \fi
+ \end{\hv at floatType}%
+ }}%
+}
+
+\def\do at hvFloat@doubleFULLPAGE at CaptionOther#1{%
+ \afterpage{%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \thispagestyle{empty}%
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \hspace*{\hv at tempWidthA}%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \refstepcounter{\hv at floatType}%
+ \expandafter\label\expandafter{\hv at label}%
+ \global\addtocounter{\hv at floatType}{-1}% to get the same <object>-ref as "label"-cap
+ \afterpage{%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \thispagestyle{empty}%
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \hspace*{\hv at tempWidthA}%
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \clipbox*{\the\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
+ \refstepcounter{\hv at floatType}%
+ \expandafter\label\expandafter{\hv at label-2}%
+ \global\addtocounter{\hv at floatType}{-1}% to get the same <object>-ref as "label"-cap
+ \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv at floatType}{\hv at longCap}}}%
+ \ifnum#1 > 0
+ \setlength\hv at tempWidthA{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet at bindCorrection}%
+ \ifdim\hv at tempWidthA < 2\paperwidth
+ \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{%
+ \expandafter\captionsetup\expandafter{\hv at caption@format}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at 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 at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \fi
+ }%
+ \endminipage}}}%
\fi
- \newpage
- }%
- \else
- \hv at typeout{>>>>>doubleFULLPAGE->evenpage}%
- \afterpage{%
- \AddToHookNext{shipout/before}{%
- \newpage
- \AddToHook{begin/page}{\thispagestyle{empty}}
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at 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 at floatType}[\hv at shortCap]{\hv at longCap}}}%
-% \captionof*{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at 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 at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at 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 at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \fi
- }%
- \endminipage}}}%
- \fi
- \else
+ \else% ifnum, caption not rotated, under or over the right page
+ \setlength\hv at tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}%
+ \ifdim\hv at tempWidthA > \ht\hvCaptionBox
+ \else
+ \put(\the\dimexpr-\textwidth-1in,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%%
+ \expandafter\captionsetup\expandafter{\hv at caption@format}%
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
\fi
+ }}}%
\fi
- \newpage
- }%
+ \fi% end \ifnum#1>0
+ \newpage
}%
- \fi
- \endgroup
+ }%
}
+
\def\setBottomCaption{%
\begin{\hv at floatType}[!b]%
\ifhv at separatorLine\drawSepLine\fi
@@ -1295,7 +1383,7 @@
\def\getMultiSubCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
- \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+ \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at 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 at subcaption@format\relax\else\captionsetup[sub]{\hv at subcaption@format}\fi
+ \ifx\hv at subcaption@format\@empty\else
+ \expandafter
+ \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+ {\hv at subcaption@format}%
+ \fi
\ifx\hvSet at objectPos\hv at Right\raggedleft\else
\ifx\hvSet at objectPos\hv at Left\raggedleft\else
\ifx\hvSet at objectPos\hv at Center\centering
@@ -1339,12 +1431,13 @@
\endgroup
\ifnum\hv at cnta<\clist_count:N\l_clist_Type\par\hv at vskip\fi
\advance\hv at cnta by \@ne
- \ifnum\hv at cnta<\hv at cntb
+ \ifnum\hv at cnta<\hv at 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 <object>-ref as "label"-cap
+ \refstepcounter{\@captype}%
\expandafter\label\expandafter{\@tempa}%
\fi
\endminipage}%
More information about the tex-live-commits
mailing list.