From b2a74f7600f0c4e33c859c718976b1215c4c747d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 30 Apr 2021 03:02:32 +0000 Subject: CTAN sync 202104300302 --- macros/latex/contrib/hvfloat/Changes | 2 ++ macros/latex/contrib/hvfloat/doc/hvfloat.pdf | Bin 18362517 -> 18344774 bytes macros/latex/contrib/hvfloat/doc/hvfloat.tex | 43 +++++++++++++------------ macros/latex/contrib/hvfloat/latex/hvfloat.sty | 10 ++++-- 4 files changed, 32 insertions(+), 23 deletions(-) (limited to 'macros/latex/contrib/hvfloat') diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes index f18e545f58..6e00a6f5fd 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -1,4 +1,6 @@ hvfloat.sty: +2.20 2021-04-29 - use better macronames for setting the defaults + and defining an own style 2.19 2021-03-15 - fix for vertical spacing of doubleFULLPAGE 2.18 2021-03-12 - add support for doublepage objects 2.17 2020-10-31 - fix for label setting of non floating objects diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf index 8a2b8d896d..50b449eb45 100644 Binary files a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf and b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex index 29404eaadd..18d4d56527 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 54 2021-03-14 14:55:34Z herbert $ +%% $Id: hvfloat.tex 56 2021-03-15 07:20:37Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4]{scrartcl} @@ -233,18 +233,18 @@ The following packages are loaded by \Lpack{hvfloat} and the optional argument \section{The Macros and optional arguments} -The syntax for the macros and \Lcs{setDefaults}, \Lcs{hvSet}, and \CMD{hvFloat} is +The syntax for the macros and \Lcs{hvFloatSetDefaults}, \Lcs{hvFloatSet}, and \CMD{hvFloat} is \begin{BDef} -\Lcs{hvset}\Largb{key=value list}\\ -\Lcs{setDefaults}\\ +\Lcs{hvFloatSet}\Largb{key=value list}\\ +\Lcs{hvFloatSetDefaults}\\ \Lcs{hvFloat}\OptArg*{*}\OptArgs\OptArg*{+}\Largb{float type}\Largb{floating object}\OptArg{short caption}\Largb{long caption}\Largb{label} \end{BDef} The star version is explained in section~\vref{star-version0} and \vref{star-version} and the optional \OptArg*{+} is explained in section~\vref{sec:multifloats}. -\Lcs{hvSet} allows the global setting of keywords and \Lcs{setDefaults} sets all keywords to +\Lcs{hvFloatSet} allows the global setting of keywords and \Lcs{hvFloatSetDefaults} sets all keywords to its default value as shown in Table~\vref{tab:options}. If \Lcs{hvFloat} has an empty second parameter \texttt{}, then \Lcs{hvFloat} switches by default to @@ -276,11 +276,14 @@ in the usual way, so that a reference to the not existing table~\ref{dummy} is \end{verbatim}} -With the macro \Lcs{defhvstyle} one can define a style which can be used instead of +%\hvDefFloatStyle +%\hvFloatSetDefaults + +With the macro \Lcs{hvDefFloatStyle} one can define a style which can be used instead of the individual setting: \begin{BDef} -\Lcs{defhvstyle}\Largb{name}\Largb{setting} +\Lcs{hvDefFloatStyle}\Largb{name}\Largb{setting} \end{BDef} Internally the style is saved in a macro named \verb|\hv@|. @@ -378,8 +381,8 @@ Code for figure \ref{fig:0}: \Lenv{hvFloatEnv} & environment & places object and caption exactly Here\\ \CMD{figcaption} & command & writes a figure caption in a non floating environment\\ \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ - \CMD{setDefaults} & command & sets all options to the defaults\\ - \CMD{defhvstyle} & command & define a user style + \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\ + \CMD{hvDefFloatStyle} & command & define a user style \end{tabularx}% }{With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}{tab:0} @@ -392,8 +395,8 @@ Code for table \ref{tab:0}: hvFloatEnv & environment & places object and caption exactly Here\\ \CMD{figcaption} & command & writes a figure caption in a non floating environment\\ \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ - \CMD{setDefaults} & command & sets all options to the defaults\\ - \CMD{defhvstyle} & command & define a user style + \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\ + \CMD{hvDefFloatStyle} & command & define a user style \end{tabularx}}% {With the only Option \texttt{capPos=top} to place the caption on top of the table, which is often the default.}% {tab:0} @@ -1187,7 +1190,7 @@ For example see table~\ref{table:1} and \ref{table:2}: hvFloatEnv & environment & places object and caption exactly Here\\ \CMD{figcaption} & command & writes a figure caption in a non floating environment\\ \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ - \CMD{setDefaults} & command & sets all options to the defaults\\\hline + \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\\hline \end{tabular}% } @@ -1202,7 +1205,7 @@ For example see table~\ref{table:1} and \ref{table:2}: hvFloatEnv & environment & places object and caption exactly Here\\ \CMD{figcaption} & command & writes a figure caption in a non floating environment\\ \CMD{tabcaption} & command & writes a table caption in a non floating environment\\ - \CMD{setDefaults} & command & sets all options to the defaults\\\hline + \CMD{hvFloatSetDefaults} & command & sets all options to the defaults\\\hline \end{tabular}% } \end{lstlisting} @@ -2727,7 +2730,7 @@ With the command \CMD{pageref} one can have a reference to the page number of a the object is set. Let's assume that we use something like \begin{verbatim} -\setDefaults +\hvFloatSetDefaults \hvFloat[fullpage,capPos=evenPage]{figure}% {\IncludeGraphics{images/frose}}% [A float which needs the complete paper width and height.]% @@ -2772,15 +2775,15 @@ and the caption on page~\pageref{demo:fullpage-cap} \section{Defining a style} -With \Lcs{defhvstyle} one can define a special style to get rid of the individual setting: +With \Lcs{hvDefFloatStyle} one can define a special style to get rid of the individual setting: \begin{BDef} -\Lcs{defhvstyle}\Largb{name}\Largb{setting} +\Lcs{hvDefFloatStyle}\Largb{name}\Largb{setting} \end{BDef} For example: \begin{verbatim} -\defhvstyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} +\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} \end{verbatim} @@ -2791,8 +2794,8 @@ For example: \end{lstlisting} -\setDefaults -\defhvstyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} +\hvFloatSetDefaults +\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} \hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}% @@ -2824,7 +2827,7 @@ optional package options to set the global placement: \Blindtext -\setDefaults +\hvFloatSetDefaults \hvFloat[FULLPAGE]{figure}% {\includegraphics[FULLPAGE]{tiger}}% [A float which needs the complete paper width and height.]% diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty index 67c4c86b8d..1fef91099f 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty +++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty @@ -1,4 +1,4 @@ -%% $Id: hvfloat.sty 55 2021-03-15 06:54:38Z herbert $ +%% $Id: hvfloat.sty 56 2021-03-15 07:20:37Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -15,8 +15,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.19} -\def\filedate{2021/03/15} +\def\fileversion{2.20} +\def\filedate{2021/04/29} \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects] \let\hvFloatFileVersion\fileversion @@ -166,6 +166,7 @@ \let\hvFloatSet\hv@set % \def\defhvstyle#1#2{\@namedef{hv@#1}{#2}} +\let\hvDefFloatStyle\defhvstyle % better name % \newcommand{\setDefaults}{% \hv@set{% @@ -179,6 +180,9 @@ capFormat={}, subcapFormat={}, }% } + +\let\hvFloatSetDefaults\setDefaults + \newcommand\reset@special@float{% \hv@set{subFloat=false,%fullpage=false, multiFloat=false,%FULLPAGE=false -- cgit v1.2.3