hvfloat (10may19)

git-svn-id: svn://tug.org/texlive/trunk@51072 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 68 insertions, 31 deletions

diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index 6394f2f003a..7a97127a189 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -1,4 +1,6 @@
 hvfloat.sty:    
+2.14  2019-05-10  - changed floatCapSep into a dimen
+2.13  2019-04-08  - fix for trailing spaces
 2.12a 2019-04-04  - fix for wrong index
 2.12  2019-04-04  - added option left/right for twocolumn mode
 2.11  2019-03-29  - fix for sub float pages
diff --git a/Master/texmf-dist/doc/latex/hvfloat/README b/Master/texmf-dist/doc/latex/hvfloat/README
index a8bcb3b5746..c1f973c24c3 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/README
+++ b/Master/texmf-dist/doc/latex/hvfloat/README
@@ -1,10 +1,18 @@
 hvfloat
-hv-float-fps (float placement setting)
+hvfloat-fps (float placement setting)
 
+hvfloat
 Placing figures/tables with various options, like rotating
-the image/table and/or caption.
+the image/table and/or caption. Placing object and caption
+side by side in one- and twocolumn mode. Fullpage objects
+with captions on the preceeding or following page in
+one- and twocolumn mode.
 
+hvfloat-fps
+Simple global placement setting for floats
 
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
 %% in directory macros/latex/base/lppl.txt.
+
+hvoss@tug.org
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index 7f299e5117b..c64edd87566 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 e8f153dfbfc..73353a7e2c5 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
@@ -33,6 +33,7 @@
 
 \usepackage{graphicx}
 \usepackage{placeins}
+\usepackage{ragged2e}
 \usepackage{xcolor}
 \usepackage{url}
 \usepackage{booktabs,xltabular}
@@ -321,7 +322,7 @@ There are the following keywords:
 
 \Lkeyword{objectAngle} & 0 & The value for the angle if the object should be rotated. Counted anti clockwise.\\
 
-\Lkeyword{floatCapSep} & 5 & The additional width between the object and a left or right placed caption. The default unit is \texttt{pt}.\\
+\Lkeyword{floatCapSep} & 5pt & The additional width between the object and a left or right placed caption.\\
 
 
 \Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \Lcs{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\
@@ -788,7 +789,7 @@ The code for figure \ref{fig:6}:
 
 The caption is always near the object, only divided by the length \Ldim{floatCapSep}
 which can be set by the keyword of the same name \Lkeyword{floatCapSep}. It accepts only
-a decimal number and is preset to 5. The default unit is \texttt{pt} and cannot be changed.
+a value with any allowed unit. %The default unit is \texttt{pt} and cannot be changed.
 The keyword \Lkeyword{objectPos} refers always to the complete floating object: caption 
 \emph{and} object. The meaning of \Lkeyset{objectPos=left} is: Put the object as far as possible to the
 left margin. If \Lkeyset{capPos=left} is also used, then the caption is at the left margin followed by
@@ -959,6 +960,32 @@ the option \texttt{wide}.}{fig:811}
 Caption at top inner beside the float and object position right and
 the option \texttt{wide}.}{fig:811}
 
+The caption can be typeset completely into the margin with:
+
+\begin{lstlisting}
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,
+	capPos=outer,
+	capVPos=top,
+        floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\end{lstlisting}
+
+%\Float[capPos=outer]
+
+\begingroup
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,
+	capPos=outer,
+	capVPos=top,
+        floatCapSep=\marginparsep,
+]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:812}
+\endgroup
+
 
 
 \section{The star version \Lcs{hvFloat*}}\label{star-version0}
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index 2f7c86ff93c..6f94d80bac6 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
@@ -1,7 +1,7 @@
-%% $Id: hvfloat.sty 1039 2019-04-07 12:20:01Z herbert $
+%% $Id: hvfloat.sty 1042 2019-04-08 18:34:25Z herbert $
 %%
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hvfloat}[2019/02/03 rotating of floating objects]
+\ProvidesPackage{hvfloat}[2019/04/08 rotating of floating objects]
 %%
 %% IMPORTANT NOTICE:
 %%
