From 2c0c7988beae1efa245bfb9fec0a25d41d88047d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 16 Jun 2021 03:01:15 +0000 Subject: CTAN sync 202106160301 --- macros/latex/contrib/easybook/easybook.dtx | 132 ++++++---- macros/latex/contrib/easybook/easybook.pdf | Bin 328635 -> 331393 bytes macros/latex/contrib/huawei/cd | 0 macros/latex/contrib/huawei/cover-picture.pdf | Bin 0 -> 253724 bytes macros/latex/contrib/huawei/huawei.cls | 8 +- macros/latex/contrib/huawei/huawei.pdf | Bin 336532 -> 336307 bytes macros/latex/contrib/huawei/huawei.tex | 4 +- .../latex/contrib/huawei/images/huawei-cover.pdf | Bin 253724 -> 0 bytes macros/latex/contrib/hvfloat/Changes | 5 + .../contrib/hvfloat/doc/examples/after1s1c.pdf | Bin 82729 -> 80294 bytes .../contrib/hvfloat/doc/examples/after2s2c.pdf | Bin 87651 -> 86722 bytes .../latex/contrib/hvfloat/doc/examples/capPos.pdf | Bin 95386 -> 95389 bytes .../contrib/hvfloat/doc/examples/default1s1c.pdf | Bin 83533 -> 81992 bytes .../contrib/hvfloat/doc/examples/default1s2c.pdf | Bin 83672 -> 83277 bytes .../contrib/hvfloat/doc/examples/default2s1c.pdf | Bin 82305 -> 79445 bytes .../contrib/hvfloat/doc/examples/default2s2c.pdf | Bin 85901 -> 85824 bytes .../hvfloat/doc/examples/doublepage2s1c.pdf | Bin 2357654 -> 2314854 bytes .../hvfloat/doc/examples/doublepage2s2c.pdf | Bin 615046 -> 619034 bytes .../contrib/hvfloat/doc/examples/even1s1c.pdf | Bin 79245 -> 77658 bytes .../contrib/hvfloat/doc/examples/even1s2c.pdf | Bin 86865 -> 86404 bytes .../contrib/hvfloat/doc/examples/even2s1c.pdf | Bin 85643 -> 84814 bytes .../contrib/hvfloat/doc/examples/even2s2c.pdf | Bin 85535 -> 85098 bytes .../contrib/hvfloat/doc/examples/fullpage1s2c.pdf | Bin 87688 -> 86780 bytes .../contrib/hvfloat/doc/examples/inner1s2c.pdf | Bin 84929 -> 84024 bytes .../contrib/hvfloat/doc/examples/inner2s1c.pdf | Bin 84881 -> 83981 bytes .../contrib/hvfloat/doc/examples/inner2s2c.pdf | Bin 84251 -> 84014 bytes .../contrib/hvfloat/doc/examples/left2s2c.pdf | Bin 85613 -> 85512 bytes .../hvfloat/doc/examples/multi-after1s1c.pdf | Bin 146330 -> 142630 bytes .../hvfloat/doc/examples/multi-after1s1c.tex | 5 +- .../hvfloat/doc/examples/multi-default1s1c.pdf | Bin 146151 -> 146172 bytes .../hvfloat/doc/examples/multi-default1s2c.pdf | Bin 94686 -> 94584 bytes .../hvfloat/doc/examples/multi-default2s1c.pdf | Bin 146317 -> 146347 bytes .../hvfloat/doc/examples/multi-default2s2c.pdf | Bin 92271 -> 92183 bytes .../hvfloat/doc/examples/multi-inner2s2c.pdf | Bin 93238 -> 89788 bytes .../hvfloat/doc/examples/multi-outer2s2c.pdf | Bin 95366 -> 92989 bytes .../hvfloat/doc/examples/multi-right1s1c.pdf | Bin 145707 -> 145741 bytes .../latex/contrib/hvfloat/doc/examples/odd1s1c.pdf | Bin 81305 -> 77875 bytes .../latex/contrib/hvfloat/doc/examples/odd1s2c.pdf | Bin 87711 -> 86523 bytes .../latex/contrib/hvfloat/doc/examples/odd2s1c.pdf | Bin 245795 -> 174225 bytes .../latex/contrib/hvfloat/doc/examples/odd2s1c.tex | 10 +- .../latex/contrib/hvfloat/doc/examples/odd2s2c.pdf | Bin 86754 -> 85568 bytes .../contrib/hvfloat/doc/examples/outer1s2c.pdf | Bin 86623 -> 86320 bytes .../contrib/hvfloat/doc/examples/outer2s1c.pdf | Bin 85191 -> 84295 bytes .../contrib/hvfloat/doc/examples/outer2s2c.pdf | Bin 84961 -> 84682 bytes .../hvfloat/doc/examples/paper-after1s1c.pdf | Bin 81145 -> 79175 bytes .../hvfloat/doc/examples/paper-default1s1c.pdf | Bin 81801 -> 79887 bytes .../hvfloat/doc/examples/paper-default1s2c.pdf | Bin 90608 -> 90510 bytes .../hvfloat/doc/examples/paper-default2s1c.pdf | Bin 88335 -> 87941 bytes .../hvfloat/doc/examples/paper-default2s2c.pdf | Bin 90429 -> 90335 bytes .../hvfloat/doc/examples/paper-inner2s2c.pdf | Bin 87924 -> 87857 bytes .../hvfloat/doc/examples/paper-right1s1c.pdf | Bin 81720 -> 80203 bytes .../contrib/hvfloat/doc/examples/preamble.ltx | 27 +++ .../contrib/hvfloat/doc/examples/right1s1c.pdf | Bin 82552 -> 80126 bytes .../contrib/hvfloat/doc/examples/right1s2c.pdf | Bin 89273 -> 89343 bytes .../contrib/hvfloat/doc/examples/right2s1c.pdf | Bin 81502 -> 81033 bytes .../contrib/hvfloat/doc/examples/right2s2c.pdf | Bin 86853 -> 85585 bytes .../contrib/hvfloat/doc/examples/sub-after1s1c.pdf | Bin 143999 -> 143886 bytes .../contrib/hvfloat/doc/examples/sub-after2s2c.pdf | Bin 145131 -> 144710 bytes .../hvfloat/doc/examples/sub-default1s1c.pdf | Bin 144046 -> 143924 bytes .../hvfloat/doc/examples/sub-default1s2c.pdf | Bin 144594 -> 144163 bytes .../hvfloat/doc/examples/sub-default2s2c.pdf | Bin 143892 -> 143452 bytes .../contrib/hvfloat/doc/examples/sub-right1s1c.pdf | Bin 143930 -> 143820 bytes .../contrib/hvfloat/doc/examples/sub-right1s2c.pdf | Bin 145245 -> 144816 bytes .../contrib/hvfloat/doc/examples/sub-right2s2c.pdf | Bin 144680 -> 144264 bytes .../contrib/hvfloat/doc/examples/wide1s2c.pdf | Bin 121490 -> 120957 bytes .../contrib/hvfloat/doc/examples/wide2s2c.pdf | Bin 123328 -> 121931 bytes macros/latex/contrib/hvfloat/doc/hvfloat.pdf | Bin 7114454 -> 7114688 bytes macros/latex/contrib/hvfloat/doc/hvfloat.tex | 88 ++++++- macros/latex/contrib/hvfloat/latex/hvfloat.sty | 265 +++++++++++++-------- 69 files changed, 376 insertions(+), 168 deletions(-) create mode 100644 macros/latex/contrib/huawei/cd create mode 100644 macros/latex/contrib/huawei/cover-picture.pdf delete mode 100644 macros/latex/contrib/huawei/images/huawei-cover.pdf (limited to 'macros/latex/contrib') diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index c07e0d03c3..762a7b0cd0 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -28,7 +28,7 @@ % % \title{\sffamily easybook 文档类手册} % \author{瞿毅} -% \date{2021/06/14\hskip\ccwd\relax v1.26b\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/06/15\hskip\ccwd\relax v1.26c\thanks{\url{https://gitee.com/texl3/easybook}}} % % \maketitle % \begin{abstract} @@ -58,7 +58,7 @@ % \end{document} % \end{frameverb} % -% 或者直接使用 \pkg{easybase} 宏包,它的宏包选项有 \opt{class} 和 \opt{draft},包含了节 \ref{sec:interface options} 所示各个模块接口命令的功能,目前只适用于 \cls{ctexbook} 和 \cls{ctexart} 文档类。 +% 或者直接使用 \pkg{easybase} 宏包,它的宏包选项有 \opt{class}、\opt{draft} 和 \opt{floatpage},包含了节 \ref{sec:interface options} 所示各个模块接口命令的功能,目前只适用于 \cls{ctexbook} 和 \cls{ctexart} 文档类。 % \begin{frameverb} % \documentclass{ctexbook} % @@ -148,10 +148,18 @@ % \begin{syntax} % config = <配置文件名> % \end{syntax} -% \opt{config}为载入用户配置选项,配置文件名不需加括号但需带有后缀名如 \opt{tex}、\opt{def} 和 \opt{cfg}。 +% \opt{config} 为载入用户配置选项,配置文件名不需加括号但需带有后缀名如 \opt{tex}、\opt{def} 和 \opt{cfg}。 % \changes{v1.10}{2021/01/08}{加入载入用户配置选项。} % \end{function} % +% \begin{function}[rEXP,added = 2021-06-15]{floatpage} +% \begin{syntax} +% floatpage = +% \end{syntax} +% 开启这个选项后浮动环境 \env{table} 和 \env{figure} 的比例参数会使用默认值,关闭它则尽可能避免出现浮动页,使图表环境与正文段落更加紧凑,减少多余的空白版面。 +% \changes{v1.26c}{2021/06/15}{增加浮动环境比例参数选项 \opt{floatpage}。} +% \end{function} +% % \subsection{article 模式} % \begin{function}[rEXP,added = 2021-03-16]{class} % \begin{syntax} @@ -231,6 +239,7 @@ % \tn{EBeforeAddBitoc*}\marg{加入目录英文标题前的代码} % \end{syntax} % \tn{appendix} 命令后的章节标题变为附录形式。英文目录中附录标题的格式用可选参数修改,英文附录目录前名字默认为 Appendix\tn{space},后名字默认为空,名字之间用一个半角逗号分开,也可以只有一部分,表示英文附录目录前名字。英文附录目录数字输出命令默认为 \tn{Alph}\{chapter\}。 +% \changes{v1.26c}{2021/06/13}{增加调整英文目录格式的钩子 \tn{EBeforeAddBitoc}。} % \end{function} % % \tn{EBeforeAddBitoc} 是一个作用于局部范围的英文目录钩子,可以插入标题或目录设置的命令改变英文目录中标题的显示格式,也可以覆盖上述的目录前后名字和编号等设置,带有星号的命令会重置之前的代码,放置在导言区或 \tn{bichapter} 等命令前生效。 @@ -462,46 +471,47 @@ % \item[spacepost] 定理标题后与第一段内容的间隔。 % \end{optdesc} % -% \begin{function}[added = 2021-01-12,updated = 2021-04-25]{\newtheorem,\EBNewTheorem,\declaretheoremstyle} +% \begin{function}[added = 2021-01-12,updated = 2021-06-15]{\declaretheorem,\EBNewTheorem,\declaretheoremstyle} % \begin{syntax} -% \tn{newtheorem}\oarg{键值列表}\marg{定理环境名} +% \tn{declaretheorem}\oarg{键值列表}\marg{定理环境名} % \tn{EBNewTheorem}\marg{定理环境名}\oarg{英文标题}\marg{中文标题}\parg{盒子样式|(tc-theorem)}\oarg{键值列表} % \tn{declaretheoremstyle}\oarg{键值列表}\marg{定理样式名} % \end{syntax} % 文档类已预置8个定理环境,环境名及对应的定理标题名见小节 \ref{subsec:theorem},如果需要新的定理标题名或定理样式可使用这两个命令。 % \changes{v1.23}{2021/03/12}{重新定义了新定理环境命令 \tn{newtheorem}。} % \changes{v1.24}{2021/04/25}{增加定义定理环境命令 \tn{EBNewTheorem}。} +% \changes{v1.26c}{2021/06/15}{定义新定理环境的命令调整为 \tn{declaretheorem}。} % \end{function} % % \begin{optdesc} -% \item[\tn{newtheorem}] 定义新的定理类环境,可选参数与 \pkg{thmtools} 宏包定理命令 \tn{declaretheorem} 的参数一致。常用的选项如下 +% \item[\tn{declaretheorem}] 定义新的定理类环境,\tn{newtheorem} 命令与它等效,可选参数与 \pkg{thmtools} 宏包创建定理命令 \tn{declaretheorem} 的参数一致。常用的选项如下 % \begin{description} % \item[name] 定理的标题。默认值是环境的名称,并且首字母大写(英文标题)。 % \item[numbered] 值为 \opt{no}、\opt{yes} 或 \opt{unless unique}。定理可以被编号、不被编号或者只有在文档中多次出现时才被编号。 % \item[numberlike] 定理将使用此计数器进行编号,通常这是另一个定理环境的名称。 % \item[style] 用 \tn{declaretheoremstyle} 定义的定理样式的名称,定理将使用这种样式的设置。 % \end{description} -% \item[\tn{EBNewTheorem}] \tn{EBNewTheorem} 是更便捷的定理命令,它定义一个新的定理环境,键值列表支持的选项与 \tn{newtheorem} 相同,但它们的区别有 +% \item[\tn{EBNewTheorem}] \tn{EBNewTheorem} 是更便捷的定理命令,它定义一个新的定理环境,键值列表支持的选项与 \tn{declaretheorem} 相同,但它们的区别有 % \begin{itemize} % \item 中英文模式下标题不同,英文标题为可选项,默认为首字母大写的环境名。 % \item 自动定义交叉引用的格式,引用标签前缀为定理名称。 % \item 定理盒子选项 \opt{thmbox} 仍然生效,盒子样式选项是用于设置定理盒子样式的名称,它需要 \pkg{tcolorbox} 的 \tn{tcbset} 接口命令设定,默认为 \opt{tc-theorem}。 % \item 默认使用 \opt{easy-theorem} 定理样式,可在最后一个选项使用 \opt{style} 更改样式。 % \end{itemize} -% \item[\tn{declaretheoremstyle}] 定义新的定理样式,可选参数中除了包括上述定理样式选项,还包括 \tn{newtheorem} 的选项。 +% \item[\tn{declaretheoremstyle}] 定义新的定理样式,可选参数中除了包括上述定理样式选项,还包括 \tn{declaretheorem} 的选项。 % \end{optdesc} % % \subsubsection{新的定理样式} % 定理由 \pkg{thmtools} 设置,预置定理的样式为 \opt{easy-theorem},上述定理样式选项将对这个定理样式生效。如果使用这个样式而只是增加新的定理名称,可以这样 % \begin{ctexexam} % \EBNewTheorem{定理环境名}{中文标题}[style = other theorem] -% \newtheorem[style = easy-theorem,name = 定理名]{定理环境名} +% \declaretheorem[style = easy-theorem,name = 定理名]{定理环境名} % \end{ctexexam} -% \tn{newtheorem} 定义的定理环境需要手动增加盒子边框,可以如下进行设置 +% \tn{declaretheorem} 定义的定理环境需要手动增加盒子边框,可以如下进行设置 % \begin{ctexexam} % \tcolorboxenvironment{定理环境名}{tc-theorem} % \end{ctexexam} -% 定义一个新的定理样式可用于 \tn{newtheorem} 的 \opt{style} 选项。 +% 定义一个新的定理样式可用于 \tn{declaretheorem} 的 \opt{style} 选项。 % \begin{ctexexam} % \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5\ccwd]{定理样式名} % \end{ctexexam} @@ -576,6 +586,7 @@ % \tn{markrule}\oarg{长度|(\tn{textwidth})}\parg{颜色名}\marg{线宽|(0.75pt)}[<上间距>+<下间距>] % \end{syntax} % 命令 \tn{easyhead} 和 \tn{easyfoot} 的使用方法与 \tn{fancyhead} 和 \tn{fancyfoot} 完全相同,它们需要在 \opt{head-foot} 选项中使用,设置的是一个名为 \opt{fancy} 的页面风格。\pkg{fancyhdr} 将页眉页脚分成了左中右和奇数页(odd)、偶数页(even)共12个部分,可选参数中E、O代表偶数、奇数,L、C、R代表左、中、右部分。单面打印时,含有偶数的选项无效。 +% \changes{v1.26c}{2021/06/14}{增加页眉页脚的横线绘制命令 \tn{markrule}。} % \end{function} % % 命令 \tn{markrule} 用于绘制页眉页脚横线,长度默认为页面文本区的宽度,上下间距为横线与上下方部件的间距,带有长度单位,间距长度之间用+号分开,若只有一部分则表示上间距,这个命令也可以在正文中绘制横线。下面举一个设置页眉内容的例子 @@ -1068,7 +1079,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/06/14}{1.26b}{beta} +\ProvidesExplClass{easybook}{2021/06/15}{1.26c}{beta} \bool_set_false:N \l__eb_compile_draft_bool \bool_set_false:N \l__eb_title_newline_bool @@ -1128,8 +1139,11 @@ }, class .initial:n = book, - config .tl_set:N = \g__eb_config_tl, - unknown .code:n = + config .tl_set:N = \g__eb_config_tl, + floatpage .bool_set:N = \l__eb_float_page_bool, + floatpage .default:n = true, + floatpage .initial:n = false, + unknown .code:n = { \clist_gput_right:NV \g__eb_options_clist \CurrentOption } } @@ -1253,7 +1267,8 @@ aftername = { \bool_if:NTF \l__eb_title_newline_bool - { \par\nobreak } { \hspace{\ccwd} } + { \par\nobreak } + { \hspace{\ccwd} } } }, chapter = @@ -1267,7 +1282,8 @@ aftername = { \bool_if:NTF \l__eb_title_newline_bool - { \par\nobreak\vskip 1.5pc } { \hspace{\ccwd} } + { \par\nobreak\vskip 1.5pc } + { \hspace{\ccwd} } }, beforeskip = -1.5ex, afterskip = 3ex, @@ -1312,7 +1328,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2021/06/14}{1.26b}{beta} +\ProvidesExplPackage{easybase}{2021/06/15}{1.26c}{beta} \cs_generate_variant:Nn \eb_ctex_define:nn { nx } \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -1382,8 +1398,11 @@ \keys_define:nn { easybase } { - draft .code:n = + draft .code:n = { \bool_set_true:N \l__eb_compile_draft_bool }, + floatpage .bool_set:N = \l__eb_float_page_bool, + floatpage .default:n = true, + floatpage .initial:n = false, class .choice:, class .value_required:n = true, @@ -1426,6 +1445,19 @@ } \keys_define:nn { } { ctex/link .inherit:n = ctex/refset } \cs_set_eq:NN \link \refset +\cs_if_exist:NF \chapter + { + \newcounter{chapter} + \bool_set_false:N \l__eb_class_book_bool + \ctex_define:n { chapter/tocline .code:n = { } } + } +\bool_if:NF \l__eb_class_book_bool + { + \cs_set_eq:NN \eb@chapter@save \chapter + \cs_undefine:N \chapter + \ctex_after_end_preamble:n + { \cs_set_eq:NN \chapter \eb@chapter@save } + } \ctex_define:n { link .meta:nn = { ctex/link } {#1}, @@ -1653,11 +1685,13 @@ fnmark-num .value_required:n = true } +\cs_set_eq:NN \eb@text@uppercase \text_uppercase:n +\cs_set_eq:NN \eb@text@nouppercase \text_titlecase_first:n \cs_new:Npn \eb_mark_uppercase_bool:nn #1#2 { \bool_if:NTF \l__eb_mark_uppercase_bool - { \text_uppercase:n } - { \text_titlecase_first:n } + { \eb@text@uppercase } + { \eb@text@nouppercase } { \use:c { eb_fancyhf_#1_mark:n } {#2} } } \cs_new:Npn \eb@level@markdouble #1#2 @@ -1723,7 +1757,8 @@ \counterwithin*{footnote}{page} } \bool_if:NTF \l__eb_footnote_hang_bool - { \booltrue{FN@hangfoot} } { \boolfalse{FN@hangfoot} } + { \booltrue{FN@hangfoot} } + { \boolfalse{FN@hangfoot} } } \eb_patch_cmd:nnn { \@footnotetext,\@mpfootnotetext } { \reset@font } @@ -1867,12 +1902,6 @@ \hspace{\use:c { eb@toc@#1@numsep }} }{} } -\cs_if_exist:NF \chapter - { - \newcounter{chapter} - \bool_set_false:N \l__eb_class_book_bool - \ctex_define:n { chapter/tocline .code:n = { } } - } \newbool{eb@titletoc@hang@fix} \eb_ctex_define:nn { tocset } { @@ -1966,7 +1995,8 @@ {\thecontentspage} { \bool_if:NTF \l__eb_toc_line_align_bool - { \contentspage } { \thecontentspage } + { \contentspage } + { \thecontentspage } } } } @@ -2288,11 +2318,10 @@ binmuber .tl_set:N = \CTEX@bichapter@number, binmuber .initial:n = \arabic{chapter} } -\cs_new_protected:Npn \eb_counter_set:nn #1#2 +\cs_new_protected:Npn \eb_counter_zero:n #1 { - \seq_set_from_clist:No \l__eb_counter_name_seq {#2} - \seq_map_inline:Nn \l__eb_counter_name_seq - { \setcounter{##1}{#1} } + \seq_set_from_clist:No \l__eb_counter_name_seq {#1} + \seq_map_inline:Nn \l__eb_counter_name_seq { \setcounter{##1}{0} } } \RenewDocumentCommand{\appendix} {O{Appendix\space}D(){\Alph{chapter}}} @@ -2319,7 +2348,7 @@ \gdef\CTEX@thechapter{\CTEX@appendix@number} \gdef\CTEX@postchapter{\CTEX@postappendix} \gdef\CTEX@chapter@numbering{\CTEX@appendix@numbering} - \eb_counter_set:nn { 0 } { chapter,section,bichapter,bisection } + \eb_counter_zero:n { chapter,section,bichapter,bisection } } { \gdef\thesection{\@Alph\c@section} @@ -2329,7 +2358,7 @@ \gdef\CTEX@postsection{\CTEX@postappendix} \gdef\CTEX@section@numbering{\CTEX@appendix@numbering} \ctex_set:nn { appendix } { number = \@Alph\c@section,name = { } } - \eb_counter_set:nn { 0 } { section,subsection,bisection,bisubsection } + \eb_counter_zero:n { section,subsection,bisection,bisubsection } } } @@ -2472,21 +2501,33 @@ \selectfont\ignorespaces } +\cs_new_protected:Npn \eb_float_proportion_set:nn #1#2 + { \tl_gset:cn { #1fraction } {#2} } +\bool_if:NF \l__eb_float_page_bool + { + \clist_map_inline:nn + { + { text } { 0.1 }, + { top } { 0.9 }, + { bottom } { 0.9 }, + { floatpage } {0.9 }, + { dbltop } { 0.9 }, + { dblfloatpage } { 0.9 } + } + { \eb_float_proportion_set:nn #1 } + } \skip_set:Nn \parskip { 0pt plus 2pt minus 1pt } \skip_set:Nn \intextsep { 14pt plus 2pt minus 2pt } \skip_set:Nn \textfloatsep { 16pt plus 2pt minus 4pt } \skip_set:Nn \multicolsep { 10pt plus 4pt minus 3pt } \skip_set:Nn \dbltextfloatsep { 16pt plus 2pt minus 4pt } +\int_gset:Nn \vbadness { 10000 } +\int_gset:Nn \hbadness { 10000 } \setcounter{topnumber}{4} \setcounter{bottomnumber}{4} \setcounter{totalnumber}{8} -\tl_gset:Nn \textfraction { 0.15 } -\tl_gset:Nn \topfraction { 0.8 } -\tl_gset:Nn \bottomfraction { 0.8 } -\tl_gset:Nn \floatpagefraction { 0.9 } -\tl_gset:Nn \dblfloatpagefraction { 0.9 } -\tl_gset:Nn \ULthickness { 0.75pt } \allowdisplaybreaks[4] +\tl_gset:Nn \ULthickness { \eb@rule@width@dim } \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif} \cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2 @@ -2546,6 +2587,10 @@ \labelformat{#1}{\tl_use:c { c__eb_name_#1_tl }~##1} } } +\cs_set_eq:NN \eb@declare@theorem@save \declaretheorem +\RenewDocumentCommand{\declaretheorem}{O{}m} + {\AfterPreamble{\eb@declare@theorem@save[#1]{#2}}} +\cs_set_eq:NN \newtheorem \declaretheorem \bool_new:N \l__eb_thmbox_bool \tl_new:N \l__eb_thm_numberwith_tl @@ -2556,8 +2601,6 @@ \tl_new:N \l__eb_thm_spaceabove_tl \tl_new:N \l__eb_thm_spacebelow_tl -\RenewDocumentCommand{\newtheorem}{O{}m} - {\AfterPreamble{\declaretheorem[#1]{#2}}} \eb_ctex_define:nn { thmset } { thmbox .bool_set:N = \l__eb_thmbox_bool, @@ -3057,10 +3100,7 @@ \clist_map_inline:nn { page,none } { \tl_if_eq:NnT \l_keys_value_tl {##1} - { - \clist_map_break:n - { \colorlet{ctex@toc@number}{black} } - } + { \clist_map_break:n { \colorlet{ctex@toc@number}{black} } } } }, linktoc .default:n = all, diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index bfa06382e0..68ec807580 100644 Binary files a/macros/latex/contrib/easybook/easybook.pdf and b/macros/latex/contrib/easybook/easybook.pdf differ diff --git a/macros/latex/contrib/huawei/cd b/macros/latex/contrib/huawei/cd new file mode 100644 index 0000000000..e69de29bb2 diff --git a/macros/latex/contrib/huawei/cover-picture.pdf b/macros/latex/contrib/huawei/cover-picture.pdf new file mode 100644 index 0000000000..6717a9ff35 Binary files /dev/null and b/macros/latex/contrib/huawei/cover-picture.pdf differ diff --git a/macros/latex/contrib/huawei/huawei.cls b/macros/latex/contrib/huawei/huawei.cls index c2b5ce7b48..61a99c65be 100644 --- a/macros/latex/contrib/huawei/huawei.cls +++ b/macros/latex/contrib/huawei/huawei.cls @@ -21,7 +21,7 @@ % SOFTWARE. \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{huawei}[2021/06/14 0.6.0 Template for Huawei documents] +\ProvidesClass{huawei}[2021/06/15 0.6.1 Template for Huawei Documents] \newif\ifnosecurity \DeclareOption{nosecurity}{\nosecuritytrue} @@ -120,7 +120,7 @@ \end{textblock}% } -\newcommand\HuaweiLogo{ +\newcommand\PrintHuaweiLogo{ \begin{tikzpicture}[y=0.80pt, x=0.80pt, yscale=-1, inner sep=0pt, outer sep=0pt] \begin{scope}[even odd rule,line width=0.800pt] \begin{scope}[shift={(0,-0.00024)}] @@ -153,7 +153,7 @@ \ifnum\value{page}=1\else% \ifnobrand\else% \begin{textblock}{8}[0,0](1.2,0.2)% - \HuaweiLogo{}% + \PrintHuaweiLogo{}% \end{textblock}% \fi% \fi% @@ -264,7 +264,7 @@ \maketitle \iflandscape\ifnocover\else \begin{textblock}{14}[1,1](14,14) - \raggedleft\includegraphics[height=3.6in]{images/huawei-cover.pdf} + \raggedleft\includegraphics[height=3.6in]{cover-picture.pdf} \end{textblock} \fi\fi } diff --git a/macros/latex/contrib/huawei/huawei.pdf b/macros/latex/contrib/huawei/huawei.pdf index 654619f9b8..fde534fd9f 100644 Binary files a/macros/latex/contrib/huawei/huawei.pdf and b/macros/latex/contrib/huawei/huawei.pdf differ diff --git a/macros/latex/contrib/huawei/huawei.tex b/macros/latex/contrib/huawei/huawei.tex index 46aad22902..07d7d66d87 100644 --- a/macros/latex/contrib/huawei/huawei.tex +++ b/macros/latex/contrib/huawei/huawei.tex @@ -29,9 +29,9 @@ \begin{document} \maketitle -\ff{Version: 0.6.0} +\ff{Version: 0.6.1} \newline -\ff{Date: 2021/06/14} +\ff{Date: 2021/06/15} \section{Overview} diff --git a/macros/latex/contrib/huawei/images/huawei-cover.pdf b/macros/latex/contrib/huawei/images/huawei-cover.pdf deleted file mode 100644 index 6717a9ff35..0000000000 Binary files a/macros/latex/contrib/huawei/images/huawei-cover.pdf and /dev/null differ diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes index 2b809bb337..fd9d99736d 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -1,4 +1,9 @@ hvfloat.sty: +2.29 2021-06-15 - some more fixes for doublepage objects + - added option sameHeight for same text height on left + and right page with a doublepage object + - added bindCorr=inner for doublepage objects to + use only the textwidth for both pages 2.28 2021-06-09 - fix for missing type that leads to nonFloat _and_ onlyText - fix for \thehv@pfigure and \thehv@ptablee 2.27 2021-06-07 - added \tabcaptionbelow diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf index 8ba1d25203..8aa7da3cf1 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf index 777c5374fd..b90848de1d 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf index 473cc1322e..d7816f6ad2 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf and b/macros/latex/contrib/hvfloat/doc/examples/capPos.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf index 68aaa6a751..32a7d1db77 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf index 772abdc767..47eb520a09 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf index 0c515b0976..29cde239da 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf index 51712f5755..539adf324a 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf index 81e91f49c9..41032411ce 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf index b535662f1c..5f2de396a7 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf index 0ef401d15a..e0051dc4cb 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf index ccaa0a0c43..288a92fff9 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf index 8a62941042..11e4c5882e 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf index 226ea5471a..8c8d5e7cec 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf index 1a18b67057..1d6f74c767 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf index 8b5431fbf6..8b3eac8c60 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf index c829f3b1e2..682c3d3940 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf index 10e8df1039..93d370456c 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf index 2a18ce58e8..00919f05cc 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf index 05c79cb897..3ed7100f4f 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex index 62cd6734ce..a01561d840 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: multi-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $ +%% $Id: multi-after1s1c.tex 112 2021-06-14 08:01:42Z herbert $ \input{preamble.ltx} @@ -49,6 +49,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. {img:demo2} \end{lstlisting} + \Float[Multi] \captionsetup{singlelinecheck=false} \hvFloat[fullpage,capPos=after,multiFloat,vFill]% @@ -78,7 +79,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. -\blinddocument +\Blindtext \begin{lstlisting} diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf index 8eadf52437..0c39135590 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf index 5482c3316f..95c0d74717 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf index 5610832201..2b1867b088 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf index 8a4a84c5a9..d9e38b05b8 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf index b50b8fa959..256ed12d1f 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf index 74a5b1a499..179b315444 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf index 56ffb0b354..9013d94523 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf index e4749a98c8..8480522fb2 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf index 4bb050f6b4..e35c4fc529 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf index f13f5e2831..0bc26ee3e3 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex index adcb965bf5..ee0e69c74e 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: odd2s1c.tex 72 2021-05-02 11:40:10Z herbert $ +%% $Id: odd2s1c.tex 107 2021-06-09 06:43:25Z herbert $ \input{preamble.ltx} @@ -23,7 +23,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=oddPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa0}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -35,7 +35,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=oddPage] \hvFloat[fullpage,capPos=oddPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa0}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -50,7 +50,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \begin{lstlisting} \hvFloat[fullpage,capPos=oddPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa0}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. @@ -63,7 +63,7 @@ The fullpage image~\vref{fig:fullpage0} has a caption~\vpageref{fig:fullpage0-ca \Float[capPos=oddPage] \hvFloat[fullpage,capPos=oddPage]% {figure}% - {\includegraphics[fullpage]{frose}}% + {\includegraphics[fullpage]{usa0}}% [A fullpage float with the default caption setting]% {A default caption of a ``fullpage'' object with the default setting, which is a ``left'' caption which means that it always appears before the object. diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf index bd173e8e0d..1bd90be749 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf index bada8ae5e0..0ee59f70b1 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf index 03a57f6862..a2ed22f860 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf index 8853b2acba..3fa8364ebe 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf index 5b0e63ac7f..7d2d7801d4 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf index 642314e192..5f4946f300 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf index 6d396debdc..3e1e0287d5 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf index 297458c772..640629b541 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf index 6ba3089988..a69f803c69 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf index 739474d938..0fbf2c5155 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf index 207f1b69c6..7e394e5d57 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx b/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx index 4b49852be7..525725c6c0 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx +++ b/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx @@ -41,4 +41,31 @@ \captionsetup{labelfont={red,sf},font={red,sf},format=plain} \usepackage{blindtext} + +\def\hvblindtext{\textcolor{black!30}{Hello, here is some text without a meaning. This text should show what a +printed text will look like at this place. If you read this text, you will get no information. Really? +Is there no information? Is there a difference between this text and some nonsense like “Huardest gef- burn”? +Kjift – not at all! A blind text like this gives you information about the selected font, how the letters +are written and an impression of the look. This text should contain all letters of the alphabet and it +should be written in of the original language. There is no need for spe- cial contents, but the length +of words should match the language.}\par\normalcolor} + +\def\Blindtext{\hvblindtext +\textcolor{black!30}{Hello, here is the second paragraph.} +\hvblindtext +\textcolor{black!30}{Hello, here is the third paragraph.} +\hvblindtext +\textcolor{black!30}{Hello, here is the forth paragraph.} +\hvblindtext +\textcolor{black!30}{Hello, here is the fifth paragraph.} +\hvblindtext} + + + +\let\hvBlinddocument\blinddocument +\def\blinddocument{\par\color{black!30}\hvBlinddocument\par\normalcolor} + + + + \flushbottom diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf index 288656941c..91e2ad65cc 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf index acaf0cb938..4dab820f09 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf index c4ca034580..439a827f28 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf index d35d53ecf0..195114fb0a 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf index 16eee22b91..807cb410c7 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf index c2971c97e6..a8f2fcef06 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf index 89b800947d..caa9d820ab 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf index a0d1f89e3c..c5e4dbfdf7 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf index 80c7cf22df..374b2a0338 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf index 109dd4d3a5..45a7f59c13 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf index 4b6d8d5eb3..f7e3d07b42 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf index 0c73301951..9ae77741d0 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf index c3a7c2cb9a..4753c61bde 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf index 7e5c40c7c9..e51326fc94 100644 Binary files a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf and b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf index 46bc0b2bcc..1bf89fbc6f 100644 Binary files a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf and b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf differ diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex index df1729be27..59805c7554 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 105 2021-06-07 07:30:15Z herbert $ +%% $Id: hvfloat.tex 112 2021-06-14 08:01:42Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,]{scrartcl} @@ -46,6 +46,10 @@ \def\Blindtext{\par\color{black!40}\hvBlindtext\par\normalcolor} \makeatletter \def\hvblindtext{\textcolor{black!40}{\blindtext@text}} + +\let\hvBlinddocument\blinddocument +\def\blinddocument{\par\color{black!30}\hvBlinddocument\par\normalcolor} + \makeatother \usepackage{marginnote} @@ -2680,7 +2684,40 @@ There will be pagenumbers and a caption can be rotated on the right of the objec and the rest of the text area is filled with text. \begin{lstlisting} -\hvFloat[doublePage,capWidth=n,capPos=right]% +\hvFloat[doublePage,sameHeight]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0sH} +\end{lstlisting} + + +%\hvFloatSetDefaults + +\marginnote{Fig. \ref{fig:doublePage0sH}} +\hvFloat[doublePage,sameHeight]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0sH} + +\Blindtext + +\Blindtext + +\hvblindtext + + +\begin{lstlisting} +\hvFloat[doublePage,capPos=right,capVPos=top]% {figure}% {\includegraphics[width=2\textwidth]{images/sonne-meer}}% [A doublepage image with a caption on the right side of the right part.]% @@ -2695,7 +2732,7 @@ and the rest of the text area is filled with text. %\hvFloatSetDefaults \marginnote{Fig. \ref{fig:doublePage0}} -\hvFloat[doublePage,capWidth=n,capPos=right]% +\hvFloat[doublePage,capPos=right,capVPos=top]% {figure}% {\includegraphics[width=2\textwidth]{images/sonne-meer}}% [A doublepage image with a caption on the right side of the right part.]% @@ -2711,6 +2748,47 @@ and the rest of the text area is filled with text. \hvblindtext + + + +\begin{lstlisting} +\hvFloat[doublePage,bindCorr=inner]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0sH2} +\end{lstlisting} + + +%\hvFloatSetDefaults + +\marginnote{Fig. \ref{fig:doublePage0sH2}} +\hvFloat[doublePage,,bindCorr=inner]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0sH2} + +\Blindtext + +\Blindtext + +\hvblindtext + + + + + + + \subsection{Tabulars} In General there is no difference in an imgage or tabular or simple text. The object will be saved in a box and @@ -2751,7 +2829,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \Blindtext -\hvFloat[doublePage,capWidth=n,capPos=right,capVPos=top]% +\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]% {table}% {\usebox\hvOBox}%%%%%%%%%%%%%% [A doublepage tabular with a caption on the right side of the right part.]% @@ -2792,7 +2870,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \end{tabular}} -\hvFloat[doublePage,capWidth=n,capPos=right]% +\hvFloat[doublePage,capPos=right,capVPos=top,floatCapSep=12pt]% {table}% {\usebox\hvOBox}%%%%%%%%%%%%%% [A doublepage tabular with a caption on the right side of the right part.]% diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty index c6bb68b8fb..681e5032d7 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty +++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty @@ -1,4 +1,4 @@ -%% $Id: hvfloat.sty 107 2021-06-09 06:43:25Z herbert $ +%% $Id: hvfloat.sty 114 2021-06-15 13:20:03Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -15,8 +15,8 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.28} -\def\filedate{2021/06/09} +\def\fileversion{2.29} +\def\filedate{2021/06/15} \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects] \let\hvFloatFileVersion\fileversion @@ -72,7 +72,6 @@ \newlength\hvWideWidth \newlength\hvMultiFloatSkip \newlength\hvMaxCapWidth -%\newlength\hv@BottomSpace %\AtBeginDocument{% % \setlength\hv@BottomSpace{\dimexpr\paperheight-1in-\topmargin-\headheight-\headsep-\textheight}} @@ -85,6 +84,7 @@ \newsavebox\hv@rightBox \newif\ifhv@capbeside \hv@capbesidefalse +\newif\ifhv@switchType \def\hv@Top{top} \def\hv@Bottom{bottom} @@ -116,7 +116,6 @@ \define@key{hvSet}{capAngle}[0]{% -360..+360, only integers \def\hvSet@capAngle{#1}% } - \define@choicekey*+{hvSet}{capPos}[\val\nr]{bottom,top,left,before,right,after,inner,outer,evenPage,oddPage}[bottom]{% \def\hvSet@capPos{#1}% it is relativ to the object, (e),(d) only valid for fullpage float @@ -135,11 +134,11 @@ \define@choicekey*+{hvSet}{capVPos}[\val\nr]{bottom,center,top}[center]{% \def\hvSet@capVPos{#1}% it is relativ to the object \ifcase\nr\relax - \gdef\hv@@capVPos{b}% + \def\hv@@capVPos{b}% \or - \gdef\hv@@capVPos{c}% + \def\hv@@capVPos{c}% \else - \gdef\hv@@capVPos{t}% + \def\hv@@capVPos{t}% \fi }{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using center.}% \def\hvSet@capVPos{center}% it is relativ to the object @@ -163,18 +162,6 @@ }{\PackageWarning{hvfloat}{erroneous input (#1) for objectPos ignored. Using center.}% \def\hvSet@capVPos{center}% it is relativ to the object } - -%\newif\ifhv@floatRefToObject -%\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to (inactive) -% \ifcase\nr\relax -% \hv@floatRefToObjectfalse -% \else -% \hv@floatRefToObjecttrue -% \fi -%}{\PackageWarning{hvfloat}{erroneous input (#1) for floatRef ignored. Using option object.}% -% \hv@floatRefToObjecttrue -% } - \define@key{hvSet}{objectAngle}[0]{% -360..+360 \def\hvSet@objectAngle{#1}% } @@ -188,14 +175,8 @@ \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@]{twoColumnCaption}[true]{% Write the caption only as text -% \ifhv@stfloats -% \global\@nameuse{hv@twoColumnCaption#1}% -% \else -% \PackageWarning{hvfloat}{Please use the package option stfloats!}% -% \global\hv@twoColumnCaptionfalse -% \fi -} +\define@boolkey{hvSet}[hv@]{twoColumnCaption}[true]\global\@nameuse{hv@twoColumnCaption#1}{}% Write the caption only as text +\define@boolkey{hvSet}[hv@]{sameHeight}[true]{\@nameuse{hv@sameHeight#1}}% Write the caption only as text \define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal \newcommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi} @@ -206,19 +187,31 @@ \newif\ifhv@doublePAGE \newif\ifhv@doublePage \newif\ifhv@setObjectLabel +\newif\ifhv@global@sameHeight \newlength\hvSet@bindCorrection \newlength\hvSet@sepLineskip \newlength\hv@leftPageObjectWidth% for doublepage images \newlength\hv@tempWidthA \newlength\hv@tempWidthB +\newlength\hv@minTextlines +\newlength\hv@floatCapSep +\newlength\hvSet@bindCorr \define@key{hvSet}{fullpage}[true]{\global\@nameuse{hv@fullpage#1}}% \define@key{hvSet}{FULLPAGE}[true]{\global\@nameuse{hv@FULLPAGE#1}} \define@key{hvSet}{doubleFULLPAGE}[true]{\global\@nameuse{hv@doubleFULLPAGE#1}\hv@doublePagefalse\hv@doublePAGEfalse} \define@key{hvSet}{doublePAGE}[true]{\global\@nameuse{hv@doublePAGE#1}\hv@doublePagefalse\hv@doubleFULLPAGEfalse} \define@key{hvSet}{doublePage}[true]{\global\@nameuse{hv@doublePage#1}\hv@doublePAGEfalse\hv@doubleFULLPAGEfalse} -\define@key{hvSet}{bindCorr}[\z@]{\setlength\hvSet@bindCorrection{#1}}% for doublepage objects +\define@key{hvSet}{bindCorr}[0]{% + \def\hv@temp{#1}% + \ifx\hv@temp\hv@Inner + \setlength\hvSet@bindCorr{\dimexpr1in+\oddsidemargin}% + \else + \setlength\hvSet@bindCorr{#1}% + \fi +} +%\setlength\hvSet@bindCorrection{#1}}% for doublepage objects \define@boolkey{hvSet}[hv@]{subFloat}[true]{% typeset values as subfloats \ifhv@subFloat\setkeys{hvSet}{multiFloat=false}\fi% @@ -230,6 +223,7 @@ \define@boolkey{hvSet}[hv@]{separatorLine}[true]{}% separator line for caption of a full page float \define@key{hvSet}{sepLineskip}{\def\hv@sepLineskip{#1}}% +\define@key{hvSet}{minTextlines}{\setlength\hv@minTextlines{#1\baselineskip}}% \define@boolkey{hvSet}[hv@]{objectFrame}[true]{}% a frame around the object with no separation \define@key{hvSet}{style}{% \@ifundefined{hv@#1}% @@ -256,9 +250,9 @@ multiFloat=false,subFloat=false, separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip, capFormat={}, subcapFormat={}, twoColumnCaption=false, -% floatRef=object, + sameHeight=false, bindCorr=\z@,sepLineskip=0pt, - vFill=false, + vFill=false, minTextlines=2, }% } @@ -300,7 +294,7 @@ \begingroup \def\@captype{figure}% \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi - \if$#1$ \caption{#2}\else\caption[#1]{#2}\fi + \ifx\relax#1\relax \caption{#2}\else\caption[#1]{#2}\fi \endgroup} \renewcommand\tabcaption[2][]{% \begingroup @@ -531,18 +525,26 @@ \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi \gdef\hv@floatType{#2}% \ifx\relax#2\relax - \setkeys{hvSet}{nonFloat,onlyText} + \setkeys{hvSet}{nonFloat,onlyText}% \fi \xdef\hv@floatListOfExt{\@nameuse{ext@\hv@floatType}}% \gdef\hv@floatObject{#3}% \@ifnextchar[{\do@@hvFloat}{\do@@hvFloat[]}% } + \def\do@@hvFloat[#1]#2#3{% #1: listof caption, #2. long caption #3: label \gdef\hv@shortCap{#1}% \gdef\hv@longCap{#2}% \gdef\hv@label{#3}% \ifhv@capbeside\def\@@temp{1}\else\def\@@temp{0}\fi + \ifhv@sameHeight\global\hv@global@sameHeighttrue\else\global\hv@global@sameHeightfalse\fi + \xdef\hv@global@@capVPos{\hv@@capVPos}% + \xdef\hvSet@global@capVPos{\hvSet@capVPos}% + \xdef\hvSet@global@capAngle{\hvSet@capAngle}% + \global\setlength\hvSet@bindCorrection{\hvSet@bindCorr}% for doublepage objects + \global\setlength\hv@floatCapSep{\hvSet@floatCapSep}% +% \ifhv@fullpage \def\hvSet@CapWidth{n}% relative value \do@@@@hvFloat% fullpage with caption on other page @@ -567,7 +569,6 @@ \fi \fi \fi -% \global\hv@capbesidefalse } % \def\do@@@hvFloat{% no special float page, caption and image on top of each other or side by side @@ -606,12 +607,12 @@ \ifx\hvSet@capWidth\hv@Natural% captionwidth=\linewidth-\objectwidth-separation \ifhv@capbeside \ifhv@wide - \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \setlength\hvCapWidth{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax}% \else \ifhv@star - \setlength\hvCapWidth{\the\dimexpr\textwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \setlength\hvCapWidth{\the\dimexpr\textwidth-\hvObjectWidth-\hv@floatCapSep\relax}% \else - \setlength\hvCapWidth{\the\dimexpr\linewidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \setlength\hvCapWidth{\the\dimexpr\linewidth-\hvObjectWidth-\hv@floatCapSep\relax}% \fi \fi \else @@ -621,10 +622,10 @@ \ifhv@capbeside \ifhv@wide \setlength\hvCapWidth{\hvSet@capWidth\hvWideWidth}% - \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \setlength\@tempdima{\the\dimexpr\hvWideWidth-\hvObjectWidth-\hv@floatCapSep\relax}% \else \setlength\hvCapWidth{\hvSet@capWidth\columnwidth}% - \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hvSet@floatCapSep\relax}% + \setlength\@tempdima{\the\dimexpr\columnwidth-\hvObjectWidth-\hv@floatCapSep\relax}% \fi \ifdim\hvCapWidth>\@tempdima \setlength\hvCapWidth{\@tempdima}% @@ -640,7 +641,7 @@ \fi \fi \saveCaptionSkip% we put this space ourselve - \ifnum\hvSet@capAngle=0 % need rotation? + \ifnum\hvSet@global@capAngle=0 % need rotation? \savebox\hvCaptionBox{% NO rotation \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation \ifhv@nonFloat @@ -674,7 +675,7 @@ }% \else \savebox\hvCaptionBox{% Rotation - \rotatebox{\hvSet@capAngle}{% + \rotatebox{\hvSet@global@capAngle}{% \minipage[b]{\hvCapWidth}%% minipage, to get hyphenation % \ifx\relax\hv@caption@format\relax\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifhv@nonFloat @@ -778,18 +779,18 @@ %%%% \savebox{\@tempboxa}{% ***** @tempbox start \expandafter\ifcase\the\hv@@capPos% 0 is LEFT START \ifcase - \ifx\hvSet@capVPos\hv@Center + \ifx\hvSet@global@capVPos\hv@Center \put@CaptionBox - \hspace{\hvSet@floatCapSep}% capfloatsep + \hspace{\hv@floatCapSep}% capfloatsep \put@ObjectBox \else - \ifx\hvSet@capVPos\hv@Top% caption and object at top aligned + \ifx\hvSet@global@capVPos\hv@Top% caption and object at top aligned \put@CaptionBox[1]% - \hspace{\hvSet@floatCapSep}% capfloatsep + \hspace{\hv@floatCapSep}% capfloatsep \put@ObjectBox[1]% \else% caption on bottom \put@CaptionBox[2]% - \hspace{\hvSet@floatCapSep}% capfloatsep + \hspace{\hv@floatCapSep}% capfloatsep \put@ObjectBox[2]% \fi \fi% end caption left @@ -809,18 +810,18 @@ \fi \end{minipage}% \or%2 is right - \ifx\hvSet@capVPos\hv@Center + \ifx\hvSet@global@capVPos\hv@Center \put@ObjectBox - \hspace{\hvSet@floatCapSep}% + \hspace{\hv@floatCapSep}% \put@CaptionBox \else - \ifx\hvSet@capVPos\hv@Top + \ifx\hvSet@global@capVPos\hv@Top \put@ObjectBox[1]% - \hspace{\hvSet@floatCapSep}% capfloatsep + \hspace{\hv@floatCapSep}% capfloatsep \put@CaptionBox[1]% \else \put@ObjectBox[2]% - \hspace{\hvSet@floatCapSep}% capfloatsep + \hspace{\hv@floatCapSep}% capfloatsep \put@CaptionBox[2]% \fi \fi @@ -1046,58 +1047,101 @@ \endgroup% startet at main \hvFloat } % + + %% ------------------------------------- the doublepage obejcts --------------------------- %% ||1in+evenside --- |1in+oddside ---|| % \def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page % #1-> 0/1 caption under/right \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% - \global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection}% - \xdef\hv@@capAngle{\hvSet@capAngle}% + \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}% \xdef\hv@caption@format@temp{\hv@caption@format}% it gets lost otherwise for next afterpage + \global\hv@switchTypefalse + \savebox\hvCaptionBox{% NO rotation + \minipage{\textwidth}%% minipage, to get hyphenation + \let\@captype\hv@floatType + \caption*{\hv@longCap}% + \endminipage}% + \savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \ifnum#1=0\relax % no rotation, caption below + \hv@typeout{Texthöhe: \the\textheight}% + \hv@typeout{Objekthöhe: \the\ht\hvObjectBox}% + \hv@typeout{Captionhöhe: \the\ht\hvCaptionBox}% + \@tempdima=\dimexpr\ht\hvObjectBox+\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip +\textfloatsep\relax%+\floatsep\relax + \hv@typeout{Summe: \the\@tempdima}% + \ifdim\@tempdima > \dimexpr\textheight-\hv@minTextlines\relax + \hv@typeout{hvfloat: switched to floattype p}% + \hv@switchTypetrue + \fi + \fi + \hv@typeout{do@hvFloat@doublePage:hv@tempWidthA=\the\hv@tempWidthA}% \checkoddpage \ifoddpage \if@twocolumn \if@firstcolumn - \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \ifhv@switchType + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \else + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \fi \else \ifhv@tugboat \do@hvFloat@doublePageCaptionRight{#1}% \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \ifhv@switchType + \do@hvFloat@doublePAGECaptionRight{#1}% + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi \fi \fi \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \ifhv@switchType + \do@hvFloat@doublePAGECaptionRight{#1}% + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi \fi - \else + \else% we have an even page \if@twocolumn \if@firstcolumn - \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}}% + \ifhv@switchType + \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% + \else + \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}}% + \fi + \else% second column + \ifhv@switchType + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \else + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \fi + \fi + \else% onecolumn + \ifhv@switchType + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% \else \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% \fi - \else - \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% \fi \fi + \let\c@fptop\hv@fptop \endgroup% started at main macro \hvFloat } % \def\do@hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ---------------------------------- - \let\hv@fptop\c@fptop - \global\setlength{\@fptop}{0pt}% - \let\hv@c@dbltopnumber\c@dbltopnumber - \setcounter{totalnumber}{0}% - \setcounter{dbltopnumber}{0}% - \def\dblfloatpagefraction{0.5}% - \global\renewcommand\thehv@tempCNTfigA{xyz}% - \global\renewcommand\thehv@tempCNTfigB{xyz}% + \do@hvFloat@doublePageCaptionRightObjectLeft{0pt}% + \afterpage{\do@hvFloat@doublePageCaptionRightObjectRight{#1}}% +} +% +\def\do@hvFloat@doublePageCaptionRightObjectLeft#1{% left part of the object \begin{\hv@floatType*}[!t] + \hv@typeout{Floatpositionsparameter: !t}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% + \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \ifx\hv@label\@empty - \else + \else \ifx\hv@floatType\hv@figure \global\refstepcounter{hv@tempCNTfigA}% \else @@ -1105,18 +1149,26 @@ \fi \label{\hv@label}% \fi + \ifhv@global@sameHeight + \hv@typeout{text should be of same height of both pages}% + \par\phantom{\parbox{\textwidth}{\caption*{\hv@longCap}}}% +% \vspace{\textfloatsep}% + \fi \end{\hv@floatType*}% - \afterpage{% +} +\def\do@hvFloat@doublePageCaptionRightObjectRight#1{% right part of the object \begin{\hv@floatType*}[!t] - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\hv@tempWidthA}% - \noindent + \global\savebox\hvObjectBox{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \hspace*{-\hv@tempWidthA}% \savebox\hv@rightBox{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}}% - \global\setlength\hv@tempWidthB{\the\dimexpr\textwidth-\wd\hv@rightBox-\hv@tempWidthA-\marginparsep}% - \parbox[\hv@@capVPos]{\the\wd\hv@rightBox}{% - \vspace{0pt}% - \raisebox{\depth}{\usebox\hv@rightBox}% - }% + \global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}% + \hv@typeout{Height of right box: \the\ht\hv@rightBox}% + \hv@typeout{Depth of right box : \the\dp\hv@rightBox}% + \ifdim\dp\hv@rightBox > \z@ + \raisebox{\depth}{\usebox\hv@rightBox}% + \else + \usebox\hv@rightBox + \fi \ifx\hv@label\@empty\else \ifx\hv@floatType\hv@figure \global\refstepcounter{hv@tempCNTfigB}% @@ -1129,26 +1181,31 @@ \expandafter\captionsetup\expandafter{\hv@caption@format@temp}% \fi \ifnum#1>\z@ % caption on the right - \ifnum\hv@@capAngle > \z@ - \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% + \hv@typeout{doublePage: capAngle=\hvSet@global@capAngle}% + \ifnum\hvSet@global@capAngle > \z@ + \hspace{\hv@floatCapSep}% + \rlap{\rotatebox{\hvSet@global@capAngle}{\parbox[b]{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% + \abovecaptionskip=0pt% local inside parbox + \belowcaptionskip=0pt% local inside parbox \ifx\relax\hv@shortCap\relax \caption{\hv@longCap}% \else \caption[\hv@shortCap]{\hv@longCap}% \fi - }}% - \ifx\relax\hv@label\relax\else\label{\hv@label-cap}\fi + }}}% + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \else - \hspace{\marginparsep}% - \parbox[\hv@@capVPos]{\hv@tempWidthB}{% + \global\setlength\hv@tempWidthB{\dimexpr\textwidth-\wd\hv@rightBox-\hvSet@bindCorrection+1in+\oddsidemargin-\hv@floatCapSep\relax}% + \hspace{\hv@floatCapSep}% + \rlap{\parbox[b][\dimexpr\ht\hv@rightBox+\dp\hv@rightBox][\hv@global@@capVPos]{\hv@tempWidthB}{% \abovecaptionskip=0pt% local inside parbox - \vspace{0pt}% + \belowcaptionskip=0pt% local inside parbox \ifx\hv@shortCap\@empty \caption{\hv@longCap}% \else - \caption[\hv@shortCap]{\hv@longCap} + \caption[\hv@shortCap]{\hv@longCap}% \fi - }% + }}% \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \fi \else % #1 = 0 caption below @@ -1159,10 +1216,8 @@ \fi \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \fi - \end{\hv@floatType*}% - }% - \let\c@topnumber\hv@c@topnumber - \let\c@fptop\hv@fptop + \vspace{0pt}% + \end{\hv@floatType*} } % \newsavebox\hv@boxLeftPage @@ -1170,11 +1225,10 @@ % %% ||1in+evenside --- |1in+oddside ---|| % -\newif\ifhv@save@twocolumn \def\do@hvFloat@doublePAGE#1{% image on left and right page with caption on the right ---------------------------------- % #1-> 0/1 caption under/right - \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection+\parindent}% + \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection}% \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \expandafter\global\expandafter\savebox\expandafter\hv@boxLeftPage\expandafter{\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% @@ -1207,13 +1261,13 @@ \def\do@hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ---------------------------------- % #1-> 0/1 caption under/right \afterpage{% - \noindent \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \noindent \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \newpage\if@twocolumn\null\newpage\fi + \null\newpage\if@twocolumn\null\newpage\fi \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{-\dimexpr\hv@tempWidthA}% \noindent + \hspace*{\dimexpr-\hv@tempWidthA}% \clipbox*{\the\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% \ifnum#1>0 \medskip @@ -1236,13 +1290,16 @@ }}% \ifx\hv@label\@empty\else\label{\hv@label}\fi \fi - \else - \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 + \else% caption not rotated + \par\noindent + \parbox{\textwidth}{% + \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 + }% \fi \newpage\if@twocolumn\null\newpage\fi }% -- cgit v1.2.3