diff options
Diffstat (limited to 'Master')
56 files changed, 74 insertions, 35 deletions
diff --git a/Master/texmf-dist/doc/latex/hvfloat/Changes b/Master/texmf-dist/doc/latex/hvfloat/Changes index b64d5e14f58..d8e8f80e88b 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/Changes +++ b/Master/texmf-dist/doc/latex/hvfloat/Changes @@ -1,4 +1,5 @@ hvfloat.sty: +2.16 2019-08-31 - fix for \hvFloat* and full page images 2.15 2019-05-13 - added optional arguments capFormat and subcapFormat which will pass the key values to \caption or \subcaption from package caption/subcaption diff --git a/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/after1s1c.pdf Binary files differindex 9f629122b5a..92a7a3e94cf 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 9ce278c7142..7930998fffb 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/after2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex index cf106566fce..4e0e17c83a7 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/after2s2c.tex @@ -74,7 +74,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \blinddocument -\Blindtext +\Blindtext \Blindtext \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default1s1c.pdf Binary files differindex f5d14d67a43..69580b76012 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 9ccfc457e6b..098f2cf9c50 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/default1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex index daec2236c95..a1d9e9d997f 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/default1s2c.tex @@ -19,19 +19,18 @@ \hvFloat*[capPos=right]{figure}% {\includegraphics{frose}}% [A float with the default caption setting]% - {A default caption of a ``'' object with the default setting, which + {A default caption of a ``default'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% {fig:0} \end{lstlisting} - \Float[default star] \hvFloat*[capPos=right]{figure}% {\includegraphics{frose}}% [A float with the default caption setting]% - {A default caption of a ``'' object with the default setting, which + {A default caption of a ``default'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. This can be an even or odd page. And some more text whch has no real meaning because it fills only the space for a long caption.}% @@ -45,19 +44,17 @@ \hvFloat[capPos=right]{figure}% {\includegraphics{frose}}% [A float with the default caption setting]% - {A default caption of a ``'' object with the default setting, which + {A default caption of a ``default'' object with the default setting, which is a ``left'' caption which means that it always appears before the object.}% {fig:1} \end{lstlisting} - \Float[default] \hvFloat[capPos=right]{figure}% {\includegraphics{frose}}% [A float with the default caption setting]% - {A default caption of a ``'' object with the default setting, which - is a ``left'' caption which means that it always appears before the object.}% - {fig:1} + {A default caption of a ``default'' object with the default setting, which + is a ``left'' caption which means that it always appears before the object.}{fig1} \blinddocument @@ -66,4 +63,6 @@ \blindtext -\end{document}
\ No newline at end of file +\end{document} + + diff --git a/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/default2s1c.pdf Binary files differindex 02d855525e3..300d92e5aa8 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 ed37dd7a9b2..24f6f83ab68 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/even1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/even1s1c.pdf Binary files differindex 8ed3320d8b8..11f2859fe96 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 7ec2329fd52..db6dd0f3481 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 1b309e47df3..c1a47cdedf1 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 a629edf636e..2a76ef9e65e 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/fullpage1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.pdf Binary files differindex 187dc86e4d4..15b69d3f9fe 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/fullpage1s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex index f4f9c5130da..cbc25e80bf6 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/fullpage1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: fullpage1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: fullpage1s2c.tex 1072 2019-06-09 14:14:19Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf b/Master/texmf-dist/doc/latex/hvfloat/hvfloat.pdf Binary files differindex c66afb61dfa..5f28291fa0b 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 75d47c45e70..dca29f2ebef 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 1054 2019-05-13 08:20:11Z herbert $ +%% $Id: hvfloat.tex 1072 2019-06-09 14:14:19Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4]{scrartcl} diff --git a/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/inner1s2c.pdf Binary files differindex e185ca85a91..f90af1abd10 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 b05404ae067..e5487420bc3 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 78d2c2f541b..da0c2ba44ab 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 67cd3b46193..d4354bfe516 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 bf8d162e5fc..222eede9be8 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 772e0e9ee87..1e82b18692e 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 f2417d7e446..6d5726c2385 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 9af48944518..5a02689ef61 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 219f5948772..7f2cf310494 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 2716acd52dc..2dd7669927a 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 0a0d18ecd0c..1b1d0907eff 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 ddf6a4c8999..2dd5415802b 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 ff7a88c3385..de422395620 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 f44559496ba..90d6d622067 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 ae9529dfaaa..af4fd9ca4d2 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 f756be16732..6e466829107 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 03b460da8f8..15198bc21d6 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 64d625ded29..e13c10e5261 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 de0a392ba5e..1b7d295d704 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 bd4d3fd8755..09d3cf9c52f 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-default1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default1s1c.pdf Binary files differindex 43b3bfb17b1..7d8a729015f 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 5e58d5eac94..91fe896dc97 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-default2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-default2s2c.pdf Binary files differindex b4c5ef49b67..4a303dee2f7 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-inner2s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-inner2s2c.pdf Binary files differindex 919e3063533..945d4e9c412 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-right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/paper-right1s1c.pdf Binary files differindex 82779134119..e4606b57515 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/right1s1c.pdf b/Master/texmf-dist/doc/latex/hvfloat/right1s1c.pdf Binary files differindex 24eca5d224b..8423fc99de6 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 9776fde7b49..62e121a492f 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 fef0d892782..c4cf6296360 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 e0389a81b00..04fe952cb51 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/right2s2c.tex b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex index 42c8ef1fca5..154a7beeae7 100644 --- a/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex +++ b/Master/texmf-dist/doc/latex/hvfloat/right2s2c.tex @@ -74,7 +74,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \blinddocument -\Blindtext +\Blindtext \Blindtext \end{document}
\ No newline at end of file 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 c5cf5fee19f..2ba15f5ffc4 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 e70b428d5b8..a06feaca2a0 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 9f1823acb6c..89721e02701 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-default1s2c.pdf b/Master/texmf-dist/doc/latex/hvfloat/sub-default1s2c.pdf Binary files differindex 25d97d2ea83..db16fbc2ddb 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 4ebe3879acd..6de66848d66 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 23be680ca2d..7f7bd678927 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 47e9983279b..87ff80154a1 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 887ab0c2519..e27919a3bc6 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/tex/latex/hvfloat/hvfloat.sty b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty index 6f94d80bac6..7eda015ab85 100644 --- a/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty +++ b/Master/texmf-dist/tex/latex/hvfloat/hvfloat.sty @@ -1,7 +1,7 @@ -%% $Id: hvfloat.sty 1042 2019-04-08 18:34:25Z herbert $ +%% $Id: hvfloat.sty 1054 2019-05-13 08:20:11Z herbert $ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{hvfloat}[2019/04/08 rotating of floating objects] +\ProvidesPackage{hvfloat}[2019/05/13 rotating of floating objects] %% %% IMPORTANT NOTICE: %% @@ -16,8 +16,8 @@ %% DESCRIPTION: %% `hvfloat' offers rotating of captions and objects for floats %% -\def\fileversion{2.14} -\def\filedate{2019/05/10} +\def\fileversion{2.15} +\def\filedate{2019/08/31} \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \let\hvFileVersion\fileversion % @@ -129,9 +129,18 @@ \define@boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment \define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text -\define@boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page + + +\newif\ifhv@fullpage +\newif\ifhv@FULLPAGE + +%\define@boolkey{hvSet}[hv@]{fullpage}[true]{}% fullpage float with caption on other page %\define@boolkey{hvSet}[hv@]{FullPage}[true]{}% fullpage float with caption on other page -\define@boolkey{hvSet}[hv@]{FULLPAGE}[true]{}% fullpage float with caption on other page +%\define@boolkey{hvSet}[hv@]{FULLPAGE}[true]{}% fullpage float with caption on other page + +\define@key{hvSet}{fullpage}[true]{\global\@nameuse{hv@fullpage#1}}% wegen \afterpage problem +\define@key{hvSet}{FULLPAGE}[true]{\global\@nameuse{hv@FULLPAGE#1}} + \define@boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats \ifhv@subFloat\setkeys{hvSet}{multiFloat=false}\fi% }% @@ -146,6 +155,9 @@ {\begingroup \edef\x{\endgroup\noexpand\setkeys{hvSet}{\@nameuse{hv@#1}}}\x}% use a defined style } +\define@key{hvSet}{capFormat}[]{\def\hv@caption@format{#1}}% +\define@key{hvSet}{subcapFormat}[]{\def\hv@subcaption@format{#1}}% + \def\hv@set#1{\begingroup\edef\x{\endgroup\noexpand\setkeys{hvSet}{#1}}\x} \let\hvFloatSet\hv@set % @@ -159,10 +171,13 @@ onlyText=false, wide=false, fullpage=false, FULLPAGE=false, multiFloat=false,subFloat=false, separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip, + capFormat={}, subcapFormat={}, }% } \newcommand\reset@special@float{% - \hv@set{subFloat=false,fullpage=false,multiFloat=false,FULLPAGE=false}} + \hv@set{subFloat=false,%fullpage=false, + multiFloat=false,%FULLPAGE=false +}} \def\hv@vskip{\vspace{\hvMultiFloatSkip}} @@ -188,9 +203,15 @@ } % \newcommand\figcaption[2][]{\def\@captype{figure}% - \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup} + \begingroup + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi + \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi + \endgroup} \newcommand\tabcaption[2][]{\def\@captype{table}% - \begingroup\ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi\endgroup} + \begingroup + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi + \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi + \endgroup} % \newlength\hv@maxImageWidth \AtBeginDocument{\hv@maxImageWidth=\columnwidth} @@ -271,8 +292,8 @@ \setDefaults \def\hvFloat{\@ifnextchar*% Main macro - {\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}% - {\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}% + {\global\hv@startrue\hv@maxImageWidth=\textwidth\hvFloat@i}% + {\global\hv@starfalse\hv@maxImageWidth=\columnwidth\hvFloat@i*}% } %\newcommand*{\hvFloat}[5][]+{% @@ -289,7 +310,7 @@ \begingroup \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}% \hv@maxImageWidth=\textwidth - \hv@capbesidefalse +% \hv@capbesidefalse \reset@special@float \setcounter{hv@pfigure}{\value{figure}}% \setcounter{hv@ptable}{\value{table}}% @@ -361,7 +382,7 @@ \def\hvFloat@ii[#1]#2#3{% \hv@maxImageWidth=\textwidth - \hv@capbesidefalse +% \hv@capbesidefalse \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi \gdef\hv@floatType{#2}% \ifx\relax#2\relax \setkeys{hvSet}{nonFloat=true}\fi @@ -419,7 +440,11 @@ \ifhv@wide \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% \else - \setlength\hvCapWidth{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \ifhv@star + \setlength\hvCapWidth{\the\dimexpr\textwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \else + \setlength\hvCapWidth{\the\dimexpr\linewidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \fi \fi \else \setlength\hvCapWidth{\columnwidth}% @@ -450,6 +475,7 @@ \ifx\hvSet@capAngle\hv@Zero % need rotation? \sbox\hvCaptionBox{% NO rotation \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifhv@nonFloat \ifhv@onlyText\hv@longCap \else @@ -470,6 +496,7 @@ \sbox\hvCaptionBox{% Rotation \rotatebox{\hvSet@capAngle}{% \begin{minipage}[b]{\hvCapWidth}% minipage, to get hyphenation + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifhv@nonFloat \ifhv@onlyText\hv@longCap \else @@ -496,11 +523,14 @@ \def\fps@figure{\hvSet@floatPos}% \ifhv@nonFloat \begingroup% Start the nonfloat part - \checkoddpage - \else - \begin{\hv@floatType}% Start the floating environment - \checkoddpage + \else + \ifhv@star + \@nameuse{\hv@floatType*}% Start the floating environment ***************************** + \else + \begin{\hv@floatType} % Start the floating environment + \fi \fi + \checkoddpage \ifx\hvSet@objectPos\hv@Right\raggedleft\fi \ifx\hvSet@objectPos\hv@Center \ifhv@nonFloat\hspace*{\fill}\else\centering\fi @@ -551,7 +581,7 @@ \fi \fi %%%% - \savebox{\@tempboxa}{% + \savebox{\@tempboxa}{% ***** @tempbox start \expandafter\ifcase\the\hv@@capPos% 0 is LEFT START \ifcase \ifx\hvSet@capVPos\hv@Center \put@CaptionBox @@ -615,7 +645,7 @@ \fi \end{minipage}% \fi% \ifcase\the\hv@@capPos - }% End savebox Object and caption + }% End savebox Object and caption %%%%%%%%%%%%%%%%% @tempboxa % % now we rotate the object and caption, if needed % @@ -635,7 +665,11 @@ \fi \endgroup% End the nonfloat part \else - \end{\hv@floatType}% End the floating environment + \ifhv@star + \@nameuse{end\hv@floatType*}% End the floating environment + \else + \end{\hv@floatType}% End the floating environment + \fi \fi \endgroup% startet at main \hvFloat } @@ -712,7 +746,7 @@ \else % onecolumn \ifoddpage \setPageObject\setBottomCaption - \else + \else% even page \afterpage{\setPageObject\setBottomCaption}% \fi \fi @@ -844,6 +878,7 @@ \def\getMultiCaptionAndLabel{% \global\sbox\hvCaptionBox{\minipage[b]{\linewidth}% + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \setlength\belowcaptionskip{5pt}% \setlength\abovecaptionskip{0pt}% \hv@cntb=\clist_count:N\l_clist_Type @@ -868,6 +903,7 @@ } \def\getMultiObjectAndLabel{% \global\sbox\hvObjectBox{\minipage{\linewidth}% + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifx\hvSet@objectPos\hv@Right\raggedleft\else \ifx\hvSet@objectPos\hv@Left\raggedleft\else \ifx\hvSet@objectPos\hv@Center\centering @@ -893,6 +929,7 @@ \def\getMultiSubCaptionAndLabel{% \global\sbox\hvCaptionBox{\minipage{\linewidth}% + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \setlength\belowcaptionskip{5pt}% \setlength\abovecaptionskip{0pt}% \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats @@ -909,6 +946,7 @@ \def\getMultiSubObjectAndLabel{% \global\sbox\hvObjectBox{\minipage{\linewidth}% + \ifx\relax\hv@subcaption@format\relax\else\captionsetup[sub]{\hv@subcaption@format}\fi \ifx\hvSet@objectPos\hv@Right\raggedleft\else \ifx\hvSet@objectPos\hv@Left\raggedleft\else \ifx\hvSet@objectPos\hv@Center\centering @@ -949,6 +987,7 @@ \def\getSingleCaptionAndLabel{% \global\sbox\hvCaptionBox{\minipage{\linewidth}% + \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \setlength\belowcaptionskip{5pt}% \setlength\abovecaptionskip{0pt}% \edef\@captype{\hv@floatType}% |