texlive[58411] Master/texmf-dist: hvfloat (15mar21)

commits+karl at tug.org commits+karl at tug.org
Mon Mar 15 23:29:46 CET 2021


Revision: 58411
          http://tug.org/svn/texlive?view=revision&revision=58411
Author:   karl
Date:     2021-03-15 23:29:46 +0100 (Mon, 15 Mar 2021)
Log Message:
-----------
hvfloat (15mar21)

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/tex/latex/hvfloat/hvfloat.sty

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2021-03-15 22:23:30 UTC (rev 58410)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2021-03-15 22:29:46 UTC (rev 58411)
@@ -1,4 +1,5 @@
 hvfloat.sty:    
+2.19  2021-03-15  - fix for vertical spacing of doubleFULLPAGE
 2.18  2021-03-12  - add support for doublepage objects
 2.17  2020-10-31  - fix for label setting of non floating objects
 2.16  2019-08-31  - fix for \hvFloat* and full page images

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-03-15 22:23:30 UTC (rev 58410)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex	2021-03-15 22:29:46 UTC (rev 58411)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 35 2020-10-31 07:41:00Z herbert $
+%% $Id: hvfloat.tex 54 2021-03-14 14:55:34Z herbert $
 \listfiles
 \errorcontextlines=100
 \documentclass[twoside,paper=a4]{scrartcl}
@@ -56,8 +56,8 @@
 \usepackage{hvindex}
 \usepackage[all=!htb]{hvfloat-fps}
 \usepackage[fbox,hyperref]{hvfloat}
-\captionsetup{format=plain,font=sf,labelfont=sf}
-\captionsetup[sub]{format=plain,font=sf,labelfont=sf}
+\captionsetup{format=plain,font=sf,labelfont={sf,bf}}
+\captionsetup[sub]{format=plain,font=sf,labelfont={sf,bf}}
 
 \hypersetup{urlcolor=blue, linktocpage, colorlinks=true}
 %
@@ -361,7 +361,7 @@
 
 
 \normalsize
-
+\marginnote{Fig.~\ref{fig:0}}
 \hvFloat{figure}{\includegraphics{images/rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0}
 
 Code for figure \ref{fig:0}:
@@ -369,7 +369,8 @@
 \hvFloat{figure}{\includegraphics{images/rose}}{Without any keywords (only the \texttt{fbox} package option)}{fig:0}
 \end{lstlisting}
 
-\Float
+
+\marginnote{Tab.~\ref{tab:0}}
 \hvFloat[capPos=top]{table}{%
 \begin{tabularx}{\textwidth}{l|l|X}
   \rmfamily Name & Type & Description\\\hline
@@ -420,7 +421,7 @@
   {Default caption width setting, which is the natural width with respect to the current linewidth.}{fig:width0}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width0}}
 \hvFloat[floatPos=!htb]{figure}{\includegraphics{images/rose}}%
   {Default caption width setting, which is the natural width with respect to the current linewidth.}{fig:width0}
 
@@ -445,7 +446,7 @@
   the separation between object and caption, and the current linewidth.}{fig:width1}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width1}}
 \hvFloat[floatPos=!htb,capPos=after,objectFrame]{figure}{\includegraphics[scale=1.5]{images/rose}}%
   {Caption right beside with a \emph{natural} width, which is given by the width of the object,
   the separation between object and caption, and the current linewidth.}{fig:width1}
@@ -467,7 +468,7 @@
    in this special case \the\linewidth. Divide it by 28.82 to get cm.}{fig:width2}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width2}}
 \hvFloat[floatPos=!htb,capWidth=0.9]{figure}{\includegraphics{images/rose}}%
   {Caption below with a width of 0.9 of the current line width (column width), which is
    in this special case \the\linewidth. Divide it by 28.82 to get cm.}{fig:width2}
@@ -489,7 +490,7 @@
   by the macro to the maximal width.}{fig:width3}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:width3}}
 \hvFloat[floatPos=!htb,capPos=after,capWidth=0.9]{figure}{\includegraphics[scale=1.5]{images/rose}}%
   {Caption right beside with a width setting of \texttt{0.9\textbackslash linewidth}
   which is too big for this example and therefore corrected by the macro to the maximal width.}{fig:width3}
@@ -506,7 +507,6 @@
   if it is a very small object.}{fig:width4}
 \end{lstlisting}
 
