texlive[59758] Master/texmf-dist: hvfloat (29jun21)
commits+karl at tug.org
commits+karl at tug.org
Tue Jun 29 21:54:30 CEST 2021
Revision: 59758
http://tug.org/svn/texlive?view=revision&revision=59758
Author: karl
Date: 2021-06-29 21:54:30 +0200 (Tue, 29 Jun 2021)
Log Message:
-----------
hvfloat (29jun21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
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-fps.sty
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-06-29 19:53:58 UTC (rev 59757)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-06-29 19:54:30 UTC (rev 59758)
@@ -1,4 +1,8 @@
hvfloat.sty:
+2.32 2021-06-29 - make multi and multisubflots caption align with the bottom
+ - added graphicx option doublefullPage
+ - prevent vertical centering for a doublepage on the right
+ page, if there is no text.
2.31 2021-06-26 - suppress "Overful hbox" message for full page or
double page floats
2.30 2021-06-20 - fix for introduced bug for multifloats
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf 2021-06-29 19:53:58 UTC (rev 59757)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf 2021-06-29 19:54:30 UTC (rev 59758)
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
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-29 19:53:58 UTC (rev 59757)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2021-06-29 19:54:30 UTC (rev 59758)
@@ -2621,7 +2621,7 @@
\begin{lstlisting}
\hvFloat[doubleFULLPAGE,capPos=right]%
{figure}%
- {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}%
{A caption for a double-sided image that will be placed on the right-hand
part of the illustration. The illustration begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2632,7 +2632,7 @@
\marginnote{Fig.~\ref{fig:doubleFULLPAGE1}}
\hvFloat[doubleFULLPAGE,capPos=right]%
{figure}%
- {\includegraphics[height=\paperheight]{images/rheinsberg}}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}%
{A caption for a double-sided image that will be placed on the right-hand
part of the illustration. The illustration begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2660,7 +2660,7 @@
\hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
{\includegraphics[doubleFULLPAGE,
- keepaspectratio=false]{images/rheinsberg}}%
+ keepaspectratio=false]{images/rheinsberg-1000}}%
{A caption for a double-sided image that will be placed \textbf{after}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2673,7 +2673,7 @@
\marginnote{Fig.~\ref{foo}}
\hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
- {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg-1000}}%
{A caption for a double-sided image that will be placed \textbf{after}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2694,7 +2694,7 @@
\hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
{\includegraphics[height=\paperheight,width=2\paperwidth,
- keepaspectratio=false]{images/rheinsberg}}%
+ keepaspectratio=false]{images/rheinsberg-1000}}%
{A caption for a double-sided image that will be placed \textbf{before}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2705,7 +2705,7 @@
\marginnote{Fig.~\ref{bar}}
\hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
- {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}%
+ {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg-1000}}%
{A caption for a double-sided image that will be placed \textbf{before}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2762,7 +2762,7 @@
\begin{lstlisting}
\hvFloat[doublePage,sameHeight]%
{figure}%
- {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
+ {\includegraphics[doublefullPage]{images/sonne-meer}}%
[A doublepage image with a caption on the right side of the right part.]%
{A caption for a double-sided image that will be placed on the right side of the
right-hand part of the illustration. The illustration begins on the left edge of
@@ -2777,7 +2777,7 @@
\marginnote{Fig. \ref{fig:doublePage0sH}}
\hvFloat[doublePage,sameHeight]%
{figure}%
- {\includegraphics[width=2\textwidth]{images/sonne-meer}}%
+ {\includegraphics[doublefullPage]{images/sonne-meer}}%
[A doublepage image with a caption on the right side of the right part.]%
{A caption for a double-sided image that will be placed on the right side of the
right-hand part of the illustration. The illustration begins on the left edge of
@@ -2859,7 +2859,7 @@
\Blindtext
-\Blindtext
+%\Blindtext
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg 2021-06-29 19:53:58 UTC (rev 59757)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg 2021-06-29 19:54:30 UTC (rev 59758)
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty 2021-06-29 19:53:58 UTC (rev 59757)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty 2021-06-29 19:54:30 UTC (rev 59758)
@@ -1,7 +1,6 @@
-%% $Id: hvfloat-fps.sty 35 2020-10-31 07:41:00Z herbert $
+%% $Id: hvfloat-fps.sty 121 2021-06-20 13:36:11Z 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-29 19:53:58 UTC (rev 59757)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-06-29 19:54:30 UTC (rev 59758)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 122 2021-06-26 12:35:53Z herbert $
+%% $Id: hvfloat.sty 126 2021-06-29 12:56:04Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,7 +15,7 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.31}
+\def\fileversion{2.32}
\def\filedate{2021/06/26}
%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
@@ -59,8 +59,6 @@
\RequirePackage{stfloats}% for bottom floats in a twocolumn mode
\fi
%
-
-
\providecommand*\LenToUnit[1]{\strip at pt\dimexpr#1*\p@/\unitlength}
\newlength\hvObjectWidth
@@ -175,7 +173,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
-
\newif\ifhv at fullpage
\newif\ifhv at FULLPAGE
\newif\ifhv at doubleFULLPAGE
@@ -268,10 +265,11 @@
}}
\def\hv at vskip{\vspace{\hvMultiFloatSkip}}
-
%
\newlength\hvAboveCaptionSkip
\newlength\hvBelowCaptionSkip
+\newlength\hv at dblfptop
+\newlength\hv at fptop
\newcount\hv@@capPos
\newlength\fboxlinewidth
@@ -290,6 +288,18 @@
\setlength\belowcaptionskip{\hvBelowCaptionSkip}%
}
+\newcommand\hv at set@noverticalSpace{% no space on top for a float page
+ \let\hv at dblfptop\@dblfptop
+ \let\hv at fptop\@fptop
+ \global\setlength{\@dblfptop}{0\p@}%
+ \global\setlength{\@fptop}{0\p@}%
+}
+
+\newcommand\hv at reset@noverticalSpace{%
+ \global\setlength{\@dblfptop}{\hv at dblfptop}%
+ \global\setlength{\@fptop}{\hv at fptop}%
+}
+
\providecommand\figcaption[2][]{}%
\providecommand\tabcaption[2][]{}%
\providecommand\tabcaptionbelow[2][]{}%
@@ -341,6 +351,11 @@
\def\Gin at eheight{\paperheight}%
\Gin at boolkey{false}{iso}%
}
+\define at key{Gin}{doublefullPage}[true]{%
+ \def\Gin at ewidth{\dimexpr2\paperwidth-2in-2\evensidemargin}%
+% \def\Gin at eheight{\paperheight}%
+ \Gin at boolkey{true}{iso}%
+}
\define at key{Gin}{doubleFULLPAGEbindCorr}[true]{%
\def\Gin at ewidth{\the\dimexpr2\paperwidth-2\hvSet at bindCorrection\relax}%
\def\Gin at eheight{\paperheight}%
@@ -1051,6 +1066,7 @@
\global\setlength\hv at leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}%
\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
+ \setlength\@dblfpbot{0\p@ \@plus 1fil}%
\global\hv at switchTypefalse
% \endgroup% started at main macro \hvFloat
\setcounter{hv at tempCNTfigA}{\value{figure}}%
@@ -1136,6 +1152,7 @@
%
\def\do at hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object
\begin{\hv at floatType*}[!t]
+ \hv at set@noverticalSpace
\hfuzz=\maxdimen
\let\c at hv@tempCNTfigA\c at figure
\let\c at hv@tempCNTtabA\c at table
@@ -1155,21 +1172,23 @@
\fi
\ifhv at global@sameHeight
\hv at typeout{text should be of same height of both pages}%
- \par\phantom{\parbox{\textwidth}{\caption*{\hv at longCap}}}%
-% \vspace{\textfloatsep}%
+ \par\noindent\phantom{\parbox{\textwidth}{\caption*{\hv at longCap}}}%
+% \vspace{-2pt}%
\fi
+ \hv at reset@noverticalSpace
\end{\hv at floatType*}%
}
\def\do at hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object
\begin{\hv at floatType*}[!t]
+ \hv at set@noverticalSpace
\hfuzz=\maxdimen
\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}%
+ \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}%
\ifdim\dp\hv at rightBox > \z@
\raisebox{\depth}{\usebox\hv at rightBox}%
\else
@@ -1227,6 +1246,7 @@
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\fi
\vspace{0pt}%
+ \hv at reset@noverticalSpace
\end{\hv at floatType*}
}
%
@@ -1698,10 +1718,9 @@
\def\getMultiCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
+ \captionsetup{aboveskip=\z@,belowskip=\z@,position=below,parbox=none}%,skip=-1ex}%
\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}%
+ \parskip=-0.5\baselineskip
\hv at cntb=\clist_count:N\l_clist_Type
\advance\hv at cntb by \@ne
\hv at cnta=1
@@ -1720,6 +1739,7 @@
\advance\hv at cnta by \@ne
\ifnum\hv at cnta<\hv at cntb
\repeat
+ \vspace{-\baselineskip}% no vspace at the end
\endminipage}%
}
@@ -1731,7 +1751,6 @@
\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
\ifx\hvSet at objectPos\hv at Center\centering
@@ -1758,9 +1777,9 @@
\endminipage}%
}
\def\getMultiSubCaptionAndLabel{%
- \global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \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}%
\xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
@@ -1780,6 +1799,7 @@
\expandafter\hvFloatSet\expandafter{\hv at save@setting}%
\ifhv at vFill
\minipage[b][\textheight][s]{\columnwidth}%
+ \captionsetup{belowskip=0pt}%
\else
\minipage{\columnwidth}%
\fi
@@ -1825,7 +1845,6 @@
\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
\edef\@temp{hv at p\@captype}%
\refstepcounter{\@temp}%
\expandafter\label\expandafter{\@tempa}%
More information about the tex-live-commits
mailing list.