summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/hvfloat/latex/hvfloat.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/hvfloat/latex/hvfloat.sty')
-rw-r--r--macros/latex/contrib/hvfloat/latex/hvfloat.sty29
1 files changed, 23 insertions, 6 deletions
diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
index 394fc869ed..be6acdf49b 100644
--- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty
+++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 676 2023-01-28 19:47:00Z herbert $
+%% $Id: hvfloat.sty 723 2023-05-17 17:27:20Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -16,8 +16,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.45}
-\def\filedate{2023/01/28}
+\def\fileversion{2.46}
+\def\filedate{2023/05/16}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
%
@@ -586,6 +586,8 @@
\ifx\relax#2\relax
\setkeys{hvSet}{nonFloat,onlyText}%
\xdef\hv@save@setting{\hv@save@setting,nonFloat,onlyText}% for later use after \endgroup inside figure/table env
+ \else
+ \xdef\hv@save@setting{\hv@save@setting}% for later use after \endgroup inside figure/table env
\fi
% \xdef\hv@floatListOfExt{\@nameuse{ext@\hv@floatType}}%
\gdef\hv@floatObject{#3}%
@@ -1677,6 +1679,12 @@
\afterpage{%
\hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
+ \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \ifx\hv@subcaption@format\@empty\else
+ \expandafter
+ \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+ {\hv@subcaption@format}%
+ \fi
\ifhv@useOBox
\global\let\hvObjectBox\hvOBox
\else
@@ -1686,11 +1694,13 @@
\global\hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection%
\global\hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection%
\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\null\newpage\if@twocolumn\null\newpage\fi
\expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\noindent
\hspace*{\dimexpr-\hv@tempWidthA}%
\clipbox*{\the\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
+ \ifx\hv@label\@empty\else\label{\hv@label-2}\fi
\begingroup
\ifnum#1>0
\medskip
@@ -1701,8 +1711,8 @@
\else
\captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
}}%
- \ifx\hv@label\@empty\else\label{\hv@label}\fi
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
\ifx\relax\hv@shortCap\relax
@@ -1710,18 +1720,19 @@
\else
\captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
}}%
- \ifx\hv@label\@empty\else\label{\hv@label}\fi
\fi
\else% caption not rotated
\par\noindent
\parbox{\textwidth}{%
+ \expandafter\hvFloatSet\expandafter{\hv@save@setting,capFormat={font={tiny},labelsep=newline}}%
\ifx\relax\hv@shortCap\relax
\captionof{\hv@floatType}{\hv@longCap}%
\else
\captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
- \ifx\hv@label\@empty\else\label{\hv@label}\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
}%
\fi
\endgroup
@@ -1735,6 +1746,12 @@
% #1-> 0/1 caption under/right
\hvfloat@typeout{>>> do@hvFloat@doubleFULLPAGE: #1}%
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
+ \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \ifx\hv@subcaption@format\@empty\else
+ \expandafter
+ \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+ {\hv@subcaption@format}%
+ \fi
\ifx\hvSet@capPos\hv@After \global\hv@@capPos=1
\else
\ifx\hvSet@capPos\hv@Before \global\hv@@capPos=0