texlive[59653] Master/texmf-dist: hvfloat (20jun21)

commits+karl at tug.org commits+karl at tug.org
Sun Jun 20 21:55:43 CEST 2021


Revision: 59653
          http://tug.org/svn/texlive?view=revision&revision=59653
Author:   karl
Date:     2021-06-20 21:55:43 +0200 (Sun, 20 Jun 2021)
Log Message:
-----------
hvfloat (20jun21)

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/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/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/odd1s1c.tex
    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-default1s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.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/runAll.sh
    trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
    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-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-fps.sty
    trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty

Removed Paths:
-------------
    trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
    trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes	2021-06-20 19:55:43 UTC (rev 59653)
@@ -1,4 +1,5 @@
 hvfloat.sty:    
+2.30  2021-06-20  - fix for introduced bug for multifloats
 2.29  2021-06-15  - some more fixes for doublepage objects
                   - added option sameHeight for same text height on left
                     and right page with a doublepage object
@@ -53,5 +54,6 @@
 
 
 hvfloat-fps.sty
+0.03 2020-06-20  - dont't give a message when package is loaded
 0.02 2017-09-20  - small changes
 0.01 2017-09-16  - first CTAN version

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/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/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	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex	2021-06-20 19:55:43 UTC (rev 59653)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 112 2021-06-14 08:01:42Z herbert $
+%% $Id: hvfloat.tex 114 2021-06-15 13:20:03Z herbert $
 \listfiles
 \errorcontextlines=100
 \documentclass[twoside,paper=a4,]{scrartcl}
@@ -166,8 +166,9 @@
 
 
 \begin{document}
-\title{Package \texttt{hvfloat}\\Rotating and scaling of objects and captions\\ver \hvFloatFileVersion}
-\author{Herbert Voß\thanks{\protect\url{hvoss at tug.org}\newline Thanks to Frank Mittelbach, Rolf Niepraschk}}
+\title{Package \texttt{hvfloat}\\
+Controlling captions, fullpage and doublepage floats\\ver \hvFloatFileVersion}
+\author{Herbert Voß\thanks{\protect\url{hvoss at tug.org}\newline Thanks to Karl Berry, Frank Mittelbach, Rolf Niepraschk}}
 \date{\today}
 \maketitle
 

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)

Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt	2021-06-20 19:55:43 UTC (rev 59653)
@@ -1,4 +0,0 @@
-Not all images of the documentation are listed here, because
-some are not for public use. You can use any other image if you
-want to run the documentation by yourselve.
-

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/odd1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex	2021-06-20 19:55:43 UTC (rev 59653)
@@ -41,8 +41,13 @@
   {fig:fullpage0}
 
 \Blindtext
-\Blindtext
 
+\hvblindtext
+
+\hvblindtext
+
+\hvblindtext
+
 \begin{lstlisting}
 \hvFloat[fullpage,capPos=oddPage]%
   {figure}%

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-default1s1c.pdf
===================================================================
(Binary files differ)

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

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

Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex	2021-06-20 19:55:43 UTC (rev 59653)
@@ -1,81 +0,0 @@
-\documentclass{scrartcl}
-%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
-
-\input{preamble.ltx}
-\setlength\columnseprule{0.4pt}
-
-\begin{document}
-\title{Example for FULLPAGE floats}
-\author{Herbert Voß}
-\maketitle
-
-\tableofcontents
-
-\blinddocument
-
-\section{File \texttt{\jobname}}
-
-\begin{lstlisting}
-The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
-\end{lstlisting}
-
-The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
-
-\begin{lstlisting}
-\hvFloat*[FULLPAGE]%
-  {figure}%
-  {\includegraphics[FULLPAGE]{frose}}%
-  [A FULLPAGE float with the default caption setting]%
-  {A default caption of a ``FULLPAGE'' object with the default setting, which
-   is a ``left''  caption which means that it always appears before the object.
-   This can be an even or odd page. And some more text whch has no
-   real meaning because it fills only the space for a long caption.}%
-  {fig:FULLPAGE0}
-\end{lstlisting}
-
-
-\Float[default]
-\hvFloat*[FULLPAGE]%
-  {figure}%
-  {\includegraphics[FULLPAGE]{frose}}%
-  [A FULLPAGE float with the default caption setting]%
-  {A default caption of a ``FULLPAGE'' object with the default setting, which
-   is a ``left''  caption which means that it always appears before the object.
-   This can be an even or odd page. And some more text whch has no
-   real meaning because it fills only the space for a long caption.}%
-  {fig:FULLPAGE0}
-
-\blinddocument
-
-\begin{lstlisting}
-\hvFloat*[FULLPAGE]%
-  {figure}%
-  {\includegraphics[FULLPAGE]{frose}}%
-  [A FULLPAGE float with the default caption setting]%
-  {A default caption of a ``FULLPAGE'' object with the default setting, which
-   is a ``left''  caption which means that it always appears before the object.
-   This can be an even or odd page. And some more text whch has no
-   real meaning because it fills only the space for a long caption.}%
-  {fig:FULLPAGE1}
-\end{lstlisting}
-
-
-\Float[default]
-\hvFloat*[FULLPAGE]%
-  {figure}%
-  {\includegraphics[FULLPAGE]{frose}}%
-  [A FULLPAGE float with the default caption setting]%
-  {A default caption of a ``FULLPAGE'' object with the default setting, which
-   is a ``left''  caption which means that it always appears before the object.
-   This can be an even or odd page. And some more text whch has no
-   real meaning because it fills only the space for a long caption.}%
-  {fig:FULLPAGE1}
-
-\blinddocument
-
-\Blindtext
-
-\blindtext
-
-
-\end{document}
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.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-right1s1c.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/runAll.sh
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/runAll.sh	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/runAll.sh	2021-06-20 19:55:43 UTC (rev 59653)
@@ -3,7 +3,7 @@
 do
    RUNS=1
    echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
