texlive[59506] Master/texmf-dist: hvfloat (7jun21)
commits+karl at tug.org
commits+karl at tug.org
Mon Jun 7 22:03:39 CEST 2021
Revision: 59506
http://tug.org/svn/texlive?view=revision&revision=59506
Author: karl
Date: 2021-06-07 22:03:38 +0200 (Mon, 07 Jun 2021)
Log Message:
-----------
hvfloat (7jun21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.tex
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf
trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex
trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.inc
trunk/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.ltx
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-06-07 20:03:16 UTC (rev 59505)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/Changes 2021-06-07 20:03:38 UTC (rev 59506)
@@ -1,4 +1,7 @@
hvfloat.sty:
+2.27 2021-06-07 - added \tabcaptionbelow
+ - fix bug with vertical alignment for top captions
+ - fix for local caption and subcaption setting
2.26 2021-05-31 - allow option wide in twocolumn mode
- allow a stretched minipage for
multifloat and multisubfloat by using
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.inc
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.inc (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.inc 2021-06-07 20:03:38 UTC (rev 59506)
@@ -0,0 +1,129 @@
+
+\subsection{\texttt{default}}
+\blindtext
+
+\begin{lstlisting}
+\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
+
+
+
+%----------------------top-----------------------------------
+\subsection{\texttt{capPos=top}}
+
+\begin{lstlisting}
+\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
+
+%----------------------before-----------------------------------
+\subsection{\texttt{capPos=before}, same as \texttt{capPos=left}}
+
+\begin{lstlisting}
+\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+\NewColumn
+
+%----------------------after-----------------------------------
+\subsection{\texttt{capPos=after}, same as \texttt{capPos=right}}
+
+\begin{lstlisting}
+\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
+
+%----------------------inner-----------------------------------
+\subsection{\texttt{capPos=inner}}
+
+\begin{lstlisting}
+\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
+
+
+%----------------------outer-----------------------------------
+\subsection{\texttt{capPos=outer}}
+
+\begin{lstlisting}
+\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
+
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.inc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.ltx
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.ltx 2021-06-07 20:03:16 UTC (rev 59505)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.ltx 2021-06-07 20:03:38 UTC (rev 59506)
@@ -1,34 +0,0 @@
-\documentclass[twoside,DIV=11]{scrartcl}
-%% $Id: capPos.ltx 72 2021-05-02 11:40:10Z herbert $
-
-\input{preamble.ltx}
-\usepackage{multicol}
-\usepackage[all=!htb]{hvfloat-fps}
-
-\setlength\columnseprule{0.4pt}
-\def\capShortText{A short caption}
-\def\capLongText{Here comes a caption to show the justification of the text relative to the object. It refers to
-the optional argument \texttt{capPos}.}
-
-\let\OrigBlindtext\blindtext
-\def\blindtext{\TeX\ is a typesetting language. Instead of visually formatting your text, you enter y
-our manuscript text intertwined with \TeX\ commands in a plain text file. You then run \TeX\ to
-produce formatted output, such as a PDF file. %Thus, in contrast to standard word processors,
-%your document is a separate file that does not pretend to be a representation of the final
-%typeset output, and so can be easily edited and manipulated.
-}
-
-
-
-\begin{document}
-\part{Examples for \texttt{capPos} and onecolumn mode}\clearpage
-\let\NewColumn\clearpage
-\input{capPos}
-
-\twocolumn[\part{Examples for \texttt{capPos} and twocolumn mode}]
-\def\blindtext{\OrigBlindtext}
-\let\NewColumn\columnbreak
-\input{capPos}
-
-
-\end{document}
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.tex 2021-06-07 20:03:16 UTC (rev 59505)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/capPos.tex 2021-06-07 20:03:38 UTC (rev 59506)
@@ -1,129 +1,50 @@
+\documentclass[twoside,DIV=13]{scrartcl}
+%% $Id: capPos.tex 103 2021-05-31 12:37:11Z herbert $
-\section{\texttt{default}}
-\blindtext
+\input{preamble.ltx}
+\usepackage{multicol}
+\usepackage[all=!htb]{hvfloat-fps}
-\begin{lstlisting}
-\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{}
-\end{lstlisting}
+\setlength\columnseprule{0.4pt}
+\def\capShortText{A short caption}
+\def\capLongText{Here comes a caption to show the justification of the text relative to the object. It refers to
+the optional argument \texttt{capPos}.}
-\hvFloat{figure}{\includegraphics{frose}}{\capShortText}{}
+\let\OrigBlindtext\blindtext
+\def\myblindtext{\TeX\ is a typesetting language. Instead of visually formatting your text, you enter y
+our manuscript text intertwined with \TeX\ commands in a plain text file. You then run \TeX\ to
+produce formatted output, such as a PDF file. %Thus, in contrast to standard word processors,
+%your document is a separate file that does not pretend to be a representation of the final
+%typeset output, and so can be easily edited and manipulated.
+}
-\blindtext
-\begin{lstlisting}
-\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{}
-\end{lstlisting}
-\hvFloat{figure}{\includegraphics{frose}}{\capLongText}{}
+\begin{document}
-\blindtext
+\tableofcontents
-\NewColumn
+\newpage
+\section{Examples for \texttt{capPos} and onecolumn mode}
+\let\NewColumn\clearpage
+\let\blindtext\myblindtext
+\input{capPos.inc}
+\section{Examples for \texttt{capVPos} and onecolumn mode }
+Horizontal alignment with the optional arguments from package \texttt{caption}, e.g. \texttt{singlelinecheck=off} for short captions.
-%----------------------top-----------------------------------
-\section{\texttt{capPos=top}}
+\input{capVPos.inc}
-\begin{lstlisting}
-\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
-\end{lstlisting}
-\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+\twocolumn[\section{Examples for \texttt{capPos} and twocolumn mode}]
+\let\NewColumn\columnbreak
+\input{capPos.inc}
-\blindtext
+\let\blindtext\OrigBlindtext
+\section{Examples for \texttt{capVPos} and twocolumn mode (\texttt{capPos=right})}
+\let\NewColumn\columnbreak
+\input{capVPos.inc}
-\begin{lstlisting}
-\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
-\end{lstlisting}
-\hvFloat[capPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
-
-\blindtext
-
-\NewColumn
-
-%----------------------before-----------------------------------
-\section{\texttt{capPos=before}, same as \texttt{capPos=left}}
-
-\begin{lstlisting}
-\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capShortText}{}
-
-\blindtext
-
-\begin{lstlisting}
-\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=before]{figure}{\includegraphics{frose}}{\capLongText}{}
-
-\blindtext
-\NewColumn
-
-%----------------------after-----------------------------------
-\section{\texttt{capPos=after}, same as \texttt{capPos=right}}
-
-\begin{lstlisting}
-\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capShortText}{}
-
-\blindtext
-
-\begin{lstlisting}
-\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=after]{figure}{\includegraphics{frose}}{\capLongText}{}
-
-\blindtext
-
-\NewColumn
-
-%----------------------inner-----------------------------------
-\section{\texttt{capPos=inner}}
-
-\begin{lstlisting}
-\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capShortText}{}
-
-\blindtext
-
-\begin{lstlisting}
-\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=inner]{figure}{\includegraphics{frose}}{\capLongText}{}
-
-\blindtext
-
-\NewColumn
-
-
-%----------------------outer-----------------------------------
-\section{\texttt{capPos=outer}}
-
-\begin{lstlisting}
-\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capShortText}{}
-
-\blindtext
-
-\begin{lstlisting}
-\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{}
-\end{lstlisting}
-
-\hvFloat[capPos=outer]{figure}{\includegraphics{frose}}{\capLongText}{}
-
-\blindtext
-
-\NewColumn
-
+\end{document}
\ No newline at end of file
Added: trunk/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc
===================================================================
--- trunk/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc 2021-06-07 20:03:38 UTC (rev 59506)
@@ -0,0 +1,133 @@
+%\define at choicekey*+{hvSet}{capVPos}[\val\nr]{bottom,center,top}[center]{%
+
+
+\iffalse
+justification=
+ justified
+ centering
+ centerlast
+ centerfirst
+ raggedright
+ RaggedRight
+ raggedleft
+\fi
+
+\subsection{\texttt{default}, same as \texttt{center}}
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capFormat={singlelinecheck=off}]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
+
+
+
+%----------------------top-----------------------------------
+\subsection{\texttt{capVPos=top}}
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=top]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capVPos=top]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
+
+%----------------------bottom-----------------------------------
+\subsection{\texttt{capVPos=bottom}}
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=bottom]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capVPos=bottom]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+\NewColumn
+
+%----------------------center-----------------------------------
+\subsection{\texttt{capPos=center}}
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capFormat={singlelinecheck=off},capVPos=center]{figure}{\includegraphics{frose}}{\capShortText}{}
+
+\blindtext
+
+\begin{lstlisting}
+\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{}
+\end{lstlisting}
+
+\hvFloat[capPos=right,capVPos=center]{figure}{\includegraphics{frose}}{\capLongText}{}
+
+\blindtext
+
+\NewColumn
Property changes on: trunk/Master/texmf-dist/doc/latex/hvfloat/capVPos.inc
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
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 2021-06-07 20:03:16 UTC (rev 59505)
+++ trunk/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex 2021-06-07 20:03:38 UTC (rev 59506)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 103 2021-05-31 12:37:11Z herbert $
+%% $Id: hvfloat.tex 105 2021-06-07 07:30:15Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,]{scrartcl}
@@ -261,7 +261,8 @@
\begin{BDef}
\Lcs{figcaption}\OptArg{short caption text}\Largb{caption text}\\
-\Lcs{tabcaption}\OptArg{short caption text}\Largb{caption text}
+\Lcs{tabcaption}\OptArg{short caption text}\Largb{caption text}\\
+\Lcs{tabcaptionbelow}\OptArg{short caption text}\Largb{caption text}\\
\end{BDef}
They are used for the \Lkeyword{nonFloat} keyword, where these macros write captions in the same way but outside of
Modified: trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-06-07 20:03:16 UTC (rev 59505)
+++ trunk/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty 2021-06-07 20:03:38 UTC (rev 59506)
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 103 2021-05-31 12:37:11Z herbert $
+%% $Id: hvfloat.sty 105 2021-06-07 07:30:15Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -15,8 +15,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.26}
-\def\filedate{2021/05/26}
+\def\fileversion{2.27}
+\def\filedate{2021/06/07}
\message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)}
\ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects]
\let\hvFloatFileVersion\fileversion
@@ -29,6 +29,7 @@
\DeclareOption{fbox}{\hv at fboxtrue\setlength{\fboxsep}{1pt}}
\DeclareOption{hyperref}{\hv at hyperreftrue}
\DeclareOption{nostfloats}{\hv at nostfloatstrue}
+\DeclareOption{no-stfloats}{\hv at nostfloatstrue}
\ProcessOptions
@@ -41,6 +42,9 @@
\PassOptionsToPackage{hypcap}{caption}
\RequirePackage{caption}
+\RequirePackage{varwidth}
+\DeclareCaptionBox{varwidth}{\varwidth[b]{#1}#2\endvarwidth}
+
\PassOptionsToPackage{hypcap}{subcaption}
\RequirePackage{subcaption}
\RequirePackage{atbegshi}
@@ -48,6 +52,7 @@
\RequirePackage{expl3,multido}
\RequirePackage{graphicx}
+\RequirePackage{varwidth}
\RequirePackage{xkeyval}
\RequirePackage{ifoddpage}
@@ -136,10 +141,23 @@
\else
\gdef\hv@@capVPos{t}%
\fi
-}{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using bottom.}%
+}{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using center.}%
\def\hvSet at capVPos{center}% it is relativ to the object
}
+\define at choicekey*+{hvSet}{allHPos}[\val\nr]{left,center,right}[center]{%
+ \def\hvSet at allHPos{#1}%
+ \ifcase\nr\relax
+ \gdef\hv@@allHPos{l}%
+ \or
+ \gdef\hv@@allHPos{c}%
+ \else
+ \gdef\hv@@allHPos{r}%
+ \fi
+}{\PackageWarning{hvfloat}{erroneous input (#1) for allHPos ignored. Using center.}%
+ \def\hvSet at capVPos{center}% it is relativ to the object
+ }
+
\define at choicekey*+{hvSet}{objectPos}[\val\nr]{left,center,right,inner,outer}[center]{%
\def\hvSet at objectPos{#1}% it is relativ to the object
}{\PackageWarning{hvfloat}{erroneous input (#1) for objectPos ignored. Using center.}%
@@ -230,8 +248,8 @@
%
\newcommand\setDefaults{%
\hv at set{%
- floatPos=, rotAngle=0, capWidth=n, capAngle=0,
- capPos=bottom, capVPos=center, objectPos=center, objectAngle=0,
+ floatPos=, rotAngle=0, capWidth=n, capAngle=0, objectAngle=0,
+ capPos=bottom, capVPos=center, objectPos=center, allHPos=center,
floatCapSep=5pt, useOBox=false, nonFloat=false,
onlyText=false, wide=false, fullpage=false, FULLPAGE=false,
doubleFULLPAGE=false, doublePage=false, doublePAGE=false,
@@ -273,15 +291,28 @@
\setlength\abovecaptionskip{\hvAboveCaptionSkip}%
\setlength\belowcaptionskip{\hvBelowCaptionSkip}%
}
+
+\providecommand\figcaption[2][]{}%
+\providecommand\tabcaption[2][]{}%
+\providecommand\tabcaptionbelow[2][]{}%
%
-\newcommand\figcaption[2][]{%
+\renewcommand\figcaption[2][]{%
+ \begingroup
\def\@captype{figure}%
- \begingroup
\ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
\if$#1$ \caption{#2}\else\caption[#1]{#2}\fi
\endgroup}
-\newcommand\tabcaption[2][]{\def\@captype{table}%
+\renewcommand\tabcaption[2][]{%
\begingroup
+ \def\@captype{table}%
+ \edef\hv at caption@format{position=top,\hv at caption@format}%
+ \expandafter\captionsetup\expandafter{\hv at caption@format}%
+ \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi
+ \endgroup}
+\renewcommand\tabcaptionbelow[2][]{%
+ \begingroup
+ \def\@captype{table}%
+ \edef\hv at caption@format{position=below,\hv at caption@format}%
\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}
@@ -372,6 +403,21 @@
\fi
}
+
+\def\drawSepLine{%
+ \par\noindent
+ \if at twocolumn
+ \ifhv at twoColumnCaption
+ \rule{\linewidth}{0.4pt}\\[-2.5ex]
+ \else
+ \rule{\columnwidth}{0.4pt}\\[-2.5ex]
+ \fi
+ \else
+ \rule{\linewidth}{0.4pt}\\[-2.5ex]
+ \fi
+ \vspace{\hv at sepLineskip}%
+}
+
\newcounter{hv at tempCNTfigA}%
\newcounter{hv at tempCNTfigB}%
\newcounter{hv at tempCNTtabA}%
@@ -415,6 +461,12 @@
\setcounter{hv at tempCNTtabB}{\value{table}}%
\gdef\hv at save@setting{#1}%
\ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi
+ \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+ \ifx\hv at subcaption@format\@empty\else
+ \expandafter
+ \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+ {\hv at subcaption@format}%
+ \fi
\gdef\hv at floatType{figure}% presetting
\@ifnextchar+{\do at multiFloat}{\hvFloat at ii[#1]}%
}
@@ -466,20 +518,6 @@
-\def\drawSepLine{%
- \par\noindent
- \if at twocolumn
- \ifhv at twoColumnCaption
- \rule{\linewidth}{0.4pt}\\[-2.5ex]
- \else
- \rule{\columnwidth}{0.4pt}\\[-2.5ex]
- \fi
- \else
- \rule{\linewidth}{0.4pt}\\[-2.5ex]
- \fi
- \vspace{\hv at sepLineskip}%
-}
-
\newcount\hv at cnta
\newcount\hv at cntb
@@ -597,8 +635,7 @@
\saveCaptionSkip% we put this space ourselve
\ifnum\hvSet at capAngle=0 % need rotation?
\savebox\hvCaptionBox{% NO rotation
- \begin{minipage}[b]{\hvCapWidth}%% minipage, to get hyphenation
- \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+ \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation
\ifhv at nonFloat
\ifhv at onlyText
\hv at longCap
@@ -625,22 +662,22 @@
\ifx\hv at shortCap\@empty\caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}\fi
\fi
\fi
- \ifx\hv at label\@empty\else\label{\hv at label}\fi
- \end{minipage}%
+ \ifx\hv at label\@empty\else\label{\hv at label}\fi
+ \endminipage
}%
\else
\savebox\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
+ \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
\ifx\hv at floatType\hv at figure
- \ifx\relax\hv at shortCap\relax \figcaption{\hv at longCap}\else\figcaption[\hv at shortCap]{\hv at longCap}\fi
+ \ifx\hv at shortCap\@empty \figcaption{\hv at longCap}\else\figcaption[\hv at shortCap]{\hv at longCap}\fi
\else
- \ifx\relax\hv at shortCap\relax \tabcaption{\hv at longCap}\else\tabcaption[\hv at shortCap]{\hv at longCap}\fi
+ \ifx\hv at shortCap\@empty \tabcaption{\hv at longCap}\else\tabcaption[\hv at shortCap]{\hv at longCap}\fi
\fi
\fi
\else
@@ -648,12 +685,12 @@
\hv at longCap
\else
\let\@captype\hv at floatType
- \ifx\relax\hv at shortCap\relax \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}%
+ \ifx\hv at shortCap\@empty \caption{\hv at longCap}\else\caption[\hv at shortCap]{\hv at longCap}%
\fi
\fi
\fi
\ifx\hv at label\@empty\else\label{\hv at label}\fi
- \end{minipage}%
+ \endminipage
}% rotatebox
}% \sbox
\fi
@@ -735,7 +772,7 @@
\savebox{\@tempboxa}{% ***** @tempbox start
\expandafter\ifcase\the\hv@@capPos% 0 is LEFT START \ifcase
\ifx\hvSet at capVPos\hv at Center
- \put at CaptionBox
+ \put at CaptionBox
\hspace{\hvSet at floatCapSep}% capfloatsep
\put at ObjectBox
\else
@@ -847,8 +884,8 @@
}
%
\newenvironment{hvFloatEnv}[1][\textwidth]
- {\minipage{#1}\center}
- {\endcenter\endminipage}
+ {\minipage{#1}}
+ {\endminipage}
%
\ExplSyntaxOn
@@ -1010,6 +1047,7 @@
\global\setlength\hv at leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet at bindCorrection}%
\global\setlength\hv at tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet at bindCorrection}%
\xdef\hv@@capAngle{\hvSet at capAngle}%
+ \xdef\hv at caption@format at temp{\hv at caption@format}% it gets lost otherwise for next afterpage
\checkoddpage
\ifoddpage
\if at twocolumn
@@ -1036,7 +1074,7 @@
\afterpage{\afterpage{\do at hvFloat@doublePageCaptionRight{#1}}}%
\fi
\fi
- \endgroup% started at main macro \hvFloat
+ \endgroup% started at main macro \hvFloat
}
%
\def\do at hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ----------------------------------
@@ -1046,9 +1084,9 @@
\setcounter{totalnumber}{0}%
\setcounter{dbltopnumber}{0}%
\def\dblfloatpagefraction{0.5}%
- \begin{\hv at floatType*}[!thb]
+ \begin{\hv at floatType*}[!t]
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
- \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \clipbox*{0 -\depth{} \hv at leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
\ifx\hv at label\@empty
\else
\ifx\hv at floatType\hv at figure
@@ -1060,7 +1098,7 @@
\fi
\end{\hv at floatType*}%
\afterpage{%
- \begin{\hv at floatType*}[!thb]
+ \begin{\hv at floatType*}[!t]
\global\savebox{\hvObjectBox}{\ifhv at useOBox\usebox{\hvOBox}\else\hv at floatObject\fi}%
\hspace*{\hv at tempWidthA}%
\noindent
@@ -1078,36 +1116,28 @@
\fi
\label{\hv at label-2}%
\fi
- \ifnum#1>0 % caption on the right
-% \medskip
- \ifnum\hv@@capAngle > 0
-% \ifdim\dp\hvObjectBox > \z@
-% \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
-% \ifx\relax\hv at shortCap\relax
-% \captionof{\hv at floatType}{\hv at longCap}%
-% \else
-% \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
-% \fi
-% \ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
-% }}%
-% \else
- \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
- \ifx\relax\hv at shortCap\relax
- \captionof{\hv at floatType}{\hv at longCap}%
- \else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
- \fi
- }}%
- \ifx\relax\hv at label\relax\else\label{\hv at label-cap}\fi
-% \fi
+ \ifx\hv at caption@format at temp\@empty\else
+ \expandafter\captionsetup\expandafter{\hv at caption@format at temp}%
+ \fi
+ \ifnum#1>\z@ % caption on the right
+ \ifnum\hv@@capAngle > \z@
+ \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
+ \ifx\relax\hv at shortCap\relax
+ \caption{\hv at longCap}%
+ \else
+ \caption[\hv at shortCap]{\hv at longCap}%
+ \fi
+ }}%
+ \ifx\relax\hv at label\relax\else\label{\hv at label-cap}\fi
\else
\hspace{\marginparsep}%
\parbox[\hv@@capVPos]{\hv at tempWidthB}{%
+ \abovecaptionskip=0pt% local inside parbox
\vspace{0pt}%
\ifx\hv at shortCap\@empty
- \captionof{\hv at floatType}{\hv at longCap\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi}%
+ \caption{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}
+ \caption[\hv at shortCap]{\hv at longCap}
\fi
}%
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
@@ -1114,9 +1144,9 @@
\fi
\else % #1 = 0 caption below
\ifx\relax\hv at shortCap\relax
- \captionof{\hv at floatType}{\hv at longCap}%
+ \caption{\hv at longCap}%
\else
- \captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
+ \caption[\hv at shortCap]{\hv at longCap}%
\fi
\ifx\hv at label\@empty\else\label{\hv at label-cap}\fi
\fi
@@ -1162,7 +1192,7 @@
\afterpage{\do at hvFloat@doublePAGECaptionRight{#1}}%
\fi
\fi
- \endgroup
+ \endgroup% startet at main macro
}
%
\def\do at hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ----------------------------------
@@ -1226,7 +1256,7 @@
\global\setlength\hv at leftPageObjectWidth{\dimexpr\paperwidth-\hvSet at bindCorrection}%
% \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}%
+% \expandafter\captionsetup\expandafter{\hv at caption@format}%
\ifoddpage
\ifcase\hv@@capPos % =0 Caption before
\if at twocolumn
@@ -1326,8 +1356,8 @@
\def\set at Normal@Bottom at Caption@{%
\begin{\hv at floatType}[!b]
\ifhv at separatorLine\drawSepLine\fi
- \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\relax\hv at shortCap\relax
+% \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}%
@@ -1338,8 +1368,8 @@
\def\set at Normal@Bottom at CaptionStar*{%
\begin{\hv at floatType*}[!b]
\ifhv at separatorLine\drawSepLine\fi
- \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\relax\hv at shortCap\relax
+% \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}%
@@ -1416,8 +1446,8 @@
\newpage\if at twocolumn\null\newpage\fi
\begin{\hv at floatType}[!b]
\ifhv at separatorLine\drawSepLine\fi
- \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\relax\hv at shortCap\relax
+% \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}%
@@ -1457,8 +1487,8 @@
\begin{\hv at floatType*}[!b]
\hv at twoColumnCaptiontrue
\ifhv at separatorLine\drawSepLine\fi
- \expandafter\captionsetup\expandafter{\hv at caption@format}%
- \ifx\relax\hv at shortCap\relax
+% \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}%
@@ -1500,8 +1530,8 @@
% \setlength\hv at tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet at bindCorrection}%
\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\relax\hv at shortCap\relax
+% \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}%
@@ -1511,7 +1541,7 @@
\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\relax\hv at shortCap\relax
+ \ifx\hv at shortCap\@empty
\captionof{\hv at floatType}{\hv at longCap}%
\else
\captionof{\hv at floatType}[\hv at shortCap]{\hv at longCap}%
@@ -1525,8 +1555,8 @@
\ifdim\hv at tempWidthA > \ht\hvCaptionBox
\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\relax\hv at shortCap\relax
+% \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}%
@@ -1583,7 +1613,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
+% \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
@@ -1614,7 +1644,7 @@
\else
\minipage{\columnwidth}%
\fi
- \ifx\relax\hv at caption@format\relax\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+% \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
@@ -1643,7 +1673,7 @@
\def\getMultiSubCaptionAndLabel{%
\global\sbox\hvCaptionBox{\minipage{\linewidth}%
- \ifx\hv at caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv at caption@format}\fi
+% \ifx\hv at caption@format\@empty\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
@@ -1665,11 +1695,11 @@
\else
\minipage{\columnwidth}%
\fi
- \ifx\hv at subcaption@format\@empty\else
- \expandafter
- \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
- {\hv at subcaption@format}%
- \fi
+% \ifx\hv at subcaption@format\@empty\else
+% \expandafter
+% \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+% {\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
@@ -1712,7 +1742,6 @@
\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.