texlive[51072] Master/texmf-dist: hvfloat (10may19)
commits+karl at tug.org
commits+karl at tug.org
Fri May 10 23:15:26 CEST 2019
Revision: 51072
http://tug.org/svn/texlive?view=revision&revision=51072
Author: karl
Date: 2019-05-10 23:15:26 +0200 (Fri, 10 May 2019)
Log Message:
-----------
hvfloat (10may19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
trunk/Master/texmf-dist/doc/latex/hvfloat/README
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
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 2019-05-10 21:15:08 UTC (rev 51071)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2019-05-10 21:15:26 UTC (rev 51072)
@@ -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
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/README 2019-05-10 21:15:08 UTC (rev 51071)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/README 2019-05-10 21:15:26 UTC (rev 51072)
@@ -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 at tug.org
\ No newline at end of file
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 2019-05-10 21:15:08 UTC (rev 51071)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2019-05-10 21:15:26 UTC (rev 51072)
@@ -33,6 +33,7 @@
\usepackage{graphicx}
\usepackage{placeins}
+\usepackage{ragged2e}
\usepackage{xcolor}
\usepackage{url}
\usepackage{booktabs,xltabular}
@@ -321,7 +322,7 @@
\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 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,8 +960,34 @@
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}
In the \Index{twocolumn} mode the floating environment can be set over both
columns with the star version \Lcs{hvFloat*}. The floating environment will
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2019-05-10 21:15:08 UTC (rev 51071)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2019-05-10 21:15:26 UTC (rev 51072)
@@ -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 at key{hvSet}{objectAngle}[0]{% -360..+360
\def\hvSet at objectAngle{#1}%
}
-\define at key{hvSet}{floatCapSep}[5]{% a width with the unit pt
+\define at key{hvSet}{floatCapSep}[5pt]{% a width with the unit pt
\def\hvSet at floatCapSep{#1}%
}
\define at key{hvSet}{multiFloatSkip}[\normalbaselineskip]{% a width with the unit pt
@@ -155,7 +155,7 @@
\hv at 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 at capWidth\hv at Natural% captionwidth=\linewidth-\objectwidth-separation
\ifhv at capbeside
\ifhv at wide
- \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet at floatCapSep pt\relax}%
+ \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet at floatCapSep\relax}%
\else
- \setlength\hvCapWidth{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet at floatCapSep pt\relax}%
+ \setlength\hvCapWidth{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet at floatCapSep\relax}%
\fi
\else
\setlength\hvCapWidth{\columnwidth}%
@@ -428,10 +428,10 @@
\ifhv at capbeside
\ifhv at wide
\setlength\hvCapWidth{\hvSet at capWidth\hvWideWidth}%
- \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet at floatCapSep pt\relax}%
+ \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet at floatCapSep\relax}%
\else
\setlength\hvCapWidth{\hvSet at capWidth\columnwidth}%
- \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet at floatCapSep pt\relax}%
+ \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet at 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 at capVPos\hv at Center
\put at CaptionBox
- \hspace{\hvSet at floatCapSep pt}% capfloatsep
+ \hspace{\hvSet at floatCapSep}% capfloatsep
\put at ObjectBox
\else
\ifx\hvSet at capVPos\hv at Top% caption and object at top aligned
- \put at CaptionBox[1]
- \hspace{\hvSet at floatCapSep pt}% capfloatsep
- \put at ObjectBox[1]
+ \put at CaptionBox[1]%
+ \hspace{\hvSet at floatCapSep}% capfloatsep
+ \put at ObjectBox[1]%
\else% caption on bottom
- \put at CaptionBox[2]
- \hspace{\hvSet at floatCapSep pt}% capfloatsep
- \put at ObjectBox[2]
+ \put at CaptionBox[2]%
+ \hspace{\hvSet at floatCapSep}% capfloatsep
+ \put at 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 at capVPos\hv at Center
\put at ObjectBox
- \hspace{\hvSet at floatCapSep pt}%
+ \hspace{\hvSet at floatCapSep}%
\put at CaptionBox
\else
\ifx\hvSet at capVPos\hv at Top
- \put at ObjectBox[1]
- \hspace{\hvSet at floatCapSep pt}% capfloatsep
- \put at CaptionBox[1]
+ \put at ObjectBox[1]%
+ \hspace{\hvSet at floatCapSep}% capfloatsep
+ \put at CaptionBox[1]%
\else
- \put at ObjectBox[2]
- \hspace{\hvSet at floatCapSep pt}% capfloatsep
- \put at CaptionBox[2]
+ \put at ObjectBox[2]%
+ \hspace{\hvSet at floatCapSep}% capfloatsep
+ \put at CaptionBox[2]%
\fi
\fi
\or %3 bottom
@@ -613,7 +613,7 @@
\ifhv at 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
%
More information about the tex-live-commits
mailing list