summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-10-02 20:18:20 +0000
committerKarl Berry <karl@freefriends.org>2022-10-02 20:18:20 +0000
commit1bb1c5dc96daf4c438e0a7929f64d14b968ca5ca (patch)
tree98fade76b5d0275e7e3911506dac184d5f9a99e7 /Master/texmf-dist
parentd9fea95e5d1a9ced16f0ea97a73b29e7343ee1d5 (diff)
hvfloat (2oct22)
git-svn-id: svn://tug.org/texlive/trunk@64581 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes1
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin5038218 -> 5040712 bytes
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty21
3 files changed, 16 insertions, 6 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index 2beb09e6706..eb0e9277b81 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index 4b98b8ea735..69b0e9a1a51 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index b80e7ce0c1c..2d2765308ef 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 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