-   lualatex $datei
+   lualatex --interaction=nonstopmode $datei >/dev/null
    MAIN=$(basename -a -s .tex $datei)
    TEST=`grep -c "Label(s) may have changed." $MAIN.log`
    while [ $TEST -gt 0 ]; 
@@ -10,11 +10,11 @@
    do
      let RUNS=RUNS+1
      echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
-     lualatex $datei
+     lualatex --interaction=nonstopmode $datei >/dev/null
      TEST=`grep -c "Label(s) may have changed." $MAIN.log `
      if [ $RUNS -gt 4 ]
      then TEST=0
      fi
    done
-   rm $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
+   rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
 done

Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh	2021-06-20 19:55:43 UTC (rev 59653)
@@ -3,7 +3,7 @@
 do
    RUNS=1
    echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
-   lualatex $datei
+   lualatex --interaction=nonstopmode $datei
    MAIN=$(basename -a -s .tex $datei)
    TEST=`grep -c "Label(s) may have changed." $MAIN.log`
    while [ $TEST -gt 0 ]; 
@@ -10,7 +10,7 @@
    do
      let RUNS=RUNS+1
      echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
-     lualatex $datei
+     lualatex --interaction=nonstopmode  $datei
      TEST=`grep -c "Label(s) may have changed." $MAIN.log `
      if [ $RUNS -gt 4 ]
      then TEST=0

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-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-fps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty	2021-06-20 19:55:43 UTC (rev 59653)
@@ -1,7 +1,6 @@
-%% $Id: hvfloat-fps.sty 35 2020-10-31 07:41:00Z herbert $
+%% $Id: hvfloat-fps.sty 120 2021-06-20 13:31:02Z herbert $
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hvfloat-fps}[2017/09/16 setting float objects]
 %%
 %% IMPORTANT NOTICE:
 %%
@@ -16,9 +15,10 @@
 %% DESCRIPTION:
 %%   `hvfloat-fps' offers global placement of floats
 %%
-\def\fileversion{0.02}
-\def\filedate{2017/09/20}
-\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)}
+\def\fileversion{0.03}
+\def\filedate{2020/06/20}
+\ProvidesPackage{hvfloat-fps}[\filedate\space v\fileversion\space global float position setting (hv)]
+%\message{`hvfloat-fps' v\fileversion, \filedate\space (Herbert Voss)}
 %
 \RequirePackage{xkeyval}
 %

Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2021-06-20 19:55:01 UTC (rev 59652)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty	2021-06-20 19:55:43 UTC (rev 59653)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 114 2021-06-15 13:20:03Z herbert $
+%% $Id: hvfloat.sty 119 2021-06-20 13:28:09Z herbert $
 %%
 %%
 %% IMPORTANT NOTICE:
@@ -15,10 +15,10 @@
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
 \NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.29}
