texlive[63201] Master/texmf-dist: hvfloat (1may22)
commits+karl at tug.org
commits+karl at tug.org
Sun May 1 22:12:23 CEST 2022
Revision: 63201
http://tug.org/svn/texlive?view=revision&revision=63201
Author: karl
Date: 2022-05-01 22:12:23 +0200 (Sun, 01 May 2022)
Log Message:
-----------
hvfloat (1may22)
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.sty
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2022-05-01 20:12:00 UTC (rev 63200)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2022-05-01 20:12:23 UTC (rev 63201)
@@ -1,4 +1,5 @@
hvfloat.sty:
+2.39 2022-05-01 - fix for using package calc and global length setting
2.38 2022-04-02 - added option l for capWidth to get a caption with linewidth,
if also using the option wide for the object
2.37 2022-02-28 - fix bug for doublepage floats in twoside and twocolumn mode
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 2022-05-01 20:12:00 UTC (rev 63200)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2022-05-01 20:12:23 UTC (rev 63201)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 488 2022-04-02 19:32:17Z herbert $
+%% $Id: hvfloat.tex 530 2022-05-01 11:01:31Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,usegeometry]{scrartcl}
@@ -2610,7 +2610,7 @@
\begin{lstlisting}
-\hvFloat[doubleFULLPAGE,capPos=right,bindCorr=5mm]%
+\hvFloat[doubleFULLPAGE,capPos=after,bindCorr=5mm]%
{figure}%
{\includegraphics[width=2\paperwidth]{images/r+j3}}%
[A doublepage image with a caption on the image.]%
@@ -2622,7 +2622,7 @@
\end{lstlisting}
\marginnote{Fig.~\ref{fig:doubleFULLPAGE0a}}
- \hvFloat[doubleFULLPAGE,capPos=right,bindCorr=5mm]%
+ \hvFloat[doubleFULLPAGE,capPos=after,bindCorr=5mm]%
{figure}%
{\includegraphics[height=2\paperwidth]{images/r+j3}}%
[A doublepage image with a caption on the image.]%
@@ -2771,6 +2771,7 @@
{fig:doublePAGE0}
\hvblindtext
+\hvblindtext
\Blindtext
@@ -2813,7 +2814,9 @@
\hvblindtext
+\Blindtext
+\hvblindtext
\begin{lstlisting}
@@ -2825,13 +2828,13 @@
right-hand part of the illustration. The illustration begins on the left edge of
the paper. A short form is used for the LOF.
The parameter is \texttt{doublePage}}%
- {fig:doublePage0}
+ {fig:doublePage1}
\end{lstlisting}
\hvFloatSetDefaults
-\marginnote{Fig. \ref{fig:doublePage0}}
+\marginnote{Fig. \ref{fig:doublePage1}}
\hvFloat[doublePage,capPos=right,capVPos=top]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
@@ -2840,7 +2843,7 @@
right-hand part of the illustration. The illustration begins on the left edge of
the paper. A short form is used for the LOF.
The parameter is \texttt{doublePage}}%
- {fig:doublePage0}
+ {fig:doublePage1}
\Blindtext
@@ -2848,9 +2851,11 @@
\Blindtext
+\Blindtext
+
\begin{lstlisting}
\hvFloat[doublePage,bindCorr=inner]%
{figure}%
@@ -2867,7 +2872,8 @@
\hvFloatSetDefaults
\marginnote{Fig. \ref{fig:doublePage0sH2}}
-\hvFloat[doublePage,,bindCorr=inner]%
+\hvFloat[doublePage,bindCorr=inner
+]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
[A doublepage image with a caption on the right side of the right part.]%
@@ -2881,7 +2887,7 @@
\Blindtext
-%\Blindtext
+\Blindtext
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2022-05-01 20:12:00 UTC (rev 63200)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2022-05-01 20:12:23 UTC (rev 63201)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 488 2022-04-02 19:32:17Z herbert $
+%% $Id: hvfloat.sty 530 2022-05-01 11:01:31Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -6,6 +6,7 @@
%% This is file `hvfloat.sty',
%%
%% Herbert Voss <hvoss at tug.org>
+%% Copyright (C) 2003-22
%%
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN archives
@@ -15,8 +16,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.38}
-\def\filedate{2022/04/02}
+\def\fileversion{2.39}
+\def\filedate{2022/05/01}
%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
@@ -299,13 +300,13 @@
\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@}%
+ \global\@dblfptop=0\p@
+ \global\@fptop=0\p@
}
\newcommand\hv at reset@noverticalSpace{%
- \global\setlength{\@dblfptop}{\hv at dblfptop}%
- \global\setlength{\@fptop}{\hv at fptop}%
+ \global\@dblfptop=\hv at dblfptop
+ \global\@fptop=\hv at fptop
}
\providecommand\figcaption[2][]{}%
@@ -560,8 +561,8 @@
\gdef\hv at label{#3}%
\ifhv at capbeside\def\@@temp{1}\else\def\@@temp{0}\fi
\ifhv at sameHeight\global\hv at global@sameHeighttrue\else\global\hv at global@sameHeightfalse\fi
- \global\setlength\hvSet at bindCorrection{\hvSet at bindCorr}% for doublepage objects
- \global\setlength\hv at floatCapSep{\hvSet at floatCapSep}%
+ \global\hvSet at bindCorrection=\hvSet at bindCorr% for doublepage objects
+ \global\hv at floatCapSep=\hvSet at floatCapSep%
%
\ifhv at fullpage
\def\hvSet at CapWidth{n}% relative value
@@ -1099,10 +1100,11 @@
%
\def\do at hvFloat@doublePage#1{% image on left and right page with caption on the right page
% #1-> 0/1 caption under/right
- \global\setlength\hv at leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}%
- \global\setlength\hv at tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection}%
+ \hv at typeout{>>>doublePage: start with definitions of \hv at floatObject}%
+ \global\hv at leftPageObjectWidth=\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection\relax
+ \global\hv at tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection\relax
\xdef\hv at caption@format at temp{\hv at caption@format}% it gets lost otherwise for next afterpage
- \setlength\@dblfpbot{0\p@ \@plus 1fil}%
+ \@dblfpbot=0\p@ \@plus 1fil%
\global\hv at switchTypefalse
\setcounter{hv at tempCNTfigA}{\value{figure}}%
\setcounter{hv at tempCNTfigB}{\value{figure}}%
@@ -1196,8 +1198,8 @@
}
%
\def\do at hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object
- \hv at typeout{do at hvFloat@doublePageCaptionRightObjectLeft: start}%
\begin{\hv at floatType*}[!t]
+ \hv at typeout{>>>doublePage: start with left side of the object \hv at floatObject}%
\hv at set@noverticalSpace
\hfuzz=\maxdimen
\let\c at hv@tempCNTfigA\c at figure
@@ -1225,15 +1227,16 @@
}
\def\do at hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object
\begin{\hv at floatType*}[!t]
+ \hv at typeout{>>>doublePage: start with right side of the object \hv at floatObject}%
\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}%
- \global\setlength\hv at tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection}% FÜR DTK
+ \savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \hv at tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection\relax% FÜR DTK
\hspace*{-\hv at tempWidthA}%
- \global\setlength\hv at leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}% FÜR FTK
+ \hv at leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection\relax% FÜR FTK
\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 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@
@@ -1271,11 +1274,11 @@
}}}%
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\else
- \global\setlength\hv at tempWidthB{\dimexpr\textwidth-\wd\hv at rightBox-\hvSet at bindCorrection+1in+\oddsidemargin-\hv at floatCapSep\relax}%
+ \hv at tempWidthB=\dimexpr\textwidth-\wd\hv at rightBox-\hvSet at bindCorrection+1in+\oddsidemargin-\hv at floatCapSep\relax
\hspace{\hv at floatCapSep}%
\rlap{\parbox[b][\dimexpr\ht\hv at rightBox+\dp\hv at rightBox][\hv@@capVPos]{\hv at tempWidthB}{%
- \abovecaptionskip=0pt% local inside parbox
- \belowcaptionskip=0pt% local inside parbox
+ \abovecaptionskip=0pt % local inside parbox
+ \belowcaptionskip=0pt % local inside parbox
\ifx\hv at shortCap\@empty
\caption{\hv at longCap}%
\else
@@ -1351,8 +1354,8 @@
\global\savebox\hvObjectBox{\hv at floatObject}%
\fi
\noindent
- \global\setlength\hv at tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection}%
- \global\setlength\hv at leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}%
+ \global\hv at tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet at bindCorrection%
+ \global\hv at leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection%
\clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\null\newpage\if at twocolumn\null\newpage\fi
\expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
@@ -1410,9 +1413,9 @@
\fi\fi
\checkoddpage
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \global\setlength\hv at tempWidthA{\dimexpr-\oddsidemargin-1in-\parindent+\hvSet at bindCorrection}% the width of the right side offset
- \global\setlength\hv at tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet at bindCorrection}%
- \global\setlength\hv at leftPageObjectWidth{\dimexpr\paperwidth-\hvSet at bindCorrection}%
+ \global\hv at tempWidthA=\dimexpr-\oddsidemargin-1in-\parindent+\hvSet at bindCorrection% the width of the right side offset
+ \global\hv at tempWidthB=\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet at bindCorrection%
+ \global\hv at leftPageObjectWidth=\dimexpr\paperwidth-\hvSet at bindCorrection%
% \savebox\hv at leftBox{\clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
% \savebox\hv at rightBox{\clipbox*{\the\hv at leftPageObjectWidth{} \depth{} \width{} \height}{\usebox\hvObjectBox}}%
% \expandafter\captionsetup\expandafter{\hv at caption@format}%
More information about the tex-live-commits
mailing list.