@@ -16,8 +16,8 @@
 %% DESCRIPTION:
 %%   `hvfloat' offers rotating of captions and objects for floats
 %%
-\def\fileversion{2.12a}
-\def\filedate{2019/04/07}
+\def\fileversion{2.14}
+\def\filedate{2019/05/10}
 \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
 \let\hvFileVersion\fileversion
 %
@@ -119,7 +119,7 @@
 \define@key{hvSet}{objectAngle}[0]{%		-360..+360
 	\def\hvSet@objectAngle{#1}%
 }
-\define@key{hvSet}{floatCapSep}[5]{%		a width with the unit pt
+\define@key{hvSet}{floatCapSep}[5pt]{%		a width with the unit pt
 	\def\hvSet@floatCapSep{#1}%
 }
 \define@key{hvSet}{multiFloatSkip}[\normalbaselineskip]{% a width with the unit pt
@@ -155,7 +155,7 @@
   \hv@set{%
 	floatPos=htbp, rotAngle=0, capWidth=n, capAngle=0,
 	capPos=bottom, capVPos=center, objectPos=center, objectAngle=0,
-	floatCapSep=5, useOBox=false, nonFloat=false,
+	floatCapSep=5pt, useOBox=false, nonFloat=false,
 	onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
         multiFloat=false,subFloat=false,
 	separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip,
@@ -417,9 +417,9 @@
       \ifx\hvSet@capWidth\hv@Natural%          captionwidth=\linewidth-\objectwidth-separation
         \ifhv@capbeside
           \ifhv@wide
-            \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+            \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
           \else
-            \setlength\hvCapWidth{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+            \setlength\hvCapWidth{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
           \fi
         \else
           \setlength\hvCapWidth{\columnwidth}%
@@ -428,10 +428,10 @@
         \ifhv@capbeside
           \ifhv@wide
             \setlength\hvCapWidth{\hvSet@capWidth\hvWideWidth}%
-            \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+            \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
           \else
             \setlength\hvCapWidth{\hvSet@capWidth\columnwidth}%
-            \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep pt\relax}%
+            \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}%
           \fi
           \ifdim\hvCapWidth>\@tempdima
             \setlength\hvCapWidth{\@tempdima}%
@@ -552,23 +552,23 @@
   \fi
 %%%%
   \savebox{\@tempboxa}{%
-    \expandafter\ifcase\the\hv@@capPos   % 0 is LEFT     START \ifcase
+    \expandafter\ifcase\the\hv@@capPos% 0 is LEFT     START \ifcase
       \ifx\hvSet@capVPos\hv@Center
         \put@CaptionBox
-        \hspace{\hvSet@floatCapSep pt}% capfloatsep
+        \hspace{\hvSet@floatCapSep}% capfloatsep
         \put@ObjectBox
       \else
         \ifx\hvSet@capVPos\hv@Top% caption and object at top aligned
-          \put@CaptionBox[1]
-          \hspace{\hvSet@floatCapSep pt}% capfloatsep
-          \put@ObjectBox[1]
+          \put@CaptionBox[1]%
+          \hspace{\hvSet@floatCapSep}% capfloatsep
+          \put@ObjectBox[1]%
         \else% caption on bottom
-          \put@CaptionBox[2]
-          \hspace{\hvSet@floatCapSep pt}% capfloatsep
-          \put@ObjectBox[2]
+          \put@CaptionBox[2]%
+          \hspace{\hvSet@floatCapSep}% capfloatsep
+          \put@ObjectBox[2]%
         \fi
       \fi%  end caption left
-    \or   %1 is top
+    \or%1 is top
       \ifdim\wd\hvCaptionBox>\wd\hvObjectBox
 	\begin{minipage}{\wd\hvCaptionBox}%
       \else
@@ -586,17 +586,17 @@
     \or   %2 is right
       \ifx\hvSet@capVPos\hv@Center
         \put@ObjectBox
-	\hspace{\hvSet@floatCapSep pt}%
+	\hspace{\hvSet@floatCapSep}%
 	\put@CaptionBox
       \else
 	\ifx\hvSet@capVPos\hv@Top
-          \put@ObjectBox[1]
-          \hspace{\hvSet@floatCapSep pt}% capfloatsep
-          \put@CaptionBox[1]
+          \put@ObjectBox[1]%
+          \hspace{\hvSet@floatCapSep}% capfloatsep
+          \put@CaptionBox[1]%
 	\else
-          \put@ObjectBox[2]
-          \hspace{\hvSet@floatCapSep pt}% capfloatsep
-          \put@CaptionBox[2]
+          \put@ObjectBox[2]%
+          \hspace{\hvSet@floatCapSep}% capfloatsep
+          \put@CaptionBox[2]%
 	\fi
       \fi
     \or %3 bottom
@@ -613,7 +613,7 @@
           \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi\\[\hvAboveCaptionSkip]%
           \usebox{\hvCaptionBox}%
         \fi
-      \end{minipage}
+      \end{minipage}%
     \fi%   \ifcase\the\hv@@capPos
   }% End savebox Object and caption
 %