summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/hvfloat
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-04 03:01:16 +0000
committerNorbert Preining <norbert@preining.info>2021-05-04 03:01:16 +0000
commit342f2e1be699f5ec70b5b1c35d9cd59798d37304 (patch)
treeb0e2ca800047194391139c36c6f3e3dc3b3d2094 /macros/latex/contrib/hvfloat
parentbf393e635d1fb55b009da7ade3001c104c7deb48 (diff)
CTAN sync 202105040301
Diffstat (limited to 'macros/latex/contrib/hvfloat')
-rw-r--r--macros/latex/contrib/hvfloat/Changes1
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.pdfbin18344774 -> 18366111 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.tex33
-rw-r--r--macros/latex/contrib/hvfloat/doc/images/missing.txt3
-rw-r--r--macros/latex/contrib/hvfloat/latex/hvfloat.sty203
5 files changed, 159 insertions, 81 deletions
diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes
index 6e00a6f5fd..1b9013caae 100644
--- a/macros/latex/contrib/hvfloat/Changes
+++ b/macros/latex/contrib/hvfloat/Changes
@@ -1,4 +1,5 @@
hvfloat.sty:
+2.21 2021-05-04 - fix for several bugs (onlyText, spaces,...)
2.20 2021-04-29 - use better macronames for setting the defaults
and defining an own style
2.19 2021-03-15 - fix for vertical spacing of doubleFULLPAGE
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
index 50b449eb45..b174232b47 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
index 18d4d56527..18c0898a59 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
@@ -1,7 +1,7 @@
-%% $Id: hvfloat.tex 56 2021-03-15 07:20:37Z herbert $
+%% $Id: hvfloat.tex 73 2021-05-03 07:38:13Z herbert $
\listfiles
\errorcontextlines=100
-\documentclass[twoside,paper=a4]{scrartcl}
+\documentclass[twoside,paper=a4,]{scrartcl}
\usepackage{fontspec}
\usepackage{libertinus}
%\usepackage[scaled=0.85]{beramono}
@@ -305,7 +305,8 @@ There are the following keywords:
\endfoot
\bottomrule
\endlastfoot
-\Lkeyword{floatPos} & \texttt{htb} & This is \emph{not} the same default placement setting like the one from the floats.\\
+\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,
@@ -313,17 +314,19 @@ There are the following keywords:
\Lkeyword{capAngle} & 0 & The value for the angle if the caption should be rotated. Counted anti clockwise.\\
-\Lkeyword{capPos} & before& The position of the caption relative to the object. Possible values are\\
+\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{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.\\
-\Lkeyword{capVPos}& c& This is only important for \texttt{capPos=left|right}. Only in this case the
+\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.\\
@@ -335,6 +338,8 @@ There are the following keywords:
\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{wide} & false & The float can use \Ldim{textwidth}+\Ldim{marginparwidth} as horizontal width.\\
@@ -2479,7 +2484,7 @@ even page and following text will be placed \emph{before} the object.
\begin{lstlisting}
\Blindtext
-\hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
+\hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]%
{figure}%
{\includegraphics[angle=90,width=2\paperwidth]{images/r+j}}%
[Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
@@ -2495,7 +2500,7 @@ even page and following text will be placed \emph{before} the object.
\Blindtext
\marginnote{Fig.~\ref{fig:doubleFULLPAGE0}}
- \hvFloat[doubleFULLPAGE,capPos=r,capAngle=90]%
+ \hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]%
{figure}%
{\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}%
[Eine doppelseitige Abbildung mit Caption auf der Abbildung]%
@@ -2514,7 +2519,7 @@ even page and following text will be placed \emph{before} the object.
\begin{lstlisting}
\Blindtext
- \hvFloat[doubleFULLPAGE,capPos=r]%
+ \hvFloat[doubleFULLPAGE,capPos=right]%
{figure}%
{\includegraphics[height=\paperheight]{images/rheinsberg}}%
{Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
@@ -2529,7 +2534,7 @@ even page and following text will be placed \emph{before} the object.
\marginnote{Fig.~\ref{fig:doubleFULLPAGE1}}
- \hvFloat[doubleFULLPAGE,capPos=r]%
+ \hvFloat[doubleFULLPAGE,capPos=right]%
{figure}%
{\includegraphics[height=\paperheight]{images/rheinsberg}}%
{Eine Beschriftung einer doppelseitigen Abbildung, die ÜBER den rechten
@@ -2589,7 +2594,7 @@ and the rest of the text area is filled with text.
\begin{lstlisting}
\Blindtext
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
[Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
@@ -2606,7 +2611,7 @@ and the rest of the text area is filled with text.
\Blindtext
\marginnote{Fig. \ref{fig:doublePage0}}
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
{figure}%
{\includegraphics[width=2\textwidth]{images/sonne-meer}}%
[Eine doppelseitige Abbildung mit rechtsseitiger Caption unterhalb]%
@@ -2659,7 +2664,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15
\bottomrule
\end{tabular}}
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
{table}%
{\usebox\hvOBox}%%%%%%%%%%%%%%
[Eine doppelseitige Tabelle mit rechtsseitiger Caption unterhalb]%
@@ -2703,7 +2708,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15
\bottomrule
\end{tabular}}
-\hvFloat[doublePage,capWidth=n,capPos=r]%
+\hvFloat[doublePage,capWidth=n,capPos=right]%
{table}%
{\usebox\hvOBox}%%%%%%%%%%%%%%
[Eine doppelseitige Tabelle mit rechtsseitiger Caption unterhalb]%
@@ -2741,7 +2746,7 @@ the object is set. Let's assume that we use something like
The label \texttt{demo:fullpage} is used for the \emph{image} and not for the caption! Internally another label
called \texttt{demo:fullpage-cap} is set on the caption page which can be before or
-behind the opject (depending to the optional argument of \Lkeyword{capPos}).
+behind the object (depending to the optional argument of \Lkeyword{capPos}).
For example:
\begin{verbatim}
diff --git a/macros/latex/contrib/hvfloat/doc/images/missing.txt b/macros/latex/contrib/hvfloat/doc/images/missing.txt
new file mode 100644
index 0000000000..5a0917558c
--- /dev/null
+++ b/macros/latex/contrib/hvfloat/doc/images/missing.txt
@@ -0,0 +1,3 @@
+Not all imaging of the documentation are listed here, because
+some are not for public use. You can use any other imgae if you
+want to run the documentation by yourselve.
diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
index 1fef91099f..dd27d7af47 100644
--- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty
+++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 56 2021-03-15 07:20:37Z herbert $
+%% $Id: hvfloat.sty 73 2021-05-03 07:38:13Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.20}
-\def\filedate{2021/04/29}
+\def\fileversion{2.21}
+\def\filedate{2021/05/04}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
\let\hvFloatFileVersion\fileversion
@@ -87,7 +87,7 @@
%
\def\hv@figure{figure}
%
-\define@key{hvSet}{floatPos}[htbp]{% LaTeX's position parameters htbp
+\define@key{hvSet}{floatPos}[tbp]{% LaTeX's position parameters htbp
\def\hvSet@floatPos{#1}%
}
\define@key{hvSet}{rotAngle}[0]{% rotates caption AND image together
@@ -99,25 +99,45 @@
\define@key{hvSet}{capAngle}[0]{% -360..+360
\def\hvSet@capAngle{#1}%
}
-\define@key{hvSet}{capPos}[bottom]{% (l)eft|(b)ottom|(t)op|(r)ight|(i)nner|(o)uter|(e)ven|o(d)d
+
+
+\define@choicekey*+{hvSet}{capPos}[\val\nr]{bottom,top,left,before,right,after,inner,outer,even,odd}[bottom]{%
\def\hvSet@capPos{#1}% it is relativ to the object, (e),(d) only valid for fullpage float
- \edef\@tempa{#1}%
- \ifx\hv@Bottom\@tempa
+ \ifcase\nr\relax
+ \hv@capbesidefalse
+ \or
\hv@capbesidefalse
\else
- \ifx\hv@Top\@tempa
- \hv@capbesidefalse
- \else
- \hv@capbesidetrue
- \fi
+ \hv@capbesidetrue
\fi
-}
-\define@key{hvSet}{capVPos}[center]{% bottom|center|top
- \def\hvSet@capVPos{#1}% it is relativ to the object
-}
-\define@key{hvSet}{objectPos}[center]{% (l)eft|(c)enter|(r)ight|(i)nner|(o)uter
- \def\hvSet@objectPos{#1}% it is relativ to the document
-}
+}{\PackageWarning{hvfloat}{erroneous input (#1) for capPos ignored. Using bottom.}%
+ \def\hvSet@capPos{bottom}% it is relativ to the object, (e),(d) only valid for fullpage float
+ \hv@capbesidefalse
+ }
+
+\define@choicekey*+{hvSet}{capVPos}[\val\nr]{bottom,center,top}[center]{%
+ \def\hvSet@capVPos{#1}% it is relativ to the object
+}{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using bottom.}%
+ \def\hvSet@capVPos{center}% it is relativ to the object
+ }
+
+\define@choicekey*+{hvSet}{objectPos}[\val\nr]{left,center,right,inner,outer}[center]{%
+ \def\hvSet@objectPos{#1}% it is relativ to the object
+}{\PackageWarning{hvfloat}{erroneous input (#1) for objectPos ignored. Using center.}%
+ \def\hvSet@capVPos{center}% it is relativ to the object
+ }
+
+\newif\ifhv@floatRefToObject
+\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to
+ \ifcase\nr\relax
+ \hv@floatRefToObjectfalse
+ \else
+ \hv@floatRefToObjecttrue
+ \fi
+}{\PackageWarning{hvfloat}{erroneous input (#1) for floatRef ignored. Using option object.}%
+ \hv@floatRefToObjecttrue
+ }
+
\define@key{hvSet}{objectAngle}[0]{% -360..+360
\def\hvSet@objectAngle{#1}%
}
@@ -177,7 +197,8 @@
doubleFULLPAGE=false, doublePage=false, doublePAGE=false,
multiFloat=false,subFloat=false,
separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip,
- capFormat={}, subcapFormat={},
+ capFormat={}, subcapFormat={},
+ floatRef=object,
}%
}
@@ -201,10 +222,10 @@
}
\setlength\belowcaptionskip{\abovecaptionskip}% it is in latex.ltx = 0pt
\newcommand\saveCaptionSkip{%
- \setlength{\hvAboveCaptionSkip}{\abovecaptionskip}
- \setlength{\hvBelowCaptionSkip}{\belowcaptionskip}
- \setlength{\abovecaptionskip}{0pt}
- \setlength{\belowcaptionskip}{0pt}
+ \setlength{\hvAboveCaptionSkip}{\abovecaptionskip}%
+ \setlength{\hvBelowCaptionSkip}{\belowcaptionskip}%
+ \setlength{\abovecaptionskip}{0pt}%
+ \setlength{\belowcaptionskip}{0pt}%
}
\newcommand{\restoreCaptionSkip}{%
\setlength\abovecaptionskip{\hvAboveCaptionSkip}%
@@ -311,7 +332,8 @@
\def\hvFloat@i*{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}}
\def\do@hvFloat[#1]{%
\begingroup
- \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
+ \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}%
+% \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
\hv@maxImageWidth=\textwidth
\reset@special@float
\setcounter{hv@pfigure}{\value{figure}}%
@@ -319,7 +341,8 @@
\gdef\hv@save@setting{#1}%
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
\gdef\hv@floatType{figure}%
- \@ifnextchar+{\do@multiFloat}{\hvFloat@ii[#1]}}
+ \@ifnextchar+{\do@multiFloat}{\hvFloat@ii[#1]}%
+}
\ExplSyntaxOn
@@ -381,15 +404,28 @@
\newcount\hv@cnta
\newcount\hv@cntb
+\def\hvFloat@ii[#1]#2{% #1: key/value, #2: floattype
+ \@ifnextchar[{\hvFloat@iii[#1]{#2}}{\hvFloat@iii[#1]{#2}[]}%
+}
-\def\hvFloat@ii[#1]#2#3{%
+\def\hvFloat@iii[#1]#2[#3]#4{% #1: key/value, #2: floattype, #3: ListOfExt, #4: object
\hv@maxImageWidth=\textwidth
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
\gdef\hv@floatType{#2}%
+ \ifx\relax#3\relax
+ \ifx\hv@floatType\hv@figure
+ \gdef\hv@floatListOfExt{lof}%
+ \else
+ \gdef\hv@floatListOfExt{lot}%
+ \fi
+ \else
+ \gdef\hv@floatListOfExt{#3}%
+ \fi
\ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi
- \gdef\hv@floatObject{#3}%
+ \gdef\hv@floatObject{#4}%
\@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}%
}
+
\def\do@@hvFloat[#1]#2#3{%
\gdef\hv@shortCap{#1}%
\gdef\hv@longCap{#2}%
@@ -404,7 +440,7 @@
\do@@@@hvFloat% fullpage with caption on other page
\else
\ifhv@doubleFULLPAGE
- \setlength\hvCapWidth{\textheight}
+ \setlength\hvCapWidth{\textheight}%
\expandafter\do@hvFloat@doubleFULLPAGE\@@temp% fullpage with caption rotated or under on an odd page
\else
\ifhv@doublePAGE
@@ -432,7 +468,7 @@
%
% First we save the object in \hvObjectBox
%
- \ifx\hvSet@objectAngle\hv@Zero % rotate the object?
+ \ifx\hvSet@objectAngle\hv@Zero% rotate the object?
\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\else
\savebox{\hvObjectBox}{%
@@ -485,15 +521,16 @@
\fi
\fi
\fi
- \fi
- \fi
- \saveCaptionSkip % we put this space ourselve
- \ifx\hvSet@capAngle\hv@Zero % need rotation?
+ \fi
+ \fi
+ \saveCaptionSkip% we put this space ourselve
+ \ifx\hvSet@capAngle\hv@Zero% need rotation?
\savebox\hvCaptionBox{% NO rotation
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
\ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifhv@nonFloat
- \ifhv@onlyText\hv@longCap
+ \ifhv@onlyText
+ \hv@longCap
\else
\ifx\hv@floatType\hv@figure
\ifx\relax\hv@shortCap\relax
@@ -510,11 +547,25 @@
\fi
\fi
\else
- \let\@captype\hv@floatType
- \expandafter\ifx\expandafter\relax\hv@shortCap\relax
- \caption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
- \else
- \caption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \ifhv@onlyText
+ \hv@longCap
+ \else
+ \let\@captype\hv@floatType
+ \ifhv@floatRefToObject
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax
+ \caption[]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \addcontentsline{\hv@floatListOfExt}{\hv@floatType}{\protect\numberline{\csname the\hv@floatType\endcsname}{\ignorespaces\hv@longCap}}%
+ \else
+ \caption[]{\hv@shortCap\expandafter\label\expandafter{\hv@label}}%
+ \addcontentsline{\hv@floatListOfExt}{\hv@floatType}{\protect\numberline{\csname the\hv@floatType\endcsname}{\ignorespaces\hv@shortCap}}%
+ \fi
+ \else
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax
+ \caption{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \caption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ \fi
\fi
\fi
% \expandafter\label\expandafter{\hv@label}% 2.17 put label into the caption argument
@@ -526,19 +577,37 @@
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
\ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
\ifhv@nonFloat
- \ifhv@onlyText\hv@longCap
- \else
- \ifx\hv@floatType\hv@figure
- \ifx\relax\hv@shortCap\relax \figcaption{\hv@longCap}\else\figcaption[\hv@shortCap]{\hv@longCap}\fi
- \else
- \ifx\relax\hv@shortCap\relax \tabcaption{\hv@longCap}\else\tabcaption[\hv@shortCap]{\hv@longCap}\fi
+ \ifhv@onlyText
+ \hv@longCap
+ \else
+ \ifx\hv@floatType\hv@figure
+ \ifx\relax\hv@shortCap\relax \figcaption{\hv@longCap}\else\figcaption[\hv@shortCap]{\hv@longCap}\fi
+ \else
+ \ifx\relax\hv@shortCap\relax \tabcaption{\hv@longCap}\else\tabcaption[\hv@shortCap]{\hv@longCap}\fi
+ \fi
\fi
- \fi
- \else
- \let\@captype\hv@floatType
- \expandafter\ifx\expandafter\relax\hv@shortCap\relax \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}\fi
- \fi
- \label{\hv@label}%
+ \else
+ \ifhv@onlyText
+ \hv@longCap
+ \else
+ \let\@captype\hv@floatType
+ \ifhv@floatRefToObject
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax
+ \caption[]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \addcontentsline{\hv@floatListOfExt}{\hv@floatType}{\protect\numberline{\csname the\hv@floatType\endcsname}{\ignorespaces\hv@longCap}}%
+ \else
+ \caption[]{\hv@shortCap\expandafter\label\expandafter{\hv@label}}%
+ \addcontentsline{\hv@floatListOfExt}{\hv@floatType}{\protect\numberline{\csname the\hv@floatType\endcsname}{\ignorespaces\hv@shortCap}}%
+ \fi
+ \else
+ \expandafter\ifx\expandafter\relax\hv@shortCap\relax
+ \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}%
+ \fi
+ \fi
+% \expandafter\ifx\expandafter\relax\hv@shortCap\relax \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}\fi
+ \fi
+ \fi
+ \label{\hv@label}%
\end{minipage}%
}% rotatebox
}% \sbox
@@ -555,7 +624,7 @@
\ifhv@star
\@nameuse{\hv@floatType*}% Start the floating environment *****************************
\else
- \begin{\hv@floatType} % Start the floating environment
+ \begin{\hv@floatType}% Start the floating environment
\fi
\fi
\checkoddpage
@@ -596,10 +665,10 @@
\ifoddpageoroneside\hv@@capPos=2\else\hv@@capPos=0\fi
\else
\ifx\hvSet@capPos\hv@Before
- \hv@@capPos=0 % same as cappos=right
+ \hv@@capPos=0% same as cappos=right
\else
\ifx\hvSet@capPos\hv@After
- \hv@@capPos=2 % same as capPos=right
+ \hv@@capPos=2% same as capPos=right
\fi
\fi
\fi
@@ -641,7 +710,7 @@
\usebox{\hvObjectBox}%
\fi
\end{minipage}%
- \or %2 is right
+ \or%2 is right
\ifx\hvSet@capVPos\hv@Center
\put@ObjectBox
\hspace{\hvSet@floatCapSep}%
@@ -657,7 +726,7 @@
\put@CaptionBox[2]%
\fi
\fi
- \or %3 bottom
+ \or%3 bottom
\ifdim\wd\hvCaptionBox>\wd\hvObjectBox
\begin{minipage}{\wd\hvCaptionBox}%
\else
@@ -678,7 +747,7 @@
% now we rotate the object and caption, if needed
%
\ifhv@wide
- \ifoddpageoroneside\else\ifoddpage\else\hspace*{-\marginparwidth}\fi\fi% <- for wide and left page
+ \ifoddpageoroneside\else\ifoddpage\else\hspace*{\dimexpr-\marginparwidth-\marginparsep}\fi\fi% <- for wide and left page
\fi
\ifx\hvSet@rotAngle\hv@Zero
\usebox{\@tempboxa}%
@@ -726,9 +795,9 @@
\else
\ifx\hvSet@capPos\hv@Outer \hv@@capPos=5
\else
- \ifx\hvSet@capPos\hv@Right \hv@@capPos=6 % only for twocolumn mode
+ \ifx\hvSet@capPos\hv@Right \hv@@capPos=6% only for twocolumn mode
\else
- \ifx\hvSet@capPos\hv@Left \hv@@capPos=7 % only for twocolumn mode
+ \ifx\hvSet@capPos\hv@Left \hv@@capPos=7% only for twocolumn mode
\else
\hv@@capPos=0
\fi
@@ -771,20 +840,20 @@
\setPageObject\setBottomCaption
\fi
\fi
- \else % onecolumn
+ \else% onecolumn
\ifoddpage
\setPageObject\setBottomCaption
\else% even page
\afterpage{\setPageObject\setBottomCaption}%
\fi
\fi
- \else % oneside
+ \else% oneside
\if@twocolumn
\ifoddpage
\if@firstcolumn% on right side
\setBottomCaption\setPageObject
\else
- \setPageObject\setBottomCaption
+ \setPageObject\setBottomCaption
\fi
\else
\if@firstcolumn% on left side
@@ -817,7 +886,7 @@
\setBottomCaption\setPageObject% start on same page/column
\fi
\fi
- \else % onecolumn
+ \else% onecolumn
\setBottomCaption\setPageObject
\fi
\or% caption on the outer column 5->outer
@@ -833,7 +902,7 @@
\if@firstcolumn
\setBottomCaption\setPageObject
\else
-
+%%% !!!! to-do: !!!!
\fi
\fi
\else% onecolumn
@@ -854,7 +923,7 @@
\if@firstcolumn
\setBottomCaption\setPageObject
\else
- \afterpage{\setBottomCaption\setPageObject}
+ \afterpage{\setBottomCaption\setPageObject}%
\fi
\else% onecolumn -> same as before
\setBottomCaption\setPageObject
@@ -1053,7 +1122,7 @@
}
\def\setBottomCaption{%
- \begin{\hv@floatType}[!b]
+ \begin{\hv@floatType}[!b]%
\ifhv@separatorLine\drawSepLine\fi
\par
\usebox\hvCaptionBox