summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/glossaries-norsk/README30
-rw-r--r--macros/latex/contrib/glossaries-norsk/glossaries-norsk.dtx162
-rw-r--r--macros/latex/contrib/glossaries-norsk/glossaries-norsk.ins37
-rw-r--r--macros/latex/contrib/hvfloat/Changes6
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdfbin80292 -> 80490 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdfbin86842 -> 87075 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/capPos.pdfbin98124 -> 98331 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdfbin82105 -> 82379 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdfbin83450 -> 83580 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdfbin79548 -> 79745 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdfbin85983 -> 86278 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdfbin1759640 -> 1760032 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdfbin2318150 -> 2318598 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdfbin617080 -> 617366 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdfbin77798 -> 77994 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdfbin86556 -> 86871 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdfbin84573 -> 84867 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdfbin85253 -> 85554 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdfbin85743 -> 85993 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdfbin84722 -> 84963 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdfbin84306 -> 84601 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdfbin84127 -> 84420 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdfbin84232 -> 84534 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdfbin85692 -> 85968 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdfbin142671 -> 142800 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdfbin146434 -> 146566 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdfbin94782 -> 94917 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdfbin146566 -> 146706 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdfbin92370 -> 92513 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdfbin89748 -> 89871 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdfbin93075 -> 93195 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdfbin146003 -> 146149 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdfbin77702 -> 77911 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdfbin86699 -> 87017 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdfbin173970 -> 174265 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdfbin85689 -> 85982 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdfbin86575 -> 86876 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdfbin84447 -> 84732 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdfbin84939 -> 85240 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdfbin78972 -> 79348 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdfbin89816 -> 90137 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdfbin81234 -> 81503 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdfbin90660 -> 90978 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdfbin88153 -> 88456 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdfbin90479 -> 90802 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdfbin87462 -> 87765 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdfbin88039 -> 88360 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdfbin87342 -> 87649 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdfbin81413 -> 81809 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdfbin1615749 -> 1615932 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdfbin80120 -> 80316 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdfbin89638 -> 89937 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdfbin81082 -> 81287 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdfbin85693 -> 85905 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdfbin144213 -> 144509 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdfbin145001 -> 145304 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdfbin144288 -> 144358 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex12
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdfbin144422 -> 144727 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdfbin143782 -> 144069 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdfbin144144 -> 144433 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdfbin145100 -> 145420 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdfbin144505 -> 144806 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdfbin120723 -> 120947 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdfbin121738 -> 121966 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.pdfbin5163692 -> 4960667 bytes
-rw-r--r--macros/latex/contrib/hvfloat/doc/hvfloat.tex9
-rw-r--r--macros/latex/contrib/hvfloat/latex/hvfloat.sty29
68 files changed, 268 insertions, 17 deletions
diff --git a/macros/latex/contrib/glossaries-norsk/README b/macros/latex/contrib/glossaries-norsk/README
new file mode 100644
index 0000000000..973bfdca7b
--- /dev/null
+++ b/macros/latex/contrib/glossaries-norsk/README
@@ -0,0 +1,30 @@
+Norsk Bokmål Language Module for glossaries Package
+
+This adds Norwegian Bokmål translations for the glossaries package, and will
+automatically be loaded when the document/babel-package has the option `norsk`.
+
+The package this is based on (glossaries-nynorsk), adds the same translations
+for Norsk Nynorsk. That package will be loaded when the `nynorsk` option is
+used as mentioned before.
+
+Author: Jakob Stendahl
+
+Based on package by:
+ Eirik Haustveit
+ www.switchcraft.org
+
+To install: copy *.ldf and *.dict to
+
+TEXMF/tex/latex/glossaries-norsk/
+
+where TEXMF is the texmf root directory.
+
+The glossaries package will automatically load this module if it is
+required, as mentioned previously.
+
+Compile using `make` or just `latex glossaries-norsk.ins`.
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/license/lppl1.3
+for the details of that license.
+
diff --git a/macros/latex/contrib/glossaries-norsk/glossaries-norsk.dtx b/macros/latex/contrib/glossaries-norsk/glossaries-norsk.dtx
new file mode 100644
index 0000000000..60e6515e00
--- /dev/null
+++ b/macros/latex/contrib/glossaries-norsk/glossaries-norsk.dtx
@@ -0,0 +1,162 @@
+%\iffalse
+% glossaries-norsk.dtx generated using makedtx version 1.1 (c) Jakob Stendahl
+% Command line args:
+% -src "(.*.ldf)=>\1"
+% -src "(.*.dict)=>\1"
+% -doc "glossaries-module.tex"
+% -author "Jakob Stendahl"
+% glossaries-norsk
+% Created on 2023/05/16 15:14
+%\fi
+%\iffalse
+%<*package>
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%</package>
+%\fi
+% \iffalse
+% Doc-Source file to use with LaTeX2e
+% Copyright (C) 2023 Jakob Stendahl, all rights reserved.
+% \fi
+% \iffalse
+%<*driver>
+\documentclass{nlctdoc}
+
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+
+\title{Glossaries Language Module: glossaries-norsk}
+\author{Jakob Stendahl}
+\date{version 1.0 (2023-05-16)}
+
+\begin{document}
+\DocInput{glossaries-norsk.dtx}
+\end{document}
+%</driver>
+%\fi
+%\maketitle
+%
+%This language module simply needs to be installed. The \sty{glossaries}
+%package will automatically load it if required.
+%
+%
+%
+%\StopEventually{}
+%\section{The Code}
+%\iffalse
+% \begin{macrocode}
+%<*glossaries-norsk.ldf>
+% \end{macrocode}
+%\fi
+%\subsection{glossaries-norsk.ldf}
+% \begin{macrocode}
+\ProvidesGlossariesLang{norsk}[2023/05/16 v1.0]
+
+\glsifusedtranslatordict{norsk}
+{%
+ \addglossarytocaptions{\CurrentTrackedLanguage}%
+ \addglossarytocaptions{\CurrentTrackedDialect}%
+}
+{%
+ \@ifpackageloaded{polyglossia}%
+ {%
+ \newcommand*{\glossariescaptionsnorsk}{%
+ \renewcommand*{\glossaryname}{\textnorsk{Ordforklaringer}}%
+ \renewcommand*{\acronymname}{\textnorsk{Forkortelser}}%
+ \renewcommand*{\entryname}{\textnorsk{Notasjon}}%
+ \renewcommand*{\descriptionname}{\textnorsk{Beskrivelse}}%
+ \renewcommand*{\symbolname}{\textnorsk{Symbol}}%
+ \renewcommand*{\pagelistname}{\textnorsk{Side}}%
+ \renewcommand*{\glssymbolsgroupname}{\textnorsk{Symbol}}%
+ \renewcommand*{\glsnumbersgroupname}{\textnorsk{Tall}}%
+ }%
+ }%
+ {%
+ \newcommand*{\glossariescaptionsnorsk}{%
+ \renewcommand*{\glossaryname}{Ordforklaringer}%
+ \renewcommand*{\acronymname}{Forkortelser}%
+ \renewcommand*{\entryname}{Notasjon}%
+ \renewcommand*{\descriptionname}{Beskrivelse}%
+ \renewcommand*{\symbolname}{Symbol}%
+ \renewcommand*{\pagelistname}{Side}%
+ \renewcommand*{\glssymbolsgroupname}{Symbol}%
+ \renewcommand*{\glsnumbersgroupname}{Tall}%
+ }%
+ }%
+ \ifcsdef{captions\CurrentTrackedDialect}
+ {%
+ \csappto{captions\CurrentTrackedDialect}%
+ {%
+ \glossariescaptionsnorsk
+ }%
+ }%
+ {%
+ \ifcsdef{captions\CurrentTrackedLanguage}
+ {
+ \csappto{captions\CurrentTrackedLanguage}%
+ {%
+ \glossariescaptionsnorsk
+ }%
+ }%
+ {%
+ }%
+ }%
+ \glossariescaptionsnorsk
+}
+% \end{macrocode}
+% General default plural suffix:
+% \begin{macrocode}
+\renewcommand*{\glspluralsuffix}{e}
+% \end{macrocode}
+% Acronym default plural suffix:
+% \begin{macrocode}
+\renewcommand*{\glsacrpluralsuffix}{\glspluralsuffix}
+% \end{macrocode}
+% Acronym in \cs{textsc} default plural suffix
+% (\cs{glstextup} is used to cancel the effect of \cs{textsc}):
+% \begin{macrocode}
+\renewcommand*{\glsupacrpluralsuffix}{\glstextup{\glsacrpluralsuffix}}
+% \end{macrocode}
+%\iffalse
+% \begin{macrocode}
+%</glossaries-norsk.ldf>
+% \end{macrocode}
+%\fi
+%\iffalse
+% \begin{macrocode}
+%<*glossaries-dictionary-norsk.dict>
+% \end{macrocode}
+%\fi
+%\subsection{glossaries-dictionary-norsk.dict}
+% \begin{macrocode}
+\ProvidesDictionary{glossaries-dictionary}{norsk}
+
+\providetranslation{Glossary}{Ordforklaringer}
+\providetranslation{Acronyms}{Forkortelser}
+\providetranslation{Notation (glossaries)}{Symbolliste}
+\providetranslation{Description (glossaries)}{Beskrivelse}
+\providetranslation{Symbol (glossaries)}{Symbol}
+\providetranslation{Page List (glossaries)}{Side}
+\providetranslation{Symbols (glossaries)}{Symbol}
+\providetranslation{Numbers (glossaries)}{Tall}
+% \end{macrocode}
+%\iffalse
+% \begin{macrocode}
+%</glossaries-dictionary-norsk.dict>
+% \end{macrocode}
+%\fi
+%\Finale
+\endinput
diff --git a/macros/latex/contrib/glossaries-norsk/glossaries-norsk.ins b/macros/latex/contrib/glossaries-norsk/glossaries-norsk.ins
new file mode 100644
index 0000000000..67b8683354
--- /dev/null
+++ b/macros/latex/contrib/glossaries-norsk/glossaries-norsk.ins
@@ -0,0 +1,37 @@
+% glossaries-english.ins generated using makedtx version 1.1 2014/11/24 18:20
+\input docstrip
+
+\preamble
+
+ glossaries-norsk.dtx
+ Copyright 2023 Jakob Stendahl
+
+
+ Based on package by Eirik Haustveit
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either version 1.3
+ of this license of (at your option) any later version.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3 or later is part of all distributions of LaTeX
+ version 2005/12/01 or later.
+
+ This work has the LPPL maintenance status `maintained'.
+
+ The Current Maintainer of this work is Jakob Stendahl.
+
+ This work consists of the files glossaries-norsk.dtx and glossaries-norsk.ins and the derived files glossaries-norsk.ldf, glossaries-dictionary-norsk.dict.
+
+\endpreamble
+
+\askforoverwritefalse
+
+\generate{\file{glossaries-norsk.ldf}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{glossaries-norsk.dtx}{glossaries-norsk.ldf,package}}
+\file{glossaries-dictionary-norsk.dict}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{glossaries-norsk.dtx}{glossaries-dictionary-norsk.dict,package}}
+}
+
+\endbatchfile
+
diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes
index c19902eff3..c1b76a003f 100644
--- a/macros/latex/contrib/hvfloat/Changes
+++ b/macros/latex/contrib/hvfloat/Changes
@@ -1,7 +1,9 @@
hvfloat.sty:
+2.46 2023-05-16 - bugfix for doublePAGE and options for package caption
+ - bugfix for doublePAGE labels: <label>,<label-2><label-cap>,
2.45 2023-01-28 - bugfix for doubleFULLPAGE images which followed
- fullpage images ...
- - added option "forceLeft" for doublepage flloats
+ fullpage images ...
+ - added option "forceLeft" for doublepage flloats
2.44 2022-11-21 - support "floats" with caption in the margin
2.43 2022-11-07 - fix for empty caption: don't use \caption
2.42 2022-10-02 - fix for twoColumnCaption and multi(sub)floats
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
index 872dc973c0..714c04d580 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
index 06949359a1..3e15ead284 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
index c206501682..35032f09c8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
index 062639ee53..c9527b40b8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
index bbc7c107e0..8d11c0e7c0 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
index d7e0bfce8b..b5a941923f 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
index 8b2bb2a448..e781aab1ed 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf
index 9c890e3706..7e922cbb8d 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublefullpage2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
index ab1c658dbd..58bfcbd417 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
index 40ca90301e..88920143cd 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
index be7272292e..1f79ea9240 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
index a15479bc59..5b5a6f2d32 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
index 16fba17ceb..f5e994aee4 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
index c128ab6de6..71e429e6b9 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf
index 3ce06c022f..35e6e0c51f 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
index 936972b835..17d5731a23 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
index f1ec08ccaf..84caf7516d 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
index 6a1325e58e..86beabc7da 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
index cc0cf680f6..33c045deba 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
index e9c4adf340..60ee0ab1a8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
index a17ff0ea75..d56b189175 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
index d1dd9d195b..51682a3bc5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
index fd40d114af..260a6282ba 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
index dbed0dc9ab..3d5f4377ee 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
index 5023af475d..d466e2179b 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
index 98fd85f954..1e13a5e1ab 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
index 6421ab72fe..1b8d66e290 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
index f318e337ea..a8a8056975 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
index 1983a9375a..0908145860 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
index 145c1ecdce..27cc4be057 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
index 9226490ffe..ac6484c820 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
index 73d3a810f3..bddaaecf37 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
index 06c3a32f05..e926458cdd 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
index 25b6f1174c..23c92ad30d 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
index bc0c66a59f..5997deace9 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
index 90d4253358..8f67ed240b 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf
index 18b1c6e2b2..7240e55163 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
index d73336bd0b..6189a0ea8f 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
index 40740a8ccf..cd70ea4e50 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
index cc73cf951b..4b151eb8f3 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
index 10d3957581..05f7c0e9f7 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf
index a7274de0f2..09e8027acf 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-even2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
index 89d0b46c04..d7fbd32893 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf
index 7325a59fea..ecb6472ccd 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-odd2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
index acc1a64f49..8ac96d2e13 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf
index b827c1a130..f145bdefa2 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/paper-twocolcaption-after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
index ac72bcbebd..e585dff5eb 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
index f754b73cf7..cfc459300c 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
index d513759ef8..f37d485bff 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
index 591a3fdc5c..570aba2bf1 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
index 69f39ce9c3..def06949e3 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
index 76baea7cfe..2a21a7ad39 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
index 3ec3881e00..40ea9808b8 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
index 374a2fa0f1..82e061fc61 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex
@@ -1,5 +1,5 @@
\documentclass{scrartcl}
-%% $Id: sub-default1s1c.tex 318 2021-11-20 07:30:54Z herbert $
+%% $Id: sub-default1s1c.tex 723 2023-05-17 17:27:20Z herbert $
\input{preamble.ltx}
@@ -25,7 +25,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text which has no
@@ -46,9 +46,11 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
{sub:demo3}
\end{lstlisting}
+\blindtext
+
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text which has no
@@ -75,7 +77,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\begin{lstlisting}
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text which has no
@@ -98,7 +100,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}.
\Float[subfloat]
\captionsetup[sub]{singlelinecheck}
-\hvFloat[fullpage,capPos=l,objectFrame,subFloat]%
+\hvFloat[fullpage,capPos=left,objectFrame,subFloat]%
+{figure}{}[Short main caption of the objects]% main short lsi entry
{The main caption of a ``fullpage'' object, which follows on the left or
right column. This can be an even or odd page. And some more text which has no
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
index 9c2150972b..7351e0324c 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
index 6bc68c681c..e6d47d3ab1 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
index 246117205e..3685009311 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
index 103bff8ed2..0867cbe1a5 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
index c51e8fc121..74a2bc4931 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
index 33a218d07a..d48f9d3fd9 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
index 2cd33a23f3..b7471e3946 100644
--- a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
+++ b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
index 441b3d86a2..be06de69ef 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf
Binary files differ
diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
index 6c38e880e3..0ef8f5d852 100644
--- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex
+++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.tex 676 2023-01-28 19:47:00Z herbert $
+%% $Id: hvfloat.tex 723 2023-05-17 17:27:20Z herbert $
\listfiles
\errorcontextlines=100
\documentclass[twoside,paper=a4,usegeometry]{scrartcl}
@@ -2648,7 +2648,8 @@ even page and following text will be placed \emph{before} the object.
\Blindtext
-It is also possible to take a bind correction into account with e.g. \texttt{binCorr=5mm}, which reserves whitespace of 5mm
+It is also possible to take a bind correction into account with e.g.
+\texttt{binCorr=5mm}, which reserves whitespace of 5mm
in the inner margin on both pages.
@@ -3163,8 +3164,8 @@ optional package options to set the global placement:
%\end{itemize}
-\section{The Package Source}
-\lstinputlisting[basicstyle=\ttfamily\footnotesize,tabsize=3,numbers=left,numberstyle=\tiny]{hvfloat.sty}
+%\section{The Package Source}
+%\lstinputlisting[basicstyle=\ttfamily\footnotesize,tabsize=3,numbers=left,numberstyle=\tiny]{hvfloat.sty}
\end{document}
diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
index 394fc869ed..be6acdf49b 100644
--- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty
+++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty
@@ -1,4 +1,4 @@
-%% $Id: hvfloat.sty 676 2023-01-28 19:47:00Z herbert $
+%% $Id: hvfloat.sty 723 2023-05-17 17:27:20Z herbert $
%%
%%
%% IMPORTANT NOTICE:
@@ -16,8 +16,8 @@
%% `hvfloat' offers rotating of captions and objects for floats
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{2.45}
-\def\filedate{2023/01/28}
+\def\fileversion{2.46}
+\def\filedate{2023/05/16}
\ProvidesPackage{hvfloat}[\filedate\space v\fileversion\space special floating objects (hv)]
\let\hvFloatFileVersion\fileversion
%
@@ -586,6 +586,8 @@
\ifx\relax#2\relax
\setkeys{hvSet}{nonFloat,onlyText}%
\xdef\hv@save@setting{\hv@save@setting,nonFloat,onlyText}% for later use after \endgroup inside figure/table env
+ \else
+ \xdef\hv@save@setting{\hv@save@setting}% for later use after \endgroup inside figure/table env
\fi
% \xdef\hv@floatListOfExt{\@nameuse{ext@\hv@floatType}}%
\gdef\hv@floatObject{#3}%
@@ -1677,6 +1679,12 @@
\afterpage{%
\hfuzz=\maxdimen
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
+ \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \ifx\hv@subcaption@format\@empty\else
+ \expandafter
+ \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+ {\hv@subcaption@format}%
+ \fi
\ifhv@useOBox
\global\let\hvObjectBox\hvOBox
\else
@@ -1686,11 +1694,13 @@
\global\hv@tempWidthA=\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection%
\global\hv@leftPageObjectWidth=\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection%
\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}%
+ \ifx\hv@label\@empty\else\label{\hv@label}\fi
\null\newpage\if@twocolumn\null\newpage\fi
\expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}%
\noindent
\hspace*{\dimexpr-\hv@tempWidthA}%
\clipbox*{\the\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}%
+ \ifx\hv@label\@empty\else\label{\hv@label-2}\fi
\begingroup
\ifnum#1>0
\medskip
@@ -1701,8 +1711,8 @@
\else
\captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
}}%
- \ifx\hv@label\@empty\else\label{\hv@label}\fi
\else
\rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{%
\ifx\relax\hv@shortCap\relax
@@ -1710,18 +1720,19 @@
\else
\captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
}}%
- \ifx\hv@label\@empty\else\label{\hv@label}\fi
\fi
\else% caption not rotated
\par\noindent
\parbox{\textwidth}{%
+ \expandafter\hvFloatSet\expandafter{\hv@save@setting,capFormat={font={tiny},labelsep=newline}}%
\ifx\relax\hv@shortCap\relax
\captionof{\hv@floatType}{\hv@longCap}%
\else
\captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}%
\fi
- \ifx\hv@label\@empty\else\label{\hv@label}\fi
+ \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi
}%
\fi
\endgroup
@@ -1735,6 +1746,12 @@
% #1-> 0/1 caption under/right
\hvfloat@typeout{>>> do@hvFloat@doubleFULLPAGE: #1}%
\expandafter\hvFloatSet\expandafter{\hv@save@setting}%
+ \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi
+ \ifx\hv@subcaption@format\@empty\else
+ \expandafter
+ \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter
+ {\hv@subcaption@format}%
+ \fi
\ifx\hvSet@capPos\hv@After \global\hv@@capPos=1
\else
\ifx\hvSet@capPos\hv@Before \global\hv@@capPos=0