-\Float
 \hvFloat[floatPos=!htb,capWidth=w]{figure}{\includegraphics[width=0.5\linewidth]{images/CTAN}}%
   {Caption below with a width of the given object which may be a problem
   if it is a very small object.}{fig:width4}
@@ -523,6 +523,7 @@
   if it is a very small object.}{fig:width5}
 \end{lstlisting}
 
+\marginnote{Fig.~\ref{fig:width5}}
 \hvFloat[floatPos=!htb,capPos=after,capWidth=h,capAngle=90,objectFrame]{figure}{\includegraphics{images/rose}}%
   {Caption beside with a width of the given object height which may be a problem
   if it is a very small object.}{fig:width5}
@@ -547,6 +548,7 @@
   {fig:1}
 \end{lstlisting}
 
+\marginnote{Fig.~\ref{fig:1}}
 \Float[capPos=right]
 \hvFloat%
   [floatPos=htb,
@@ -575,7 +577,7 @@
    of \texttt{capWidth=h}, which is the height of the object.}{fig:2}
 \end{lstlisting}
 
-\Float[capAngle=90]
+\marginnote{Fig.~\ref{fig:2}}
 \hvFloat%
   [floatPos=htb,
    capPos=left,
@@ -610,8 +612,7 @@
 	 of the image and a rotation of the caption and the object.}{fig:3}
 \end{lstlisting}
 
-
-\Float
+\marginnote{Fig.~\ref{fig:3}}
 \hvFloat[%
 	capWidth=h,% of \columnwidth
 	capPos=after,
@@ -640,7 +641,7 @@
 	an odd page.}{fig:20}
 \end{lstlisting}
 
-\Float[capPos=inner]
+\marginnote{Fig.~\ref{fig:20}}
 \hvFloat[capPos=inner]{figure}{\includegraphics{images/rose}}%
 	[Centered Caption on the inner side]{%
 	Caption set with the parameter setting \texttt{capPos=inner}, which will be
@@ -666,7 +667,7 @@
 	an odd page.}{fig:20b}
 \end{lstlisting}
 
-\Float[capPos=outer]
+\marginnote{Fig.~\ref{fig:20b}}
 \hvFloat[capPos=outer]{figure}{\includegraphics{images/rose}}%
 	[Centered Caption on the inner side]{%
 	Caption set with the parameter setting \texttt{capPos=outer}, which will be
@@ -675,8 +676,7 @@
 
 
 
-
-\Float
+\marginnote{Fig.~\ref{fig:21}}
 \hvFloat[%
 	capWidth=0.5,% of \columnwidth
 	capPos=outer,
@@ -709,7 +709,7 @@
    width of \texttt{0.5\textbackslash columnwidth} and \texttt{capPos=outer} }{fig:22}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:22}}
 \hvFloat[%
 	capWidth=0.5,% of \columnwidth
 	capPos=inner,
@@ -745,7 +745,7 @@
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:4}}
 \hvFloat[%
 	floatPos=htb,%
 	capWidth=0.25,%
@@ -766,7 +766,7 @@
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:5}}
 \hvFloat[%
 	floatPos=htb,%
 	capWidth=0.25,%
@@ -785,7 +785,7 @@
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:6}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=right,%
@@ -807,7 +807,7 @@
 ]{figure}{\frame{\includegraphics{images/rose}}}{\blindtext}{fig:66}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:66}}
 \hvFloat[%
   capPos=right,
   capFormat={labelsep=newline,justification=RaggedRight,font={small,it},labelfont=bf}
@@ -837,7 +837,7 @@
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:7}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=right,%
@@ -853,7 +853,7 @@
 The same with \Lkeyset{capPos=left}:
 
 
-\Float[capPos=left]
+\marginnote{Fig.~\ref{fig:700}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=left,%
@@ -879,7 +879,7 @@
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:8}}
 \hvFloat[%
 	capWidth=0.25,%
 	capPos=before,%
@@ -908,7 +908,7 @@
 the option \texttt{wide}.}{fig:70}
 \end{lstlisting}
 
