5 files changed, 27 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index d8e8f80e88b..083cd05ceb5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,5 @@
 hvfloat.sty:    
+2.17  2020-10-31  - fix for label setting of non floating objects
 2.16  2019-08-31  - fix for \hvFloat* and full page images
 2.15  2019-05-13  - added optional arguments capFormat and subcapFormat
                     which will pass the key values to \caption or
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index 5f28291fa0b..0928f3b1879 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
index dca29f2ebef..5c330d42090 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 1072 2019-06-09 14:14:19Z herbert $
+%% $Id: hvfloat.tex 35 2020-10-31 07:41:00Z herbert $
 \listfiles
 \errorcontextlines=100
 \documentclass[twoside,paper=a4]{scrartcl}
@@ -155,7 +155,7 @@
 
 
 \begin{document}
-\title{Package \texttt{hvfloat}\\Rotating and scaling of objects and captions\\ver \hvFileVersion}
+\title{Package \texttt{hvfloat}\\Rotating and scaling of objects and captions\\ver \hvFloatFileVersion}
 \author{Herbert Voß\thanks{\protect\url{hvoss@tug.org}}}
 \date{\today}
 \maketitle
@@ -2546,7 +2546,7 @@ optional package options to set the global placement:
 
 %\setDefaults
 \hvFloat[FULLPAGE]{figure}%
-  {\includegraphics[FULLPAGE]{images/frose}}%
+  {\includegraphics[FULLPAGE]{tiger}}%
   [A float which needs the complete paper width and height.]%
   {A Caption of a ``fullpage'' object, which follows on the next page. 
    This can be an even or odd page. The object uses the complete paper dimensions}%
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
index 6fff6b4323e..99b7cbfbab6 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat-fps.sty 1031 2019-04-03 20:40:25Z herbert $
+%% $Id: hvfloat-fps.sty 35 2020-10-31 07:41:00Z herbert $
 %%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{hvfloat-fps}[2017/09/16 setting float objects]
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index 7eda015ab85..622c1fba502 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
@@ -1,7 +1,5 @@
-%% $Id: hvfloat.sty 1054 2019-05-13 08:20:11Z herbert $
+%% $Id: hvfloat.sty 36 2020-10-31 08:22:30Z herbert $
 %%
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hvfloat}[2019/05/13 rotating of floating objects]
 %%
 %% IMPORTANT NOTICE:
 %%
@@ -16,10 +14,12 @@
 %% DESCRIPTION:
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
-\def\fileversion{2.15}
-\def\filedate{2019/08/31}
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.17}
+\def\filedate{2020/10/31}
 \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
-\let\hvFileVersion\fileversion
+\ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
+\let\hvFloatFileVersion\fileversion
 %
 \newif\ifhv@fbox \hv@fboxfalse
 \newif\ifhv@hyperref \hv@hyperreffalse
@@ -480,16 +480,28 @@
 	  \ifhv@onlyText\hv@longCap
   	  \else
 	    \ifx\hv@floatType\hv@figure
-	      \ifx\relax\hv@shortCap\relax \figcaption{\hv@longCap}\else\figcaption[\hv@shortCap]{\hv@longCap}\fi
+	      \ifx\relax\hv@shortCap\relax 
+	        \figcaption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+	      \else
+	        \figcaption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+	      \fi
 	    \else
-	      \ifx\relax\hv@shortCap\relax \tabcaption{\hv@longCap}\else\tabcaption[\hv@shortCap]{\hv@longCap}\fi
+	      \ifx\relax\hv@shortCap\relax 
+	        \tabcaption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+	      \else
+	        \tabcaption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+	      \fi
 	    \fi
 	  \fi
 	\else
           \let\@captype\hv@floatType
-          \expandafter\ifx\expandafter\relax\hv@shortCap\relax \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}\fi
+          \expandafter\ifx\expandafter\relax\hv@shortCap\relax 
+            \caption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+          \else
+            \caption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+          \fi
 	\fi
-	\expandafter\label\expandafter{\hv@label}%
+%	\expandafter\label\expandafter{\hv@label}%   2.17 put label into the caption argument
       \end{minipage}%
     }%
   \else