texlive[59409] Master/texmf-dist: hvfloat (31may21)
commits+karl at tug.org
commits+karl at tug.org
Mon May 31 22:24:25 CEST 2021
Revision: 59409
http://tug.org/svn/texlive?view=revision&revision=59409
Author: karl
Date: 2021-05-31 22:24:24 +0200 (Mon, 31 May 2021)
Log Message:
-----------
hvfloat (31may21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
trunk/Master/texmf-dist/doc/latex/hvfloat/README.exa
trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,4 +1,8 @@
hvfloat.sty:
+2.26 2021-05-31 - allow option wide in twocolumn mode
+ - allow a stretched minipage for
+ multifloat and multisubfloat by using
+ option vFill
2.25 2021-05-18 - support of \twocolumn mode
2.24 2021-05-12 - allow a caption on the bottom of a preceding or a
following page of double page floats (left-right)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/README.exa
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/README.exa 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/README.exa 2021-05-31 20:24:24 UTC (rev 59409)
@@ -22,7 +22,4 @@
runEXA.sh <base>
runs a group of examples, e.g. "./runEXA.sh inner" runs _all_ examples
-started with "inner".
-
-** single files **
-lualatex capPos.ltx
\ No newline at end of file
+starting with "inner".
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: after1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: after2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -8,7 +8,7 @@
\begin{document}
\tableofcontents
- ewpage
+\newpage
\blinddocument
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,7 @@
+\errorcontextlines=100
+%\documentclass[final]{ltugboat}
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: doublepage2s2c.tex 92 2021-05-18 09:46:55Z herbert $
+%% $Id: doublepage2s2c.tex 97 2021-05-26 19:31:53Z herbert $
\input{preamble.ltx}
\usepackage{blindtext,xcolor,marginnote}
@@ -36,7 +38,7 @@
\begin{lstlisting}
-\hvFloat[doublePage,capWidth=n,capPos=right]%
+\hvFloat[doublePage]%,capWidth=n,capPos=right]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
[A doublepage image with a caption on the right side of the right part.]%
@@ -49,7 +51,7 @@
\marginnote{Fig. \ref{fig:doublePage0}}
-\hvFloat[doublePage,capWidth=n,capPos=right]%
+\hvFloat[doublePage]%,capWidth=n,capPos=right]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
[A doublepage image with a caption on the right side of the right part.]%
@@ -165,6 +167,10 @@
\Blindtext
+
+\end{document}
+
+
\subsection{Definition on an even page}
@@ -740,7 +746,6 @@
{fig:doubleFULLPAGE0after2col}
\end{lstlisting}
-
\marginnote{Fig. \ref{fig:doubleFULLPAGE0after2col}}
\hvFloat[doubleFULLPAGE,capWidth=n,twoColumnCaption,capPos=after,separatorLine]%
{figure}%
@@ -751,9 +756,8 @@
the paper. A short form is used for the LOF.
The parameter is \texttt{doubleFULLPAGE}}%
{fig:doubleFULLPAGE0after2col}
-
+
\Blindtext
-
%\hvblindtext
%\hvblindtext
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: even1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: even1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: even2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: even2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: even2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: fullpage1s2c.tex 1072 2019-06-09 14:14:19Z herbert $
+%% $Id: fullpage1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
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-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 90 2021-05-14 09:08:46Z herbert $
+%% $Id: hvfloat.tex 103 2021-05-31 12:37:11Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,]{scrartcl}
@@ -210,7 +210,8 @@
\Loption{fbox} & The objects and captions are put into a \Lcs{fbox} command, like in
this documentation. This doesn't make real sense and is only for some demonstration useful or for locating
problems if images seems to have too much whitespace.\\
-\Loption{hyperref} & Load package \Lpack{hyperref}. % and also package \Lpack{hypcap}.
+\Loption{hyperref} & Load package \Lpack{hyperref}.\\
+\Loption{nostfloats} & do not load package \Lpack{stfloats}.
\end{tabularx}
\bigskip
@@ -225,7 +226,7 @@
\Lpack{caption},
\Lpack{subcaption},
\Lpack{atbegshi},
-%\RequirePackage{hyperref}
+\Lpack{stfloats},
\Lpack{expl3}, \Lpack{multido},
\Lpack{graphicx},
\Lpack{xkeyval},
@@ -271,16 +272,18 @@
the not existing table~\ref{dummy} is no problem.
{\small\begin{verbatim}
-[...] It is no problem to use the \verb|\tabcaption| command to place a caption anywhere,
-like here in an inlined mode: \tabcaption[The Caption without sense ...]{A Caption without any
-sense and any object}\label{dummy} A label can be put inside the argument or after the command
-in the usual way, so that a reference to the not existing table~\ref{dummy} is no problem.
+[...] It is no problem to use the \verb|\tabcaption|
+command to place a caption anywhere,
+like here in an inlined mode:
+\tabcaption[The Caption without sense ...]%
+{A Caption without any sense and any
+object}\label{dummy} A label can be put
+inside the argument or after the command
+in the usual way, so that a reference to
+the not existing table~\ref{dummy} is no problem.
\end{verbatim}}
-%\hvDefFloatStyle
-%\hvFloatSetDefaults
-
With the macro \Lcs{hvDefFloatStyle} one can define a style which can be used instead of
the individual setting:
@@ -290,10 +293,6 @@
Internally the style is saved in a macro named \verb|\hv@<name>|.
-
-%\index{capPos@\texttt {capPos} (keyword)|(}
-
-%\subsection{The Options}
There are the following keywords:
\begin{xltabular}{\textwidth}{@{} l>{\small\ttfamily}cX @{}}
@@ -307,52 +306,45 @@
\endfoot
\bottomrule
\endlastfoot
+
\Lkeyword{floatPos} & \texttt{tbp} & This is the same default placement setting like the one from standard \LaTeX, but maybe not always
the best setting. \\
-\Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption should be rotated in the same way.\\
-
-\Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width,
+\Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption, should be rotated together.\\
+\Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width given by the current linewidth,
»\texttt{w}« for the width of the object, »\texttt{h}« for the height of the object, or a scale for \verb|\columnwidth|.\\
-
-\Lkeyword{capAngle} & 0 & The value for the angle if the caption should be rotated. Counted anti clockwise.\\
-
+\Lkeyword{capAngle} & 0 & The integer value for the angle if the caption should be rotated. Counted counter clockwise.\\
\Lkeyword{capPos} & bottom& The position of the caption relative to the object. Possible values are\\
& & \Lkeyval{before}: \emph{always} before (left) from the object.\\
& & \Lkeyval{top}: \emph{always} on top of the object.\\
- & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\
+ & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in twocolumn mode.\\
& & \Lkeyval{after}: \emph{always} after (right) from the object.\\
& & \Lkeyval{bottom}: \emph{always} on the bottom of the object.\\
- & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\
- & & \Lkeyval{inner}: in \Index{twoside} mode always typeset at the inner margin.\\
- & & \Lkeyval{outer}: in \Index{twoside} mode always typeset at the outer margin.\\
- & & \Lkeyval{evenPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an even page.\\
- & & \Lkeyval{oddPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an odd page.\\
-
+ & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in twocolumn mode.\\
+ & & \Lkeyval{inner}: in twoside mode always typeset at the inner margin.\\
+ & & \Lkeyval{outer}: in twoside mode always typeset at the outer margin.\\
+ & & \Lkeyval{evenPage}: in twoside mode with fullpage objects always on an even page.\\
+ & & \Lkeyval{oddPage}: in twoside mode with fullpage objects always on an odd page.\\
\Lkeyword{capVPos}& center& This is only important for \texttt{capPos=left|right}. Only in this case the
caption can vertically placed at the \Lkeyval{bottom}, \Lkeyval{center} and \Lkeyval{top}.\\
-
-\Lkeyword{objectPos} & center & The horizontalplacement of the object relative to the document. Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\
-
-\Lkeyword{objectAngle} & 0 & The value for the angle if the object should be rotated. Counted anti clockwise.\\
-
-\Lkeyword{floatCapSep} & 5pt & The additional width between the object and a left or right placed caption.\\
-
-
+\Lkeyword{objectPos} & center & The horizontal placement of the object relative to the document.
+Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\
+\Lkeyword{objectAngle} & 0 & The integer value for the angle if the object should be rotated. Counted counter clockwise.\\
+\Lkeyword{floatCapSep} & 5pt & The additional space 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.\\
-
\Lkeyword{onlyText} & false & The caption will be printed as normal text and there is no entry in the list of \ldots.\\
-
-\Lkeyword{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counters are increased as usual and can be referenced.\\
-
+\Lkeyword{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counter is increased as usual and can be referenced.\\
\Lkeyword{wide} & false & The float can use \Ldim{textwidth}+\Ldim{marginparwidth} as horizontal width.\\
-
\Lkeyword{objectFrame} & false & put a frame with no separation around the float object.\\
-
\Lkeyword{style} & --- & Use a defined style\\
-
\Lkeyword{capFormat} & --- & Define formatting options for \Lcs{caption} (see documentation of package \Lpack{caption}).\\
-
\Lkeyword{subcapFormat} & --- & Define formatting options for \Lcs{subcaption}.\\
+\Lkeyword{fullpage} & false & Use a complete column in twocolumn mode.\\
+\Lkeyword{FULLPAGE} & false & Use the complete paper width/height for the object.\\
+\Lkeyword{FullPage} & false & Use the complete text area for the object.\\
+\Lkeyword{doublePage} & false & Use the textarea on a doublepage with additional text.\\
+\Lkeyword{doublePAGE} & false & Use the textarea on a doublepage without additional text.\\
+\Lkeyword{doubleFULLPAGE} & false & Use the paperwidth on a doublepage without additional text.\\
+\Lkeyword{vFill} & false & Put a \Lcs{vfill} between every two objects in a multi- or subfloat.\\
\end{xltabular}
@@ -1717,7 +1709,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=before,multiFloat]%
+\hvFloat[fullpage,capPos=before,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{images/CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -1724,7 +1716,7 @@
right column. This can be an even or odd page. And some more text whch has no
real meaning because it fills only the space for a long caption.}%
{img:demo0}%
- +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
+ +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2
Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline
L & R & C & P\\
left & right & center & Text with possible linebreaks\\
@@ -1802,7 +1794,7 @@
\begin{lstlisting}
-\hvFloat[fullpage,capPos=before,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=before,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -1816,11 +1808,9 @@
{A Caption C of a ``fullpage'' object, which follows on the left or right column.}%
{sub:demo1}
+{}{\includegraphics[width=\linewidth]{images/CTAN}}%
- {A Caption D of a ``fullpage'' object}%
- {sub:demo2}
+ {A Caption D of a ``fullpage'' object}{sub:demo2}
+{}{\includegraphics[width=\linewidth]{images/CTAN}}%
- {A Caption E of a ``fullpage'' object}%
- {sub:demo3}
+ {A Caption E of a ``fullpage'' object}{sub:demo3}
\end{lstlisting}
@@ -1830,7 +1820,7 @@
-\begin{figure}[p]
+\begin{figure}[!htb]
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
@@ -1841,7 +1831,9 @@
\frame{\includegraphics[page=10,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill
\frame{\includegraphics[page=11,width=0.24\linewidth]{examples/sub-default1s1c}}
\caption{Output of \texttt{sub-default1s1c} (pages 4--11)}\label{sub-default1s1c}
+\end{figure}
+\begin{figure}[!htb]
\frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill
\frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill
\frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill
@@ -2277,7 +2269,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{images/rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -2376,7 +2368,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=before,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=before,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -2498,7 +2490,7 @@
\marginnote{Fig.~\ref{fig:doubleFULLPAGE0}}
\hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]%
{figure}%
- {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}%
+ {\includegraphics[angle=90,height=\paperheight]{images/r+j}}%
[A doublepage image with a caption on the image.]%
{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.
@@ -2587,9 +2579,9 @@
\verb/\pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}/ $\rightarrow$ \pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}
\begin{lstlisting}
- \hvFloat[doubleFULLPAGE,capPos=before]%
+ \hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
- {\includegraphics[height=\paperheight,width=2\paperwidth,
+ {\includegraphics[doubleFULLPAGE,
keepaspectratio=false]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed before
the image. The image begins on the left edge of the paper.
@@ -2598,10 +2590,12 @@
{foo}
\end{lstlisting}
+\hvFloatSetDefaults
+
\marginnote{Fig.~\ref{foo}}
- \hvFloat[doubleFULLPAGE,capPos=before]%
+ \hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
- {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed 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.
@@ -2608,11 +2602,15 @@
The parameter is \texttt{doubleFULLPAGE}}%
{foo}
-\Blindtext \Blindtext
+\Blindtext %\Blindtext
+\hvblindtext
+\hvblindtext
+\hvblindtext
+
\begin{lstlisting}
- \hvFloat[doubleFULLPAGE,capPos=after]%
+ \hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
{\includegraphics[height=\paperheight,width=2\paperwidth,
keepaspectratio=false]{images/rheinsberg}}%
@@ -2620,11 +2618,11 @@
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.
The parameter is \texttt{doubleFULLPAGE}}%
- {foo}
+ {bar}
\end{lstlisting}
\marginnote{Fig.~\ref{bar}}
- \hvFloat[doubleFULLPAGE,capPos=after]%
+ \hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
{\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed after
@@ -2638,6 +2636,9 @@
\Blindtext
\hvblindtext
+
+%\hvblindtext
+
\subsection{\Lkeyword{doublePAGE}}
With this option the object also starts at the left paper margin but on the top of the text area.
There will be pagenumbers and a caption can be rotated on the right of the object or under it.
@@ -2666,10 +2667,11 @@
The parameter is \texttt{doublePAGE}}%
{fig:doublePAGE0}
-\hvblindtext
+%\hvblindtext
\Blindtext
+\Blindtext
\subsection{\Lkeyword{doublePage}}
With this option the object also starts at the left top of the text area.
@@ -2689,6 +2691,8 @@
\end{lstlisting}
+%\hvFloatSetDefaults
+
\marginnote{Fig. \ref{fig:doublePage0}}
\hvFloat[doublePage,capWidth=n,capPos=right]%
{figure}%
@@ -2746,7 +2750,7 @@
\Blindtext
-\hvFloat[doublePage,capWidth=n,capPos=right]%
+\hvFloat[doublePage,capWidth=n,capPos=right,capVPos=top]%
{table}%
{\usebox\hvOBox}%%%%%%%%%%%%%%
[A doublepage tabular with a caption on the right side of the right part.]%
@@ -2786,6 +2790,7 @@
\bottomrule
\end{tabular}}
+
\hvFloat[doublePage,capWidth=n,capPos=right]%
{table}%
{\usebox\hvOBox}%%%%%%%%%%%%%%
@@ -2801,7 +2806,6 @@
\Blindtext
-
\section{References to the page}\label{varioref}
%Whith loading package \texttt{hyperref} references to floating objects with a caption left or right of the object
%are no problem in difference to captions below othe object or on another page (using \texttt{fullpage} option).
@@ -2838,7 +2842,7 @@
\begin{verbatim}
Whith the package \Lpack{varioref} (\url{https://ctan.org/pkg/varioref})
one can get something like: see figure~\vref{demo:fullpage}, which uses a
-correct page number of the floatinmg object and not the caption
+^correct page number of the floatinmg object and not the caption
page number which is~\vpageref{demo:fullpage-cap}.
The figure~\ref{demo:fullpage} is on page~\pageref{demo:fullpage}
and the caption on page~\pageref{demo:fullpage-cap}
@@ -2852,7 +2856,7 @@
and the caption on page~\pageref{demo:fullpage-cap}
-\FloatBarrier
+%\FloatBarrier
\section{Defining a style}
@@ -2876,16 +2880,16 @@
\hvFloatSetDefaults
-\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center}
+\hvDefFloatStyle{RightCaption}{capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center}
-
\hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}%
{Caption at bottom right beside the float with a caption width of
\texttt{0.5\textbackslash columnwidth}.}{fig:style}
-\hvblindtext
+\Blindtext
+\Blindtext
\section{Global float setting}
@@ -2908,6 +2912,8 @@
\Blindtext
+\Blindtext
+
%\hvFloatSetDefaults
\hvFloat[FULLPAGE]{figure}%
{\includegraphics[FULLPAGE]{tiger}}%
@@ -2919,9 +2925,10 @@
\Blindtext
+\Blindtext
+
\printindex
-
\clearpage
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: inner1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: inner1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: inner2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: inner2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: left2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: left2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -23,7 +23,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -51,7 +51,7 @@
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -83,7 +83,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -111,7 +111,7 @@
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=after,multiFloat]%
+\hvFloat[fullpage,capPos=after,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: multi-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: multi-default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: multi-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,6 +1,6 @@
\errorcontextlines=200
\documentclass[twoside]{scrartcl}
-%% $Id: multi-inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-inner2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -27,7 +27,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -54,7 +54,7 @@
\Float[Multi]
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -86,7 +86,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -113,7 +113,7 @@
\Float[Multi]
%\end{document}
-\hvFloat[fullpage,multiFloat,capPos=inner]%
+\hvFloat[fullpage,multiFloat,capPos=inner,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,6 +1,6 @@
\errorcontextlines=100
\documentclass[twoside]{scrartcl}
-%% $Id: multi-outer2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-outer2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -28,7 +28,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=outer]%
+\hvFloat[fullpage,multiFloat,capPos=outer,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -53,7 +53,7 @@
\Float[Multi]
-\hvFloat[fullpage,multiFloat,capPos=o,objectPos=c]%
+\hvFloat[fullpage,multiFloat,capPos=o,objectPos=c,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -84,7 +84,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,multiFloat,capPos=outer]%
+\hvFloat[fullpage,multiFloat,capPos=outer,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -111,7 +111,7 @@
\Float[Multi]
%\end{document}
-\hvFloat[fullpage,multiFloat,capPos=outer]%
+\hvFloat[fullpage,multiFloat,capPos=outer,vFill]%
+{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: multi-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: multi-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -23,7 +23,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -51,7 +51,7 @@
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -83,7 +83,7 @@
\begin{lstlisting}
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
@@ -111,7 +111,7 @@
\Float[Multi]
\captionsetup{singlelinecheck=false}
-\hvFloat[fullpage,capPos=right,multiFloat]%
+\hvFloat[fullpage,capPos=right,multiFloat,vFill]%
+{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1
[Short caption A]%
{A Caption A of a ``fullpage'' object, which follows on the left or
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: odd1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: odd1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: odd2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: odd2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: odd2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: outer1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: outer1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: outer2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: outer2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: outer2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: outer2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-after1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: paper-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf 2021-05-31 20:24:24 UTC (rev 59409)
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -0,0 +1,81 @@
+\documentclass{scrartcl}
+%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\setlength\columnseprule{0.4pt}
+
+\begin{document}
+\title{Example for FULLPAGE floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\blinddocument
+
+\section{File \texttt{\jobname}}
+
+\begin{lstlisting}
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+\end{lstlisting}
+
+The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
+
+\begin{lstlisting}
+\hvFloat*[FULLPAGE]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat*[FULLPAGE]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE0}
+
+\blinddocument
+
+\begin{lstlisting}
+\hvFloat*[FULLPAGE]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+\end{lstlisting}
+
+
+\Float[default]
+\hvFloat*[FULLPAGE]%
+ {figure}%
+ {\includegraphics[FULLPAGE]{frose}}%
+ [A FULLPAGE float with the default caption setting]%
+ {A default caption of a ``FULLPAGE'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.
+ This can be an even or odd page. And some more text whch has no
+ real meaning because it fills only the space for a long caption.}%
+ {fig:FULLPAGE1}
+
+\blinddocument
+
+\Blindtext
+
+\blindtext
+
+
+\end{document}
\ No newline at end of file
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: paper-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: paper-inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: paper-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: paper-right1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\usepackage{pdfpages}
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/preamble.ltx 2021-05-31 20:24:24 UTC (rev 59409)
@@ -36,8 +36,8 @@
\usepackage{varioref}
\usepackage{nameref}
\usepackage[hyperref]{hvfloat}
-%\usepackage{hvfloat}
\DeclareCaptionFont{red}{\color{red}}
+\DeclareCaptionFont{white}{\color{white}}
\captionsetup{labelfont={red,sf},font={red,sf},format=plain}
\usepackage{blindtext}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: right1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside]{scrartcl}
-%% $Id: right2s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right2s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: right2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/runAll.sh
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/runAll.sh 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/runAll.sh 2021-05-31 20:24:24 UTC (rev 59409)
@@ -12,7 +12,7 @@
echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
lualatex $datei
TEST=`grep -c "Label(s) may have changed." $MAIN.log `
- if [ $RUNS -gt 5 ]
+ if [ $RUNS -gt 4 ]
then TEST=0
fi
done
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/runEXA.sh 2021-05-31 20:24:24 UTC (rev 59409)
@@ -12,9 +12,9 @@
echo "LuaLaTeX-Lauf Nr. $RUNS von $datei ======================================="
lualatex $datei
TEST=`grep -c "Label(s) may have changed." $MAIN.log `
- if [ $RUNS -gt 5 ]
+ if [ $RUNS -gt 4 ]
then TEST=0
fi
done
- rm $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc
+ rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc $MAIN.lof $MAIN.lot $MAIN.idx
done
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -45,9 +45,9 @@
{sub:demo3}
\end{lstlisting}
-\Float[subfloat]
+\Float[subFloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -74,7 +74,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -97,7 +97,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-after2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -47,7 +47,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -74,7 +74,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -97,7 +97,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: sub-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -47,7 +47,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -74,7 +74,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -97,7 +97,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-right1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-right1s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -47,7 +47,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -74,7 +74,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -97,7 +97,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=after,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: sub-right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: sub-right2s2c.tex 103 2021-05-31 12:37:11Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -47,7 +47,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -74,7 +74,7 @@
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
@@ -97,7 +97,7 @@
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=right,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text whch has no
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf 2021-05-31 20:24:24 UTC (rev 59409)
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -0,0 +1,165 @@
+\documentclass[twocolumn,DIV=12]{scrartcl}
+%% $Id: sub-right2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\usepackage{ragged2e}
+\usepackage{showframe}
+\setlength\columnseprule{0.4pt}
+
+\usepackage{marginnote}
+\let\Lkeyword\texttt
+\let\Lkeyset\texttt
+\def\Ldim#1{\texttt{\textbackslash#1}}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\textcolor{black!40}{\blindtext}
+
+\textcolor{black!40}{\blindtext}
+
+\section{File \texttt{\jobname}}
+
+With the optional argument \Lkeyword{wide} the width of the defined \Ldim{marginparwidth} is
+added to the allowed horizontal width of the float.
+
+The code for figure \ref{fig:70}:
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=right,
+ capVPos=top,
+ objectPos=left,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+\end{lstlisting}
+
+\hvFloat[%
+ wide,nonFloat,
+ capPos=right,%
+ capVPos=top,%
+ objectPos=left,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+
+\textcolor{black!40}{\blindtext}
+%\blindtext
+
+
+The code for figure \ref{fig:80}:
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=left,
+ capVPos=top,
+ objectPos=right,
+ ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=left,%
+ capVPos=top,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+
+
+For a twosided document it will place the object always in the margin.
+
+\textcolor{black!40}{\blindtext}
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+\end{lstlisting}
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+
+Now we set the same image with the same setting on the next page. The caption will
+change its side due to the setting \Lkeyset{capPos=outer}.
+
+
+\textcolor{black!40}{\blindtext}
+
+
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+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:
+
+\textcolor{black!40}{\blindtext}
+
+
+\begin{lstlisting}
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,nonFloat,
+ 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}
+
+\textcolor{black!40}{\blindtext}
+
+\begingroup
+\captionsetup{justification=RaggedRight}
+\hvFloat[wide,nonFloat,
+ 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
+
+\textcolor{black!40}{\blindtext}
+
+\hvFloat[wide,nonFloat,
+ 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:813}
+
+
+
+
+
+\textcolor{black!40}{\Blindtext}
+
+\end{document}
+
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf 2021-05-31 20:24:24 UTC (rev 59409)
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pdf
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex 2021-05-31 20:24:24 UTC (rev 59409)
@@ -0,0 +1,159 @@
+\documentclass[twocolumn]{scrartcl}
+%% $Id: sub-right2s2c.tex 72 2021-05-02 11:40:10Z herbert $
+
+\input{preamble.ltx}
+\usepackage{ragged2e}
+\usepackage{showframe}
+\setlength\columnseprule{0.4pt}
+
+\usepackage{marginnote}
+\let\Lkeyword\texttt
+\let\Lkeyset\texttt
+\def\Ldim#1{\texttt{\textbackslash#1}}
+
+\begin{document}
+\title{Example for fullpage floats}
+\author{Herbert Voß}
+\maketitle
+
+\tableofcontents
+
+\Blindtext
+
+\section{File \texttt{\jobname}}
+
+With the optional argument \Lkeyword{wide} the width of the defined \Ldim{marginparwidth} is
+added to the allowed horizontal width of the float.
+
+The code for figure \ref{fig:70}:
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=right,
+ capVPos=top,
+ objectPos=left,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+\end{lstlisting}
+
+\hvFloat[%
+ wide,nonFloat,
+ capPos=right,%
+ capVPos=top,%
+ objectPos=left,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+ Caption at top right beside the float and object position left and
+the option \texttt{wide}.}{fig:70}
+
+%\blindtext
+
+
+The code for figure \ref{fig:80}:
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=left,
+ capVPos=top,
+ objectPos=right,
+ ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=left,%
+ capVPos=top,%
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
+ {Caption at top left beside the object and object position left and
+ the option \texttt{wide}.}{fig:80}
+
+
+For a twosided document it will place the object always in the margin.
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+\end{lstlisting}
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top and inner beside the float and object position right and
+the option \texttt{wide}.}{fig:81}
+
+Now we set the same image with the same setting on the next page. The caption will
+change its side due to the setting \Lkeyset{capPos=outer}.
+
+\blindtext
+
+
+
+\begin{lstlisting}
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+Caption at top inner beside the float and object position right and
+the option \texttt{wide}.}{fig:811}
+\end{lstlisting}
+
+
+\hvFloat[wide,nonFloat,
+ capPos=inner,
+ capVPos=top,
+]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{%
+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,nonFloat,
+ 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,nonFloat,
+ 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
+
+\blindtext
+\blindtext
+
+\hvFloat[wide,nonFloat,
+ 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:813}
+
+
+
+
+
+\Blindtext
+
+\end{document}
+
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-05-31 20:23:44 UTC (rev 59408)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-05-31 20:24:24 UTC (rev 59409)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 92 2021-05-18 09:46:55Z herbert $
+%% $Id: hvfloat.sty 103 2021-05-31 12:37:11Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.25}
-\def\filedate{2021/05/18}
+\def\fileversion{2.26}
+\def\filedate{2021/05/26}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
\let\hvFloatFileVersion\fileversion
@@ -23,18 +23,27 @@
%
\newif\ifhv at fbox \hv at fboxfalse
\newif\ifhv at hyperref \hv at hyperreffalse
-\newif\ifhv at stfloats \hv at stfloatsfalse
+\newif\ifhv at nostfloats \hv at nostfloatsfalse
+\newif\ifhv at tugboat \hv at tugboatfalse
\DeclareOption{fbox}{\hv at fboxtrue\setlength{\fboxsep}{1pt}}
\DeclareOption{hyperref}{\hv at hyperreftrue}
-\DeclareOption{stfloats}{\hv at stfloatstrue}
+\DeclareOption{nostfloats}{\hv at nostfloatstrue}
\ProcessOptions
+\providecommand\@tugclass{\@empty}
+\ifx\@tugclass\@empty
+\else
+ \hv at tugboattrue % special page handling
+ \typeout{>>> we are using a TUGboat class}%
+\fi
+
\PassOptionsToPackage{hypcap}{caption}
\RequirePackage{caption}
\PassOptionsToPackage{hypcap}{subcaption}
\RequirePackage{subcaption}
+\RequirePackage{atbegshi}
\RequirePackage{picture,trimclip}
\RequirePackage{expl3,multido}
@@ -47,7 +56,7 @@
\ifhv at hyperref
\RequirePackage{hyperref}
\fi
-\ifhv at stfloats
+\ifhv at nostfloats\else
\RequirePackage{stfloats}% for bottom floats in a twocolumn mode
\fi
%
@@ -99,12 +108,12 @@
\define at key{hvSet}{capWidth}[n]{% (n)atural width|object (w)idth)|object (h)eight|<scale of \columnwidth>
\def\hvSet at capWidth{#1}%
}
-\define at key{hvSet}{capAngle}[0]{% -360..+360
+\define at key{hvSet}{capAngle}[0]{% -360..+360, only integers
\def\hvSet at capAngle{#1}%
}
-\define at choicekey*+{hvSet}{capPos}[\val\nr]{bottom,top,left,before,right,after,inner,outer,even,odd}[bottom]{%
+\define at choicekey*+{hvSet}{capPos}[\val\nr]{bottom,top,left,before,right,after,inner,outer,evenPage,oddPage}[bottom]{%
\def\hvSet at capPos{#1}% it is relativ to the object, (e),(d) only valid for fullpage float
\ifcase\nr\relax
\hv at capbesidefalse
@@ -120,6 +129,13 @@
\define at choicekey*+{hvSet}{capVPos}[\val\nr]{bottom,center,top}[center]{%
\def\hvSet at capVPos{#1}% it is relativ to the object
+ \ifcase\nr\relax
+ \gdef\hv@@capVPos{b}%
+ \or
+ \gdef\hv@@capVPos{c}%
+ \else
+ \gdef\hv@@capVPos{t}%
+ \fi
}{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using bottom.}%
\def\hvSet at capVPos{center}% it is relativ to the object
}
@@ -164,7 +180,7 @@
}
\define at boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal
-\newcommand\hv at typeout[1]{\ifhv at Debug\typeout{#1}\fi}
+\newcommand\hv at typeout[1]{\ifhv at Debug\typeout{>>>> #1}\fi}
\newif\ifhv at fullpage
\newif\ifhv at FULLPAGE
@@ -190,8 +206,10 @@
\ifhv at subFloat\setkeys{hvSet}{multiFloat=false}\fi%
}%
\define at boolkey{hvSet}[hv@]{multiFloat}[true]{% typeset values as continous floats
- \ifhv at multiFloat\setkeys{hvSet}{subFloat=false}\fi%
+ \ifhv at multiFloat\setkeys{hvSet}{subFloat=false}\fi
}%
+\define at boolkey{hvSet}[hv@]{vFill}[true]{}% \vfill between multifloat objects
+
\define at boolkey{hvSet}[hv@]{separatorLine}[true]{}% separator line for caption of a full page float
\define at key{hvSet}{sepLineskip}{\def\hv at sepLineskip{#1}}%
\define at boolkey{hvSet}[hv@]{objectFrame}[true]{}% a frame around the object with no separation
@@ -222,6 +240,7 @@
capFormat={}, subcapFormat={}, twoColumnCaption=false,
% floatRef=object,
bindCorr=\z@,sepLineskip=0pt,
+ vFill=false,
}%
}
@@ -270,6 +289,11 @@
\newlength\hv at maxImageWidth
\AtBeginDocument{\hv at maxImageWidth=\columnwidth}
+\define at key{Gin}{columnWidth}[true]{%
+ \def\Gin at ewidth{\columnwidth}%
+% \def\Gin at eheight{1ex}%
+ \Gin at boolkey{true}{iso}%
+}
\define at key{Gin}{fullpage}[true]{%
\def\Gin at ewidth{\columnwidth}%
\def\Gin at eheight{\textheight}%
@@ -291,7 +315,7 @@
\Gin at boolkey{false}{iso}%
}
\define at key{Gin}{doubleFULLPAGEbindCorr}[true]{%
- \def\Gin at ewidth{\the\dimexpr2\paperwidth-2\hvSet at bindCorrection}%
+ \def\Gin at ewidth{\the\dimexpr2\paperwidth-2\hvSet at bindCorrection\relax}%
\def\Gin at eheight{\paperheight}%
\Gin at boolkey{false}{iso}%
}
@@ -342,11 +366,22 @@
\ifhv at fbox
\fbox{\usebox{\hvObjectBox}}%
\else
- \ifhv at objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi%
+ % rotated object with a depth need to raise up the \depth
+ \ifhv at objectFrame\frame{\usebox{\hvObjectBox}}\else\raisebox{\depth}{\usebox{\hvObjectBox}}\fi%
\fi
\fi
}
+\newcounter{hv at tempCNTfigA}%
+\newcounter{hv at tempCNTfigB}%
+\newcounter{hv at tempCNTtabA}%
+\newcounter{hv at tempCNTtabB}%
+
+\newcounter{hv at pfigure}
+\newcounter{hv at ptable}
+\newcounter{subhv at pfigure}
+\newcounter{subhv at ptable}
+
\newif\ifhv at star
\newif\if at hvsubstar
\setDefaults
@@ -367,15 +402,20 @@
\def\hvFloat at i*{\@ifnextchar[{\do at hvFloat}{\do at hvFloat[]}}
\def\do at hvFloat[#1]{%
\begingroup
- \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}%
+ \setlength\hvWideWidth{\dimexpr\columnwidth+\marginparwidth+\marginparsep}%
+% \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}%
% \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
\hv at maxImageWidth=\textwidth
\reset at special@float
- \setcounter{hv at pfigure}{\value{figure}}%
- \setcounter{hv at ptable}{\value{table}}%
+ \global\setcounter{hv at pfigure}{\value{figure}}%
+ \global\setcounter{hv at ptable}{\value{table}}%
+ \setcounter{hv at tempCNTfigA}{\value{figure}}%
+ \setcounter{hv at tempCNTfigB}{\value{figure}}%
+ \setcounter{hv at tempCNTtabA}{\value{table}}%
+ \setcounter{hv at tempCNTtabB}{\value{table}}%
\gdef\hv at save@setting{#1}%
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
- \gdef\hv at floatType{figure}%
+ \gdef\hv at floatType{figure}% presetting
\@ifnextchar+{\do at multiFloat}{\hvFloat at ii[#1]}%
}
@@ -425,14 +465,6 @@
\ExplSyntaxOff
-\newcounter{hv at tempCNTa}\setcounter{hv at tempCNTa}{0}% defined after \refstepcounter{figure}
-\newcounter{hv at tempCNTb}\setcounter{hv at tempCNTb}{0}% defined before \refstepcounter{figure}
-\def\thehv at tempCNTa{\arabic{figure}}
-\def\thehv at tempCNTb{\the\numexpr\arabic{figure}+1}
-\newcounter{hv at pfigure}
-\newcounter{hv at ptable}
-\newcounter{subhv at pfigure}
-\newcounter{subhv at ptable}
\def\drawSepLine{%
\par\noindent
@@ -503,10 +535,14 @@
%
% First we save the object in \hvObjectBox
%
- \ifx\hvSet at objectAngle\hv at Zero% rotate the object?
- \savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \ifnum\hvSet at objectAngle=0 % rotate the object?
+ \ifhv at useOBox
+ \let\hvObjectBox\hvOBox
+ \else
+ \savebox\hvObjectBox{\hv at floatObject}%
+ \fi
\else
- \savebox{\hvObjectBox}{%
+ \savebox\hvObjectBox{%
\rotatebox{\hvSet at objectAngle}{%
\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi
}%
@@ -559,10 +595,10 @@
\fi
\fi
\saveCaptionSkip% we put this space ourselve
- \ifx\hvSet at capAngle\hv at Zero% need rotation?
+ \ifnum\hvSet at capAngle=0 % need rotation?
\savebox\hvCaptionBox{% NO rotation
\begin{minipage}[b]{\hvCapWidth}%% minipage, to get hyphenation
- \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+ \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\ifhv at nonFloat
\ifhv at onlyText
\hv at longCap
@@ -569,15 +605,15 @@
\else
\ifx\hv at floatType\hv at figure
\ifx\relax\hv at shortCap\relax
- \figcaption{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \figcaption{\hv at longCap}%
\else
- \figcaption[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \figcaption[\hv at shortCap]{\hv at longCap}%
\fi
\else
\ifx\relax\hv at shortCap\relax
- \tabcaption{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \tabcaption{\hv at longCap}%
\else
- \tabcaption[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
+ \tabcaption[\hv at shortCap]{\hv at longCap}%
\fi
\fi
\fi
@@ -586,15 +622,10 @@
\hv at longCap
\else
\let\@captype\hv at floatType
- \expandafter\ifx\expandafter\relax\hv at shortCap\relax
- \caption{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \else
- \caption[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label}}%
- \fi
-% \fi
+ \ifx\hv at shortCap\@empty\caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}\fi
\fi
\fi
-% \expandafter\label\expandafter{\hv at label}% 2.17 put label into the caption argument
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
\end{minipage}%
}%
\else
@@ -617,12 +648,11 @@
\hv at longCap
\else
\let\@captype\hv at floatType
- \expandafter\ifx\expandafter\relax\hv at shortCap\relax
- \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}%
+ \ifx\relax\hv at shortCap\relax \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}%
\fi
\fi
\fi
- \label{\hv at label}%
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
\end{minipage}%
}% rotatebox
}% \sbox
@@ -638,10 +668,15 @@
\@namedef{fps@\hv at floatType}{\hvSet at floatPos}%
\fi
\ifhv at nonFloat
+ \noindent
\begingroup% Start the nonfloat part
\else
\ifhv at star
- \@nameuse{\hv at floatType*}% Start the floating environment *****************************
+ \ifx\hvSet at floatPos\hv at floatBottom
+ \@nameuse{\hv at floatType*}[b]% Start the floating environment *****************************
+ \else
+ \@nameuse{\hv at floatType*}%
+ \fi
\else
\begin{\hv at floatType}% Start the floating environment
\fi
@@ -766,7 +801,28 @@
% now we rotate the object and caption, if needed
%
\ifhv at wide
- \ifoddpageoroneside\else\ifoddpage\else\hspace*{\dimexpr-\marginparwidth-\marginparsep}\fi\fi% <- for wide and left page
+ \ifoddpageoroneside
+ \if at twocolumn
+ \if at firstcolumn
+ \noindent
+ \hspace*{\dimexpr-\marginparwidth-\marginparsep}% oddpage first column
+ \fi
+ \fi
+ \else
+ \ifoddpage
+ \if at twocolumn
+ \if at firstcolumn
+ \noindent
+ \hspace*{\dimexpr-\marginparwidth-\marginparsep}% oddpage first column
+ \fi
+ \fi
+ \else% evenpage
+ \if at firstcolumn
+ \noindent
+ \hspace*{\dimexpr-\marginparwidth-\marginparsep}% <- for wide and left page
+ \fi
+ \fi
+ \fi
\fi
\ifx\hvSet at rotAngle\hv at Zero
\usebox{\@tempboxa}%
@@ -775,9 +831,9 @@
\fi
\ifhv at nonFloat
\ifx\hvSet at objectPos\hv at Center
- \ifhv at nonFloat
+% \ifhv at nonFloat
\hspace{\fill}%
- \fi
+% \fi
\fi
\endgroup% End the nonfloat part
\else
@@ -827,7 +883,7 @@
\fi
\fi
\checkoddpage
- \set at caption@object% set caption and object into a box
+ \set at caption@object{\hv at floatType}% set caption and object into a box
\ifcase\hv@@capPos% caption before object 0-> _always_ left
\setBottomCaption\setPageObject
\or% caption after object 1-> _always_ right
@@ -836,12 +892,7 @@
\ifoddpage
\afterpage{\setBottomCaption\setPageObject}%
\else% we are on an even page
-% \zsaveposy{hv at currentPos}%
-% \ifdim\the\dimexpr\zposy{hv at currentPos}sp-\hv at BottomSpace-1cm>\ht\TBox % enough space*
- \setBottomCaption\setPageObject
-% \else
-% \afterpage{\afterpage{\setBottomCaption\setPageObject}}%
-% \fi
+ \setBottomCaption\setPageObject
\fi
\or% caption on odd page 3->right page
\if at twoside
@@ -890,7 +941,7 @@
\fi
\fi
\or% caption on the inner column 4->inner
- \set at caption@object
+% \set at caption@object
\if at twocolumn
\ifoddpage
\if at firstcolumn% on right side
@@ -909,7 +960,7 @@
\setBottomCaption\setPageObject
\fi
\or% caption on the outer column 5->outer
- \set at caption@object
+% \set at caption@object
\if at twocolumn
\ifoddpage
\if at firstcolumn
@@ -957,28 +1008,32 @@
\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\dimexpr-\oddsidemargin-1in-\parindent+\hvSet at bindCorrection}% the width of the right side offset
\global\setlength\hv at tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet at bindCorrection}%
+ \xdef\hv@@capAngle{\hvSet at capAngle}%
\checkoddpage
\ifoddpage
\if at twocolumn
\if at firstcolumn
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{\afterpage{\do at hvFloat@doublePageCaptionRight{#1}}}%
\else
- \do at hvFloat@doublePageCaptionRight{#1}%
+ \ifhv at tugboat
+ \do at hvFloat@doublePageCaptionRight{#1}%
+ \else
+ \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
+ \fi
\fi
\else
- \do at hvFloat@doublePageCaptionRight{#1}%
+ \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
\fi
\else
\if at twocolumn
\if at firstcolumn
+ \afterpage{\afterpage{\afterpage{\do at hvFloat@doublePageCaptionRight{#1}}}}%
+ \else
\afterpage{\afterpage{\do at hvFloat@doublePageCaptionRight{#1}}}%
- \else
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
\fi
\else
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{\afterpage{\do at hvFloat@doublePageCaptionRight{#1}}}%
\fi
\fi
\endgroup% started at main macro \hvFloat
@@ -985,50 +1040,90 @@
}
%
\def\do at hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ----------------------------------
- \afterpage{%
- \let\hv at fptop\c at fptop
- \global\setlength{\@fptop}{0pt}%
- \let\hv at c@topnumber\c at topnumber
- \setcounter{topnumber}{1}%
- \begin{\hv at floatType*}[t]
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \end{\hv at floatType*}%
- \begin{\hv at floatType*}[t]
- \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \hspace*{\hv at tempWidthA}%
- \noindent
- \clipbox*{\hv at leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
- \ifnum#1>0
- \medskip
- \ifdim\dp\hvObjectBox > \z@
- \rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
- \fi
- }}%
- \else
- \rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
- \fi
- }}%
- \fi
- \else
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
- \fi
- \fi
- \end{\hv at floatType*}%
- \let\c at topnumber\hv at c@topnumber
- \let\c at fptop\hv at fptop
+ \let\hv at fptop\c at fptop
+ \global\setlength{\@fptop}{0pt}%
+ \let\hv at c@dbltopnumber\c at dbltopnumber
+ \setcounter{totalnumber}{0}%
+ \setcounter{dbltopnumber}{0}%
+ \def\dblfloatpagefraction{0.5}%
+ \begin{\hv at floatType*}[!thb]
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \ifx\hv at label\@empty
+ \else
+ \ifx\hv at floatType\hv at figure
+ \refstepcounter{hv at tempCNTfigA}%
+ \else
+ \refstepcounter{hv at tempCNTtabA}% before caption
+ \fi
+ \label{\hv at label}%
+ \fi
+ \end{\hv at floatType*}%
+ \afterpage{%
+ \begin{\hv at floatType*}[!thb]
+ \global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \hspace*{\hv at tempWidthA}%
+ \noindent
+ \savebox\hv at rightBox{\clipbox*{\hv at leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}%
+ \global\setlength\hv at tempWidthB{\the\dimexpr\textwidth-\wd\hv at rightBox-\hv at tempWidthA-\marginparsep}%
+ \parbox[\hv@@capVPos]{\the\wd\hv at rightBox}{%
+ \vspace{0pt}%
+ \raisebox{\depth}{\usebox\hv at rightBox}%
+ }%
+ \ifx\hv at label\@empty\else
+ \ifx\hv at floatType\hv at figure
+ \global\refstepcounter{hv at tempCNTfigB}%
+ \else
+ \global\refstepcounter{hv at tempCNTtabB}% before caption
+ \fi
+ \label{\hv at label-2}%
+ \fi
+ \ifnum#1>0 % caption on the right
+% \medskip
+ \ifnum\hv@@capAngle > 0
+% \ifdim\dp\hvObjectBox > \z@
+% \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
+% \ifx\relax\hv at shortCap\relax
+% \captionof{\hv at floatType}{\hv at longCap}%
+% \else
+% \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+% \fi
+% \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
+% }}%
+% \else
+ \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
+ }}%
+ \ifx\relax\hv at label\relax\else\label{\hv at label-cap}\fi
+% \fi
+ \else
+ \hspace{\marginparsep}%
+ \parbox[\hv@@capVPos]{\hv at tempWidthB}{%
+ \vspace{0pt}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}
+ \fi
+ }%
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
+ \fi
+ \else % #1 = 0 caption below
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
+ \fi
+ \end{\hv at floatType*}%
}%
+ \let\c at topnumber\hv at c@topnumber
+ \let\c at fptop\hv at fptop
}
%
\newsavebox\hv at boxLeftPage
@@ -1050,6 +1145,8 @@
\if at twocolumn
\if at firstcolumn
\afterpage{\do at hvFloat@doublePAGECaptionRight{#1}}%
+ \else
+ \do at hvFloat@doublePAGECaptionRight{#1}%
\fi
\else
\do at hvFloat@doublePAGECaptionRight{#1}%
@@ -1073,40 +1170,40 @@
\afterpage{%
\noindent
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \null
- \global\savebox\hv at boxLeftPage{\clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
- \usebox\hv at boxLeftPage
+ \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\newpage\if at twocolumn\null\newpage\fi
\expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\hspace*{-\dimexpr\hv at tempWidthA}%
\noindent
-% \usebox\hv at boxRightPage
\clipbox*{\the\hv at leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
\ifnum#1>0
\medskip
\ifdim\dp\hvObjectBox > \z@
\rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
\fi
}}%
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
\fi
}}%
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
\fi
\else
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\ifx\hv at label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv at label}\fi}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
\fi
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
\fi
\newpage\if at twocolumn\null\newpage\fi
}%
@@ -1124,8 +1221,11 @@
\fi\fi
\checkoddpage
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \global\setlength\hv at tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet at bindCorrection}% the width of the right side offset
- \global\setlength\hv at leftPageObjectWidth{\the\dimexpr\paperwidth-\hvSet at bindCorrection}%
+ \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}%
+% \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}%
\ifoddpage
\ifcase\hv@@capPos % =0 Caption before
@@ -1137,29 +1237,40 @@
\else
\afterpage{\set at Normal@Bottom at Caption\do at hvFloat@doubleFULLPAGE at CaptionBefore}%
\fi
- \else
+ \else% \if at firstcolumn
\set at Normal@Bottom at Caption
\do at hvFloat@doubleFULLPAGE at CaptionBefore
\fi
- \else
+ \else% \if at twocolumn
\set at Normal@Bottom at Caption
\do at hvFloat@doubleFULLPAGE at CaptionBefore
\fi
\or % =1 Caption after
\ifhv at twoColumnCaption
- \do at hvFloat@doubleFULLPAGE at CaptionAfterTwoCol
+ \if at firstcolumn
+ \afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfterTwoCol}%
+ \else
+ \do at hvFloat@doubleFULLPAGE at CaptionAfterTwoCol
+ \fi
\else
- \do at hvFloat@doubleFULLPAGE at CaptionAfter
+ \if at twocolumn
+ \if at firstcolumn
+ \afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfter}%
+ \else
+ \do at hvFloat@doubleFULLPAGE at CaptionAfter
+ \fi
+ \else
+ \do at hvFloat@doubleFULLPAGE at CaptionAfter
+ \fi
\fi
- \else% >1 all other Captions
+ \else% \ifcase >1 all other Captions
\if at twocolumn
\if at firstcolumn
-% \global\setlength\hv at tempWidthA{\the\dimexpr-\evensidemargin-1in-\parindent+\hvSet at bindCorrection}%
\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionOther{#1}}%
\else
\do at hvFloat@doubleFULLPAGE at CaptionOther{#1}%
\fi
- \else % >1 Caption right/bottom
+ \else % \if at twocolumn
\do at hvFloat@doubleFULLPAGE at CaptionOther{#1}%
\fi
\fi% \ifcase
@@ -1175,20 +1286,28 @@
\else
\afterpage{\afterpage{\set at Normal@Bottom at Caption\do at hvFloat@doubleFULLPAGE at CaptionBefore{#1}}}%
\fi
- \else
+ \else% \if at twocolumn
\afterpage{\set at Normal@Bottom at Caption\do at hvFloat@doubleFULLPAGE at CaptionBefore}%
\fi
\or % capPos after
\if at twocolumn
\if at firstcolumn
- \afterpage{\afterpage\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfter{#1}}}%
+ \ifhv at twoColumnCaption
+ \afterpage{\afterpage\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfterTwoCol{#1}}}%
+ \else
+ \afterpage{\afterpage\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfter{#1}}}%
+ \fi
\else
- \afterpage{\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfter{#1}}}%
+ \ifhv at twoColumnCaption
+ \afterpage{\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfterTwoCol{#1}}}%
+ \else
+ \afterpage{\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfter{#1}}}%
+ \fi
\fi
- \else
+ \else% \if at twocolumn
\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionAfter}%
\fi
- \else % Any other caption
+ \else % \ifcase Any other caption
\if at twocolumn
\if at firstcolumn
\afterpage{\afterpage{\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionOther{#1}}}}%
@@ -1198,7 +1317,7 @@
\else
\afterpage{\do at hvFloat@doubleFULLPAGE at CaptionOther{#1}}%
\fi
- \fi%% \ifcase
+ \fi% \ifcase
\fi% main ifoddpage
\endgroup% started at main macro \hvFloat
}
@@ -1208,34 +1327,44 @@
\begin{\hv at floatType}[!b]
\ifhv at separatorLine\drawSepLine\fi
\expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
\fi
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\end{\hv at floatType}%
}
\def\set at Normal@Bottom at CaptionStar*{%
- \begin{\hv at floatType*}[!b]
- \ifhv at separatorLine\drawSepLine\fi
- \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
- \fi
- \end{\hv at floatType*}%
+ \begin{\hv at floatType*}[!b]
+ \ifhv at separatorLine\drawSepLine\fi
+ \expandafter\captionsetup\expandafter{\hv at caption@format}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
+ \end{\hv at floatType*}%
}
+
\def\do at hvFloat@doubleFULLPAGE at CaptionBefore{%
+% \setcounter{hv at tempCNTfigA}{\value{figure}}%
+% \setcounter{hv at tempCNTfigB}{\value{figure}}%
+% \setcounter{hv at tempCNTtabA}{\value{table}}%
+% \setcounter{hv at tempCNTtabB}{\value{table}}%
\afterpage{%
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
- \refstepcounter{hv at tempCNTa}%
+ \ifx\hv at floatType\hv at figure
+ \global\refstepcounter{hv at tempCNTfigB}%
+ \else
+ \global\refstepcounter{hv at tempCNTtabB}% before caption
+ \fi
\expandafter\label\expandafter{\hv at label}%
-%%% \global\addtocounter{\hv at floatType}{-1}% to get the same <object>-ref as "label"-cap
\clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\afterpage{%
\if at twocolumn\newpage\null\newpage\fi
@@ -1245,7 +1374,11 @@
\hspace*{\hv at tempWidthA}%
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\clipbox*{\the\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
- \refstepcounter{hv at tempCNTa}%
+ \ifx\hv at floatType\hv at figure
+ \global\refstepcounter{hv at tempCNTfigA}%
+ \else
+ \global\refstepcounter{hv at tempCNTtabA}% before caption
+ \fi
\expandafter\label\expandafter{\hv at label-2}%
\newpage\if at twocolumn\null\newpage\fi
}}%
@@ -1259,10 +1392,14 @@
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
- \refstepcounter{hv at tempCNTb}%
- \expandafter\label\expandafter{\hv at label}%
- \clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \afterpage{%
+ \clipbox*{0 \the\dp\hvObjectBox{} \the\hv at leftPageObjectWidth{} \the\ht\hvObjectBox}{\usebox\hvObjectBox}%
+ \ifx\hv at floatType\hv at figure
+ \refstepcounter{hv at tempCNTfigA}%
+ \else
+ \refstepcounter{hv at tempCNTtabA}% before caption
+ \fi
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
+% \afterpage{%
\newpage\if at twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\thispagestyle{empty}%
@@ -1270,19 +1407,24 @@
\hspace*{\hv at tempWidthA}%
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\clipbox*{\the\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
- \refstepcounter{hv at tempCNTb}%
+ \ifx\hv at floatType\hv at figure
+ \refstepcounter{hv at tempCNTfigB}%
+ \else
+ \refstepcounter{hv at tempCNTtabB}% before caption
+ \fi
\expandafter\label\expandafter{\hv at label-2}%
\newpage\if at twocolumn\null\newpage\fi
- \begin{\hv at floatType}[b]
+ \begin{\hv at floatType}[!b]
\ifhv at separatorLine\drawSepLine\fi
\expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
- \fi
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\end{\hv at floatType}%
- }}%
+ }%}%
}
\def\do at hvFloat@doubleFULLPAGE at CaptionAfterTwoCol{%
@@ -1291,10 +1433,13 @@
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\thispagestyle{empty}%
- \refstepcounter{hv at tempCNTb}%
- \expandafter\label\expandafter{\hv at label}%
+ \ifx\hv at floatType\hv at figure
+ \refstepcounter{hv at tempCNTfigA}%
+ \else
+ \refstepcounter{hv at tempCNTtabA}% before caption
+ \fi
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
\clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \afterpage{%
\newpage\if at twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\thispagestyle{empty}%
@@ -1302,20 +1447,25 @@
\hspace*{\hv at tempWidthA}%
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\clipbox*{\the\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
- \refstepcounter{hv at tempCNTb}%
- \expandafter\label\expandafter{\hv at label-2}%
- \newpage\if at twocolumn\null\newpage\fi
- \begin{\hv at floatType*}[b]
+ \ifx\hv at floatType\hv at figure
+ \refstepcounter{hv at tempCNTfigB}%
+ \else
+ \refstepcounter{hv at tempCNTtabB}% before caption
+ \fi
+ \ifx\hv at label\@empty\else\label{\hv at label-2}\fi
+ \newpage
+ \begin{\hv at floatType*}[!b]
\hv at twoColumnCaptiontrue
\ifhv at separatorLine\drawSepLine\fi
\expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
- \fi
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\end{\hv at floatType*}%
- }}%
+ }%
}
\def\do at hvFloat@doubleFULLPAGE at CaptionOther#1{%
@@ -1325,9 +1475,13 @@
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \clipbox*{0 0 \the\hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
- \refstepcounter{hv at tempCNTb}
- \expandafter\label\expandafter{\hv at label}%
+ \clipbox*{0 \depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \ifx\hv at floatType\hv at figure
+ \refstepcounter{hv at tempCNTfigA}%
+ \else
+ \refstepcounter{hv at tempCNTtabA}% before caption
+ \fi
+ \label{\hv at label}%
\afterpage{%
\if at twocolumn\newpage\if at firstcolumn\else\null\newpage\fi\fi
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
@@ -1334,30 +1488,36 @@
\thispagestyle{empty}%
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
\hspace*{\hv at tempWidthA}%
- \clipbox*{\the\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
- \refstepcounter{hv at tempCNTb}%
+ \clipbox*{\hv at leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}%
+ \ifx\hv at floatType\hv at figure
+ \refstepcounter{hv at tempCNTfigB}%
+ \else
+ \refstepcounter{hv at tempCNTtabB}% before caption
+ \fi
\expandafter\label\expandafter{\hv at label-2}%
\savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv at floatType}{\hv at longCap}}}%
\ifnum#1 > 0\relax % rotation with 90°
- \setlength\hv at tempWidthA{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet at bindCorrection}%
- \ifdim\hv at tempWidthA < 2\paperwidth
- \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{%
+% \setlength\hv at tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet at bindCorrection}%
+ \ifdim\hv at tempWidthB < 2\paperwidth
+ \rotatebox[origin=lb]{90}{\makebox[\paperheight][c]{\parbox{0.8\ht\hvObjectBox}{%
\expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
\fi
- }}% rotatebox
+ }}}% rotatebox
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\else% ifdim: no space left on page
- \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
+ \put(-2\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
\parbox{0.8\textwidth}{%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
\fi
}%
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\endminipage}}}%
\fi
\else% ifnum, caption not rotated, under or over the right page
@@ -1364,15 +1524,15 @@
\setlength\hv at tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}%
\ifdim\hv at tempWidthA > \ht\hvCaptionBox
\else
-% \refstepcounter{hv at temp}%%
- \put(\the\dimexpr-\textwidth-2in-\oddsidemargin,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%%
+ \put(\the\dimexpr1.5\paperwidth-\wd\hvObjectBox-\hvSet at bindCorrection,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][c]{\parbox{\textwidth}{%%
\expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \ifx\relax\hv at shortCap\relax
+ \captionof{\hv at floatType}{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap\expandafter\label\expandafter{\hv at label-cap}}%
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
\fi
}}}%
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\fi
\fi% end \ifnum#1>0
\newpage\if at twocolumn\null\newpage\fi
@@ -1407,9 +1567,8 @@
\else
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
\fi
- %\put(0,0){%
\AtBeginShipoutNext{\thispagestyle{empty}}%
- \usebox\hvObjectBox%}%
+ \usebox\hvObjectBox%
\else
\usebox\hvObjectBox
\fi
@@ -1447,8 +1606,14 @@
\repeat
\endminipage}%
}
+
\def\getMultiObjectAndLabel{%
- \global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \global\sbox\hvObjectBox{%
+ \ifhv at vFill
+ \minipage[b][\textheight][s]{\columnwidth}%
+ \else
+ \minipage{\columnwidth}%
+ \fi
\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
@@ -1461,6 +1626,8 @@
\def\@temp{\clist_item:Nn\l_clist_Object{\hv at cnta}}%
\ifhv at objectFrame\frame{\@temp}\else\@temp\fi
\edef\@tempa{\clist_item:Nn\l_clist_Label{\hv at cnta}}%
+ \edef\@tempb{\clist_item:Nn\l_clist_Type{\hv at cnta}}%
+ \edef\@captype{hv at p\@tempb}%
\ifx\@tempa\@empty
\else
\refstepcounter{\@captype}%
@@ -1469,6 +1636,7 @@
\ifnum\hv at cnta<\clist_count:N\l_clist_Type\par\hv at vskip\fi
\advance\hv at cnta by \@ne
\ifnum\hv at cnta<\hv at cntb
+ \ifhv at vFill\vfill\fi
\repeat
\endminipage}%
}
@@ -1491,7 +1659,12 @@
}
\def\getMultiSubObjectAndLabel{%
- \global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \global\sbox\hvObjectBox{%
+ \ifhv at vFill
+ \minipage[b][\textheight][s]{\columnwidth}%
+ \else
+ \minipage{\columnwidth}%
+ \fi
\ifx\hv at subcaption@format\@empty\else
\expandafter
\captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
@@ -1504,7 +1677,7 @@
\hv at cntb=\clist_count:N\l_clist_Caption
\advance\hv at cntb by \@ne
\hv at cnta=2
- \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
+ \edef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
\loop
\def\@temp{\clist_item:Nn\l_clist_Object{\hv at cnta}}%
\ifhv at objectFrame\frame{\@temp}\else\@temp\fi
@@ -1524,6 +1697,7 @@
\ifnum\hv at cnta<\clist_count:N\l_clist_Type\par\hv at vskip\fi
\advance\hv at cnta by \@ne
\ifnum\hv at cnta<\hv at cntb
+ \ifhv at vFill\vfill\fi
\repeat
\edef\@tempa{\clist_item:Nn\l_clist_Label{1}}% the main label at the end
\ifx\@tempa\@empty
@@ -1547,11 +1721,11 @@
\else
\caption[\hv at shortCap]{\hv at longCap}%
\fi
- \expandafter\ifx\expandafter\relax\hv at label\relax\else\label{\hv at label-cap}\fi
+ \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\endminipage}%
}
-\def\set at caption@object{% first caption, then object
+\def\set at caption@object#1{% first caption, then object #1=\hv at floatType
\ifhv at multiFloat
\getMultiCaptionAndLabel
\else
@@ -1561,7 +1735,7 @@
\getSingleCaptionAndLabel
\fi
\fi
- \edef\@captype{hv at p\hv at floatType}%
+ \edef\@captype{hv at p#1}%
\ifhv at multiFloat
\getMultiObjectAndLabel
\else
More information about the tex-live-commits
mailing list.