From 0ec122c100e39ea118fdb2c4b6223ece8053f439 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 3 Oct 2022 03:03:44 +0000 Subject: CTAN sync 202210030303 --- macros/latex/contrib/hvfloat/Changes | 1 + macros/latex/contrib/hvfloat/doc/hvfloat.pdf | Bin 5038218 -> 5040712 bytes macros/latex/contrib/hvfloat/latex/hvfloat.sty | 21 +++++++++++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'macros/latex/contrib/hvfloat') diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes index 2beb09e670..eb0e9277b8 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -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 diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf index 4b98b8ea73..69b0e9a1a5 100644 Binary files a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf and b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf differ diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty index b80e7ce0c1..2d2765308e 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty +++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty @@ -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@floatType}[!b]% + \ifhv@twoColumnCaption + \begin{\hv@floatType*}[!b]% + \else + \begin{\hv@floatType}[!b]% + \fi \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \ifhv@separatorLine\drawSepLine\fi \par \usebox\hvCaptionBox - \end{\hv@floatType}% + \ifhv@twoColumnCaption + \end{\hv@floatType*}% + \else + \end{\hv@floatType}% + \fi } \def\setPageObject{% @@ -1827,7 +1835,8 @@ \ExplSyntaxOn \def\getMultiCaptionAndLabel{% - \global\sbox\hvCaptionBox{\minipage[b]{\linewidth}% + \ifhv@twoColumnCaption\hv@tempWidthA=\textwidth \else \hv@tempWidthA=\linewidth\fi + \global\sbox\hvCaptionBox{\minipage[b]{\hv@tempWidthA}% \captionsetup{aboveskip=\z@,belowskip=\z@,position=below,parbox=none}%,skip=-1ex}% \expandafter\hvFloatSet\expandafter{\hv@save@setting}% \parskip=-0.5\baselineskip -- cgit v1.2.3