summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/hvfloat/latex/hvfloat.sty
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-05-07 03:01:25 +0000
committerNorbert Preining <norbert@preining.info>2021-05-07 03:01:25 +0000
commitc92d9953347e3bdebc5243c67cf012a2f7a60fb6 (patch)
tree808a0ad402713257a48445f97e662786d95207ee /macros/latex/contrib/hvfloat/latex/hvfloat.sty
parent25f20b6d8ccd4edcdfec23c1a3c908516076ee06 (diff)
CTAN sync 202105070301
Diffstat (limited to 'macros/latex/contrib/hvfloat/latex/hvfloat.sty')
-rw-r--r--macros/latex/contrib/hvfloat/latex/hvfloat.sty240
1 files changed, 160 insertions, 80 deletions
diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
index dd27d7af47..61222e4aca 100644
--- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty
+++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 73 2021-05-03 07:38:13Z herbert $
+%% $Id: hvfloat.sty 75 2021-05-04 19:52:22Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.21}
-\def\filedate{2021/05/04}
+\def\fileversion{2.22}
+\def\filedate{2021/05/06}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
\let\hvFloatFileVersion\fileversion
@@ -128,7 +128,7 @@
}
\newif\ifhv@floatRefToObject
-\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to
+\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to (inactive)
\ifcase\nr\relax
\hv@floatRefToObjectfalse
\else
@@ -151,7 +151,9 @@
\define@boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment
\define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text
\define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text
+\define@boolkey{hvSet}[hv@]{debug}[true]{}% give more infos in the terminal
+\newcommand\hv@typeout[1]{\ifhv@debug\typeout{#1}\fi}
\newif\ifhv@fullpage
\newif\ifhv@FULLPAGE
@@ -190,7 +192,7 @@
%
\newcommand{\setDefaults}{%
\hv@set{%
- floatPos=htbp, rotAngle=0, capWidth=n, capAngle=0,
+ floatPos=, rotAngle=0, capWidth=n, capAngle=0,
capPos=bottom, capVPos=center, objectPos=center, objectAngle=0,
floatCapSep=5pt, useOBox=false, nonFloat=false,
onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
@@ -232,10 +234,11 @@
\setlength\belowcaptionskip{\hvBelowCaptionSkip}%
}
%
-\newcommand\figcaption[2][]{\def\@captype{figure}%
+\newcommand\figcaption[2][]{%
+ \def\@captype{figure}%
\begingroup
\ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
- \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
+ \if$#1$ \caption{#2}\else\caption[#1]{#2}\fi
\endgroup}
\newcommand\tabcaption[2][]{\def\@captype{table}%
\begingroup
@@ -404,29 +407,17 @@
\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@iii[#1]#2[#3]#4{% #1: key/value, #2: floattype, #3: ListOfExt, #4: object
+\def\hvFloat@ii[#1]#2#3{% #1: key/value, #2: floattype, #3: 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
+ \xdef\hv@floatListOfExt{\@nameuse{ext@\hv@floatType}}%
\ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi
- \gdef\hv@floatObject{#4}%
+ \gdef\hv@floatObject{#3}%
\@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}%
}
-\def\do@@hvFloat[#1]#2#3{%
+\def\do@@hvFloat[#1]#2#3{% #1: listof caption, #2. long caption #3: label
\gdef\hv@shortCap{#1}%
\gdef\hv@longCap{#2}%
\gdef\hv@label{#3}%
@@ -458,7 +449,7 @@
% \global\hv@capbesidefalse
}
%
-\def\do@@@hvFloat{% no special float page
+\def\do@@@hvFloat{% no special float page, caption and image on top of each other or side by side
\def\@tempa{90}%
\ifx\hvSet@rotAngle\@tempa
\setlength\hvMaxCapWidth{\textheight}%
@@ -551,21 +542,12 @@
\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
\fi
% \expandafter\label\expandafter{\hv@label}% 2.17 put label into the caption argument
@@ -591,20 +573,9 @@
\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}%
@@ -617,7 +588,11 @@
% rotated angles saved in different boxes
%%
\restoreCaptionSkip% save old values
- \def\fps@figure{\hvSet@floatPos}%
+% \def\fps@figure{\hvSet@floatPos}%
+ \ifx\hvSet@floatPos\@empty % use type default
+ \else
+ \@namedef{fps@\hv@floatType}{\hvSet@floatPos}%
+ \fi
\ifhv@nonFloat
\begingroup% Start the nonfloat part
\else
@@ -953,13 +928,27 @@
\medskip
\ifdim\dp\hvObjectBox > \z@
\rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\fi
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
\fi
}%
}%
@@ -982,13 +971,27 @@
\medskip
\ifdim\dp\hvObjectBox > \z@
\rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\fi
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
\fi
}}}%
\fi
@@ -997,6 +1000,7 @@
\def\do@hvFloat@doublePAGE#1{% image on left and right page with caption on the right ----------------------------------
% #1-> 0/1 caption under/right
+ \hv@typeout{>>>>do@hvFloat@doublePAGE}%
\checkoddpage
\ifoddpage
\afterpage{%
@@ -1012,13 +1016,27 @@
\medskip
\ifdim\dp\hvObjectBox > \z@
\rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\fi
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
\fi
\newpage
}%
@@ -1037,13 +1055,27 @@
\medskip
\ifdim\dp\hvObjectBox > \z@
\rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
\fi
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
\fi
\newpage
}}%
@@ -1053,66 +1085,114 @@
%
\def\do@hvFloat@doubleFULLPAGE#1{% image on left and right page with caption on the right ----------------------------------
% #1-> 0/1 caption under/right
+ \hv@typeout{>>>>do@hvFloat@doubleFULLPAGE}%
\checkoddpage
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\ifoddpage
+ \hv@typeout{>>>>>doubleFULLPAGE->oddpage}%
\afterpage{%
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip}% +0.5\paperheight-0.5\ht\hvObjectBox
+ \begingroup
+ \nointerlineskip
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
+ \endgroup
\AtBeginShipoutNext{\thispagestyle{empty}}%
\clipbox*{0 0 \paperwidth{} \height}{\usebox\hvObjectBox}%
\newpage
\AtBeginShipoutNext{\thispagestyle{empty}}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\normalbaselineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \begingroup
+ \nointerlineskip
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
+ \endgroup
\clipbox*{\paperwidth{} 0 \wd\hvObjectBox{} \paperheight{}}{\usebox\hvObjectBox}%
\savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{%
- \captionof*{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \captionof*{\hv@floatType}{\hv@longCap}}}%
+% \captionof*{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
\ifnum#1>0
\ifdim\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox\relax < 2\paperwidth
- \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \hv@typeout{>>>>>doubleFULLPAGE->oddpage->floatRefToObject=false}%
+ \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{%
+ \if$\hv@shortCap$
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }}%
+% \fi
\else
\put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
- \parbox{0.8\textwidth}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}\endminipage
- }}}%
+ \parbox{0.8\textwidth}{%
+ \hv@typeout{>>>>>doubleFULLPAGE->oddpage->#1<0->floatRefToObject=false}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }%
+ \endminipage}}}%
\fi
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \ifx\relax\hv@shortCap\relax
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
\fi
\newpage
}%
\else
+ \hv@typeout{>>>>>doubleFULLPAGE->evenpage}%
\afterpage{%
\AddToHookNext{shipout/before}{%
\newpage
\AddToHook{begin/page}{\thispagestyle{empty}}
\global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip}% +0.5\paperheight-0.5\ht\hvObjectBox
+ \begingroup
+ \nointerlineskip
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}%
+ \endgroup
\AtBeginShipoutNext{\thispagestyle{empty}}%
\clipbox*{0 0 \paperwidth{} \paperheight}{\usebox\hvObjectBox}%
\newpage
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\normalbaselineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
+ \begingroup
+ \nointerlineskip
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip
\hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}%
+ \endgroup
\clipbox*{\paperwidth{} 0 \wd\hvObjectBox{} \paperheight{}}{\usebox\hvObjectBox}%
\AtBeginShipoutNext{\thispagestyle{empty}}%
- \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{%
- \captionof*{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
+ \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv@floatType}[\hv@shortCap]{\hv@longCap}}}%
+% \captionof*{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}}%
\ifnum#1>0
\ifdim\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox\relax < 2\paperwidth
- \rotatebox{90}{\minipage{\the\ht\hvObjectBox}\centering\parbox{0.75\textwidth}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}%
- \endminipage}%
+ \rotatebox{90}{\minipage{\the\ht\hvObjectBox}\centering\parbox{0.75\textwidth}{%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }%
+ \endminipage}%
\else% no space on the right, put it over the imag
\put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\the\dimexpr\ht\hvObjectBox}%
- \centering\parbox{0.8\textwidth}{%
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}}\endminipage}}}%
+ \centering\parbox{0.8\textwidth}{%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
+ }%
+ \endminipage}}}%
\fi
\else
- \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \ifx\hv@shortCap\@empty
+ \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \else
+ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}%
+ \fi
\fi
\newpage
}%
@@ -1136,7 +1216,7 @@
\begin{\hv@floatType}[p]%
\fi
\ifhv@FULLPAGE
- \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip}%
+ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep}%-0.5\baselineskip%
\checkoddpage
\if@twoside
\ifoddpage
@@ -1278,9 +1358,9 @@
\setlength\abovecaptionskip{0pt}%
\edef\@captype{\hv@floatType}%
\expandafter\ifx\expandafter\relax\hv@shortCap\relax
- \caption{\hv@longCap}%
+ \caption{\hv@longCap}%
\else
- \caption[\hv@shortCap]{\hv@longCap}%
+ \caption[\hv@shortCap]{\hv@longCap}%
\fi
\expandafter\ifx\expandafter\relax\hv@label\relax\else\label{\hv@label-cap}\fi
\endminipage}%