texlive[67149] Master/texmf-dist: hvfloat (18may23)

commits+karl at tug.org commits+karl at tug.org
Thu May 18 22:06:54 CEST 2023


Revision: 67149
          http://tug.org/svn/texlive?view=revision&revision=67149
Author:   karl
Date:     2023-05-18 22:06:54 +0200 (Thu, 18 May 2023)
Log Message:
-----------
hvfloat (18may23)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
    trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
    trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.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	2023-05-18 20:06:36 UTC (rev 67148)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2023-05-18 20:06:54 UTC (rev 67149)
@@ -1,7 +1,9 @@
 hvfloat.sty:    
+2.46  2023-05-16  - bugfix for doublePAGE and options for package caption
+                  - bugfix for doublePAGE labels: <label>,<label-2><label-cap>,
 2.45  2023-01-28  - bugfix for doubleFULLPAGE images which followed
-		    fullpage images ... 
-		  - added option "forceLeft" for doublepage flloats
+                    fullpage images ... 
+                  - added option "forceLeft" for doublepage flloats
 2.44  2022-11-21  - support "floats" with caption in the margin 
 2.43  2022-11-07  - fix for empty caption: don't use \caption 
 2.42  2022-10-02  - fix for twoColumnCaption and multi(sub)floats 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex	2023-05-18 20:06:36 UTC (rev 67148)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex	2023-05-18 20:06:54 UTC (rev 67149)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 676 2023-01-28 19:47:00Z herbert $
+%% $Id: hvfloat.tex 723 2023-05-17 17:27:20Z herbert $
 \listfiles
 \errorcontextlines=100
 \documentclass[twoside,paper=a4,usegeometry]{scrartcl}
@@ -2648,7 +2648,8 @@
 \Blindtext
 
 
-It is also possible to take a bind correction into account with e.g. \texttt{binCorr=5mm}, which reserves whitespace of 5mm
+It is also possible to take a bind correction into account with e.g. 
+\texttt{binCorr=5mm}, which reserves whitespace of 5mm
 in the inner margin on both pages.
 
 
@@ -3163,8 +3164,8 @@
 %\end{itemize}
 
 
-\section{The Package Source}
-\lstinputlisting[basicstyle=\ttfamily\footnotesize,tabsize=3,numbers=left,numberstyle=\tiny]{hvfloat.sty}
+%\section{The Package Source}
+%\lstinputlisting[basicstyle=\ttfamily\footnotesize,tabsize=3,numbers=left,numberstyle=\tiny]{hvfloat.sty}
 
 
 \end{document} 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex	2023-05-18 20:06:36 UTC (rev 67148)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex	2023-05-18 20:06:54 UTC (rev 67149)
@@ -1,5 +1,5 @@
 \documentclass{scrartcl}
-%% $Id: sub-default1s1c.tex 318 2021-11-20 07:30:54Z herbert $
+%% $Id: sub-default1s1c.tex 723 2023-05-17 17:27:20Z herbert $
 
 \input{preamble.ltx}
 
@@ -25,7 +25,7 @@
 
 \begin{lstlisting}
 \captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
   +{figure}{}[Short main caption of the objects]%   main short lsi entry
    {The main  caption of a ``fullpage'' object, which follows on the left or
         right column. This can be an even or odd page. And some more text which has no
@@ -46,9 +46,11 @@
    {sub:demo3}
 \end{lstlisting}
 
+\blindtext
+
 \Float[subfloat]
 \captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
   +{figure}{}[Short main caption of the objects]%   main short lsi entry
    {The main  caption of a ``fullpage'' object, which follows on the left or
         right column. This can be an even or odd page. And some more text which has no
@@ -75,7 +77,7 @@
 
 \begin{lstlisting}
 \captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
   +{figure}{}[Short main caption of the objects]%   main short lsi entry
    {The main  caption of a ``fullpage'' object, which follows on the left or
         right column. This can be an even or odd page. And some more text which has no
@@ -98,7 +100,7 @@
 
 \Float[subfloat]
 \captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
   +{figure}{}[Short main caption of the objects]%   main short lsi entry
    {The main  caption of a ``fullpage'' object, which follows on the left or
         right column. This can be an even or odd page. And some more text which has no

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

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

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

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

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

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

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

Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2023-05-18 20:06:36 UTC (rev 67148)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2023-05-18 20:06:54 UTC (rev 67149)
@@ -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 at save@setting{\hv at save@setting,nonFloat,onlyText}%  for later use after \endgroup inside figure/table env
+  \else    
+    \xdef\hv at save@setting{\hv at save@setting}%  for later use after \endgroup inside figure/table env
   \fi
 %  \xdef\hv at floatListOfExt{\@nameuse{ext@\hv at floatType}}%
   \gdef\hv at floatObject{#3}%
@@ -1677,6 +1679,12 @@
     \afterpage{%
       \hfuzz=\maxdimen
       \expandafter\hvFloatSet\expandafter{\hv at save@setting}%
+      \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+      \ifx\hv at subcaption@format\@empty\else
+        \expandafter
+           \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+                             {\hv at subcaption@format}%
+      \fi
       \ifhv at useOBox
         \global\let\hvObjectBox\hvOBox
       \else      
@@ -1686,11 +1694,13 @@
       \global\hv at tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection%
       \global\hv at leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection%
       \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+      \ifx\hv at label\@empty\else\label{\hv at label}\fi            
       \null\newpage\if at twocolumn\null\newpage\fi
       \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
       \noindent
       \hspace*{\dimexpr-\hv at tempWidthA}%
       \clipbox*{\the\hv at leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
+      \ifx\hv at label\@empty\else\label{\hv at label-2}\fi            
       \begingroup
           \ifnum#1>0
             \medskip
@@ -1701,8 +1711,8 @@
                 \else
                   \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
                 \fi
+              \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi            
               }}%
-              \ifx\hv at label\@empty\else\label{\hv at label}\fi            
             \else
               \rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
                 \ifx\relax\hv at shortCap\relax
@@ -1710,18 +1720,19 @@
                 \else
                   \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
                 \fi
+              \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi            
               }}%
-              \ifx\hv at label\@empty\else\label{\hv at label}\fi            
             \fi
         \else% caption not rotated
           \par\noindent
           \parbox{\textwidth}{%
+      \expandafter\hvFloatSet\expandafter{\hv at save@setting,capFormat={font={tiny},labelsep=newline}}%
               \ifx\relax\hv at shortCap\relax
                 \captionof{\hv at floatType}{\hv at longCap}%
               \else
                 \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
               \fi
-              \ifx\hv at label\@empty\else\label{\hv at label}\fi
+              \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
             }%
         \fi
         \endgroup
@@ -1735,6 +1746,12 @@
   % #1-> 0/1 caption under/right
   \hvfloat at typeout{>>> do at hvFloat@doubleFULLPAGE: #1}%
   \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
+  \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+      \ifx\hv at subcaption@format\@empty\else
+        \expandafter
+           \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+                             {\hv at subcaption@format}%
+  \fi
   \ifx\hvSet at capPos\hv at After \global\hv@@capPos=1
   \else
     \ifx\hvSet at capPos\hv at Before  \global\hv@@capPos=0



More information about the tex-live-commits mailing list.