diff options
| author | Karl Berry <karl@freefriends.org> | 2023-05-18 20:06:54 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2023-05-18 20:06:54 +0000 |
| commit | bc20e3d6a724dc6e21f922791360efe638a8a412 (patch) | |
| tree | d956cae654330a23b279f2e5a83dccef9669472d /Master | |
| parent | 8764827c580a6fc346b394ba3fae06d0a819dfaf (diff) | |
hvfloat (18may23)
git-svn-id: svn://tug.org/texlive/trunk@67149 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
65 files changed, 39 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index c19902eff39..c1b76a003f7 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf Binary files differindex 872dc973c08..714c04d5809 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf Binary files differindex 06949359a1e..3e15ead2845 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf Binary files differindex c2065016829..35032f09c8b 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/capPos.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf Binary files differindex 062639ee538..c9527b40b8e 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf Binary files differindex bbc7c107e01..8d11c0e7c0e 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf Binary files differindex d7e0bfce8b8..b5a941923ff 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf Binary files differindex 8b2bb2a448b..e781aab1edf 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf Binary files differindex 9c890e37062..7e922cbb8d6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/doublefullpage2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf Binary files differindex ab1c658dbdc..58bfcbd4170 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf Binary files differindex 40ca90301e3..88920143cd1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/doublepage2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf Binary files differindex be7272292e5..1f79ea92404 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf Binary files differindex a15479bc59a..5b5a6f2d320 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf Binary files differindex 16fba17cebe..f5e994aee44 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf Binary files differindex c128ab6de6f..71e429e6b98 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/even2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf Binary files differindex 3ce06c022f4..35e6e0c51ff 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf Binary files differindex 936972b8356..17d5731a23c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf Binary files differindex 441b3d86a27..be06de69efe 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex index 6c38e880e30..0ef8f5d852e 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/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/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf Binary files differindex f1ec08ccaf1..84caf7516d8 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf Binary files differindex 6a1325e58e4..86beabc7da5 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf Binary files differindex cc0cf680f6f..33c045deba4 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/inner2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf Binary files differindex e9c4adf340f..60ee0ab1a8f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/left2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf Binary files differindex a17ff0ea752..d56b1891757 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf Binary files differindex d1dd9d195bd..51682a3bc56 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf Binary files differindex fd40d114af2..260a6282ba6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf Binary files differindex dbed0dc9ab8..3d5f4377ee4 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf Binary files differindex 5023af475d5..d466e2179b5 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf Binary files differindex 98fd85f954c..1e13a5e1abd 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-inner2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf Binary files differindex 6421ab72fec..1b8d66e2906 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-outer2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf Binary files differindex f318e337ea0..a8a8056975c 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/multi-right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf Binary files differindex 1983a9375a5..09081458604 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf Binary files differindex 145c1ecdcea..27cc4be057a 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf Binary files differindex 9226490ffea..ac6484c820b 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf Binary files differindex 73d3a810f38..bddaaecf371 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/odd2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf Binary files differindex 06c3a32f05c..e926458cdde 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/outer1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf Binary files differindex 25b6f1174ce..23c92ad30d1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf Binary files differindex bc0c66a59fd..5997deace9f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/outer2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf Binary files differindex 90d42533580..8f67ed240ba 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf Binary files differindex 18b1c6e2b25..7240e551637 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-after2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf Binary files differindex d73336bd0b5..6189a0ea8f3 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf Binary files differindex 40740a8ccfd..cd70ea4e507 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf Binary files differindex cc73cf951be..4b151eb8f31 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf Binary files differindex 10d39575818..05f7c0e9f7e 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf Binary files differindex a7274de0f2b..09e8027acf3 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-even2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf Binary files differindex 89d0b46c047..d7fbd328934 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf Binary files differindex 7325a59fea6..ecb6472ccde 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-odd2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf Binary files differindex acc1a64f499..8ac96d2e13f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf Binary files differindex b827c1a1306..f145bdefa2d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/paper-twocolcaption-after2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf Binary files differindex ac72bcbebd4..e585dff5ebc 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf Binary files differindex f754b73cf7a..cfc459300c8 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf Binary files differindex d513759ef83..f37d485bff1 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right2s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf Binary files differindex 591a3fdc5c5..570aba2bf10 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf Binary files differindex 69f39ce9c3d..def06949e36 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf Binary files differindex 76baea7cfeb..2a21a7ad399 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-after2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf Binary files differindex 3ec3881e002..40ea9808b84 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex index 374a2fa0f1c..82e061fc61f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s1c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/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/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf Binary files differindex 9c2150972b0..7351e0324ce 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf Binary files differindex 6bc68c681c4..e6d47d3ab15 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-default2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf Binary files differindex 246117205e1..36850093115 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s1c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf Binary files differindex 103bff8ed27..0867cbe1a57 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf Binary files differindex c51e8fc121e..74a2bc49315 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/sub-right2s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf Binary files differindex 33a218d07ab..d48f9d3fd9d 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/wide1s2c.pdf diff --git a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf Binary files differindex 2cd33a23f38..b7471e39464 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf +++ b/Master/texmf-dist/doc/latex/hvfloat/wide2s2c.pdf diff --git a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty index 394fc869eda..be6acdf49b4 100644 --- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty +++ b/Master/texmf-dist/tex/latex/hvfloat/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 |