texlive[52010] Master/texmf-dist: hvfloat (1sep19)
commits+karl at tug.org
commits+karl at tug.org
Sun Sep 1 23:36:31 CEST 2019
Revision: 52010
http://tug.org/svn/texlive?view=revision&revision=52010
Author: karl
Date: 2019-09-01 23:36:30 +0200 (Sun, 01 Sep 2019)
Log Message:
-----------
hvfloat (1sep19)
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/after2s2c.tex
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/default1s2c.tex
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/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/fullpage1s2c.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/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/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/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/tex/latex/hvfloat/hvfloat.sty
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2019-09-01 21:36:04 UTC (rev 52009)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2019-09-01 21:36:30 UTC (rev 52010)
@@ -1,4 +1,5 @@
hvfloat.sty:
+2.16 2019-08-31 - fix for \hvFloat* and full page images
2.15 2019-05-13 - added optional arguments capFormat and subcapFormat
which will pass the key values to \caption or
\subcaption from package caption/subcaption
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/after2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex 2019-09-01 21:36:04 UTC (rev 52009)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex 2019-09-01 21:36:30 UTC (rev 52010)
@@ -74,7 +74,7 @@
\blinddocument
-\Blindtext
+\Blindtext \Blindtext
\end{document}
\ No newline at end of file
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/default1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex 2019-09-01 21:36:04 UTC (rev 52009)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex 2019-09-01 21:36:30 UTC (rev 52010)
@@ -19,7 +19,7 @@
\hvFloat*[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
+ {A default caption of a ``default'' 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.}%
@@ -26,12 +26,11 @@
{fig:0}
\end{lstlisting}
-
\Float[default star]
\hvFloat*[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
+ {A default caption of a ``default'' 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.}%
@@ -45,19 +44,17 @@
\hvFloat[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
+ {A default caption of a ``default'' object with the default setting, which
is a ``left'' caption which means that it always appears before the object.}%
{fig:1}
\end{lstlisting}
-
\Float[default]
\hvFloat[capPos=right]{figure}%
{\includegraphics{frose}}%
[A float with the default caption setting]%
- {A default caption of a ``'' object with the default setting, which
- is a ``left'' caption which means that it always appears before the object.}%
- {fig:1}
+ {A default caption of a ``default'' object with the default setting, which
+ is a ``left'' caption which means that it always appears before the object.}{fig1}
\blinddocument
@@ -66,4 +63,6 @@
\blindtext
-\end{document}
\ No newline at end of file
+\end{document}
+
+
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/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/fullpage1s2c.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex 2019-09-01 21:36:04 UTC (rev 52009)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex 2019-09-01 21:36:30 UTC (rev 52010)
@@ -1,5 +1,5 @@
\documentclass[twocolumn]{scrartcl}
-%% $Id: fullpage1s2c.tex 1033 2019-04-04 07:24:57Z herbert $
+%% $Id: fullpage1s2c.tex 1072 2019-06-09 14:14:19Z herbert $
\input{preamble.ltx}
\setlength\columnseprule{0.4pt}
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2019-09-01 21:36:04 UTC (rev 52009)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2019-09-01 21:36:30 UTC (rev 52010)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 1054 2019-05-13 08:20:11Z herbert $
+%% $Id: hvfloat.tex 1072 2019-06-09 14:14:19Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4]{scrartcl}
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/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-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-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)
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex 2019-09-01 21:36:04 UTC (rev 52009)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex 2019-09-01 21:36:30 UTC (rev 52010)
@@ -74,7 +74,7 @@
\blinddocument
-\Blindtext
+\Blindtext \Blindtext
\end{document}
\ No newline at end of file
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/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2019-09-01 21:36:04 UTC (rev 52009)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2019-09-01 21:36:30 UTC (rev 52010)
@@ -1,7 +1,7 @@
-%% $Id: hvfloat.sty 1042 2019-04-08 18:34:25Z herbert $
+%% $Id: hvfloat.sty 1054 2019-05-13 08:20:11Z herbert $
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hvfloat}[2019/04/08 rotating of floating objects]
+\ProvidesPackage{hvfloat}[2019/05/13 rotating of floating objects]
%%
%% IMPORTANT NOTICE:
%%
@@ -16,8 +16,8 @@
%% DESCRIPTION:
%% `hvfloat' offers rotating of captions and objects for floats
%%
-\def\fileversion{2.14}
-\def\filedate{2019/05/10}
+\def\fileversion{2.15}
+\def\filedate{2019/08/31}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\let\hvFileVersion\fileversion
%
@@ -129,9 +129,18 @@
\define at boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment
\define at boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text
\define at boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text
-\define at boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page
+
+
+\newif\ifhv at fullpage
+\newif\ifhv at FULLPAGE
+
+%\define at boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page
%\define at boolkey{hvSet}[hv@]{FullPage}[true]{}% fullpage float with caption on other page
-\define at boolkey{hvSet}[hv@]{FULLPAGE}[true]{}% fullpage float with caption on other page
+%\define at boolkey{hvSet}[hv@]{FULLPAGE}[true]{}% fullpage float with caption on other page
+
+\define at key{hvSet}{fullpage}[true]{\global\@nameuse{hv at fullpage#1}}% wegen \afterpage problem
+\define at key{hvSet}{FULLPAGE}[true]{\global\@nameuse{hv at FULLPAGE#1}}
+
\define at boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats
\ifhv at subFloat\setkeys{hvSet}{multiFloat=false}\fi%
}%
@@ -146,6 +155,9 @@
{\begingroup
\edef\x{\endgroup\noexpand\setkeys{hvSet}{\@nameuse{hv@#1}}}\x}% use a defined style
}
+\define at key{hvSet}{capFormat}[]{\def\hv at caption@format{#1}}%
+\define at key{hvSet}{subcapFormat}[]{\def\hv at subcaption@format{#1}}%
+
\def\hv at set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x}
\let\hvFloatSet\hv at set
%
@@ -159,10 +171,13 @@
onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
multiFloat=false,subFloat=false,
separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip,
+ capFormat={}, subcapFormat={},
}%
}
\newcommand\reset at special@float{%
- \hv at set{subFloat=false,fullpage=false,multiFloat=false,FULLPAGE=false}}
+ \hv at set{subFloat=false,%fullpage=false,
+ multiFloat=false,%FULLPAGE=false
+}}
\def\hv at vskip{\vspace{\hvMultiFloatSkip}}
@@ -188,9 +203,15 @@
}
%
\newcommand\figcaption[2][]{\def\@captype{figure}%
- \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup}
+ \begingroup
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+ \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
+ \endgroup}
\newcommand\tabcaption[2][]{\def\@captype{table}%
- \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup}
+ \begingroup
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+ \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
+ \endgroup}
%
\newlength\hv at maxImageWidth
\AtBeginDocument{\hv at maxImageWidth=\columnwidth}
@@ -271,8 +292,8 @@
\setDefaults
\def\hvFloat{\@ifnextchar*% Main macro
- {\hv at startrue\hv at maxImageWidth=\textwidth\hvFloat at i}%
- {\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*}%
}
%\newcommand*{\hvFloat}[5][]+{%
@@ -289,7 +310,7 @@
\begingroup
\setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}%
\hv at maxImageWidth=\textwidth
- \hv at capbesidefalse
+% \hv at capbesidefalse
\reset at special@float
\setcounter{hv at pfigure}{\value{figure}}%
\setcounter{hv at ptable}{\value{table}}%
@@ -361,7 +382,7 @@
\def\hvFloat at ii[#1]#2#3{%
\hv at maxImageWidth=\textwidth
- \hv at capbesidefalse
+% \hv at capbesidefalse
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
\gdef\hv at floatType{#2}%
\ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi
@@ -419,7 +440,11 @@
\ifhv at wide
\setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet at floatCapSep\relax}%
\else
- \setlength\hvCapWidth{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet at floatCapSep\relax}%
+ \ifhv at star
+ \setlength\hvCapWidth{\the\dimexpr\textwidth-\hvObjectWidth-\hvSet at floatCapSep\relax}%
+ \else
+ \setlength\hvCapWidth{\the\dimexpr\linewidth-\hvObjectWidth-\hvSet at floatCapSep\relax}%
+ \fi
\fi
\else
\setlength\hvCapWidth{\columnwidth}%
@@ -450,6 +475,7 @@
\ifx\hvSet at capAngle\hv at Zero % need rotation?
\sbox\hvCaptionBox{% NO rotation
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\ifhv at nonFloat
\ifhv at onlyText\hv at longCap
\else
@@ -470,6 +496,7 @@
\sbox\hvCaptionBox{% Rotation
\rotatebox{\hvSet at capAngle}{%
\begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\ifhv at nonFloat
\ifhv at onlyText\hv at longCap
\else
@@ -496,11 +523,14 @@
\def\fps at figure{\hvSet at floatPos}%
\ifhv at nonFloat
\begingroup% Start the nonfloat part
- \checkoddpage
- \else
- \begin{\hv at floatType}% Start the floating environment
- \checkoddpage
+ \else
+ \ifhv at star
+ \@nameuse{\hv at floatType*}% Start the floating environment *****************************
+ \else
+ \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
@@ -551,7 +581,7 @@
\fi
\fi
%%%%
- \savebox{\@tempboxa}{%
+ \savebox{\@tempboxa}{% ***** @tempbox start
\expandafter\ifcase\the\hv@@capPos% 0 is LEFT START \ifcase
\ifx\hvSet at capVPos\hv at Center
\put at CaptionBox
@@ -615,7 +645,7 @@
\fi
\end{minipage}%
\fi% \ifcase\the\hv@@capPos
- }% End savebox Object and caption
+ }% End savebox Object and caption %%%%%%%%%%%%%%%%% @tempboxa
%
% now we rotate the object and caption, if needed
%
@@ -635,7 +665,11 @@
\fi
\endgroup% End the nonfloat part
\else
- \end{\hv at floatType}% End the floating environment
+ \ifhv at star
+ \@nameuse{end\hv at floatType*}% End the floating environment
+ \else
+ \end{\hv at floatType}% End the floating environment
+ \fi
\fi
\endgroup% startet at main \hvFloat
}
@@ -712,7 +746,7 @@
\else % onecolumn
\ifoddpage
\setPageObject\setBottomCaption
- \else
+ \else% even page
\afterpage{\setPageObject\setBottomCaption}%
\fi
\fi
@@ -844,6 +878,7 @@
\def\getMultiCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage[b]{\linewidth}%
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
\hv at cntb=\clist_count:N\l_clist_Type
@@ -868,6 +903,7 @@
}
\def\getMultiObjectAndLabel{%
\global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\ifx\hvSet at objectPos\hv at Right\raggedleft\else
\ifx\hvSet at objectPos\hv at Left\raggedleft\else
\ifx\hvSet at objectPos\hv at Center\centering
@@ -893,6 +929,7 @@
\def\getMultiSubCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
\xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats
@@ -909,6 +946,7 @@
\def\getMultiSubObjectAndLabel{%
\global\sbox\hvObjectBox{\minipage{\linewidth}%
+ \ifx\relax\hv at subcaption@format\relax\else\captionsetup[sub]{\hv at subcaption@format}\fi
\ifx\hvSet at objectPos\hv at Right\raggedleft\else
\ifx\hvSet at objectPos\hv at Left\raggedleft\else
\ifx\hvSet at objectPos\hv at Center\centering
@@ -949,6 +987,7 @@
\def\getSingleCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
+ \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\setlength\belowcaptionskip{5pt}%
\setlength\abovecaptionskip{0pt}%
\edef\@captype{\hv at floatType}%
More information about the tex-live-commits
mailing list