texlive[70675] Master/texmf-dist: hvfloat (17mar24)
commits+karl at tug.org
commits+karl at tug.org
Sun Mar 17 20:48:58 CET 2024
Revision: 70675
https://tug.org/svn/texlive?view=revision&revision=70675
Author: karl
Date: 2024-03-17 20:48:57 +0100 (Sun, 17 Mar 2024)
Log Message:
-----------
hvfloat (17mar24)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
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/even1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
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/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/inner2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
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-default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
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/sub-after1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
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
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2024-03-17 19:48:57 UTC (rev 70675)
@@ -1,4 +1,5 @@
hvfloat.sty:
+2.49 2024-03-17 - bugfix for checkoddpage and FULLPAGE option
2.48 2024-03-03 - added option fboxLines to get patial lines of \fbox
(package fbox)
2.47 2023-10-16 - added type doubleFullPage for images with a width
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf
===================================================================
(Binary files differ)
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 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.tex 2024-03-17 19:48:57 UTC (rev 70675)
@@ -1,7 +1,7 @@
\errorcontextlines=100
%\documentclass[final]{ltugboat}
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: doublepage2s2c.tex 773 2023-10-16 12:29:28Z herbert $
+%% $Id: doublepage2s2c.tex 781 2023-10-19 19:57:50Z herbert $
\input{preamble.ltx}
\usepackage{blindtext,xcolor,marginnote}
@@ -69,6 +69,8 @@
\hvblindtext
+\hvblindtext
+
\subsubsection{\texttt{bindCorr=1cm}}
\begin{lstlisting}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf
===================================================================
(Binary files differ)
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 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/even2s2c.tex 2024-03-17 19:48:57 UTC (rev 70675)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: even2s2c.tex 318 2021-11-20 07:30:54Z herbert $
+%% $Id: even2s2c.tex 878 2024-03-16 20:49:50Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\hvFloat[fullpage,capPos=evenPage]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -37,7 +37,7 @@
\Float[capPos=evenPage]
\hvFloat[fullpage,capPos=evenPage]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -50,7 +50,7 @@
\begin{lstlisting}
\hvFloat[fullpage,capPos=evenPage]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -63,7 +63,7 @@
\Float[capPos=evenPage]
\hvFloat[fullpage,capPos=evenPage]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf
===================================================================
(Binary files differ)
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 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2024-03-17 19:48:57 UTC (rev 70675)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 876 2024-03-03 14:04:56Z herbert $
+%% $Id: hvfloat.tex 878 2024-03-16 20:49:50Z herbert $
%\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,usegeometry,index=totoc]{scrartcl}
@@ -188,6 +188,8 @@
\marginnote{\fbox{\shortstack{float\\#1}}}\fi
}
+\graphicspath{{images/}}
+
\begin{document}
\title{Package \texttt{hvfloat}\\
Controlling captions, fullpage and doublepage floats\\ver \hvFloatFileVersion}
@@ -216,7 +218,10 @@
objectAngle=120,
capAngle=-210,
objectPos=center
-]{figure}{\protect\fbox{\includegraphics[scale=0.9]{images/rose}}}{\protect\fbox{What a nice Caption :-)}}{fig:title}
+ objectFrame,
+]{figure}{\includegraphics[scale=0.9]{images/rose}}
+ {\protect\fbox{What a nice Caption :-)}}
+ {fig:title}
\vspace*{\fill}
@@ -458,8 +463,7 @@
\end{lstlisting}
-\MarginNote{Tab.~\ref{tab:0}}
-\hvFloat[capPos=top]{table}{%
+\savebox\hvOBox{%
\begin{tabularx}{\textwidth}{l|l|X}
\rmfamily Name & Type & Description\\\hline
\CMD{hvFloat} & command & places object and caption in different ways\\
@@ -468,23 +472,30 @@
\CMD{tabcaption} & command & writes a table caption in a non floating environment\\
\CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\
\CMD{hvDefFloatStyle} & command & define a user style
-\end{tabularx}%
-}{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}{tab:0}
+\end{tabularx}}
+\MarginNote{Tab.~\ref{tab:0}}
+\hvFloat[capPos=top,useOBox]{table}{}
+ {With the only Option \texttt{capPos=top} to place the caption on
+ top of the table, which is often the default.}
+ {tab:0}
+
Code for table \ref{tab:0}:
\begin{lstlisting}
-\hvFloat[capPos=top]{table}{%
-\begin{tabularx}{\textwidth}{>{\ttfamily}l|l|X}
+\savebox\hvOBox{%
+\begin{tabularx}{\textwidth}{l|l|X}
\rmfamily Name & Type & Description\\\hline
\CMD{hvFloat} & command & places object and caption in different ways\\
- hvFloatEnv & environment & places object and caption exactly Here\\
+ \Lenv{hvFloatEnv} & environment & places object and caption exactly Here\\
\CMD{figcaption} & command & writes a figure caption in a non floating environment\\
\CMD{tabcaption} & command & writes a table caption in a non floating environment\\
\CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\
\CMD{hvDefFloatStyle} & command & define a user style
-\end{tabularx}}%
-{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}%
-{tab:0}
+\end{tabularx}}
+\hvFloat[capPos=top,useOBox]{table}{}
+ {With the only Option \texttt{capPos=top} to place the caption on
+ top of the table, which is often the default.}
+ {tab:0}
\end{lstlisting}
See section~\ref{sec:tables} for some more informations about tabulars as objects.
@@ -1147,26 +1158,29 @@
%\hvblindtext
+\clearpage
+
\section{Margin floats}
With the optional argument \Lkeyword{inMargin} the opject and the caption can be placed into
the margin. This is done internally with the command \Lcs{marginnote} from the package of the same name.
+
+
%\marginnote{Fig.~\ref{thea}}
\hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}}
{An image in the margin of the document.}
{thea}
-
\begin{lstlisting}
\hvFloat[inMargin]{figure}{\includegraphics[width=\marginparwidth]{images/thea}}
{An image in the margin of the document.}
{thea}
-
...
-
-\hvFloat[inMargin]{table}{\small\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\
+\savebox\hvOBox{\small\begin{tabular}{@{}
+ ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\
Dienst & Dienst & Frei\\\hline \end{tabular}}
+\hvFloat[inMargin,useOBox]{table}{}
{A tabular in the margin just like the image.}
{thea2}
\end{lstlisting}
@@ -1175,9 +1189,13 @@
\hvblindtext
+\savebox\hvOBox{%
+ \small\begin{tabular}{@{}ccc@{}}\hline
+ Mon& Di& Mi\\ frei & Dienst & frei\\
+ Dienst & Dienst & Frei\\\hline \end{tabular}%
+}
%\marginnote{Fig.~\ref{thea2}}
-\hvFloat[inMargin]{table}{\small\tabcolsep=3pt\begin{tabular}{@{}ccc@{}}\hline Mon& Di& Mi\\ frei & Dienst & frei\\
- Dienst & Dienst & Frei\\\hline \end{tabular}}
+\hvFloat[inMargin,useOBox]{table}{}
{A tabular in the margin just like the image.}
{thea2}
@@ -1383,7 +1401,7 @@
\hvFloat[%
floatPos=!hb,
capPos=top,
- useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1}
+ useOBox]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1}
\hvblindtext
@@ -1403,7 +1421,7 @@
\hvFloat[%
floatPos=!hb,
capPos=top,
- useOBox=true]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1}
+ useOBox]{table}{}{Demonstration of the \texttt{useOBox} Parameter}{table:1}
@@ -1410,7 +1428,7 @@
\MarginNote{Tab.~\ref{table:2}}
\hvFloat[%
floatPos=!htb,%
- useOBox=true,%
+ useOBox,%
objectAngle=90,%
capPos=right,%
capVPos=top,%
@@ -2730,7 +2748,7 @@
\begin{lstlisting}
\hvFloat[doubleFULLPAGE,capPos=right]%
{figure}%
- {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed on the right-hand
part of the illustration. The illustration begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2741,7 +2759,7 @@
\MarginNote{Fig.~\ref{fig:doubleFULLPAGE1}}
\hvFloat[doubleFULLPAGE,capPos=right]%
{figure}%
- {\includegraphics[height=\paperheight]{images/rheinsberg-1000}}%
+ {\includegraphics[height=\paperheight]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed on the right-hand
part of the illustration. The illustration begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2770,7 +2788,7 @@
\hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
{\includegraphics[doubleFULLPAGE,
- keepaspectratio=false]{images/rheinsberg-1000}}%
+ keepaspectratio=false]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed \textbf{after}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2783,7 +2801,7 @@
\MarginNote{Fig.~\ref{foo}}
\hvFloat[doubleFULLPAGE,capPos=after]%
{figure}%
- {\includegraphics[doubleFULLPAGE]{images/rheinsberg-1000}}%
+ {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed \textbf{after}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2804,7 +2822,7 @@
\hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
{\includegraphics[height=\paperheight,width=2\paperwidth,
- keepaspectratio=false]{images/rheinsberg-1000}}%
+ keepaspectratio=false]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed \textbf{before}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -2815,7 +2833,7 @@
\MarginNote{Fig.~\ref{bar}}
\hvFloat[doubleFULLPAGE,capPos=before]%
{figure}%
- {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg-1000}}%
+ {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}%
{A caption for a double-sided image that will be placed \textbf{before}
the image. The image begins on the left edge of the paper.
No further text is placed on the pages. A short form is used for the LOF.
@@ -3117,9 +3135,9 @@
\hvBlindtext
-\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]%
+\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt,useOBox]%
{table}%
- {\usebox\hvOBox}%%%%%%%%%%%%%%
+ {}%%%%%%%%%%%%%%
[A doublepage tabular with a caption on the right side of the right part.]%
{A caption for a double-sided tabular that will be placed on the right side of the
right-hand part of the illustration. The illustration begins on the left edge of
@@ -3128,7 +3146,7 @@
\end{lstlisting}
-\global\savebox\hvOBox{%
+\savebox\hvOBox{%
\begin{tabular}{l*{18}r} \toprule
& \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976}
& \textbf{1977} & \textbf{1978} & \textbf{1979} & \textbf{1980} & \textbf{1981} & \textbf{1982} & \textbf{1983} & \textbf{1984} & \textbf{1985}
@@ -3159,7 +3177,31 @@
\marginpar{Tab.~\ref{tab:doublePage3}}%
\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]%
{table}%
- {\usebox\hvOBox}%%%%%%%%%%%%%%
+ {\begin{tabular}{l*{18}r} \toprule
+ & \textbf{1972} & \textbf{1973} & \textbf{1974} & \textbf{1975} & \textbf{1976}
+ & \textbf{1977} & \textbf{1978} & \textbf{1979} & \textbf{1980} & \textbf{1981} & \textbf{1982} & \textbf{1983} & \textbf{1984} & \textbf{1985}
+ & \textbf{1986} & \textbf{1987} & \textbf{1988} & \textbf{1989}
+ \\\midrule
+\addlinespace[3pt]
+Zeile 1 & 1 & 3 & 1 & 1 & 1 & 0 & 1 & 1 & 0 & 0 & 0 & 0 &20 & 0 & 2 & 2 & 2 & 1\\\addlinespace[3pt]
+Zeile 2 & 1 & 1 & 3 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 2 & 1 & 3 & 4 & 4 & 6 & 4 & 2\\\addlinespace[3pt]
+Zeile 3 & 2 & 1 & 2 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 5 & 3 & 1 & 7 & 7 & 3\\\addlinespace[3pt]
+Zeile 4 & 1 & 0 & 5 & 1 & 2 & 0 & 0 & 0 & 0 & 2 & 1 & 0 & 1 & 0 & 3 & 7 & 2 & 1\\\addlinespace[3pt]
+Zeile 6 & 2 & 1 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 2 & 0 & 5 & 2 & 2 & 5 & 4 & 2\\\addlinespace[3pt]
+Zeile 5 & 0 & 0 & 4 & 2 & 1 & 2 & 2 & 1 & 0 & 0 & 0 & 1 & 1 & 0 & 2 & 5 & 4 & 3\\\addlinespace[3pt]
+Zeile 8 & 0 & 1 & 1 & 0 & 0 & 0 & 1 & 1 & 0 & 3 & 2 & 1 & 2 & 1 & 3 & 5 & 3 & 4\\\addlinespace[3pt]
+Zeile 9 & 0 & 0 & 0 & 0 & 0 & 1 & 2 & 1 & 0 & 0 & 0 & 0 & 4 & 2 & 1 & 4 & 5 & 2\\\addlinespace[3pt]
+Zeile10 & 0 & 1 & 3 & 0 & 1 & 0 & 1 & 0 & 0 & 1 & 1 & 0 & 1 & 1 & 1 & 4 & 4 & 1\\\addlinespace[3pt]
+Zeile11 & 0 & 2 & 2 & 1 & 1 & 0 & 1 & 0 & 0 & 0 & 0 & 2 & 6 & 1 & 0 & 2 & 1 & 1 \\\addlinespace[3pt]
+Zeile12 & 2 & 0 & 2 & 4 & 1 & 0 & 4 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 3\\\addlinespace[3pt]
+Lärm & 2 & 3 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 2 & 0 & 0 & 2 & 2 & 2\\\addlinespace[3pt]
+Zeile13 & 0 & 1 & 0 & 0 & 1 & 0 & 3 & 0 & 0 & 0 & 0 & 0 & 2 & 0 & 1 & 3 & 0 & 2\\\addlinespace[3pt]
+Zeile14 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 3 & 3 & 2 & 1 & 1 & 0\\\addlinespace[3pt]
+Zeile15 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 4 & 0 & 0 & 3 & 1 & 1\\\addlinespace[3pt]
+Zeile16 & 0 & 0 & 0 & 0 & 0 & 1 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 3 & 5 & 0 & 1\\\addlinespace[3pt]\midrule
+Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 & 13 &1 \\
+\bottomrule
+\end{tabular}}%%%%%%%%%%%%%%
[A doublepage tabular with a caption on the right side of the right part.]%
{A caption for a double-sided tabular that will be placed on the right side of the
right-hand part of the illustration. The illustration begins on the left edge of
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf
===================================================================
(Binary files differ)
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 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/left2s2c.tex 2024-03-17 19:48:57 UTC (rev 70675)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: left2s2c.tex 318 2021-11-20 07:30:54Z herbert $
+%% $Id: left2s2c.tex 878 2024-03-16 20:49:50Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\hvFloat[fullpage,capPos=left]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -37,7 +37,7 @@
\Float[default]
\hvFloat[fullpage,capPos=left]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -50,7 +50,7 @@
\begin{lstlisting}
\hvFloat[fullpage,capPos=left]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -63,7 +63,7 @@
\Float[default]
\hvFloat[fullpage,capPos=left]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf
===================================================================
(Binary files differ)
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 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex 2024-03-17 19:48:57 UTC (rev 70675)
@@ -1,5 +1,5 @@
\documentclass[twoside,twocolumn]{scrartcl}
-%% $Id: right2s2c.tex 318 2021-11-20 07:30:54Z herbert $
+%% $Id: right2s2c.tex 878 2024-03-16 20:49:50Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
@@ -24,7 +24,7 @@
\begin{lstlisting}
\hvFloat[fullpage,capPos=right]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -37,7 +37,7 @@
\Float[capPos=right]
\hvFloat[fullpage,capPos=right]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -50,7 +50,7 @@
\begin{lstlisting}
\hvFloat[fullpage,capPos=right]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
@@ -63,7 +63,7 @@
\Float[capPos=right]
\hvFloat[fullpage,capPos=right]%
{figure}%
- {\includegraphics[fullpage]{frose}}%
+ {\includegraphics[fullpage]{usa5}}%
[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.
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf
===================================================================
(Binary files differ)
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg
===================================================================
(Binary files differ)
Index: trunk/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg 2024-03-17 19:48:57 UTC (rev 70675)
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/usa5.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.tex 2024-03-17 19:48:57 UTC (rev 70675)
@@ -47,8 +47,7 @@
Caption at top right beside the float and object position left and
the option \texttt{wide}.}{fig:70}
-\textcolor{black!40}{\blindtext}
-%\blindtext
+\textcolor{black!40}{\blindtext\blindtext}
The code for figure \ref{fig:80}:
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.tex 2024-03-17 19:48:57 UTC (rev 70675)
@@ -60,8 +60,10 @@
\end{lstlisting}
+\newpage
+
\hvFloat[wide,nonFloat,
- capPos=left,%
+ capPos=right,%
capVPos=top,%
]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}%
{Caption at top left beside the object and object position left and
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-0.inc 2024-03-17 19:48:57 UTC (rev 70675)
@@ -24,7 +24,7 @@
\fi
\let\c at hv@tempCNTfigA\c at figure
\let\c at hv@tempCNTtabA\c at table
-% \checkoddpage
+ \checkoddpage
\ifoddpage
\if at twocolumn
\if at firstcolumn
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-1.inc 2024-03-17 19:48:57 UTC (rev 70675)
@@ -24,7 +24,6 @@
\else
\global\hv@@capPos=2 % other caption type
\fi\fi
- %\checkoddpage
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\global\hv at tempWidthA=\dimexpr-\oddsidemargin-1in-\parindent+\hvSet at bindCorrection% the width of the right side offset
\global\hv at tempWidthB=\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet at bindCorrection%
@@ -32,6 +31,7 @@
% \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}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{do at hvFloat@doubleFULLPAGE: oddpage}%
\ifcase\hv@@capPos % =0 Caption before
@@ -451,6 +451,7 @@
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip%
\if at twoside
\hvfloat at typeout{>>>> setPageObject/FULLPAGE/twoside}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>> setPageObject/FULLPAGE/twoside/oddpage (\thepage)}%
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-2.inc 2024-03-17 19:48:57 UTC (rev 70675)
@@ -16,7 +16,7 @@
\expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\expandafter\global\expandafter\savebox\expandafter\hv at boxLeftPage\expandafter{\clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}%
\expandafter\global\expandafter\savebox\expandafter\hv at boxRightPage\expandafter{\clipbox*{\hv at leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}%
- %\checkoddpage
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{do at hvFloat@doublePAGE: oddpage}%
\if at twocolumn
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-3.inc 2024-03-17 19:48:57 UTC (rev 70675)
@@ -45,7 +45,7 @@
\ifhv at forceOutput
\do at hvFloat@doublePAGECaptionRight{#1}% no cheque
\else
- %\checkoddpage
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{do at hvFloat@doublePage:oddpage}%
\if at twocolumn
@@ -54,11 +54,15 @@
\hvfloat at typeout{do at hvFloat@doublePage:oddpage->twocolumn->firstcolumn}%
\ifhv at switchType
\hvfloat at typeout{hvfloat: switched to floattype p}%
- \afterpage{\do at hvFloat@doublePAGECaptionRight{#1}}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePAGECaptionRight{#1}}%
\else
\hvfloat at typeout{calling do at hvFloat@doublePageCaptionRight}%
- %\afterpage{
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%}%
+ %\afterpage{%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePageCaptionRight{#1}}%}%
\fi
\else
% \hvfloat at typeout{do at hvFloat@doublePage:oddpage->twocolumn->secondcolumn}%
@@ -68,7 +72,9 @@
\ifhv at switchType
\do at hvFloat@doublePAGECaptionRight{#1}%
\else
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePageCaptionRight{#1}}%
\fi
\fi
\fi
@@ -82,7 +88,9 @@
\ifhv at forceLeft
\do at hvFloat@doublePageCaptionRight{#1}% no \afterpage
\else
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePageCaptionRight{#1}}%
\fi
\fi
\fi
@@ -112,16 +120,24 @@
\if at twocolumn
\if at firstcolumn
\ifhv at switchType
- \afterpage{\afterpage{\do at hvFloat@doublePAGECaptionRight{#1}}}%
+ \afterpage{\afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePAGECaptionRight{#1}}}%
\else
- \afterpage{\afterpage{\afterpage{\do at hvFloat@doublePageCaptionRight{#1}}}}%
+ \afterpage{\afterpage{\afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePageCaptionRight{#1}}}}%
\fi
\else% second column
\ifhv at switchType
- \afterpage{\do at hvFloat@doublePAGECaptionRight{#1}}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePAGECaptionRight{#1}}%
\else
%\afterpage{
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePageCaptionRight{#1}}%}%
\fi
\fi
\else% onecolumn
@@ -128,14 +144,20 @@
\hvfloat at typeout{do at hvFloat@doublePage:evenpage/onecolumn -> (\thepage)}%
\ifhv at switchType
\hvfloat at typeout{do at hvFloat@doublePage:evenpage/onecolumn/switchType -> (\thepage)}%
- \afterpage{\do at hvFloat@doublePAGECaptionRight{#1}}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePAGECaptionRight{#1}}%
\else
\hvfloat at typeout{do at hvFloat@doublePage:evenpage/onecolumn/noSwitchType -> (\thepage)}%
\ifhv at forceLeft
\hvfloat at typeout{do at hvFloat@doublePage:evenpage/onecolumn/noSwitchType/forceLeft -> (\thepage)}%
- \afterpage{\do at hvFloat@doublePageCaptionRight{#1}}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePageCaptionRight{#1}}%
\else
- \afterpage{\afterpage{\do at hvFloat@doublePageCaptionRight{#1}}}%
+ \afterpage{\afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \do at hvFloat@doublePageCaptionRight{#1}}}%
\fi
\fi
\fi
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2024-03-17 19:48:32 UTC (rev 70674)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2024-03-17 19:48:57 UTC (rev 70675)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 876 2024-03-03 14:04:56Z herbert $
+%% $Id: hvfloat.sty 879 2024-03-17 10:44:09Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -16,8 +16,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.48}
-\def\filedate{2024/03/03}
+\def\fileversion{2.49}
+\def\filedate{2024/03/17}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
%
@@ -58,6 +58,7 @@
\RequirePackage{zref-savepos}
\newdimen\@tempx
\newdimen\@tempy
+\newcounter{hvfloat at testCtr}
\newcounter{hvfloat at ref}
\renewcommand\thehvfloat at ref{tmp@\arabic{hvfloat at ref}}
\setcounter{hvfloat at ref}{0}
@@ -196,7 +197,10 @@
\define at boolkey{hvSet}[hv@]{twoColumnCaption}[true]\global\@nameuse{hv at twoColumnCaption#1}{}% Write the caption only as text
\define at boolkey{hvSet}[hv@]{sameHeight}[true]{\@nameuse{hv at sameHeight#1}}% Write the caption only as text
\define at boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal
+\define at boolkey{hvSet}[hv@]{test}[true]{}% use of the hvOBox contents
+\def\test at typeout#1{\ifhv at test\typeout{>>>test\thehvfloat at testCtr:>#1}\fi}
+
\newif\ifhv at fullpage
\newif\ifhv at FULLPAGE
\newif\ifhv at doubleFullPage
@@ -531,12 +535,13 @@
\def\hvFloat{\@ifnextchar*% Main macro
- {\checkoddpage\global\hv at startrue\hv at maxImageWidth=\textwidth\hvFloat at i}%
- {\checkoddpage\global\hv at starfalse\hv at maxImageWidth=\columnwidth\hvFloat at i*}%
+ {\global\hv at startrue\hv at maxImageWidth=\textwidth\hvFloat at i}%
+ {\global\hv at starfalse\hv at maxImageWidth=\columnwidth\hvFloat at i*}%
}
\def\hvFloat at i*{\@ifnextchar[{\do at hvFloat}{\do at hvFloat[]}}
\def\do at hvFloat[#1]{%
+ \ifhv at Debug\marginnote{\textbf{hvFloat}}\fi%
%\marginnote{\textbf{hvFloat}}%
\savebox\hvObjectBox{}%
\begingroup
@@ -553,6 +558,9 @@
\setcounter{hv at tempCNTtabB}{\value{table}}%
\gdef\hv at save@setting{#1}% for later use after \endgroup inside figure/table env
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
+ \global\stepcounter{hvfloat at ref}%
+ \test at typeout{>>>test:>hvfloat at ref \thehvfloat at ref}%
+ \global\stepcounter{hvfloat at testCtr}% use anyway, it's only for debugging
\ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\ifx\hv at subcaption@format\@empty\else
\expandafter
@@ -608,7 +616,6 @@
}
\ExplSyntaxOff
-
\newcount\hv at cnta
\newcount\hv at cntb
@@ -623,7 +630,8 @@
\xdef\hv at save@setting{\hv at save@setting}% for later use after \endgroup inside figure/table env
\fi
% \xdef\hv at floatListOfExt{\@nameuse{ext@\hv at floatType}}%
- \gdef\hv at floatObject{#3}%
+ \ifhv at useOBox\gdef\hv at floatObject{\usebox\hvOBox}\else\gdef\hv at floatObject{#3}\fi
+% \gdef\hv at floatObject{#3}%
\@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}%
}
@@ -644,7 +652,7 @@
\ifhv at FULLPAGE
\hvfloat at typeout{>>>> do@@hvFloat: FULLPAGE true}%
\def\hvSet at CapWidth{n}% relative value
- \do@@@@hvFloat% fullpage with caption on other page
+ \do@@@@hvFloat% FULLPAGE with caption on other page
\else
\ifhv at doubleFULLPAGE
\hvfloat at typeout{>>>> do@@hvFloat: doubleFULLPAGE true}%
@@ -702,7 +710,7 @@
}%
}%
\fi
- \ifhv at useOBox\global\savebox\hvOBox{}\fi
+% \ifhv at useOBox\global\savebox\hvOBox{}\fi%%%%%%%%%%%%%
\setlength\hvObjectWidth{\wd\hvObjectBox}%
%
% Now we save the caption with its defined \hvCapWidth
@@ -844,15 +852,16 @@
\begin{\hv at floatType}% Start the floating environment
\fi
\fi
- \checkoddpage
\ifx\hvSet at objectPos\hv at Right\raggedleft\fi
\ifx\hvSet at objectPos\hv at Center
\ifhv at nonFloat\hspace*{\fill}\else\centering\fi
\fi
\ifx\hvSet at objectPos\hv at Outer
+ \checkoddpage
\ifoddpage\raggedleft\fi
\fi
\ifx\hvSet at objectPos\hv at Inner
+ \checkoddpage
\ifoddpage\else\raggedleft\fi
\fi
%
@@ -876,9 +885,11 @@
\hv@@capPos=3
\else
\ifx\hvSet at capPos\hv at Inner
+ \checkoddpage
\ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi
\else
\ifx\hvSet at capPos\hv at Outer
+ \checkoddpage
\ifoddpage\hv@@capPos=2\else\hv@@capPos=0\fi
% \ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi
% even page (left=0) | odd page (oneside) (right=2)
@@ -897,7 +908,7 @@
\fi
\fi
%%%%
-%\typeout{>>>>>>>>>Pos: \the\hv@@capPos}%
+\test at typeout{>>>>>>>>>Pos: \the\hv@@capPos}%
\savebox{\@tempboxa}{% ***** @tempbox start
\expandafter%
\ifcase\the\hv@@capPos % 0 is LEFT START \ifcase
@@ -984,6 +995,7 @@
% now we rotate the object and caption, if needed
%
\ifhv at wide
+ \checkoddpage
\ifoddpageoroneside
\if at twocolumn
\if at firstcolumn
@@ -992,6 +1004,7 @@
\fi
\fi
\else
+ \checkoddpage
\ifoddpage
\if at twocolumn
\if at firstcolumn
@@ -1042,7 +1055,7 @@
\global\savebox\hvObjectBox{\rotatebox{\hvSet at objectAngle}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}}%
\fi
\setlength\hvObjectWidth{\wd\hvObjectBox}%
- \ifhv at useOBox\global\savebox\hvOBox{}\fi
+ %%%\ifhv at useOBox\global\savebox\hvOBox{}\fi%%%%%%%%%%%%%%%%%%%
%
% Now we save the caption with its defined \hvCapWidth
%
@@ -1115,11 +1128,10 @@
\ifx\hvSet at floatPos\@empty \else\@namedef{fps@\hv at floatType}{\hvSet at floatPos}\fi
\noindent
\begingroup% Start the nonfloat part
- %\checkoddpage
\ifx\hvSet at objectPos\hv at Right \raggedleft\fi
\ifx\hvSet at objectPos\hv at Center \hspace*{\fill}\fi
- \ifx\hvSet at objectPos\hv at Outer \ifoddpage\raggedleft\fi\fi
- \ifx\hvSet at objectPos\hv at Inner \ifoddpage\else\raggedleft\fi\fi
+ \ifx\hvSet at objectPos\hv at Outer \checkoddpage\ifoddpage\raggedleft\fi\fi
+ \ifx\hvSet at objectPos\hv at Inner \checkoddpage\ifoddpage\else\raggedleft\fi\fi
%
% to rotate object and caption together, we save all in another box
% the caption comes first, if its on the left or the top
@@ -1128,6 +1140,7 @@
% 2 caption right, inner and even page, oneside outer
% 3 caption bottom
%
+% \checkoddpage
\ifx\hvSet at capPos\hv at Left \hv@@capPos=0
\else
\ifx\hvSet at capPos\hv at Top \hv@@capPos=1
@@ -1136,9 +1149,9 @@
\else
\ifx\hvSet at capPos\hv at Bottom \hv@@capPos=3
\else
- \ifx\hvSet at capPos\hv at Inner \ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi
+ \ifx\hvSet at capPos\hv at Inner \checkoddpage\ifoddpageoroneside\hv@@capPos=0\else\hv@@capPos=2\fi
\else
- \ifx\hvSet at capPos\hv at Outer \ifoddpage\hv@@capPos=2\else\hv@@capPos=0\fi
+ \ifx\hvSet at capPos\hv at Outer \checkoddpage\ifoddpage\hv@@capPos=2\else\hv@@capPos=0\fi
% \ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi
% even page (left=0) | odd page (oneside) (right=2)
\else
@@ -1154,7 +1167,7 @@
\fi
\fi
%%%%
-%\typeout{>>>>>>>>>Pos: \the\hv@@capPos}%
+\test at typeout{>>>>>>>>>Pos: \the\hv@@capPos}%
\savebox{\@tempboxa}{% ***** @tempbox start
\expandafter\ifcase\the\hv@@capPos % 0 is LEFT START \ifcase
\ifx\hvSet at capVPos\hv at Center
@@ -1247,7 +1260,8 @@
\let\clist at count@N\clist_count:N
\ExplSyntaxOff
-\def\do@@@@hvFloat{% special float page: caption <-> fullpage images
+\def\do@@@@hvFloat{% special float page: caption <-> FULLPAGE images
+% \ifhv at useOBox\gdef\hv at floatObject{\usebox\hvOBox}\fi
\hvfloat at typeout{>>>do@@@@hvFloat: special float page}%
\ifx\hvSet at capPos\hv at After \global\hv@@capPos=1
\else
@@ -1259,9 +1273,9 @@
\else
\ifx\hvSet at capPos\hv at Outer \global\hv@@capPos=5
\else
- \ifx\hvSet at capPos\hv at Right \global\hv@@capPos=6% only for twocolumn mode
+ \ifx\hvSet at capPos\hv at Right \global\hv@@capPos=6 % only for twocolumn mode
\else
- \ifx\hvSet at capPos\hv at Left \global\hv@@capPos=7% only for twocolumn mode
+ \ifx\hvSet at capPos\hv at Left \global\hv@@capPos=7 % only for twocolumn mode
\else
\global\hv@@capPos=0
\fi
@@ -1272,9 +1286,10 @@
\fi
\fi
\hvfloat at typeout{>>>do@@@@hvFloat: hv at capPos is \the\hv@@capPos}%
- %\checkoddpage
+% \checkoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: set floattype}%
\set at caption@object{\hv at floatType}% set caption and object into a box
+%
\ifcase\hv@@capPos% caption before object 0-> _always_ left
\hvfloat at typeout{>>>do@@@@hvFloat: setBottomCaption and setPageObject (0)}%
\setBottomCaption\setPageObject
@@ -1282,9 +1297,13 @@
\hvfloat at typeout{>>>do@@@@hvFloat: setPageObject and setBottomCaption (1)}%
\setPageObject\setBottomCaption
\or% caption on even page 2-> left page
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage-> oddpage/setBottomCaption and setPageObject (2)}%
- \afterpage{\setBottomCaption\setPageObject}%
+ \afterpage{%
+ \setBottomCaption
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject}%
\else% we are on an even page
\hvfloat at typeout{>>>do@@@@hvFloat: evenpage/setBottomCaption and setPageObject (2)}%
\setBottomCaption\setPageObject
@@ -1294,6 +1313,7 @@
\hvfloat at typeout{>>>do@@@@hvFloat: twoside and caption on oddpage (3)}%
\if at twocolumn
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/twocolumn and caption on oddpage (3)}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/twocolumn/oddpage and caption on oddpage (3)}%
\if at firstcolumn% on right side
@@ -1301,13 +1321,16 @@
\setBottomCaption\setPageObject
\else
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage->twoside/twocolumn/oddpage/secondcolumn and caption on oddpage (3)}%
- \afterpage{\setPageObject\setBottomCaption}% start next column
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject\setBottomCaption}% start next column
\fi
\else% left (even) page
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/twocolumn/oddpage and caption on evenpage (3)}%
\if at firstcolumn
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage->twoside/twocolumn/evenpage/firstcolumn and caption on oddpage (3)}%
- \afterpage{\setPageObject\setBottomCaption}% start next column
+ \afterpage{\global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject\setBottomCaption}% start next column
\else
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/twocolumn/evenage/secondcolumn and caption on oddpage (3)}%
\setPageObject\setBottomCaption
@@ -1315,12 +1338,15 @@
\fi
\else% onecolumn
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/onecolumn and caption on oddpage (3)}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/onecolumn/oddpage and caption on oddpage (3)}%
\setPageObject\setBottomCaption
\else% even page
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage->twoside/onecolumn/evenpage and caption on oddpage (3)}%
- \afterpage{\setPageObject\setBottomCaption}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject\setBottomCaption}%
\fi
\fi
\else% oneside
@@ -1327,6 +1353,7 @@
\hvfloat at typeout{>>>do@@@@hvFloat: oneside and caption on oddpage (3)}%
\if at twocolumn
\hvfloat at typeout{>>>do@@@@hvFloat: oneside/twocolumn and caption on oddpage (3)}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: oneside/twocolumn/oddpage and caption on oddpage (3)}%
\if at firstcolumn% on right side
@@ -1340,7 +1367,9 @@
\hvfloat at typeout{>>>do@@@@hvFloat: oneside/twocolumn/evenpage and caption on oddpage (3)}%
\if at firstcolumn% on left side
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage->oneside/twocolumn/evenpage/firstcolumn and caption on oddpage (3)}%
- \afterpage{\setPageObject\setBottomCaption}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject\setBottomCaption}%
\else
\hvfloat at typeout{>>>do@@@@hvFloat: oneside/twocolumn/evenpage/secondcolumn and caption on oddpage (3)}%
\setPageObject\setBottomCaption
@@ -1348,12 +1377,15 @@
\fi
\else % onecolumn
\hvfloat at typeout{>>>do@@@@hvFloat: oneside/onecolumn and caption on oddpage (3)}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: oneside/onecolumn/oddpage and caption on oddpage (3)}%
- \setBottomCaption\setPageObject
+ \setBottomCaption\setPageObject%
\else
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage->oneside/onecolumn/evenpage and caption on oddpage (3)}%
- \afterpage{\setBottomCaption\setPageObject}%
+ \afterpage{\setBottomCaption
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject}%
\fi
\fi
\fi
@@ -1361,11 +1393,12 @@
% \set at caption@object
\if at twocolumn
\hvfloat at typeout{>>>do@@@@hvFloat: twocolumn and caption on inner column (4)}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/oddpage and caption on inner column (4)}%
\if at firstcolumn% on right side
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/oddpage/firstcolumn and caption on inner column (4)}%
- \setBottomCaption\setPageObject
+ \setBottomCaption\setPageObject
\else % right column on right side
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/oddpage/secondcolumn and caption on inner column (4)}%
\setPageObject\setBottomCaption% start next firstcolumn next page
@@ -1374,7 +1407,10 @@
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/evenpage and caption on inner column (4)}%
\if at firstcolumn% on left side
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage^2 -> twoside/evenpage/firstcolumn and caption on inner column (4)}%
- \afterpage{\afterpage{\setBottomCaption\setPageObject}}% start next page/first column
+ \afterpage{\afterpage{%
+ \setBottomCaption
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject}}% start next page/first column
\else% left page/column
\hvfloat at typeout{>>>do@@@@hvFloat: twoside/evenpage/secondcolumn and caption on inner column (4)}%
\setBottomCaption\setPageObject% start on same page/column
@@ -1388,14 +1424,20 @@
% \set at caption@object
\if at twocolumn
\hvfloat at typeout{>>>do@@@@hvFloat: twocolumn and caption on outer column (5)}%
+ \checkoddpage
\ifoddpage
\hvfloat at typeout{>>>do@@@@hvFloat: twocolumn/oddpage and caption on outer column (5)}%
\if at firstcolumn
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage^2 -> firstcolumn/oddpage/twocolumn and caption on outer column (5)}%
- \afterpage{\afterpage{\setBottomCaption\setPageObject}}%
+ \afterpage{\afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setBottomCaption\setPageObject}}%
\else
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/oddpage/secondcolumn and caption on outer column (5)}%
- \afterpage{\setBottomCaption\setPageObject}%
+ \afterpage{%
+ \setBottomCaption
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject}%
\fi
\else% even page (left)
\hvfloat at typeout{>>>do@@@@hvFloat: twocolumn/evenpage and caption on outer column (5)}%
@@ -1415,7 +1457,9 @@
\hvfloat at typeout{>>>do@@@@hvFloat: twocolumn and caption after object (6)}%
\if at firstcolumn
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/firstcolumn and caption after object (6)}%
- \afterpage{\setPageObject\setBottomCaption}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setPageObject\setBottomCaption}%
\else
\hvfloat at typeout{>>>do@@@@hvFloat: twocolumn/secondcolumn and caption after object (6)}%
\setPageObject\setBottomCaption
@@ -1432,7 +1476,10 @@
\setBottomCaption\setPageObject
\else
\hvfloat at typeout{>>>do@@@@hvFloat: afterpage -> twocolumn/secondcolumn and caption before object (7)}%
- \afterpage{\setBottomCaption\setPageObject}%
+% \global\savebox\hvObjectBox{\hv at floatObject}%
+ \afterpage{%
+ \global\savebox\hvObjectBox{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
+ \setBottomCaption\setPageObject}%
\fi
\else% onecolumn -> same as before
\hvfloat at typeout{>>>do@@@@hvFloat: onecolumn and caption before object (7)}%
@@ -1441,7 +1488,6 @@
\fi
\endgroup% startet at main \hvFloat
}
-%
\newsavebox\hv at boxLeftPage
\newsavebox\hv at boxRightPage
More information about the tex-live-commits
mailing list.