summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-06-29 19:54:30 +0000
committerKarl Berry <karl@freefriends.org>2021-06-29 19:54:30 +0000
commitcd408191264e2fa77ba5e3c3faaab7f0eb4ea64d (patch)
tree944e512625a77710a9058b70f4d282abc3728f97
parent5e67ffc0a28b238385328470453cf2890979e391 (diff)
hvfloat (29jun21)
git-svn-id: svn://tug.org/texlive/trunk@59758 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/Changes4
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdfbin0 -> 1362739 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdfbin7126601 -> 5722381 bytes
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex18
-rw-r--r--Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpgbin0 -> 501524 bytes
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty10
-rw-r--r--Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty55
7 files changed, 55 insertions, 32 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes
index 676ac9822c1..3de2f35087a 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/Changes
+++ b/Master/texmf-dist/doc/latex/hvfloat/Changes
@@ -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
diff --git a/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf b/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
new file mode 100644
index 00000000000..44f19b9258a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
index 918e5f5f679..3fcd284a96b 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
index 5382371f7e9..afe13b5bc49 100644
--- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
+++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
@@ -2621,7 +2621,7 @@ in the inner margin on both pages.
\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 @@ in the inner margin on both pages.
\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 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\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 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\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 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\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 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same
\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 @@ and the rest of the text area is filled with text.
\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 @@ and the rest of the text area is filled with text.
\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 @@ and the rest of the text area is filled with text.
\Blindtext
-\Blindtext
+%\Blindtext
diff --git a/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg b/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
new file mode 100644
index 00000000000..e0e4b910a7e
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
index 99b7cbfbab6..a86244b9e54 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
@@ -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}
%
diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
index 82bf238e6d7..3d54b4f9817 100644
--- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
+++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
@@ -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@pt\dimexpr#1*\p@/\unitlength}
\newlength\hvObjectWidth
@@ -175,7 +173,6 @@
\define@boolkey{hvSet}[hv@]{sameHeight}[true]{\@nameuse{hv@sameHeight#1}}% Write the caption only as text
\define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal
-
\newif\ifhv@fullpage
\newif\ifhv@FULLPAGE
\newif\ifhv@doubleFULLPAGE
@@ -268,10 +265,11 @@
}}
\def\hv@vskip{\vspace{\hvMultiFloatSkip}}
-
%
\newlength\hvAboveCaptionSkip
\newlength\hvBelowCaptionSkip
+\newlength\hv@dblfptop
+\newlength\hv@fptop
\newcount\hv@@capPos
\newlength\fboxlinewidth
@@ -290,6 +288,18 @@
\setlength\belowcaptionskip{\hvBelowCaptionSkip}%
}
+\newcommand\hv@set@noverticalSpace{% no space on top for a float page
+ \let\hv@dblfptop\@dblfptop
+ \let\hv@fptop\@fptop
+ \global\setlength{\@dblfptop}{0\p@}%
+ \global\setlength{\@fptop}{0\p@}%
+}
+
+\newcommand\hv@reset@noverticalSpace{%
+ \global\setlength{\@dblfptop}{\hv@dblfptop}%
+ \global\setlength{\@fptop}{\hv@fptop}%
+}
+
\providecommand\figcaption[2][]{}%
\providecommand\tabcaption[2][]{}%
\providecommand\tabcaptionbelow[2][]{}%
@@ -341,6 +351,11 @@
\def\Gin@eheight{\paperheight}%
\Gin@boolkey{false}{iso}%
}
+\define@key{Gin}{doublefullPage}[true]{%
+ \def\Gin@ewidth{\dimexpr2\paperwidth-2in-2\evensidemargin}%
+% \def\Gin@eheight{\paperheight}%
+ \Gin@boolkey{true}{iso}%
+}
\define@key{Gin}{doubleFULLPAGEbindCorr}[true]{%
\def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection\relax}%
\def\Gin@eheight{\paperheight}%
@@ -1051,6 +1066,7 @@
\global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}%
\global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}%
\xdef\hv@caption@format@temp{\hv@caption@format}% it gets lost otherwise for next afterpage
+ \setlength\@dblfpbot{0\p@ \@plus 1fil}%
\global\hv@switchTypefalse
% \endgroup% started at main macro \hvFloat
\setcounter{hv@tempCNTfigA}{\value{figure}}%
@@ -1136,6 +1152,7 @@
%
\def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object
\begin{\hv@floatType*}[!t]
+ \hv@set@noverticalSpace
\hfuzz=\maxdimen
\let\c@hv@tempCNTfigA\c@figure
\let\c@hv@tempCNTtabA\c@table
@@ -1155,21 +1172,23 @@
\fi
\ifhv@global@sameHeight
\hv@typeout{text should be of same height of both pages}%
- \par\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}%
-% \vspace{\textfloatsep}%
+ \par\noindent\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}%
+% \vspace{-2pt}%
\fi
+ \hv@reset@noverticalSpace
\end{\hv@floatType*}%
}
\def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object
\begin{\hv@floatType*}[!t]
+ \hv@set@noverticalSpace
\hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
\global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\hspace*{-\hv@tempWidthA}%
\savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}%
- \global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}%
- \hv@typeout{Height of right box: \the\ht\hv@rightBox}%
- \hv@typeout{Depth of right box : \the\dp\hv@rightBox}%
+ \global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}%
+ \hv@typeout{Height of right box: \the\ht\hv@rightBox}%
+ \hv@typeout{Depth of right box : \the\dp\hv@rightBox}%
\ifdim\dp\hv@rightBox > \z@
\raisebox{\depth}{\usebox\hv@rightBox}%
\else
@@ -1227,6 +1246,7 @@
\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
\fi
\vspace{0pt}%
+ \hv@reset@noverticalSpace
\end{\hv@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@save@setting}%
-% \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
- \setlength\belowcaptionskip{5pt}%
- \setlength\abovecaptionskip{0pt}%
+ \parskip=-0.5\baselineskip
\hv@cntb=\clist_count:N\l_clist_Type
\advance\hv@cntb by \@ne
\hv@cnta=1
@@ -1720,6 +1739,7 @@
\advance\hv@cnta by \@ne
\ifnum\hv@cnta<\hv@cntb
\repeat
+ \vspace{-\baselineskip}% no vspace at the end
\endminipage}%
}
@@ -1731,7 +1751,6 @@
\minipage{\columnwidth}%
\fi
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
-% \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifx\hvSet@objectPos\hv@Right\raggedleft\else
\ifx\hvSet@objectPos\hv@Left\raggedleft\else
\ifx\hvSet@objectPos\hv@Center\centering
@@ -1758,9 +1777,9 @@
\endminipage}%
}
\def\getMultiSubCaptionAndLabel{%
- \global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \global\sbox\hvCaptionBox{%
+ \minipage{\linewidth}%
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
-% \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@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@save@setting}%
\ifhv@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@p\@captype}%
\refstepcounter{\@temp}%
\expandafter\label\expandafter{\@tempa}%