-\def\filedate{2021/06/15}
-\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
-\ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
+\def\fileversion{2.30}
+\def\filedate{2021/06/20}
+%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
+\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
 \let\hvFloatFileVersion\fileversion
 %
 \newif\ifhv at fbox \hv at fboxfalse
@@ -33,12 +33,6 @@
 
 \ProcessOptions
 
-\providecommand\@tugclass{\@empty}
-\ifx\@tugclass\@empty
-\else
-  \hv at tugboattrue  % special page handling
-  \typeout{>>> we are using a TUGboat class}%
-\fi
 
 \PassOptionsToPackage{hypcap}{caption}
 \RequirePackage{caption}
@@ -65,6 +59,8 @@
   \RequirePackage{stfloats}%  for bottom floats in a twocolumn mode
 \fi
 %
+
+
 \providecommand*\LenToUnit[1]{\strip at pt\dimexpr#1*\p@/\unitlength}
 
 \newlength\hvObjectWidth
@@ -179,7 +175,6 @@
 \define at boolkey{hvSet}[hv@]{sameHeight}[true]{\@nameuse{hv at sameHeight#1}}%	Write the caption only as text
 \define at boolkey{hvSet}[hv@]{Debug}[true]{}%		give more infos in the terminal
 
-\newcommand\hv at typeout[1]{\ifhv at Debug\typeout{>>>> #1}\fi}
 
 \newif\ifhv at fullpage
 \newif\ifhv at FULLPAGE
@@ -258,6 +253,15 @@
 
 \let\hvFloatSetDefaults\setDefaults
 
+\newcommand\hv at typeout[1]{\ifhv at Debug\typeout{>>>> #1}\fi}
+
+\providecommand\@tugclass{\@empty}
+\ifx\@tugclass\@empty
+\else
+  \hv at tugboattrue  % special page handling
+  \hv at typeout{>>> we are using a TUGboat class}%
+\fi
+
 \newcommand\reset at special@float{%
   \hv at set{subFloat=false,%fullpage=false,
           multiFloat=false,%FULLPAGE=false
@@ -425,10 +429,6 @@
 \newif\if at hvsubstar
 \setDefaults
 
-\def\hvFloat{\@ifnextchar*%     Main macro
-  {\global\hv at startrue\hv at maxImageWidth=\textwidth\hvFloat at i}%
-  {\global\hv at starfalse\hv at maxImageWidth=\columnwidth\hvFloat at i*}%
-}
 
 %\newcommand*{\hvFloat}[5][]+{%
 % [#1}: keyvalues
@@ -438,6 +438,12 @@
 % #5: caption
 % #6: label
 %
+
+\def\hvFloat{\@ifnextchar*%     Main macro
+  {\global\hv at startrue\hv at maxImageWidth=\textwidth\hvFloat at i}%
+  {\global\hv at starfalse\hv at maxImageWidth=\columnwidth\hvFloat at i*}%
+}
+
 \def\hvFloat at i*{\@ifnextchar[{\do at hvFloat}{\do at hvFloat[]}}
 \def\do at hvFloat[#1]{%
   \begingroup
@@ -446,19 +452,13 @@
 %  \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
   \hv at maxImageWidth=\textwidth
   \reset at special@float
-  \setcounter{hv at pfigure}{\value{figure}}%
-  \setcounter{hv at ptable}{\value{table}}%
+  \global\setcounter{hv at pfigure}{\value{figure}}%
+  \global\setcounter{hv at ptable}{\value{table}}%
   \setcounter{hv at tempCNTfigA}{\value{figure}}%
   \setcounter{hv at tempCNTfigB}{\value{figure}}%
   \setcounter{hv at tempCNTtabA}{\value{table}}%
   \setcounter{hv at tempCNTtabB}{\value{table}}%
-  \renewcommand\thehv at pfigure{\thefigure}%
-  \renewcommand\thehv at ptable{\thetable}%
-  \renewcommand\thehv at tempCNTfigA{\thefigure}%
-  \renewcommand\thehv at tempCNTfigB{\thefigure}%
-  \renewcommand\thehv at tempCNTtabA{\thetable}%
-  \renewcommand\thehv at tempCNTtabB{\thetable}%
-  \gdef\hv at save@setting{#1}%
+  \gdef\hv at save@setting{#1}%  for later use after \endgroup inside figure/table env
   \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
   \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
   \ifx\hv at subcaption@format\@empty\else
@@ -516,23 +516,22 @@
 \ExplSyntaxOff
 
 
-
 \newcount\hv at cnta
 \newcount\hv at cntb
 
 \def\hvFloat at ii[#1]#2#3{%     #1: key/value, #2: floattype, #3: object
   \hv at maxImageWidth=\textwidth
-  \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
+%  \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
   \gdef\hv at floatType{#2}%
   \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
   \fi
-  \xdef\hv at floatListOfExt{\@nameuse{ext@\hv at floatType}}%
+%  \xdef\hv at floatListOfExt{\@nameuse{ext@\hv at floatType}}%
   \gdef\hv at floatObject{#3}%
   \@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}%
 }
 
-
 \def\do@@hvFloat[#1]#2#3{%     #1: listof caption,  #2. long caption  #3: label
   \gdef\hv at shortCap{#1}%
   \gdef\hv at longCap{#2}%
@@ -539,9 +538,6 @@
   \gdef\hv at label{#3}%
   \ifhv at capbeside\def\@@temp{1}\else\def\@@temp{0}\fi
   \ifhv at sameHeight\global\hv at global@sameHeighttrue\else\global\hv at global@sameHeightfalse\fi  
-  \xdef\hv at global@@capVPos{\hv@@capVPos}%   
-  \xdef\hvSet at global@capVPos{\hvSet at capVPos}%
-  \xdef\hvSet at global@capAngle{\hvSet at capAngle}%
   \global\setlength\hvSet at bindCorrection{\hvSet at bindCorr}%  for doublepage objects   
   \global\setlength\hv at floatCapSep{\hvSet at floatCapSep}%
 %
@@ -641,7 +637,7 @@
     \fi
   \fi
   \saveCaptionSkip% we put this space ourselve
-  \ifnum\hvSet at global@capAngle=0 % need rotation?
+  \ifnum\hvSet at capAngle=0 % need rotation?
     \savebox\hvCaptionBox{%   NO rotation
       \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation
         \ifhv at nonFloat
@@ -675,7 +671,7 @@
     }%
   \else
     \savebox\hvCaptionBox{%   Rotation
-      \rotatebox{\hvSet at global@capAngle}{%
+      \rotatebox{\hvSet at capAngle}{%
         \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation
 % 	  \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
   	  \ifhv at nonFloat
@@ -779,12 +775,12 @@
 %%%%
   \savebox{\@tempboxa}{%                     ***** @tempbox   start
     \expandafter\ifcase\the\hv@@capPos% 0 is LEFT     START \ifcase
-      \ifx\hvSet at global@capVPos\hv at Center
+      \ifx\hvSet at capVPos\hv at Center
         \put at CaptionBox 
         \hspace{\hv at floatCapSep}% capfloatsep
         \put at ObjectBox
       \else
-        \ifx\hvSet at global@capVPos\hv at Top% caption and object at top aligned
+        \ifx\hvSet at capVPos\hv at Top% caption and object at top aligned
           \put at CaptionBox[1]%
           \hspace{\hv at floatCapSep}% capfloatsep
           \put at ObjectBox[1]%
@@ -810,12 +806,12 @@
       \fi
       \end{minipage}%
     \or%2 is right
-      \ifx\hvSet at global@capVPos\hv at Center
+      \ifx\hvSet at capVPos\hv at Center
         \put at ObjectBox
 	\hspace{\hv at floatCapSep}%
 	\put at CaptionBox
       \else
-	\ifx\hvSet at global@capVPos\hv at Top
+	\ifx\hvSet at capVPos\hv at Top
           \put at ObjectBox[1]%
           \hspace{\hv at floatCapSep}% capfloatsep
           \put at CaptionBox[1]%
@@ -904,22 +900,22 @@
 \let\clist at count@N\clist_count:N
 \ExplSyntaxOff
 
-\def\do@@@@hvFloat{%  special float page: caption <-> fullpage image
-  \ifx\hvSet at capPos\hv at After \hv@@capPos=1
+\def\do@@@@hvFloat{%  special float page: caption <-> fullpage images
+  \ifx\hvSet at capPos\hv at After \global\hv@@capPos=1
   \else
-    \ifx\hvSet at capPos\hv at Even  \hv@@capPos=2
+    \ifx\hvSet at capPos\hv at Even  \global\hv@@capPos=2
     \else
-      \ifx\hvSet at capPos\hv at Odd   \hv@@capPos=3
+      \ifx\hvSet at capPos\hv at Odd   \global\hv@@capPos=3
       \else
-        \ifx\hvSet at capPos\hv at Inner   \hv@@capPos=4
+        \ifx\hvSet at capPos\hv at Inner   \global\hv@@capPos=4
         \else
-          \ifx\hvSet at capPos\hv at Outer   \hv@@capPos=5
+          \ifx\hvSet at capPos\hv at Outer   \global\hv@@capPos=5
           \else
-            \ifx\hvSet at capPos\hv at Right   \hv@@capPos=6% only for twocolumn mode
+            \ifx\hvSet at capPos\hv at Right   \global\hv@@capPos=6% only for twocolumn mode
             \else
-              \ifx\hvSet at capPos\hv at Left   \hv@@capPos=7% only for twocolumn mode
+              \ifx\hvSet at capPos\hv at Left   \global\hv@@capPos=7% only for twocolumn mode
               \else
-                \hv@@capPos=0
+                \global\hv@@capPos=0
               \fi
             \fi
           \fi
@@ -1058,6 +1054,11 @@
   \global\setlength\hv at tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection}%
   \xdef\hv at caption@format at temp{\hv at caption@format}%  it gets lost otherwise for next afterpage
   \global\hv at switchTypefalse
+%  \endgroup% started at main macro \hvFloat
+  \setcounter{hv at tempCNTfigA}{\value{figure}}%
+  \setcounter{hv at tempCNTfigB}{\value{figure}}%
+  \setcounter{hv at tempCNTtabA}{\value{table}}%
+  \setcounter{hv at tempCNTtabB}{\value{table}}%
   \savebox\hvCaptionBox{%   NO rotation
     \minipage{\textwidth}%% minipage, to get hyphenation
       \let\@captype\hv at floatType
@@ -1137,7 +1138,11 @@
 %
 \def\do at hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object
   \begin{\hv at floatType*}[!t]
-    \hv at typeout{Floatpositionsparameter: !t}%
+    \let\c at hv@tempCNTfigA\c at figure
+    \let\c at hv@tempCNTtabA\c at table
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}% 
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}% 
+    \hv at typeout{Floatpositionsparameter: !t}%    
     \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
     \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
     \ifx\hv at label\@empty
@@ -1157,10 +1162,11 @@
   \end{\hv at floatType*}%
 }
 \def\do at hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object
-    \begin{\hv at floatType*}[!t]
-       \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
-       \hspace*{-\hv at tempWidthA}%
-       \savebox\hv at rightBox{\clipbox*{\hv at leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}%
+  \begin{\hv at floatType*}[!t]
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
+    \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+    \hspace*{-\hv at tempWidthA}%
+    \savebox\hv at rightBox{\clipbox*{\hv at leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}%
        \global\setlength\hv at tempWidthB{\dimexpr\textwidth-\wd\hv at rightBox-\hvSet at bindCorrection+1in+\oddsidemargin-\hv at floatCapSep\relax}%
        \hv at typeout{Height of right box: \the\ht\hv at rightBox}%
        \hv at typeout{Depth of right box : \the\dp\hv at rightBox}%
@@ -1169,11 +1175,13 @@
        \else
          \usebox\hv at rightBox
        \fi
+       \c at hv@tempCNTfigB=\numexpr\c at figure-1\relax
+       \c at hv@tempCNTtabB=\numexpr\c at table-1\relax
        \ifx\hv at label\@empty\else
          \ifx\hv at floatType\hv at figure
-           \global\refstepcounter{hv at tempCNTfigB}%
+           \refstepcounter{hv at tempCNTfigB}%
          \else
-           \global\refstepcounter{hv at tempCNTtabB}%   before caption
+           \refstepcounter{hv at tempCNTtabB}%   before caption
          \fi
          \label{\hv at label-2}%
        \fi        
@@ -1180,11 +1188,13 @@
        \ifx\hv at caption@format at temp\@empty\else
          \expandafter\captionsetup\expandafter{\hv at caption@format at temp}%
        \fi
+       \c at figure=\numexpr\c at hv@tempCNTfigB-1\relax
+       \c at table=\numexpr\c at hv@tempCNTtabB-1\relax
        \ifnum#1>\z@		% caption on the right
-         \hv at typeout{doublePage: capAngle=\hvSet at global@capAngle}%
-         \ifnum\hvSet at global@capAngle > \z@
+         \hv at typeout{doublePage: capAngle=\hvSet at capAngle}%
+         \ifnum\hvSet at capAngle > \z@
            \hspace{\hv at floatCapSep}%        
-           \rlap{\rotatebox{\hvSet at global@capAngle}{\parbox[b]{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
+           \rlap{\rotatebox{\hvSet at capAngle}{\parbox[b]{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
              \abovecaptionskip=0pt% local inside parbox
              \belowcaptionskip=0pt% local inside parbox
              \ifx\relax\hv at shortCap\relax
@@ -1197,7 +1207,7 @@
          \else
            \global\setlength\hv at tempWidthB{\dimexpr\textwidth-\wd\hv at rightBox-\hvSet at bindCorrection+1in+\oddsidemargin-\hv at floatCapSep\relax}%
            \hspace{\hv at floatCapSep}%
-           \rlap{\parbox[b][\dimexpr\ht\hv at rightBox+\dp\hv at rightBox][\hv at global@@capVPos]{\hv at tempWidthB}{%
+           \rlap{\parbox[b][\dimexpr\ht\hv at rightBox+\dp\hv at rightBox][\hv@@capVPos]{\hv at tempWidthB}{%
              \abovecaptionskip=0pt% local inside parbox
              \belowcaptionskip=0pt% local inside parbox
              \ifx\hv at shortCap\@empty
@@ -1233,7 +1243,8 @@
   \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
   \expandafter\global\expandafter\savebox\expandafter\hv at boxLeftPage\expandafter{\clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
   \expandafter\global\expandafter\savebox\expandafter\hv at boxRightPage\expandafter{\clipbox*{\hv at leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}%
-  \checkoddpage
+%  \endgroup% started at main macro \hvFloat
+ \checkoddpage
   \ifoddpage
     \if at twocolumn
       \if at firstcolumn
@@ -1261,6 +1272,7 @@
 \def\do at hvFloat@doublePAGECaptionRight#1{%  image on left and right page with caption on the right ----------------------------------
   % #1-> 0/1 caption under/right
     \afterpage{%
+      \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
       \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
       \noindent
       \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
@@ -1269,6 +1281,7 @@
       \noindent
       \hspace*{\dimexpr-\hv at tempWidthA}%
         \clipbox*{\the\hv at leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
+      \begingroup
           \ifnum#1>0
             \medskip
             \ifdim\dp\hvObjectBox > \z@
@@ -1301,6 +1314,7 @@
               \ifx\hv at label\@empty\else\label{\hv at label}\fi
             }%
         \fi
+        \endgroup
         \newpage\if at twocolumn\null\newpage\fi
   }%
 }
@@ -1309,11 +1323,12 @@
 %
 \def\do at hvFloat@doubleFULLPAGE#1{%  image on left and right page with caption before/below/right/after
   % #1-> 0/1 caption under/right
-  \ifx\hvSet at capPos\hv at After \hv@@capPos=1
+  \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
+  \ifx\hvSet at capPos\hv at After \global\hv@@capPos=1
   \else
-    \ifx\hvSet at capPos\hv at Before  \hv@@capPos=0
+    \ifx\hvSet at capPos\hv at Before  \global\hv@@capPos=0
     \else
-      \hv@@capPos=2 % other caption type
+      \global\hv@@capPos=2 % other caption type
   \fi\fi
   \checkoddpage
   \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
@@ -1421,6 +1436,7 @@
 \def\set at Normal@Bottom at Caption{\@ifnextchar*\set at Normal@Bottom at CaptionStar\set at Normal@Bottom at Caption@}
 \def\set at Normal@Bottom at Caption@{%
     \begin{\hv at floatType}[!b]
+      \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
       \ifhv at separatorLine\drawSepLine\fi
 %      \expandafter\captionsetup\expandafter{\hv at caption@format}%
       \ifx\hv at shortCap\@empty
@@ -1433,6 +1449,7 @@
 }
 \def\set at Normal@Bottom at CaptionStar*{%
     \begin{\hv at floatType*}[!b]
+      \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
       \ifhv at separatorLine\drawSepLine\fi
 %      \expandafter\captionsetup\expandafter{\hv at caption@format}%
       \ifx\hv at shortCap\@empty
@@ -1444,12 +1461,7 @@
     \end{\hv at floatType*}%
 }
 
-
 \def\do at hvFloat@doubleFULLPAGE at CaptionBefore{%
-%  \setcounter{hv at tempCNTfigA}{\value{figure}}%
-%  \setcounter{hv at tempCNTfigB}{\value{figure}}%
-%  \setcounter{hv at tempCNTtabA}{\value{table}}%
-%  \setcounter{hv at tempCNTtabB}{\value{table}}%
   \afterpage{%
     \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
     \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}%  no interlineskip
@@ -1639,6 +1651,7 @@
 
 \def\setBottomCaption{%
   \begin{\hv at floatType}[!b]%
+  \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
   \ifhv at separatorLine\drawSepLine\fi
   \par
   \usebox\hvCaptionBox
@@ -1651,6 +1664,7 @@
   \else
     \begin{\hv at floatType}[p]%
   \fi
+  \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
   \ifhv at FULLPAGE
     \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip%
     \checkoddpage
@@ -1664,7 +1678,7 @@
       \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
     \fi
     \AtBeginShipoutNext{\thispagestyle{empty}}%
-    \usebox\hvObjectBox%
+    \usebox\hvObjectBox
   \else
     \usebox\hvObjectBox
   \fi
@@ -1679,6 +1693,7 @@
 
 \def\getMultiCaptionAndLabel{%
   \global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
 %    \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
     \setlength\belowcaptionskip{5pt}%
     \setlength\abovecaptionskip{0pt}%
@@ -1710,6 +1725,7 @@
     \else
       \minipage{\columnwidth}%
     \fi
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
 %    \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
     \ifx\hvSet at objectPos\hv at Right\raggedleft\else
       \ifx\hvSet at objectPos\hv at Left\raggedleft\else
@@ -1736,9 +1752,9 @@
     \repeat
   \endminipage}%
 }
-
 \def\getMultiSubCaptionAndLabel{%
   \global\sbox\hvCaptionBox{\minipage{\linewidth}%
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
 %    \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
     \setlength\belowcaptionskip{5pt}%
     \setlength\abovecaptionskip{0pt}%
@@ -1756,6 +1772,7 @@
 
 \def\getMultiSubObjectAndLabel{%
   \global\sbox\hvObjectBox{%
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
     \ifhv at vFill
       \minipage[b][\textheight][s]{\columnwidth}%
     \else
@@ -1774,6 +1791,11 @@
     \advance\hv at cntb by \@ne
     \hv at cnta=2
     \edef\@captype{\clist_item:Nn\l_clist_Type{1}}%  the same for all subfloats
+    \ifx\@tempa\@empty
+    \else
+%      \refstepcounter{\@captype}%
+%      \expandafter\label\expandafter{\@tempa}%
+    \fi
     \loop
       \def\@temp{\clist_item:Nn\l_clist_Object{\hv at cnta}}%
       \ifhv at objectFrame\frame{\@temp}\else\@temp\fi
@@ -1798,8 +1820,9 @@
     \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}%    the  main label at the end
     \ifx\@tempa\@empty
     \else
-      \addtocounter{\@captype}{-1}%       to get the same <object>-ref as "label"-cap
-      \refstepcounter{\@captype}%
+%      \addtocounter{\@captype}{-1}%       to get the same <object>-ref as "label"-cap
+      \edef\@temp{hv at p\@captype}%
+      \refstepcounter{\@temp}%
       \expandafter\label\expandafter{\@tempa}%
     \fi
   \endminipage}%
@@ -1808,6 +1831,7 @@
 
 \def\getSingleCaptionAndLabel{%
   \global\sbox\hvCaptionBox{\minipage{\linewidth}%
+    \expandafter\hvFloatSet\expandafter{\hv at save@setting}%    
     \setlength\belowcaptionskip{5pt}%
     \setlength\abovecaptionskip{0pt}%
     \edef\@captype{\hv at floatType}%
@@ -1822,9 +1846,13 @@
 
 \def\set at caption@object#1{%    first caption, then object  #1=\hv at floatType
   \ifhv at multiFloat
+    \setcounter{hv at pfigure}{\value{figure}}%
+    \setcounter{hv at ptable}{\value{table}}%
     \getMultiCaptionAndLabel
   \else
     \ifhv at subFloat
+      \setcounter{hv at pfigure}{\value{figure}}%
+      \setcounter{hv at ptable}{\value{table}}%
       \getMultiSubCaptionAndLabel
     \else
       \getSingleCaptionAndLabel



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