texlive[60587] Master/texmf-dist: hvfloat (23sep21)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 23 22:12:20 CEST 2021
Revision: 60587
http://tug.org/svn/texlive?view=revision&revision=60587
Author: karl
Date: 2021-09-23 22:12:19 +0200 (Thu, 23 Sep 2021)
Log Message:
-----------
hvfloat (23sep21)
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/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/fullpage1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
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/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/odd1s1c.tex
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-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-inner2s2c.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/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/wide2s2c.pdf
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-09-22 23:48:34 UTC (rev 60586)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-09-23 20:12:19 UTC (rev 60587)
@@ -1,4 +1,5 @@
hvfloat.sty:
+2.34 2021-09-23 - fix for nonFloat and forceOutput
2.33 2021-07-14 - fix for doublePAGE, needs length setting inside the macro
2.32 2021-06-29 - make multi and multisubflots caption align with the bottom
- added graphicx option doublefullPage
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/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)
Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/felsen-wasser-small.pdf
===================================================================
(Binary files differ)
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/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)
Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt 2021-09-22 23:48:34 UTC (rev 60586)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/missing.txt 2021-09-23 20:12:19 UTC (rev 60587)
@@ -1,4 +0,0 @@
-Not all images of the documentation are listed here, because
-some are not for public use. You can use any other image if you
-want to run the documentation by yourselve.
-
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/odd1s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex 2021-09-22 23:48:34 UTC (rev 60586)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.tex 2021-09-23 20:12:19 UTC (rev 60587)
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: odd1s1c.tex 119 2021-06-20 13:28:09Z herbert $
+%% $Id: odd1s1c.tex 72 2021-05-02 11:40:10Z herbert $
\input{preamble.ltx}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/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-default1s1c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex 2021-09-22 23:48:34 UTC (rev 60586)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.tex 2021-09-23 20:12:19 UTC (rev 60587)
@@ -1,81 +0,0 @@
-\documentclass{scrartcl}
-%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $
-
-\input{preamble.ltx}
-\setlength\columnseprule{0.4pt}
-
-\begin{document}
-\title{Example for FULLPAGE floats}
-\author{Herbert Voß}
-\maketitle
-
-\tableofcontents
-
-\blinddocument
-
-\section{File \texttt{\jobname}}
-
-\begin{lstlisting}
-The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
-\end{lstlisting}
-
-The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}.
-
-\begin{lstlisting}
-\hvFloat*[FULLPAGE]%
- {figure}%
- {\includegraphics[FULLPAGE]{frose}}%
- [A FULLPAGE float with the default caption setting]%
- {A default caption of a ``FULLPAGE'' object with the default setting, which
- is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}%
- {fig:FULLPAGE0}
-\end{lstlisting}
-
-
-\Float[default]
-\hvFloat*[FULLPAGE]%
- {figure}%
- {\includegraphics[FULLPAGE]{frose}}%
- [A FULLPAGE float with the default caption setting]%
- {A default caption of a ``FULLPAGE'' object with the default setting, which
- is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}%
- {fig:FULLPAGE0}
-
-\blinddocument
-
-\begin{lstlisting}
-\hvFloat*[FULLPAGE]%
- {figure}%
- {\includegraphics[FULLPAGE]{frose}}%
- [A FULLPAGE float with the default caption setting]%
- {A default caption of a ``FULLPAGE'' object with the default setting, which
- is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}%
- {fig:FULLPAGE1}
-\end{lstlisting}
-
-
-\Float[default]
-\hvFloat*[FULLPAGE]%
- {figure}%
- {\includegraphics[FULLPAGE]{frose}}%
- [A FULLPAGE float with the default caption setting]%
- {A default caption of a ``FULLPAGE'' object with the default setting, which
- is a ``left'' caption which means that it always appears before the object.
- This can be an even or odd page. And some more text whch has no
- real meaning because it fills only the space for a long caption.}%
- {fig:FULLPAGE1}
-
-\blinddocument
-
-\Blindtext
-
-\blindtext
-
-
-\end{document}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.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-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)
Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/sonne-meer.jpg
===================================================================
(Binary files differ)
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)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty 2021-09-22 23:48:34 UTC (rev 60586)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat-fps.sty 2021-09-23 20:12:19 UTC (rev 60587)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat-fps.sty 121 2021-06-20 13:36:11Z herbert $
+%% $Id: hvfloat-fps.sty 120 2021-06-20 13:31:02Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
%%
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-09-22 23:48:34 UTC (rev 60586)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-09-23 20:12:19 UTC (rev 60587)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 126 2021-06-29 12:56:04Z herbert $
+%% $Id: hvfloat.sty 257 2021-09-23 11:44:35Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.33}
-\def\filedate{2021/07/14}
+\def\fileversion{2.34}
+\def\filedate{2021/09/23}
%\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
@@ -180,6 +180,7 @@
\newif\ifhv at doublePage
\newif\ifhv at setObjectLabel
\newif\ifhv at global@sameHeight
+\newif\ifhv at forceOutput
\newlength\hvSet at bindCorrection
\newlength\hvSet at sepLineskip
@@ -195,7 +196,7 @@
\define at key{hvSet}{doubleFULLPAGE}[true]{\global\@nameuse{hv at doubleFULLPAGE#1}\hv at doublePagefalse\hv at doublePAGEfalse}
\define at key{hvSet}{doublePAGE}[true]{\global\@nameuse{hv at doublePAGE#1}\hv at doublePagefalse\hv at doubleFULLPAGEfalse}
\define at key{hvSet}{doublePage}[true]{\global\@nameuse{hv at doublePage#1}\hv at doublePAGEfalse\hv at doubleFULLPAGEfalse}
-\define at key{hvSet}{bindCorr}[0]{%
+\define at key{hvSet}{bindCorr}[0pt]{%
\def\hv at temp{#1}%
\ifx\hv at temp\hv at Inner
\setlength\hvSet at bindCorr{\dimexpr1in+\oddsidemargin}%
@@ -225,6 +226,8 @@
}
\define at key{hvSet}{capFormat}{\def\hv at caption@format{#1}}%
\define at key{hvSet}{subcapFormat}{\def\hv at subcaption@format{#1}}%
+\define at boolkey{hvSet}[hv@]{forceOutput}[true]{%
+ \ifhv at forceOutput\hv at nonFloattrue\fi}% immediate output, no floating!
\def\hv at set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x}
\let\hvFloatSet\hv at set
@@ -236,7 +239,7 @@
\hv at set{%
floatPos=, rotAngle=0, capWidth=n, capAngle=0, objectAngle=0,
capPos=bottom, capVPos=center, objectPos=center, allHPos=center,
- floatCapSep=5pt, useOBox=false, nonFloat=false,
+ floatCapSep=5pt, useOBox=false,
onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
doubleFULLPAGE=false, doublePage=false, doublePAGE=false,
multiFloat=false,subFloat=false,
@@ -245,10 +248,12 @@
sameHeight=false,
bindCorr=\z@,sepLineskip=0pt,
vFill=false, minTextlines=2,
+ forceOutput=false, nonFloat=false,
}%
}
\let\hvFloatSetDefaults\setDefaults
+\hvFloatSetDefaults% onyl for first loading of the package
\newcommand\hv at typeout[1]{\ifhv at Debug\typeout{>>>> #1}\fi}
@@ -452,6 +457,7 @@
% #6: label
%
+
\def\hvFloat{\@ifnextchar*% Main macro
{\global\hv at startrue\hv at maxImageWidth=\textwidth\hvFloat at i}%
{\global\hv at starfalse\hv at maxImageWidth=\columnwidth\hvFloat at i*}%
@@ -1091,6 +1097,9 @@
\fi
\fi
\hv at typeout{do at hvFloat@doublePage:hv at tempWidthA=\the\hv at tempWidthA}%
+ \ifhv at forceOutput
+ \do at hvFloat@doublePAGECaptionRight{#1}% no cheque
+ \else
\checkoddpage
\ifoddpage
\if at twocolumn
@@ -1142,6 +1151,7 @@
\fi
\fi
\let\c at fptop\hv at fptop
+ \fi
\endgroup% started at main macro \hvFloat
}
%
@@ -1465,10 +1475,14 @@
\expandafter\hvFloatSet\expandafter{\hv at save@setting}%
\ifhv at separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\end{\hv at floatType}%
@@ -1478,10 +1492,14 @@
\expandafter\hvFloatSet\expandafter{\hv at save@setting}%
\ifhv at separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\end{\hv at floatType*}%
@@ -1535,8 +1553,8 @@
\refstepcounter{hv at tempCNTtabA}% before caption
\fi
\ifx\hv at label\@empty\else\label{\hv at label}\fi
-% \afterpage{%
- \newpage\if at twocolumn\null\newpage\fi
+ \newpage
+ \if at twocolumn\null\newpage\fi
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\thispagestyle{empty}%
\vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox
@@ -1553,14 +1571,18 @@
\begin{\hv at floatType}[!b]
\ifhv at separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\end{\hv at floatType}%
- }%}%
+ }%
}
\def\do at hvFloat@doubleFULLPAGE at CaptionAfterTwoCol{%
@@ -1594,10 +1616,14 @@
\hv at twoColumnCaptiontrue
\ifhv at separatorLine\drawSepLine\fi
% \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\end{\hv at floatType*}%
@@ -1638,10 +1664,14 @@
\ifdim\hv at tempWidthB < 2\paperwidth
\rotatebox[origin=lb]{90}{\makebox[\paperheight][c]{\parbox{0.8\ht\hvObjectBox}{%
% \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
}}}% rotatebox
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
@@ -1648,10 +1678,14 @@
\else% ifdim: no space left on page
\put(-2\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering
\parbox{0.8\textwidth}{%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
+ \else
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
}%
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
@@ -1663,10 +1697,14 @@
\else
\put(\the\dimexpr1.5\paperwidth-\wd\hvObjectBox-\hvSet at bindCorrection,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][c]{\parbox{\textwidth}{%%
% \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
+ \else
+ \ifx\hv at shortCap\@empty
+ \captionof{\hv at floatType}{\hv at longCap}%
+ \else
+ \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
}}}%
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
@@ -1863,11 +1901,15 @@
\expandafter\hvFloatSet\expandafter{\hv at save@setting}%
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
- \edef\@captype{\hv at floatType}%
- \expandafter\ifx\expandafter\relax\hv at shortCap\relax
- \caption{\hv at longCap}%
+ \ifhv at onlyText
+ \hv at longCap
\else
- \caption[\hv at shortCap]{\hv at longCap}%
+ \edef\@captype{\hv at floatType}%
+ \expandafter\ifx\expandafter\relax\hv at shortCap\relax
+ \caption{\hv at longCap}%
+ \else
+ \caption[\hv at shortCap]{\hv at longCap}%
+ \fi
\fi
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\endminipage}%
More information about the tex-live-commits
mailing list.