diff options
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/Changes | 1 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf | bin | 5031955 -> 5039170 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex | 22 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty | 53 |
4 files changed, 43 insertions, 33 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index 5cd0c94e9d1..9976f84d270 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -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 diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf Binary files differindex 856cdd1ffb3..83ad56d4727 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 820136ff360..116141dec66 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex @@ -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 @@ in the inner margin on both pages. \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 @@ in the inner margin on both pages. \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 @@ There will be pagenumbers and a caption can be rotated on the right of the objec {fig:doublePAGE0} \hvblindtext +\hvblindtext \Blindtext @@ -2813,7 +2814,9 @@ and the rest of the text area is filled with text. \hvblindtext +\Blindtext +\hvblindtext \begin{lstlisting} @@ -2825,13 +2828,13 @@ and the rest of the text area is filled with text. 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,9 @@ and the rest of the text area is filled with text. 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 \Blindtext @@ -2867,7 +2872,8 @@ and the rest of the text area is filled with text. \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 @@ and the rest of the text area is filled with text. \Blindtext -%\Blindtext +\Blindtext diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty index c3d8d0e57d3..ec23f2c3181 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 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@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@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@}% + \global\@dblfptop=0\p@ + \global\@fptop=0\p@ } \newcommand\hv@reset@noverticalSpace{% - \global\setlength{\@dblfptop}{\hv@dblfptop}% - \global\setlength{\@fptop}{\hv@fptop}% + \global\@dblfptop=\hv@dblfptop + \global\@fptop=\hv@fptop } \providecommand\figcaption[2][]{}% @@ -560,8 +561,8 @@ \gdef\hv@label{#3}% \ifhv@capbeside\def\@@temp{1}\else\def\@@temp{0}\fi \ifhv@sameHeight\global\hv@global@sameHeighttrue\else\global\hv@global@sameHeightfalse\fi - \global\setlength\hvSet@bindCorrection{\hvSet@bindCorr}% for doublepage objects - \global\setlength\hv@floatCapSep{\hvSet@floatCapSep}% + \global\hvSet@bindCorrection=\hvSet@bindCorr% for doublepage objects + \global\hv@floatCapSep=\hvSet@floatCapSep% % \ifhv@fullpage \def\hvSet@CapWidth{n}% relative value @@ -1099,10 +1100,11 @@ % \def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page % #1-> 0/1 caption under/right - \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% - \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}% + \hv@typeout{>>>doublePage: start with definitions of \hv@floatObject}% + \global\hv@leftPageObjectWidth=\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax + \global\hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection\relax \xdef\hv@caption@format@temp{\hv@caption@format}% it gets lost otherwise for next afterpage - \setlength\@dblfpbot{0\p@ \@plus 1fil}% + \@dblfpbot=0\p@ \@plus 1fil% \global\hv@switchTypefalse \setcounter{hv@tempCNTfigA}{\value{figure}}% \setcounter{hv@tempCNTfigB}{\value{figure}}% @@ -1196,8 +1198,8 @@ } % \def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object - \hv@typeout{do@hvFloat@doublePageCaptionRightObjectLeft: start}% \begin{\hv@floatType*}[!t] + \hv@typeout{>>>doublePage: start with left side of the object \hv@floatObject}% \hv@set@noverticalSpace \hfuzz=\maxdimen \let\c@hv@tempCNTfigA\c@figure @@ -1225,15 +1227,16 @@ } \def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object \begin{\hv@floatType*}[!t] + \hv@typeout{>>>doublePage: start with right side of the object \hv@floatObject}% \hv@set@noverticalSpace \hfuzz=\maxdimen \expandafter\hvFloatSet\expandafter{\hv@save@setting}% - \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}% FÜR DTK + \savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection\relax% FÜR DTK \hspace*{-\hv@tempWidthA}% - \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% FÜR FTK + \hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection\relax% FÜR FTK \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@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@ @@ -1271,11 +1274,11 @@ }}}% \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \else - \global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}% + \hv@tempWidthB=\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax \hspace{\hv@floatCapSep}% \rlap{\parbox[b][\dimexpr\ht\hv@rightBox+\dp\hv@rightBox][\hv@@capVPos]{\hv@tempWidthB}{% - \abovecaptionskip=0pt% local inside parbox - \belowcaptionskip=0pt% local inside parbox + \abovecaptionskip=0pt % local inside parbox + \belowcaptionskip=0pt % local inside parbox \ifx\hv@shortCap\@empty \caption{\hv@longCap}% \else @@ -1351,8 +1354,8 @@ \global\savebox\hvObjectBox{\hv@floatObject}% \fi \noindent - \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}% - \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% + \global\hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection% + \global\hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection% \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \null\newpage\if@twocolumn\null\newpage\fi \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% @@ -1410,9 +1413,9 @@ \fi\fi \checkoddpage \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \global\setlength\hv@tempWidthA{\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset - \global\setlength\hv@tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}% - \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-\hvSet@bindCorrection}% + \global\hv@tempWidthA=\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection% the width of the right side offset + \global\hv@tempWidthB=\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection% + \global\hv@leftPageObjectWidth=\dimexpr\paperwidth-\hvSet@bindCorrection% % \savebox\hv@leftBox{\clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% % \savebox\hv@rightBox{\clipbox*{\the\hv@leftPageObjectWidth{} \depth{} \width{} \height}{\usebox\hvObjectBox}}% % \expandafter\captionsetup\expandafter{\hv@caption@format}% |