texlive[64581] Master/texmf-dist: hvfloat (2oct22)

[commits+karl at tug.org]

Revision: 64581
          http://tug.org/svn/texlive?view=revision&revision=64581
Author:   karl
Date:     2022-10-02 22:18:20 +0200 (Sun, 02 Oct 2022)
Log Message:
-----------
hvfloat (2oct22)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
    trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
    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	2022-10-02 20:17:38 UTC (rev 64580)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2022-10-02 20:18:20 UTC (rev 64581)
@@ -1,4 +1,5 @@
 hvfloat.sty:    
+2.42  2022-10-02  - fix for twoColumnCaption and multi(sub)floats 
 2.41  2022-09-01  - another fix full page floats without pagenumber and 
                     without using package floatpag
 2.40  2022-07-20  - fix full page floats without pagenumber. We now use

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2022-10-02 20:17:38 UTC (rev 64580)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2022-10-02 20:18:20 UTC (rev 64581)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 596 2022-09-01 13:15:38Z herbert $
+%% $Id: hvfloat.sty 617 2022-10-02 14:25:10Z herbert $
 %%
 %%
 %% IMPORTANT NOTICE:
@@ -16,8 +16,8 @@
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.41}
-\def\filedate{2022/09/01}
+\def\fileversion{2.42}
+\def\filedate{2022/10/02}
 \ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
 \let\hvFloatFileVersion\fileversion
 %
@@ -1780,12 +1780,20 @@
 
 
 \def\setBottomCaption{%
-  \begin{\hv at floatType}[!b]%
+  \ifhv at twoColumnCaption
+    \begin{\hv at floatType*}[!b]%
+  \else
+    \begin{\hv at floatType}[!b]%
+  \fi
   \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
   \ifhv at separatorLine\drawSepLine\fi
   \par
   \usebox\hvCaptionBox
-  \end{\hv at floatType}%
+  \ifhv at twoColumnCaption
+    \end{\hv at floatType*}%
+  \else
+    \end{\hv at floatType}%
+  \fi
 }
 
 \def\setPageObject{%
@@ -1827,7 +1835,8 @@
 \ExplSyntaxOn
 
 \def\getMultiCaptionAndLabel{%
-  \global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
+  \ifhv at twoColumnCaption\hv at tempWidthA=\textwidth \else \hv at tempWidthA=\linewidth\fi
+  \global\sbox\hvCaptionBox{\minipage[b]{\hv at tempWidthA}%
     \captionsetup{aboveskip=\z@,belowskip=\z@,position=below,parbox=none}%,skip=-1ex}%
     \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
     \parskip=-0.5\baselineskip