hvfloat (29jun21)

git-svn-id: svn://tug.org/texlive/trunk@59758 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 42 insertions, 23 deletions

diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
index 99b7cbfbab6..a86244b9e54 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
@@ -1,7 +1,6 @@
-%% $Id: hvfloat-fps.sty 35 2020-10-31 07:41:00Z herbert $
+%% $Id: hvfloat-fps.sty 121 2021-06-20 13:36:11Z herbert $
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hvfloat-fps}[2017/09/16 setting float objects]
 %%
 %% IMPORTANT NOTICE:
 %%
@@ -16,9 +15,10 @@
 %% DESCRIPTION:
 %%   `hvfloat-fps' offers global placement of floats
 %%
-\def\fileversion{0.02}
-\def\filedate{2017/09/20}
-\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)}
+\def\fileversion{0.03}
+\def\filedate{2020/06/20}
+\ProvidesPackage{hvfloat-fps}[\filedate\space v\fileversion\space global float position setting (hv)]
+%\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)}
 %
 \RequirePackage{xkeyval}
 %
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index 82bf238e6d7..3d54b4f9817 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 122 2021-06-26 12:35:53Z herbert $
+%% $Id: hvfloat.sty 126 2021-06-29 12:56:04Z herbert $
 %%
 %%
 %% IMPORTANT NOTICE:
@@ -15,7 +15,7 @@
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.31}
+\def\fileversion{2.32}
 \def\filedate{2021/06/26}
 %\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
 \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
@@ -59,8 +59,6 @@
   \RequirePackage{stfloats}%  for bottom floats in a twocolumn mode
 \fi
 %
-
-
 \providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}
 
 \newlength\hvObjectWidth
@@ -175,7 +173,6 @@
 \define@boolkey{hvSet}[hv@]{sameHeight}[true]{\@nameuse{hv@sameHeight#1}}%	Write the caption only as text
 \define@boolkey{hvSet}[hv@]{Debug}[true]{}%		give more infos in the terminal
 
-
 \newif\ifhv@fullpage
 \newif\ifhv@FULLPAGE
 \newif\ifhv@doubleFULLPAGE
@@ -268,10 +265,11 @@
 }}
 
 \def\hv@vskip{\vspace{\hvMultiFloatSkip}}
-
 %
 \newlength\hvAboveCaptionSkip
 \newlength\hvBelowCaptionSkip
+\newlength\hv@dblfptop
+\newlength\hv@fptop
 \newcount\hv@@capPos
 
 \newlength\fboxlinewidth
@@ -290,6 +288,18 @@
   \setlength\belowcaptionskip{\hvBelowCaptionSkip}%
 }
 
+\newcommand\hv@set@noverticalSpace{%   no space on top for a float page 
+  \let\hv@dblfptop\@dblfptop
+  \let\hv@fptop\@fptop
+  \global\setlength{\@dblfptop}{0\p@}%
+  \global\setlength{\@fptop}{0\p@}%
+}
+
+\newcommand\hv@reset@noverticalSpace{%
+  \global\setlength{\@dblfptop}{\hv@dblfptop}%
+  \global\setlength{\@fptop}{\hv@fptop}%
+}
+
 \providecommand\figcaption[2][]{}%
 \providecommand\tabcaption[2][]{}%
 \providecommand\tabcaptionbelow[2][]{}%
@@ -341,6 +351,11 @@
   \def\Gin@eheight{\paperheight}%
   \Gin@boolkey{false}{iso}%
 }
+\define@key{Gin}{doublefullPage}[true]{%
+  \def\Gin@ewidth{\dimexpr2\paperwidth-2in-2\evensidemargin}%
+%  \def\Gin@eheight{\paperheight}%
+  \Gin@boolkey{true}{iso}%
+}
 \define@key{Gin}{doubleFULLPAGEbindCorr}[true]{%
   \def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection\relax}%
   \def\Gin@eheight{\paperheight}%
@@ -1051,6 +1066,7 @@
   \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}%
   \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}%
   \xdef\hv@caption@format@temp{\hv@caption@format}%  it gets lost otherwise for next afterpage
+    \setlength\@dblfpbot{0\p@ \@plus 1fil}%
   \global\hv@switchTypefalse
 %  \endgroup% started at main macro \hvFloat
   \setcounter{hv@tempCNTfigA}{\value{figure}}%
@@ -1136,6 +1152,7 @@
 %
 \def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object
   \begin{\hv@floatType*}[!t]
+    \hv@set@noverticalSpace
     \hfuzz=\maxdimen
     \let\c@hv@tempCNTfigA\c@figure
     \let\c@hv@tempCNTtabA\c@table
@@ -1155,21 +1172,23 @@
     \fi        
     \ifhv@global@sameHeight
       \hv@typeout{text should be of same height of both pages}%
-      \par\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}%
-%      \vspace{\textfloatsep}%
+      \par\noindent\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}%
+%      \vspace{-2pt}%
     \fi
+    \hv@reset@noverticalSpace
   \end{\hv@floatType*}%
 }
 \def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object
   \begin{\hv@floatType*}[!t]
+    \hv@set@noverticalSpace
     \hfuzz=\maxdimen
     \expandafter\hvFloatSet\expandafter{\hv@save@setting}%    
     \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
     \hspace*{-\hv@tempWidthA}%
     \savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}%
-       \global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}%
-       \hv@typeout{Height of right box: \the\ht\hv@rightBox}%
-       \hv@typeout{Depth of right box : \the\dp\hv@rightBox}%
+    \global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}%
+    \hv@typeout{Height of right box: \the\ht\hv@rightBox}%
+    \hv@typeout{Depth of right box : \the\dp\hv@rightBox}%
        \ifdim\dp\hv@rightBox > \z@
            \raisebox{\depth}{\usebox\hv@rightBox}%
        \else
@@ -1227,6 +1246,7 @@
          \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
        \fi
     \vspace{0pt}%
+    \hv@reset@noverticalSpace
   \end{\hv@floatType*}
 }
 %
@@ -1698,10 +1718,9 @@
 
 \def\getMultiCaptionAndLabel{%
   \global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
+    \captionsetup{aboveskip=\z@,belowskip=\z@,position=below,parbox=none}%,skip=-1ex}%
     \expandafter\hvFloatSet\expandafter{\hv@save@setting}%    
-%    \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
-    \setlength\belowcaptionskip{5pt}%
-    \setlength\abovecaptionskip{0pt}%
+    \parskip=-0.5\baselineskip
     \hv@cntb=\clist_count:N\l_clist_Type
     \advance\hv@cntb by \@ne
     \hv@cnta=1
@@ -1720,6 +1739,7 @@
       \advance\hv@cnta by \@ne
     \ifnum\hv@cnta<\hv@cntb
     \repeat
+    \vspace{-\baselineskip}%  no vspace at the end
   \endminipage}%
 }
 
@@ -1731,7 +1751,6 @@
       \minipage{\columnwidth}%
     \fi
     \expandafter\hvFloatSet\expandafter{\hv@save@setting}%    
-%    \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
     \ifx\hvSet@objectPos\hv@Right\raggedleft\else
       \ifx\hvSet@objectPos\hv@Left\raggedleft\else
         \ifx\hvSet@objectPos\hv@Center\centering
@@ -1758,9 +1777,9 @@
   \endminipage}%
 }
 \def\getMultiSubCaptionAndLabel{%
-  \global\sbox\hvCaptionBox{\minipage{\linewidth}%
+  \global\sbox\hvCaptionBox{%
+    \minipage{\linewidth}%
     \expandafter\hvFloatSet\expandafter{\hv@save@setting}%    
-%    \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
     \setlength\belowcaptionskip{5pt}%
     \setlength\abovecaptionskip{0pt}%
     \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}%  the same for all subfloats
@@ -1780,6 +1799,7 @@
     \expandafter\hvFloatSet\expandafter{\hv@save@setting}%    
     \ifhv@vFill
       \minipage[b][\textheight][s]{\columnwidth}%
+      \captionsetup{belowskip=0pt}%
     \else
       \minipage{\columnwidth}%
     \fi
@@ -1825,7 +1845,6 @@
     \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}%    the  main label at the end
     \ifx\@tempa\@empty
     \else
-%      \addtocounter{\@captype}{-1}%       to get the same <object>-ref as "label"-cap
       \edef\@temp{hv@p\@captype}%
       \refstepcounter{\@temp}%
       \expandafter\label\expandafter{\@tempa}%