-%\Float
+\marginnote{Fig.~\ref{fig:70}}
 \hvFloat[%
 	wide,
 	capPos=right,%
@@ -933,7 +933,7 @@
 \end{lstlisting}
 
 
-%\Float
+\marginnote{Fig.~\ref{fig:80}}
 \hvFloat[wide,
 	capPos=left,%
 	capVPos=top,%
@@ -955,8 +955,7 @@
 the option \texttt{wide}.}{fig:81}
 \end{lstlisting}
 
-%\Float[capPos=outer]
-
+\marginnote{Fig.~\ref{fig:81}}
 \hvFloat[wide,
 	capPos=inner,
 	capVPos=top,
@@ -980,8 +979,8 @@
 the option \texttt{wide}.}{fig:811}
 \end{lstlisting}
 
-%\Float[capPos=outer]
 
+\marginnote{Fig.~\ref{fig:811}}
 \hvFloat[wide,
 	capPos=inner,
 	capVPos=top,
@@ -1005,6 +1004,7 @@
 %\Float[capPos=outer]
 
 \begingroup
+\marginnote{Fig.~\ref{fig:812}}
 \captionsetup{justification=RaggedRight}
 \hvFloat[wide,
 	capPos=outer,
@@ -1071,7 +1071,7 @@
 The float can also be put to the left or to the right  (above/below in landscape) 
 with the \Lkeyset{objectPos=l} parameter
 
-\Float[landscape]
+\marginnote{Fig.~\ref{fig:9}}
 \hvFloat[%
 	floatPos=p,
 	capPos=bottom,
@@ -1100,7 +1100,7 @@
         degrees.\blindtext}{fig:10}
 \end{lstlisting}
 
-\Float
+\marginnote{Fig.~\ref{fig:10}}
 \hvFloat[%
 	floatPos=p,%
 	capWidth=h,%
@@ -1142,9 +1142,9 @@
 Some nonsense text after the preceding  \emph{non floating} object.
 \end{lstlisting}
 
-\Float
 Some nonsense text before the following \emph{non floating} object.
 
+\marginnote{Fig.~\ref{fig:11}}
 \hvFloat[%
 	nonFloat,%
 	capWidth=0.25,%
@@ -1218,6 +1218,7 @@
 
 \hvblindtext
 
+\marginnote{Tab.~\ref{table:2}}
 \hvFloat[%
   floatPos=hb,
   useOBox=true,
@@ -1229,7 +1230,7 @@
 
 In this case leave the third parameter empty.
 
-\Float
+\marginnote{Tab.~\ref{table:1}}
 \hvFloat[%
   floatPos=!hb,
   capPos=top,
@@ -1237,7 +1238,7 @@
 
 
 
-\Float
+\marginnote{Tab.~\ref{table:2}}
 \hvFloat[%
 	floatPos=!htb,%
 	useOBox=true,%
@@ -1270,7 +1271,7 @@
 \end{lstlisting}
 
 
-\Float
+\marginnote{Fig.~\ref{fig:text}}
 \hvFloat[%
 	onlyText=true,%
 	capAngle=90,%
@@ -2443,7 +2444,6 @@
 
 %\index{capPos@\texttt {capPos} (keyword)|)}
 
-
 \section{Doublepage objects -- images and/or tabulars}
 If an image or a tabular or any other object is too big for one page, it can be split over two pages (left -- right).
 It is obvious that this makes only sense for twoside documents.
@@ -2454,21 +2454,20 @@
 The user has to scale the image to be sure that the object will not be greater than \verb|2\paperwidth-4\margin|. The caption can be rotated
 on the right side of the right object part or under the right part.
 
-
 \item[\Lkeyword{doublePAGE}] A splitted object with or without a caption on top of a double page, beginning at the left side
 of the paper area and top of the text area.
 The user has to scale the image to be sure that the object will not be greater than \verb|2\paperwidth|. The caption can only be
 under the right part of the object. The will be \emph{no additional text} on the double page.
 
-\item[\Lkeyword{doubleFULLPAGE}] A splitted object with or without a caption on top of a double page, beginning at the
-left top paper edge and filling the complete double page.
+\item[\Lkeyword{doubleFULLPAGE}] A splitted object with or without a caption on the right or below of a double page. The object can 
+fill the complete double page.
 The user has to scale the image to be sure that the object will not be greater than \verb|2\paperwidth|. A caption will be
-rotated and written \emph{over} the object. The user has to take care for a correct text color.
+rotated and written \emph{over} the object, or if possible, at the right. The user has to take care for a correct text color.
 \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,
-then there can be a white part on the right or bottom of the object. A pagenumber will not be printed. You'll
+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.
 
@@ -2479,7 +2478,7 @@
 
 \hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
   {figure}%
-  {\includegraphics[angle=90,width=2\paperwidth]{images/raphi}}%
+  {\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}%
   [Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
    Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2492,10 +2491,10 @@
 \end{lstlisting}
 
 \Blindtext
-\marginnote{doubleFULLPAGE0}
+\marginnote{Fig.~\ref{fig:doubleFULLPAGE0}}
  \hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
   {figure}%
-  {\includegraphics[angle=90,width=2\paperwidth]{images/raphi}}%
+  {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}%
   [Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
    Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2508,6 +2507,39 @@
 
 \Blindtext
 
+
+\begin{lstlisting}
+\Blindtext 
+
+ \hvFloat[doubleFULLPAGE,capPos=r]%
+  {figure}%
+  {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+  {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
+   Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
+   Papierrand. Auf den Seiten wird kein weiterer Text
+   platziert. Für das LOF wird dabei eine Kurzform berücksichtigt. Parameter
+   ist \texttt{doubleFULLPAGE}}%
+  {fig:doubleFULLPAGE1}
+
+\Blindtext \Blindtext
+\end{lstlisting}
+
+\marginnote{Fig.~\ref{fig:doubleFULLPAGE1}}
+
+ \hvFloat[doubleFULLPAGE,capPos=r]%
+  {figure}%
+  {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+  {Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
+   Teil der Abbildung platziert wird. Die Abbildung beginnt am linken 
+   Papierrand. Auf den Seiten wird kein weiterer Text
+   platziert. Für das LOF wird dabei eine Kurzform berücksichtigt. Parameter
+   ist \texttt{doubleFULLPAGE}}%
+  {fig:doubleFULLPAGE1}
+
+\Blindtext \Blindtext
+
+
+
 \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.
@@ -2517,7 +2549,7 @@
 
 \hvFloat[doublePAGE]%
   {figure}%
-  {\includegraphics[width=2\paperwidth]{images/felsen-wasser}}%
+  {\includegraphics[width=2\paperwidth]{images/seiser}}%
   [Eine doppelseitige Abbildung mit Caption unterhalb der rechten Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb der rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2529,12 +2561,12 @@
 \Blindtext
 \end{lstlisting}
 
-\Blindtext
+\blindtext
 
-\marginnote{doublePAGE0}
+\marginnote{Fig. \ref{fig:doublePAGE0}}
 \hvFloat[doublePAGE]%
   {figure}%
-  {\includegraphics[width=2\paperwidth]{images/felsen-wasser}}%
+  {\includegraphics[width=2\paperwidth]{images/seiser}}%
   [Eine doppelseitige Abbildung mit Caption unterhalb der rechten Abbildung]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb der rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2556,7 +2588,7 @@
 
 \hvFloat[doublePage,capWidth=n,capPos=r]%
   {figure}%
-  {\includegraphics[width=2\textwidth]{images/felsen-wasser-small}}%
+  {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
   [Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb des rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2570,10 +2602,10 @@
 
 \Blindtext
 
-\marginnote{doublePage0}
+\marginnote{Fig. \ref{fig:doublePage0}}
 \hvFloat[doublePage,capWidth=n,capPos=r]%
   {figure}%
-  {\includegraphics[width=2\textwidth]{images/felsen-wasser-small}}%
+  {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
   [Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
   {Eine Beschriftung einer doppelseitigen Abbildung, die unterhalb des rechten
    Teils der Abbildung platziert wird. Die Abbildung beginnt am linken 
@@ -2584,8 +2616,8 @@
 
 \Blindtext
 
+\hvblindtext
 
-
 \subsection{Tabulars}
 
 In General there is no difference in an imgage or tabular or simple text. The object will be saved in a box and
@@ -2640,7 +2672,7 @@
 
 \Blindtext
 
-\marginpar{doublePage1}
+\marginpar{Tab.~\ref{tab:doublePage3}}
 \global\savebox\hvOBox{%
 \begin{tabular}{l*{18}r} \toprule
  & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976} 

Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2021-03-15 22:23:30 UTC (rev 58410)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2021-03-15 22:29:46 UTC (rev 58411)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 41 2020-11-21 21:03:28Z herbert $
+%% $Id: hvfloat.sty 55 2021-03-15 06:54:38Z herbert $
 %%
 %%
 %% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.18}
-\def\filedate{2021/03/12}
+\def\fileversion{2.19}
+\def\filedate{2021/03/15}
 \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
 \ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
 \let\hvFloatFileVersion\fileversion
@@ -401,7 +401,7 @@
     \else
       \ifhv at doubleFULLPAGE
         \setlength\hvCapWidth{\textheight}
-        \do at hvFloat@doubleFULLPAGE%  fullpage with caption rotated or under on an odd page
+        \expandafter\do at hvFloat@doubleFULLPAGE\@@temp%  fullpage with caption rotated or under on an odd page
       \else
         \ifhv at doublePAGE
           \expandafter\do at hvFloat@doublePAGE\@@temp%  fullpage with caption rotated or under on an odd page
@@ -861,6 +861,7 @@
 %
 %
 \def\do at hvFloat@doublePage#1{%  image on left and right page with caption on the right ----------------------------------
+  % #1-> 0/1 caption under/right
   \checkoddpage
   \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
   \ifoddpage
@@ -892,8 +893,8 @@
   \else
     \afterpage{%
       \afterpage{%
-%        \newpage
-        \noindent\null 
+        \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}%
@@ -922,6 +923,7 @@
 }
 
 \def\do at hvFloat@doublePAGE#1{%  image on left and right page with caption on the right ----------------------------------
+  % #1-> 0/1 caption under/right
   \checkoddpage
   \ifoddpage
     \afterpage{%
@@ -958,7 +960,7 @@
         \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
+        \ifnum#1>0      % caption right and rotated
             \medskip
             \ifdim\dp\hvObjectBox > \z@
               \rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
@@ -976,44 +978,69 @@
   \endgroup
 }
 %
-\def\do at hvFloat@doubleFULLPAGE{%  image on left and right page with caption on the right ----------------------------------
+\def\do at hvFloat@doubleFULLPAGE#1{%  image on left and right page with caption on the right ----------------------------------
+  % #1-> 0/1 caption under/right
   \checkoddpage
   \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
   \ifoddpage
     \afterpage{%
         \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
-        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep+0.5\paperheight-0.5\ht\hvObjectBox-\normalbaselineskip}%
+        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip}%   +0.5\paperheight-0.5\ht\hvObjectBox
         \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
-        \thispagestyle{empty}%
+        \AtBeginShipoutNext{\thispagestyle{empty}}%
         \clipbox*{0 0 \paperwidth{} \height}{\usebox\hvObjectBox}%
         \newpage
-        \thispagestyle{empty}%
-        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-0.5\paperheight+0.5\ht\hvObjectBox-\normalbaselineskip}%
+        \AtBeginShipoutNext{\thispagestyle{empty}}%
+        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\normalbaselineskip}%    -0.5\paperheight+0.5\ht\hvObjectBox
         \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
         \clipbox*{\paperwidth{} 0 \wd\hvObjectBox{} \paperheight{}}{\usebox\hvObjectBox}%
         \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{%
           \captionof*{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}}}%
-        \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\parbox{0.9\ht\hvObjectBox}{%
-           \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}{\qquad\parbox{0.9\ht\hvObjectBox}{%
+               \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}}}%
+          \else
+            \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
+        	\parbox{0.8\textwidth}{%
+               \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}}\endminipage
+             }}}%
+          \fi
+        \else
+          \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+        \fi
         \newpage
     }%
   \else
     \afterpage{%
       \AddToHookNext{shipout/before}{%
+        \newpage
+        \AddToHook{begin/page}{\thispagestyle{empty}}
         \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
-        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-0.75\paperheight+0.75\ht\hvObjectBox}%
+        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip}%   +0.5\paperheight-0.5\ht\hvObjectBox
         \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
-        \thispagestyle{empty}%
+        \AtBeginShipoutNext{\thispagestyle{empty}}%
         \clipbox*{0 0 \paperwidth{} \paperheight}{\usebox\hvObjectBox}%
         \newpage
-        \thispagestyle{empty}%
-        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-0.5\paperheight+0.5\ht\hvObjectBox-\normalbaselineskip}%
+        \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\normalbaselineskip}%  -0.5\paperheight+0.5\ht\hvObjectBox
         \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
         \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\expandafter\label\expandafter{\hv at label}}}}%
-        \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\parbox{0.9\ht\hvObjectBox}{%
-           \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}{%
+               \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}}%
+            \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}{%
+               \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}}\endminipage}}}%
+          \fi
+        \else
+          \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+        \fi
         \newpage
       }%
     }%
@@ -1047,7 +1074,7 @@
     \else
       \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
     \fi
-    %\put(0,0){
+    %\put(0,0){%
     \AtBeginShipoutNext{\thispagestyle{empty}}%
     \usebox\hvObjectBox%}%    
   \else



More information about the tex-live-commits mailing list.