diff options
Diffstat (limited to 'macros/latex')
150 files changed, 1927 insertions, 543 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 455f92911b..ad29040915 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -23,11 +23,11 @@ % % \changes{v1.20}{2021/01/09}{修改和完善用户文档。} % \changes{v1.20}{2021/01/09}{模板更改为使用 CC-BY 许可协议。} -% \changes{v1.25o}{2021/05/03}{取消附带的示例文件，可查看历史版本及其它来源的使用样例。} +% \changes{v1.25p}{2021/05/03}{取消附带的示例文件，可查看历史版本及其它来源的使用样例。} % % \title{\sffamily easybook 文档类手册} % \author{瞿毅} -% \date{2021/05/30\hskip\ccwd\relax v1.25o\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/05/31\hskip\ccwd\relax v1.25p\thanks{\url{https://gitee.com/texl3/easybook}}} % % \maketitle % \begin{abstract} @@ -117,7 +117,7 @@ % \end{syntax} % 传递给 \cls{ctexbook} 设置字体，最好不要使用原有的 \opt{fontset} 选项，默认情况下使用自定义字体而不开启这个选项，可根据安装的字体及电脑系统选取。\opt{noto} 与 \opt{none} 选项的相关描述见小节 \ref{subsec:font settings}，\opt{overleaf} 是一个各系统通用选项，会检测系统环境选取对应字体。 % \changes{v1.21}{2021/01/12}{默认字体与 \CTeX 一致，不再是自定义字体。} -% \changes{v1.25o}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。} +% \changes{v1.25p}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。} % \end{function} % % \begin{function}[rEXP,added = 2021-01-05,updated = 2021-01-13]{paper} @@ -168,7 +168,7 @@ % \tn{listoflistings*+}\oarg{键值列表} % \end{syntax} % \tn{listoffigures} 命令输出图片目录，\tn{listoftables} 输出表格目录，\tn{listoflistings} 输出代码目录。带有星号的目录命令不将标题添加进主文档目录，带有+号的目录命令可以使当前标题编号。\tn{tableofcontents+} 与其它命令不同是用于输出双语目录，需要与双语目录标题命令 \tn{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用，附加代码是中文与英文目录之间的代码，可以插入文本和换页命令等。目录的键值列表选项如下 -% \changes{v1.25o}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。} +% \changes{v1.25p}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。} % \end{function} % % \begin{function}{multoc,title,format,aftertitle,pagestyle,book,article} @@ -199,7 +199,7 @@ % 双语目录的标题命令目前设置了常用的三个级别，它们将中文标题正常输出，并使中英文标题加入双语目录，这个功能是为国内一些大学的学位论文模板的要求设计，在一般情况和英文模式下不需要使用。 % % 它们的星号变体命令使文中标题不编号，但是仍然加入双语目录，若英文标题参数空置那么仅加入中文目录而不加入英文目录，这一特点与 \tn{chapter*} 等命令的行为不太一样，在一些情况下会用到。可选参数是目录中的中文标题，默认与中文标题一致，正文标题过长时可用它设置在目录中显示的标题。双语目录的格式是一致的，共享使用 \tn{tocset} 的设置，英文目录的章级别标题名及编号的修改方式如下 -% \changes{v1.25o}{2021/05/05}{增加与双语目录配合的标题命令。} +% \changes{v1.25p}{2021/05/05}{增加与双语目录配合的标题命令。} % \end{function} % % \begin{function}{biname,binmuber} @@ -299,7 +299,7 @@ % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。} % \changes{v1.23}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。} % \changes{v1.24}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。} -% \changes{v1.25o}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset}，\opt{link} 作为兼容性保留。} +% \changes{v1.25p}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset}，\opt{link} 作为兼容性保留。} % \end{function} % % \begin{optdesc} @@ -356,7 +356,7 @@ % \ding{229} 以上选项路径为 \opt{subfont/...} % \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。} % \changes{v1.23}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} -% \changes{v1.25o}{2021/05/30}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont}，并增加数学字体的选项 \opt{subfont/math}。} +% \changes{v1.25p}{2021/05/31}{其它字体模块名由 \opt{elsefont} 改为 \opt{subfont}，并增加数学字体的选项 \opt{subfont/math}。} % \end{function} % % \begin{optdesc} @@ -381,7 +381,7 @@ % \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项，可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。} % \changes{v1.23}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} % \changes{v1.24}{2021/04/09}{可以不载入参考文献包手动配置参考文献格式。} -% \changes{v1.25o}{2021/05/12}{取消 \opt{bib-loadpkg} 选项，由是否设置参考文献数据库来决定载入宏包。} +% \changes{v1.25p}{2021/05/12}{取消 \opt{bib-loadpkg} 选项，由是否设置参考文献数据库来决定载入宏包。} % \end{function} % % \begin{optdesc} @@ -516,7 +516,7 @@ % % \subsection{页眉页脚} % \label{subsec:header and footer} -% \begin{function}[EXP,added = 2021-01-13,updated = 2021-05-30]{head-foot,chap-mark,sec-mark,subsec-mark,chap-label,sec-label,subsec-label,headrule,footrule,footnoterule} +% \begin{function}[EXP,added = 2021-01-13,updated = 2021-05-31]{head-foot,chap-mark,sec-mark,subsec-mark,chap-label,sec-label,subsec-label,headrule,footrule,footnoterule} % \begin{syntax} % head-foot = <页眉页脚中的内容> % chap-mark = <\tn{chaptermark} 标志命令的内容> @@ -532,10 +532,10 @@ % \ding{229} 以上选项路径为 \opt{hdrset/...} \\ % \opt{hdrset} 设置的命令由 \pkg{fancyhdr} 宏包提供支持。设置章节标志选项 \opt{chap-mark}、\opt{sec-mark} 和 \opt{subsec-mark} 时已做了情形考虑，不需要使用 \tn{markboth} 或 \tn{markright} 命令，其中参数 \#1 代表当前章、节或小节的标题。\opt{chap-mark} 和 \opt{sec-mark} 选项在 \opt{book} 模式时有意义，\opt{sec-mark} 和 \opt{subsec-mark} 选项在 \opt{article} 模式时有意义，这与标准文档类的行为一致。也可以直接重新定义这些标志命令，但此时 \opt{style/uppercase} 选项失效，这时可以用例如 \tn{MakeUppercase} 命令来设置标志内容的大小写。 % -% 标签选项 \opt{chap-label}、\opt{sec-label} 和 \opt{subsec-label} 用于设置标志命令中的标签，包括标题编号和与标题内容之间的距离，它们比标志命令内容的选项更常用 +% 标签选项 \opt{chap-label}、\opt{sec-label} 和 \opt{subsec-label} 用于设置标志命令中的标签，包括标题编号和与标题内容之间的距离，它们比标志命令内容的选项更常用，可选参数是编号，必选参数是距离命令 % % \begin{ctexexam} -% \hdrset{chap-label = \thechapter\hspace{\ccwd}} +% \hdrset{chap-label = [\thechapter]{\hspace{\ccwd}}} % \end{ctexexam} % % \opt{headrule}、\opt{footrule} 和 \opt{footnoterule} 三个横线选项一般可以使用 \tn{hrule} width \meta{长度} height \meta{高度} 命令来绘制，脚注横线默认为空。当然，手动绘制横线时线条粗细选项 \opt{style/rulewidth} 会失效。 @@ -584,7 +584,7 @@ % 上面几个选项用于设置脚注格式，\opt{fnparskip} 和 \opt{fnparindent} 选项仅在 \opt{fnhang = true} 时有效。\opt{fnhang} 用于将脚注设置为悬挂缩进的格式，\opt{fnmark-pos} 选项设置脚注编号的位置，正常文本或是上标形式。\opt{fnmark-num} 选项设置脚注编号的格式，默认为原生样式 \opt{plain}，还可以改为 \opt{pifont} 的各个版本，从左往右依次为普通版、阴文衬线版、阳文无衬线版和阴文无衬线版，缺点是它们的编号仅包括1-10。 % % \opt{fnmark-form} 是脚注标记的格式，在此设置字体命令会覆盖 \opt{subfont/footnote} 的设置，最后一个格式命令可以带有一个参数，这个参数接受脚注编号，一般配合 \opt{fnmark-num = plain} 使用。\opt{afterfnmark} 是脚注标记后的代码，一般用于设置标记与文本间的距离。 -% \changes{v1.25o}{2021/05/12}{增加脚注样式设置选项。} +% \changes{v1.25p}{2021/05/12}{增加脚注样式设置选项。} % \end{function} % % \subsection{目录样式} @@ -603,7 +603,7 @@ % \opt{format} 是目录中标题的格式，可以设置字体和加入垂直间距等，垂直间距最好使用无间距重合的 \tn{addvspace} 命令，带有加号的 \opt{format+} 选项用于在已有的格式命令后附加内容。\opt{indent} 是目录中标题在页面左侧的缩进距离，应该有长度单位。\opt{rule} 选项中一般应当使用 \tn{tocrule} 命令，将会在接下来介绍。\opt{numsep} 是有编号的标题在目录中编号与标题的间距。 % \changes{v1.21}{2021/01/13}{增加配置目录样式的选项。} % \changes{v1.24}{2021/04/20}{增加目录中编号与标题的间距选项 \opt{numsep}。} -% \changes{v1.25o}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。} +% \changes{v1.25p}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。} % \end{function} % % \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EbNumberLine} @@ -688,7 +688,7 @@ % \tn{end}\marg{环境名} % \end{syntax} % \pkg{tabularray} 是一个较新的宏包，不仅提供了 \pkg{tabularx}、\pkg{multirow}、和 \pkg{booktabs} 宏包的功能，并且不依赖其它宏包与它们同时使用不会产生冲突，还实现了用简便的键值列表方式设置表格样式。目前除了表头斜线以及跨页功能存在不足，其它方面已满足对表格绝大多数格式的需求，具体用法可见宏包的说明文档。 -% \changes{v1.25o}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。} +% \changes{v1.25p}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。} % \end{function} % % \subsection{列表} @@ -852,7 +852,7 @@ % \tn{qtyrange}\oarg{键值列表}\marg{数字1}\marg{数字2}\marg{单位} % \end{syntax} % \pkg{siunitx} 宏包的 \tn{num} 命令可以输出以科学计数法表示的数值，单位格式化命令 \tn{unit} 包含文字项目（例如字母或数字）时，使用 . 和 \~{} 放置在单元乘积中间，并使用 \_ 和 \^{} 正确放置指定的下标和上标。格式化方法可在数学和文本模式下使用。而 \tn{qty} 命令可用来输出带有单位的量，\tn{qtyrange} 可以输出带有范围和单位的量。 -% \changes{v1.25o}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变，修改相关配置选项。} +% \changes{v1.25p}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变，修改相关配置选项。} % \end{function} % % \begin{ctexexam} @@ -989,7 +989,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplClass{easybook}{2021/05/30}{1.25o}{beta} +\ProvidesExplClass{easybook}{2021/05/31}{1.25p}{beta} \cs_generate_variant:Nn \eb_ctex_define:nn { nx } \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -1354,6 +1354,21 @@ \booltrue{@mainmatter} \pagenumbering{arabic} } +\seq_const_from_clist:Nn \c__eb_mark_title_level_seq + { chapter,section,subsection } +\seq_map_inline:Nn \c__eb_mark_title_level_seq + { + \exp_args:Nc \NewDocumentCommand { eb@mark@#1@label@layout } + {O{\use:c { CTEXthe#1 }}m} + {\tl_set:cn { eb@mark@#1@label } {##1##2}} + \cs_new:cpn { eb_mark_#1_number_bool:n } ##1 + { + \tl_if_in:nnTF {##1} { [ } + { \use:c { eb@mark@#1@label@layout } ##1 } + { \use:c { eb@mark@#1@label@layout } {##1} } + } + } + \cs_gset_eq:NN \easyhead \fancyhead \cs_gset_eq:NN \easyfoot \fancyfoot \eb_ctex_define:nn { hdrset } @@ -1403,12 +1418,12 @@ { \eb@mark@subsection@label } }#1 }, - chap-label .tl_set:N = \eb@mark@chapter@label, - chap-label .initial:n = \CTEXthechapter\hspace{\ccwd}, - sec-label .tl_set:N = \eb@mark@section@label, - sec-label .initial:n = \CTEXthesection\hspace{0.5\ccwd}, - subsec-label .tl_set:N = \eb@mark@subsection@label, - subsec-label .initial:n = \CTEXthesubsection\hspace{0.5\ccwd}, + chap-label .code:n = \eb_mark_chapter_number_bool:n {#1}, + chap-label .initial:n = \hspace{\ccwd}, + sec-label .code:n = \eb_mark_section_number_bool:n {#1}, + sec-label .initial:n = \hspace{0.5\ccwd}, + subsec-label .code:n = \eb_mark_subsection_number_bool:n {#1}, + subsec-label .initial:n = \hspace{0.5\ccwd}, headrule .tl_gset:N = \headrule, headrule .initial:n = @@ -2287,7 +2302,7 @@ \allowdisplaybreaks[4] \DeclareGraphicsExtensions{.pdf,.png,.jpg,.eps,.tif} -\cs_new_protected:Npn \eb_enumitem_labelval_set:nn #1#2 +\cs_new_protected:Npn \eb_enumitem_label_set:nn #1#2 { \SetEnumitemValue{label}{#1}{\color{ctex@emph}#2} } \clist_map_inline:nn { @@ -2299,7 +2314,7 @@ { roman } { \roman*. }, { outline } { \upshape\ding{111} } } - { \eb_enumitem_labelval_set:nn #1 } + { \eb_enumitem_label_set:nn #1 } \SetEnumitemValue{font}{sf}{\color{ctex@emph}\normalfont\sffamily} \SetEnumitemValue{ref}{enumii}{\arabic{enumi}.\alph*} \SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*} diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex a589705c1e..80221ec676 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/hvfloat/Changes b/macros/latex/contrib/hvfloat/Changes index c6fc9698b4..90d8f75e71 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -1,4 +1,8 @@ hvfloat.sty: +2.26 2021-05-31 - allow option wide in twocolumn mode + - allow a stretched minipage for + multifloat and multisubfloat by using + option vFill 2.25 2021-05-18 - support of \twocolumn mode 2.24 2021-05-12 - allow a caption on the bottom of a preceding or a following page of double page floats (left-right) diff --git a/macros/latex/contrib/hvfloat/doc/examples/README.exa b/macros/latex/contrib/hvfloat/doc/examples/README.exa index e6a3dff255..4f03d70150 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/README.exa +++ b/macros/latex/contrib/hvfloat/doc/examples/README.exa @@ -22,7 +22,4 @@ a.s.o. runEXA.sh <base> runs a group of examples, e.g. "./runEXA.sh inner" runs _all_ examples -started with "inner". - -** single files ** -lualatex capPos.ltx
\ No newline at end of file +starting with "inner". diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf Binary files differindex 92a7a3e94c..8ba1d25203 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex index de0464cc9d..bdb9db7170 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: after1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf Binary files differindex 7930998fff..777c5374fd 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex index 4e0e17c83a..8c9f998931 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/after2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: after2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -8,7 +8,7 @@ \begin{document} \tableofcontents - ewpage +\newpage \blinddocument diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf Binary files differindex 69580b7601..68aaa6a751 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex index 387ebd6a24..357a8c7543 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/default1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf Binary files differindex 098f2cf9c5..772abdc767 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex index a1d9e9d997..86c3b0a898 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf Binary files differindex 300d92e5aa..0c515b0976 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex index b0935fe53c..282925826d 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/default2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: default2s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf Binary files differindex 24f6f83ab6..51712f5755 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex index 6bd583d8de..45278e1e8d 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf Binary files differindex 84a90a4282..81e91f49c9 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf Binary files differindex 3099998bdf..b535662f1c 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex index 5c579160cc..48214608fc 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex @@ -1,5 +1,7 @@ +\errorcontextlines=100 +%\documentclass[final]{ltugboat} \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: doublepage2s2c.tex 92 2021-05-18 09:46:55Z herbert $ +%% $Id: doublepage2s2c.tex 97 2021-05-26 19:31:53Z herbert $ \input{preamble.ltx} \usepackage{blindtext,xcolor,marginnote} @@ -36,7 +38,7 @@ \begin{lstlisting} -\hvFloat[doublePage,capWidth=n,capPos=right]% +\hvFloat[doublePage]%,capWidth=n,capPos=right]% {figure}% {\includegraphics[width=2\textwidth]{images/sonne-meer}}% [A doublepage image with a caption on the right side of the right part.]% @@ -49,7 +51,7 @@ \marginnote{Fig. \ref{fig:doublePage0}} -\hvFloat[doublePage,capWidth=n,capPos=right]% +\hvFloat[doublePage]%,capWidth=n,capPos=right]% {figure}% {\includegraphics[width=2\textwidth]{images/sonne-meer}}% [A doublepage image with a caption on the right side of the right part.]% @@ -165,6 +167,10 @@ \Blindtext + +\end{document} + + \subsection{Definition on an even page} @@ -740,7 +746,6 @@ is on the pages~\pageref{fig:doubleFULLPAGE0after2col}f. {fig:doubleFULLPAGE0after2col} \end{lstlisting} - \marginnote{Fig. \ref{fig:doubleFULLPAGE0after2col}} \hvFloat[doubleFULLPAGE,capWidth=n,twoColumnCaption,capPos=after,separatorLine]% {figure}% @@ -751,9 +756,8 @@ is on the pages~\pageref{fig:doubleFULLPAGE0after2col}f. the paper. A short form is used for the LOF. The parameter is \texttt{doubleFULLPAGE}}% {fig:doubleFULLPAGE0after2col} - + \Blindtext - %\hvblindtext %\hvblindtext diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf Binary files differindex 11f2859fe9..0ef401d15a 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex index ac29b4782b..75eb2bf872 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/even1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: even1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: even1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf Binary files differindex db6dd0f348..ccaa0a0c43 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex index aed80a2d3c..da5d013c40 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/even1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: even1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: even1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf Binary files differindex c1a47cdedf..8a62941042 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex index 06a0b3119e..1ee584c81a 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/even2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: even2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: even2s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf Binary files differindex 2a76ef9e65..226ea5471a 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex index a35ce24fbc..ce3206c075 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/even2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: even2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: even2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf Binary files differindex 15b69d3f9f..1a18b67057 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.tex index cbc25e80bf..799aa9ed6b 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/fullpage1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: fullpage1s2c.tex 1072 2019-06-09 14:14:19Z herbert $ +%% $Id: fullpage1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf Binary files differindex f90af1abd1..8b5431fbf6 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex index 001d9e824d..6960658c3b 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/inner1s2c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: inner1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: inner1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf Binary files differindex e5487420bc..c829f3b1e2 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex index ec50400c01..15b6508111 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: inner2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: inner2s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf Binary files differindex da0c2ba44a..10e8df1039 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex index 315b04f769..0f4a3856c8 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/inner2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf Binary files differindex d4354bfe51..2a18ce58e8 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex index 20f991759a..d415c7e343 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/left2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: left2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: left2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf Binary files differindex 222eede9be..05c79cb897 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-after1s1c.tex index e38ac497ee..62cd6734ce 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 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} @@ -23,7 +23,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=after,multiFloat]% +\hvFloat[fullpage,capPos=after,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -51,7 +51,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \Float[Multi] \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=after,multiFloat]% +\hvFloat[fullpage,capPos=after,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -83,7 +83,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=after,multiFloat]% +\hvFloat[fullpage,capPos=after,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -111,7 +111,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \Float[Multi] \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=after,multiFloat]% +\hvFloat[fullpage,capPos=after,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf Binary files differindex 1e82b18692..8eadf52437 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex index 11a813f499..1c4e98195f 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: multi-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf Binary files differindex 6d5726c238..5482c3316f 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex index 86d0211eb3..f42bc85ae5 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: multi-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf Binary files differindex 5a02689ef6..5610832201 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex index 3bb4198577..8725520a26 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: multi-default2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-default2s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf Binary files differindex 7f2cf31049..8a4a84c5a9 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex index 2508fa7c71..4ce8149cda 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: multi-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf Binary files differindex 2dd7669927..b50b8fa959 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex index 796f367595..668da0a147 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-inner2s2c.tex @@ -1,6 +1,6 @@ \errorcontextlines=200 \documentclass[twoside]{scrartcl} -%% $Id: multi-inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-inner2s2c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -27,7 +27,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,multiFloat,capPos=inner]% +\hvFloat[fullpage,multiFloat,capPos=inner,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -54,7 +54,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \Float[Multi] -\hvFloat[fullpage,multiFloat,capPos=inner]% +\hvFloat[fullpage,multiFloat,capPos=inner,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -86,7 +86,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,multiFloat,capPos=inner]% +\hvFloat[fullpage,multiFloat,capPos=inner,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -113,7 +113,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \Float[Multi] %\end{document} -\hvFloat[fullpage,multiFloat,capPos=inner]% +\hvFloat[fullpage,multiFloat,capPos=inner,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf Binary files differindex 1b1d0907ef..74a5b1a499 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex index 1947d4c409..fef798e1e9 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-outer2s2c.tex @@ -1,6 +1,6 @@ \errorcontextlines=100 \documentclass[twoside]{scrartcl} -%% $Id: multi-outer2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-outer2s2c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -28,7 +28,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,multiFloat,capPos=outer]% +\hvFloat[fullpage,multiFloat,capPos=outer,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -53,7 +53,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \Float[Multi] -\hvFloat[fullpage,multiFloat,capPos=o,objectPos=c]% +\hvFloat[fullpage,multiFloat,capPos=o,objectPos=c,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -84,7 +84,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,multiFloat,capPos=outer]% +\hvFloat[fullpage,multiFloat,capPos=outer,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -111,7 +111,7 @@ The fullpage multifloat~\vref{multi:demo0} has a caption~\vpageref{multi:demo0-c \Float[Multi] %\end{document} -\hvFloat[fullpage,multiFloat,capPos=outer]% +\hvFloat[fullpage,multiFloat,capPos=outer,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf Binary files differindex 2dd5415802..56ffb0b354 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex index 16b2ebacbf..1b78f0fba6 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/multi-right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: multi-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: multi-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} @@ -23,7 +23,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=right,multiFloat]% +\hvFloat[fullpage,capPos=right,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -51,7 +51,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \Float[Multi] \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=right,multiFloat]% +\hvFloat[fullpage,capPos=right,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -83,7 +83,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=right,multiFloat]% +\hvFloat[fullpage,capPos=right,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -111,7 +111,7 @@ The fullpage multifloat~\vref{img:demo0} has a caption~\vpageref{img:demo0-cap}. \Float[Multi] \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=right,multiFloat]% +\hvFloat[fullpage,capPos=right,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf Binary files differindex de42239562..e4749a98c8 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex index 073d3b0d7e..ae4ea4dd4a 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: odd1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: odd1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf Binary files differindex 90d6d62206..4bb050f6b4 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex index b749afc192..8454f4198b 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/odd1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: odd1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: odd1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf Binary files differindex af4fd9ca4d..ef2c6e6b8d 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd2s1c.tex index a2f6e8fb0d..adcb965bf5 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 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: odd2s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf Binary files differindex 6e46682910..bd173e8e0d 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex index a6014dfe5d..f044fa127c 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/odd2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: odd2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: odd2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf Binary files differindex 15198bc21d..bada8ae5e0 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex index 92bca1907c..f6444f614c 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/outer1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: outer1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: outer1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf Binary files differindex e13c10e526..03a57f6862 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex index 2392915bcb..d30d66e8fa 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: outer2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: outer2s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf Binary files differindex 1b7d295d70..8853b2acba 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex index fd96ebb4c9..84b3dc0cf5 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/outer2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: outer2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: outer2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf Binary files differindex 09d3cf9c52..5b0e63ac7f 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex index 1832540102..90e4ac9196 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: paper-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: paper-after1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \usepackage{pdfpages} \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf Binary files differindex 7d8a729015..642314e192 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex index 09233d3b4f..bb789ab593 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: paper-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: paper-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \usepackage{pdfpages} \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf Binary files differindex 91fe896dc9..6d396debdc 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex index bb4b173deb..73701e6c1e 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: paper-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: paper-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf Binary files differnew file mode 100644 index 0000000000..297458c772 --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex new file mode 100644 index 0000000000..4db0220481 --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s1c.tex @@ -0,0 +1,81 @@ +\documentclass{scrartcl} +%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ + +\input{preamble.ltx} +\setlength\columnseprule{0.4pt} + +\begin{document} +\title{Example for FULLPAGE floats} +\author{Herbert Voß} +\maketitle + +\tableofcontents + +\blinddocument + +\section{File \texttt{\jobname}} + +\begin{lstlisting} +The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. +\end{lstlisting} + +The FULLPAGE image~\vref{fig:FULLPAGE0} has a caption~\vpageref{fig:FULLPAGE0-cap}. + +\begin{lstlisting} +\hvFloat*[FULLPAGE]% + {figure}% + {\includegraphics[FULLPAGE]{frose}}% + [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. + 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:FULLPAGE0} +\end{lstlisting} + + +\Float[default] +\hvFloat*[FULLPAGE]% + {figure}% + {\includegraphics[FULLPAGE]{frose}}% + [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. + 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:FULLPAGE0} + +\blinddocument + +\begin{lstlisting} +\hvFloat*[FULLPAGE]% + {figure}% + {\includegraphics[FULLPAGE]{frose}}% + [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. + 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:FULLPAGE1} +\end{lstlisting} + + +\Float[default] +\hvFloat*[FULLPAGE]% + {figure}% + {\includegraphics[FULLPAGE]{frose}}% + [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. + 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:FULLPAGE1} + +\blinddocument + +\Blindtext + +\blindtext + + +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf Binary files differindex 4a303dee2f..6ba3089988 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex index 6647b434ed..64b430652b 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: paper-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: paper-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf Binary files differindex 945d4e9c41..739474d938 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex index 08a44c47eb..1cb218ac79 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-inner2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: paper-inner2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: paper-inner2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf Binary files differindex e4606b5751..207f1b69c6 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex index 23ee98ff60..f285704496 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/paper-right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: paper-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: paper-right1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \usepackage{pdfpages} \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx b/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx index dd2d7ccc4f..4b49852be7 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx +++ b/macros/latex/contrib/hvfloat/doc/examples/preamble.ltx @@ -36,8 +36,8 @@ \usepackage{varioref} \usepackage{nameref} \usepackage[hyperref]{hvfloat} -%\usepackage{hvfloat} \DeclareCaptionFont{red}{\color{red}} +\DeclareCaptionFont{white}{\color{white}} \captionsetup{labelfont={red,sf},font={red,sf},format=plain} \usepackage{blindtext} diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf Binary files differindex 8423fc99de..288656941c 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex index a3042a3530..4ad53de6b9 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: right1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf Binary files differindex 62e121a492..acaf0cb938 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex index 98ce0eb17d..ada1d0b186 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/right1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: right1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: right1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf Binary files differindex c4cf629636..c4ca034580 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex index 362f953f8b..6672586390 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/right2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: right2s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: right2s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf Binary files differindex 04fe952cb5..d35d53ecf0 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex index 154a7beeae..eaaed1d57c 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/right2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: right2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/runAll.sh b/macros/latex/contrib/hvfloat/doc/examples/runAll.sh index 94e35c43f1..3b6bc2008f 100755 --- a/macros/latex/contrib/hvfloat/doc/examples/runAll.sh +++ b/macros/latex/contrib/hvfloat/doc/examples/runAll.sh @@ -12,7 +12,7 @@ do echo "LuaLaTeX-Lauf Nr. $RUNS von $datei =======================================" lualatex $datei TEST=`grep -c "Label(s) may have changed." $MAIN.log ` - if [ $RUNS -gt 5 ] + if [ $RUNS -gt 4 ] then TEST=0 fi done diff --git a/macros/latex/contrib/hvfloat/doc/examples/runEXA.sh b/macros/latex/contrib/hvfloat/doc/examples/runEXA.sh index 8d6e6f84fe..ea7f8b1f78 100755 --- a/macros/latex/contrib/hvfloat/doc/examples/runEXA.sh +++ b/macros/latex/contrib/hvfloat/doc/examples/runEXA.sh @@ -12,9 +12,9 @@ do echo "LuaLaTeX-Lauf Nr. $RUNS von $datei =======================================" lualatex $datei TEST=`grep -c "Label(s) may have changed." $MAIN.log ` - if [ $RUNS -gt 5 ] + if [ $RUNS -gt 4 ] then TEST=0 fi done - rm $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc + rm -fr $MAIN.aux $MAIN.log $MAIN.out $MAIN.toc $MAIN.lof $MAIN.lot $MAIN.idx done diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf Binary files differindex 2ba15f5ffc..16eee22b91 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex index 4d87de577a..660e942090 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: sub-after1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-after1s1c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} @@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -45,9 +45,9 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. {sub:demo3} \end{lstlisting} -\Float[subfloat] +\Float[subFloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf Binary files differindex a06feaca2a..c2971c97e6 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex index 5d46609f00..761faa2c4b 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-after2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-after2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-after2s2c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf Binary files differindex 89721e0270..89b800947d 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex index 6777dea5c7..ec371418a7 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: sub-default1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-default1s1c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf Binary files differindex db16fbc2dd..a0d1f89e3c 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex index 1ebc5bb9cc..c9307aecef 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-default1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-default1s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf Binary files differindex 6de66848d6..80c7cf22df 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex index 3e007f239e..cd6d370b80 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-default2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twoside,twocolumn]{scrartcl} -%% $Id: sub-default2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-default2s2c.tex 72 2021-05-02 11:40:10Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf Binary files differindex 7f7bd67892..109dd4d3a5 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex index 078f901932..e4fea43506 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s1c.tex @@ -1,5 +1,5 @@ \documentclass{scrartcl} -%% $Id: sub-right1s1c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-right1s1c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} @@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf Binary files differindex 87ff80154a..4b6d8d5eb3 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex index f721256a11..d1073b7838 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right1s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-right1s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-right1s2c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=after,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=after,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf Binary files differindex e27919a3bc..0c73301951 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex index e4f5f9c246..a6e556161c 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/sub-right2s2c.tex @@ -1,5 +1,5 @@ \documentclass[twocolumn]{scrartcl} -%% $Id: sub-right2s2c.tex 1033 2019-04-04 07:24:57Z herbert $ +%% $Id: sub-right2s2c.tex 103 2021-05-31 12:37:11Z herbert $ \input{preamble.ltx} \setlength\columnseprule{0.4pt} @@ -24,7 +24,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -47,7 +47,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -74,7 +74,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -97,7 +97,7 @@ subimage~~\vref{sub:demo1} has a caption~\vpageref{sub:demo1}. \Float[subfloat] \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=right,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=right,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf Binary files differnew file mode 100644 index 0000000000..c3a7c2cb9a --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex new file mode 100644 index 0000000000..f7c4f36b5e --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/wide1s2c.tex @@ -0,0 +1,165 @@ +\documentclass[twocolumn,DIV=12]{scrartcl} +%% $Id: sub-right2s2c.tex 72 2021-05-02 11:40:10Z herbert $ + +\input{preamble.ltx} +\usepackage{ragged2e} +\usepackage{showframe} +\setlength\columnseprule{0.4pt} + +\usepackage{marginnote} +\let\Lkeyword\texttt +\let\Lkeyset\texttt +\def\Ldim#1{\texttt{\textbackslash#1}} + +\begin{document} +\title{Example for fullpage floats} +\author{Herbert Voß} +\maketitle + +\tableofcontents + +\textcolor{black!40}{\blindtext} + +\textcolor{black!40}{\blindtext} + +\section{File \texttt{\jobname}} + +With the optional argument \Lkeyword{wide} the width of the defined \Ldim{marginparwidth} is +added to the allowed horizontal width of the float. + +The code for figure \ref{fig:70}: +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=right, + capVPos=top, + objectPos=left, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% + Caption at top right beside the float and object position left and +the option \texttt{wide}.}{fig:70} +\end{lstlisting} + +\hvFloat[% + wide,nonFloat, + capPos=right,% + capVPos=top,% + objectPos=left,% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% + Caption at top right beside the float and object position left and +the option \texttt{wide}.}{fig:70} + +\textcolor{black!40}{\blindtext} +%\blindtext + + +The code for figure \ref{fig:80}: +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=left, + capVPos=top, + objectPos=right, + ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% + {Caption at top left beside the object and object position left and + the option \texttt{wide}.}{fig:80} +\end{lstlisting} + + +\hvFloat[wide,nonFloat, + capPos=left,% + capVPos=top,% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% + {Caption at top left beside the object and object position left and + the option \texttt{wide}.}{fig:80} + + +For a twosided document it will place the object always in the margin. + +\textcolor{black!40}{\blindtext} + +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top and inner beside the float and object position right and +the option \texttt{wide}.}{fig:81} +\end{lstlisting} + +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top and inner beside the float and object position right and +the option \texttt{wide}.}{fig:81} + +Now we set the same image with the same setting on the next page. The caption will +change its side due to the setting \Lkeyset{capPos=outer}. + + +\textcolor{black!40}{\blindtext} + + + +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:811} +\end{lstlisting} + + +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:811} + +The caption can be typeset completely into the margin with: + +\textcolor{black!40}{\blindtext} + + +\begin{lstlisting} +\captionsetup{justification=RaggedRight} +\hvFloat[wide,nonFloat, + capPos=outer, + capVPos=top, + floatCapSep=\marginparsep, +]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:812} +\end{lstlisting} + +\textcolor{black!40}{\blindtext} + +\begingroup +\captionsetup{justification=RaggedRight} +\hvFloat[wide,nonFloat, + capPos=outer, + capVPos=top, + floatCapSep=\marginparsep, +]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:812} +\endgroup + +\textcolor{black!40}{\blindtext} + +\hvFloat[wide,nonFloat, + capPos=outer, + capVPos=top, + floatCapSep=\marginparsep, +]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:813} + + + + + +\textcolor{black!40}{\Blindtext} + +\end{document} + diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf Binary files differnew file mode 100644 index 0000000000..7e5c40c7c9 --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.pdf diff --git a/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex new file mode 100644 index 0000000000..46c8182cb9 --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/wide2s2c.tex @@ -0,0 +1,159 @@ +\documentclass[twocolumn]{scrartcl} +%% $Id: sub-right2s2c.tex 72 2021-05-02 11:40:10Z herbert $ + +\input{preamble.ltx} +\usepackage{ragged2e} +\usepackage{showframe} +\setlength\columnseprule{0.4pt} + +\usepackage{marginnote} +\let\Lkeyword\texttt +\let\Lkeyset\texttt +\def\Ldim#1{\texttt{\textbackslash#1}} + +\begin{document} +\title{Example for fullpage floats} +\author{Herbert Voß} +\maketitle + +\tableofcontents + +\Blindtext + +\section{File \texttt{\jobname}} + +With the optional argument \Lkeyword{wide} the width of the defined \Ldim{marginparwidth} is +added to the allowed horizontal width of the float. + +The code for figure \ref{fig:70}: +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=right, + capVPos=top, + objectPos=left, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% + Caption at top right beside the float and object position left and +the option \texttt{wide}.}{fig:70} +\end{lstlisting} + +\hvFloat[% + wide,nonFloat, + capPos=right,% + capVPos=top,% + objectPos=left,% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% + Caption at top right beside the float and object position left and +the option \texttt{wide}.}{fig:70} + +%\blindtext + + +The code for figure \ref{fig:80}: +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=left, + capVPos=top, + objectPos=right, + ]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% + {Caption at top left beside the object and object position left and + the option \texttt{wide}.}{fig:80} +\end{lstlisting} + + +\hvFloat[wide,nonFloat, + capPos=left,% + capVPos=top,% +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}% + {Caption at top left beside the object and object position left and + the option \texttt{wide}.}{fig:80} + + +For a twosided document it will place the object always in the margin. + +\blindtext + +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top and inner beside the float and object position right and +the option \texttt{wide}.}{fig:81} +\end{lstlisting} + +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top and inner beside the float and object position right and +the option \texttt{wide}.}{fig:81} + +Now we set the same image with the same setting on the next page. The caption will +change its side due to the setting \Lkeyset{capPos=outer}. + +\blindtext + + + +\begin{lstlisting} +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:811} +\end{lstlisting} + + +\hvFloat[wide,nonFloat, + capPos=inner, + capVPos=top, +]{figure}{\includegraphics[width=0.75\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:811} + +The caption can be typeset completely into the margin with: + +\begin{lstlisting} +\captionsetup{justification=RaggedRight} +\hvFloat[wide,nonFloat, + capPos=outer, + capVPos=top, + floatCapSep=\marginparsep, +]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:812} +\end{lstlisting} + +%\Float[capPos=outer] + +\begingroup +\captionsetup{justification=RaggedRight} +\hvFloat[wide,nonFloat, + capPos=outer, + capVPos=top, + floatCapSep=\marginparsep, +]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:812} +\endgroup + +\blindtext +\blindtext + +\hvFloat[wide,nonFloat, + capPos=outer, + capVPos=top, + floatCapSep=\marginparsep, +]{figure}{\includegraphics[width=\linewidth]{images/CTAN}}{% +Caption at top inner beside the float and object position right and +the option \texttt{wide}.}{fig:813} + + + + + +\Blindtext + +\end{document} + diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf Binary files differindex fe878066ec..981f685c0a 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.tex b/macros/latex/contrib/hvfloat/doc/hvfloat.tex index 902f9c0754..807a63415e 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 90 2021-05-14 09:08:46Z herbert $ +%% $Id: hvfloat.tex 103 2021-05-31 12:37:11Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,]{scrartcl} @@ -210,7 +210,8 @@ marginnote \fbox{float} is set into the margin. This is done also only for demon \Loption{fbox} & The objects and captions are put into a \Lcs{fbox} command, like in this documentation. This doesn't make real sense and is only for some demonstration useful or for locating problems if images seems to have too much whitespace.\\ -\Loption{hyperref} & Load package \Lpack{hyperref}. % and also package \Lpack{hypcap}. +\Loption{hyperref} & Load package \Lpack{hyperref}.\\ +\Loption{nostfloats} & do not load package \Lpack{stfloats}. \end{tabularx} \bigskip @@ -225,7 +226,7 @@ The following packages are loaded by \Lpack{hvfloat} and the optional argument \Lpack{caption}, \Lpack{subcaption}, \Lpack{atbegshi}, -%\RequirePackage{hyperref} +\Lpack{stfloats}, \Lpack{expl3}, \Lpack{multido}, \Lpack{graphicx}, \Lpack{xkeyval}, @@ -271,16 +272,18 @@ A label can be put inside the argument or after the command in the usual way, so the not existing table~\ref{dummy} is no problem. {\small\begin{verbatim} -[...] It is no problem to use the \verb|\tabcaption| command to place a caption anywhere, -like here in an inlined mode: \tabcaption[The Caption without sense ...]{A Caption without any -sense and any object}\label{dummy} A label can be put inside the argument or after the command -in the usual way, so that a reference to the not existing table~\ref{dummy} is no problem. +[...] It is no problem to use the \verb|\tabcaption| +command to place a caption anywhere, +like here in an inlined mode: +\tabcaption[The Caption without sense ...]% +{A Caption without any sense and any +object}\label{dummy} A label can be put +inside the argument or after the command +in the usual way, so that a reference to +the not existing table~\ref{dummy} is no problem. \end{verbatim}} -%\hvDefFloatStyle -%\hvFloatSetDefaults - With the macro \Lcs{hvDefFloatStyle} one can define a style which can be used instead of the individual setting: @@ -290,10 +293,6 @@ the individual setting: Internally the style is saved in a macro named \verb|\hv@<name>|. - -%\index{capPos@\texttt {capPos} (keyword)|(} - -%\subsection{The Options} There are the following keywords: \begin{xltabular}{\textwidth}{@{} l>{\small\ttfamily}cX @{}} @@ -307,52 +306,45 @@ There are the following keywords: \endfoot \bottomrule \endlastfoot + \Lkeyword{floatPos} & \texttt{tbp} & This is the same default placement setting like the one from standard \LaTeX, but maybe not always the best setting. \\ -\Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption should be rotated in the same way.\\ - -\Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width, +\Lkeyword{rotAngle} & 0& The value for the angle if both, the object and the caption, should be rotated together.\\ +\Lkeyword{capWidth} & n& The width of the caption. Can be »\texttt{n}« like a natural width given by the current linewidth, »\texttt{w}« for the width of the object, »\texttt{h}« for the height of the object, or a scale for \verb|\columnwidth|.\\ - -\Lkeyword{capAngle} & 0 & The value for the angle if the caption should be rotated. Counted anti clockwise.\\ - +\Lkeyword{capAngle} & 0 & The integer value for the angle if the caption should be rotated. Counted counter clockwise.\\ \Lkeyword{capPos} & bottom& The position of the caption relative to the object. Possible values are\\ & & \Lkeyval{before}: \emph{always} before (left) from the object.\\ & & \Lkeyval{top}: \emph{always} on top of the object.\\ - & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\ + & & \Lkeyval{left}: \emph{always} before (left) from the object, but on the \emph{same page} in twocolumn mode.\\ & & \Lkeyval{after}: \emph{always} after (right) from the object.\\ & & \Lkeyval{bottom}: \emph{always} on the bottom of the object.\\ - & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in \Index{twocolumn} mode.\\ - & & \Lkeyval{inner}: in \Index{twoside} mode always typeset at the inner margin.\\ - & & \Lkeyval{outer}: in \Index{twoside} mode always typeset at the outer margin.\\ - & & \Lkeyval{evenPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an even page.\\ - & & \Lkeyval{oddPage}: in \Index{twoside} mode with \Index{fullpage} objects always on an odd page.\\ - + & & \Lkeyval{right}: \emph{always} after (right) from the object, but on the \emph{same page} in twocolumn mode.\\ + & & \Lkeyval{inner}: in twoside mode always typeset at the inner margin.\\ + & & \Lkeyval{outer}: in twoside mode always typeset at the outer margin.\\ + & & \Lkeyval{evenPage}: in twoside mode with fullpage objects always on an even page.\\ + & & \Lkeyval{oddPage}: in twoside mode with fullpage objects always on an odd page.\\ \Lkeyword{capVPos}& center& This is only important for \texttt{capPos=left|right}. Only in this case the caption can vertically placed at the \Lkeyval{bottom}, \Lkeyval{center} and \Lkeyval{top}.\\ - -\Lkeyword{objectPos} & center & The horizontalplacement of the object relative to the document. Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\ - -\Lkeyword{objectAngle} & 0 & The value for the angle if the object should be rotated. Counted anti clockwise.\\ - -\Lkeyword{floatCapSep} & 5pt & The additional width between the object and a left or right placed caption.\\ - - +\Lkeyword{objectPos} & center & The horizontal placement of the object relative to the document. +Possible values are (\textbf{l})eft|(\textbf{c})enter|(\textbf{r})ight.\\ +\Lkeyword{objectAngle} & 0 & The integer value for the angle if the object should be rotated. Counted counter clockwise.\\ +\Lkeyword{floatCapSep} & 5pt & The additional space between the object and a left or right placed caption.\\ \Lkeyword{useOBox} & false & Instead of passing the object as parameter to the \Lcs{hvFloat}, the contents maybe saved in the box \texttt{\textbackslash hvOBox} With \texttt{useOBox=true} the contents of this box will be used.\\ - \Lkeyword{onlyText} & false & The caption will be printed as normal text and there is no entry in the list of \ldots.\\ - -\Lkeyword{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counters are increased as usual and can be referenced.\\ - +\Lkeyword{nonFloat} & false & The object isn't put in a floating environment. It is printed as standard text with an additional caption. The float counter is increased as usual and can be referenced.\\ \Lkeyword{wide} & false & The float can use \Ldim{textwidth}+\Ldim{marginparwidth} as horizontal width.\\ - \Lkeyword{objectFrame} & false & put a frame with no separation around the float object.\\ - \Lkeyword{style} & --- & Use a defined style\\ - \Lkeyword{capFormat} & --- & Define formatting options for \Lcs{caption} (see documentation of package \Lpack{caption}).\\ - \Lkeyword{subcapFormat} & --- & Define formatting options for \Lcs{subcaption}.\\ +\Lkeyword{fullpage} & false & Use a complete column in twocolumn mode.\\ +\Lkeyword{FULLPAGE} & false & Use the complete paper width/height for the object.\\ +\Lkeyword{FullPage} & false & Use the complete text area for the object.\\ +\Lkeyword{doublePage} & false & Use the textarea on a doublepage with additional text.\\ +\Lkeyword{doublePAGE} & false & Use the textarea on a doublepage without additional text.\\ +\Lkeyword{doubleFULLPAGE} & false & Use the paperwidth on a doublepage without additional text.\\ +\Lkeyword{vFill} & false & Put a \Lcs{vfill} between every two objects in a multi- or subfloat.\\ \end{xltabular} @@ -1717,14 +1709,14 @@ can be mixed: \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,capPos=before,multiFloat]% +\hvFloat[fullpage,capPos=before,multiFloat,vFill]% +{figure}{\includegraphics[width=\linewidth]{images/CTAN}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or right column. 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.}% {img:demo0}% - +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 + +{table}{\begin{tabular}{lrcp{3cm}}\hline % no 2 Linksbündig & Rechtsbündig & Zentriert & Parbox\\\hline L & R & C & P\\ left & right & center & Text with possible linebreaks\\ @@ -1802,7 +1794,7 @@ float type entry is ignored. \begin{lstlisting} -\hvFloat[fullpage,capPos=before,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=before,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -1816,11 +1808,9 @@ float type entry is ignored. {A Caption C of a ``fullpage'' object, which follows on the left or right column.}% {sub:demo1} +{}{\includegraphics[width=\linewidth]{images/CTAN}}% - {A Caption D of a ``fullpage'' object}% - {sub:demo2} + {A Caption D of a ``fullpage'' object}{sub:demo2} +{}{\includegraphics[width=\linewidth]{images/CTAN}}% - {A Caption E of a ``fullpage'' object}% - {sub:demo3} + {A Caption E of a ``fullpage'' object}{sub:demo3} \end{lstlisting} @@ -1830,7 +1820,7 @@ The package \Lpack{subcaption} is loaded by default and should be activated with -\begin{figure}[p] +\begin{figure}[!htb] \frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill \frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill \frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill @@ -1841,7 +1831,9 @@ The package \Lpack{subcaption} is loaded by default and should be activated with \frame{\includegraphics[page=10,width=0.24\linewidth]{examples/sub-default1s1c}}\hfill \frame{\includegraphics[page=11,width=0.24\linewidth]{examples/sub-default1s1c}} \caption{Output of \texttt{sub-default1s1c} (pages 4--11)}\label{sub-default1s1c} +\end{figure} +\begin{figure}[!htb] \frame{\includegraphics[page=4,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill \frame{\includegraphics[page=5,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill \frame{\includegraphics[page=6,width=0.24\linewidth]{examples/sub-after1s1c}}\hfill @@ -2277,7 +2269,7 @@ can be mixed: \begin{lstlisting} \captionsetup{singlelinecheck=false} -\hvFloat[fullpage,multiFloat,capPos=inner]% +\hvFloat[fullpage,multiFloat,capPos=inner,vFill]% +{figure}{\includegraphics[height=0.4\textheight]{images/rose}}%% no 1 [Short caption A]% {A Caption A of a ``fullpage'' object, which follows on the left or @@ -2376,7 +2368,7 @@ float type entry is ignored. \begin{lstlisting} \captionsetup[sub]{singlelinecheck} -\hvFloat[fullpage,capPos=before,objectFrame,subFloat]% +\hvFloat[fullpage,capPos=before,objectFrame,subFloat,vFill]% +{figure}{}[Short main caption of the objects]% main short lsi entry {The main caption of a ``fullpage'' object, which follows on the left or right column. This can be an even or odd page. And some more text whch has no @@ -2498,7 +2490,7 @@ even page and following text will be placed \emph{before} the object. \marginnote{Fig.~\ref{fig:doubleFULLPAGE0}} \hvFloat[doubleFULLPAGE,capPos=right,capAngle=90]% {figure}% - {\includegraphics[height=2\paperwidth,angle=90]{images/r+j}}% + {\includegraphics[angle=90,height=\paperheight]{images/r+j}}% [A doublepage image with a caption on the image.]% {A caption for a double-sided image that will be placed on the right-hand part of the illustration. The illustration begins on the left edge of the paper. @@ -2587,9 +2579,9 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \verb/\pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}/ $\rightarrow$ \pageref{foo} | \pageref{foo-cap} | \pageref{foo-2} \begin{lstlisting} - \hvFloat[doubleFULLPAGE,capPos=before]% + \hvFloat[doubleFULLPAGE,capPos=after]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth, + {\includegraphics[doubleFULLPAGE, keepaspectratio=false]{images/rheinsberg}}% {A caption for a double-sided image that will be placed before the image. The image begins on the left edge of the paper. @@ -2598,21 +2590,27 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same {foo} \end{lstlisting} +\hvFloatSetDefaults + \marginnote{Fig.~\ref{foo}} - \hvFloat[doubleFULLPAGE,capPos=before]% + \hvFloat[doubleFULLPAGE,capPos=after]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% {A caption for a double-sided image that will be placed before the image. The image begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. The parameter is \texttt{doubleFULLPAGE}}% {foo} -\Blindtext \Blindtext +\Blindtext %\Blindtext +\hvblindtext + +\hvblindtext +\hvblindtext \begin{lstlisting} - \hvFloat[doubleFULLPAGE,capPos=after]% + \hvFloat[doubleFULLPAGE,capPos=before]% {figure}% {\includegraphics[height=\paperheight,width=2\paperwidth, keepaspectratio=false]{images/rheinsberg}}% @@ -2620,11 +2618,11 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same the image. The image begins on the left edge of the paper. No further text is placed on the pages. A short form is used for the LOF. The parameter is \texttt{doubleFULLPAGE}}% - {foo} + {bar} \end{lstlisting} \marginnote{Fig.~\ref{bar}} - \hvFloat[doubleFULLPAGE,capPos=after]% + \hvFloat[doubleFULLPAGE,capPos=before]% {figure}% {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% {A caption for a double-sided image that will be placed after @@ -2638,6 +2636,9 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \Blindtext \hvblindtext + +%\hvblindtext + \subsection{\Lkeyword{doublePAGE}} With this option the object also starts at the left paper margin but on the top of the text area. There will be pagenumbers and a caption can be rotated on the right of the object or under it. @@ -2666,10 +2667,11 @@ There will be pagenumbers and a caption can be rotated on the right of the objec The parameter is \texttt{doublePAGE}}% {fig:doublePAGE0} -\hvblindtext +%\hvblindtext \Blindtext +\Blindtext \subsection{\Lkeyword{doublePage}} With this option the object also starts at the left top of the text area. @@ -2689,6 +2691,8 @@ and the rest of the text area is filled with text. \end{lstlisting} +%\hvFloatSetDefaults + \marginnote{Fig. \ref{fig:doublePage0}} \hvFloat[doublePage,capWidth=n,capPos=right]% {figure}% @@ -2746,7 +2750,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]% +\hvFloat[doublePage,capWidth=n,capPos=right,capVPos=top]% {table}% {\usebox\hvOBox}%%%%%%%%%%%%%% [A doublepage tabular with a caption on the right side of the right part.]% @@ -2786,6 +2790,7 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \bottomrule \end{tabular}} + \hvFloat[doublePage,capWidth=n,capPos=right]% {table}% {\usebox\hvOBox}%%%%%%%%%%%%%% @@ -2801,7 +2806,6 @@ Artikel gesamt & 2 & 6 & 13 & 8 & 4 & 3 & 5 & 4 & 0 & 6 & 3 & 5 &23 &10 & 8 & 15 \Blindtext - \section{References to the page}\label{varioref} %Whith loading package \texttt{hyperref} references to floating objects with a caption left or right of the object %are no problem in difference to captions below othe object or on another page (using \texttt{fullpage} option). @@ -2838,7 +2842,7 @@ With package \Lpack{varioref} it is: \begin{verbatim} Whith the package \Lpack{varioref} (\url{https://ctan.org/pkg/varioref}) one can get something like: see figure~\vref{demo:fullpage}, which uses a -correct page number of the floatinmg object and not the caption +^correct page number of the floatinmg object and not the caption page number which is~\vpageref{demo:fullpage-cap}. The figure~\ref{demo:fullpage} is on page~\pageref{demo:fullpage} and the caption on page~\pageref{demo:fullpage-cap} @@ -2852,7 +2856,7 @@ The figure~\ref{demo:fullpage} is on page~\pageref{demo:fullpage} and the caption on page~\pageref{demo:fullpage-cap} -\FloatBarrier +%\FloatBarrier \section{Defining a style} @@ -2876,16 +2880,16 @@ For example: \hvFloatSetDefaults -\hvDefFloatStyle{RightCaption}{floatPos=htb, capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} - +\hvDefFloatStyle{RightCaption}{capWidth=0.5, capPos=after, capVPos=bottom, objectPos=center} \hvFloat[style=RightCaption]{figure}{\includegraphics{images/rose}}% {Caption at bottom right beside the float with a caption width of \texttt{0.5\textbackslash columnwidth}.}{fig:style} -\hvblindtext +\Blindtext +\Blindtext \section{Global float setting} @@ -2908,6 +2912,8 @@ optional package options to set the global placement: \Blindtext +\Blindtext + %\hvFloatSetDefaults \hvFloat[FULLPAGE]{figure}% {\includegraphics[FULLPAGE]{tiger}}% @@ -2919,8 +2925,9 @@ optional package options to set the global placement: \Blindtext -\printindex +\Blindtext +\printindex \clearpage diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty index 59bfd20a45..66a354eae6 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty +++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty @@ -1,4 +1,4 @@ -%% $Id: hvfloat.sty 92 2021-05-18 09:46:55Z herbert $ +%% $Id: hvfloat.sty 103 2021-05-31 12:37:11Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -15,26 +15,35 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.25} -\def\filedate{2021/05/18} +\def\fileversion{2.26} +\def\filedate{2021/05/26} \message{`hvfloat' v\fileversion, \filedate\space (Herbert Voss)} \ProvidesPackage{hvfloat}[\filedate\ rotating of floating objects] \let\hvFloatFileVersion\fileversion % \newif\ifhv@fbox \hv@fboxfalse \newif\ifhv@hyperref \hv@hyperreffalse -\newif\ifhv@stfloats \hv@stfloatsfalse +\newif\ifhv@nostfloats \hv@nostfloatsfalse +\newif\ifhv@tugboat \hv@tugboatfalse \DeclareOption{fbox}{\hv@fboxtrue\setlength{\fboxsep}{1pt}} \DeclareOption{hyperref}{\hv@hyperreftrue} -\DeclareOption{stfloats}{\hv@stfloatstrue} +\DeclareOption{nostfloats}{\hv@nostfloatstrue} \ProcessOptions +\providecommand\@tugclass{\@empty} +\ifx\@tugclass\@empty +\else + \hv@tugboattrue % special page handling + \typeout{>>> we are using a TUGboat class}% +\fi + \PassOptionsToPackage{hypcap}{caption} \RequirePackage{caption} \PassOptionsToPackage{hypcap}{subcaption} \RequirePackage{subcaption} +\RequirePackage{atbegshi} \RequirePackage{picture,trimclip} \RequirePackage{expl3,multido} @@ -47,7 +56,7 @@ \ifhv@hyperref \RequirePackage{hyperref} \fi -\ifhv@stfloats +\ifhv@nostfloats\else \RequirePackage{stfloats}% for bottom floats in a twocolumn mode \fi % @@ -99,12 +108,12 @@ \define@key{hvSet}{capWidth}[n]{% (n)atural width|object (w)idth)|object (h)eight|<scale of \columnwidth> \def\hvSet@capWidth{#1}% } -\define@key{hvSet}{capAngle}[0]{% -360..+360 +\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,even,odd}[bottom]{% +\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 \ifcase\nr\relax \hv@capbesidefalse @@ -120,6 +129,13 @@ \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}% + \or + \gdef\hv@@capVPos{c}% + \else + \gdef\hv@@capVPos{t}% + \fi }{\PackageWarning{hvfloat}{erroneous input (#1) for capVPos ignored. Using bottom.}% \def\hvSet@capVPos{center}% it is relativ to the object } @@ -164,7 +180,7 @@ } \define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal -\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{#1}\fi} +\newcommand\hv@typeout[1]{\ifhv@Debug\typeout{>>>> #1}\fi} \newif\ifhv@fullpage \newif\ifhv@FULLPAGE @@ -190,8 +206,10 @@ \ifhv@subFloat\setkeys{hvSet}{multiFloat=false}\fi% }% \define@boolkey{hvSet}[hv@]{multiFloat}[true]{% typeset values as continous floats - \ifhv@multiFloat\setkeys{hvSet}{subFloat=false}\fi% + \ifhv@multiFloat\setkeys{hvSet}{subFloat=false}\fi }% +\define@boolkey{hvSet}[hv@]{vFill}[true]{}% \vfill between multifloat objects + \define@boolkey{hvSet}[hv@]{separatorLine}[true]{}% separator line for caption of a full page float \define@key{hvSet}{sepLineskip}{\def\hv@sepLineskip{#1}}% \define@boolkey{hvSet}[hv@]{objectFrame}[true]{}% a frame around the object with no separation @@ -222,6 +240,7 @@ capFormat={}, subcapFormat={}, twoColumnCaption=false, % floatRef=object, bindCorr=\z@,sepLineskip=0pt, + vFill=false, }% } @@ -270,6 +289,11 @@ \newlength\hv@maxImageWidth \AtBeginDocument{\hv@maxImageWidth=\columnwidth} +\define@key{Gin}{columnWidth}[true]{% + \def\Gin@ewidth{\columnwidth}% +% \def\Gin@eheight{1ex}% + \Gin@boolkey{true}{iso}% +} \define@key{Gin}{fullpage}[true]{% \def\Gin@ewidth{\columnwidth}% \def\Gin@eheight{\textheight}% @@ -291,7 +315,7 @@ \Gin@boolkey{false}{iso}% } \define@key{Gin}{doubleFULLPAGEbindCorr}[true]{% - \def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection}% + \def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection\relax}% \def\Gin@eheight{\paperheight}% \Gin@boolkey{false}{iso}% } @@ -342,11 +366,22 @@ \ifhv@fbox \fbox{\usebox{\hvObjectBox}}% \else - \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\usebox{\hvObjectBox}\fi% + % rotated object with a depth need to raise up the \depth + \ifhv@objectFrame\frame{\usebox{\hvObjectBox}}\else\raisebox{\depth}{\usebox{\hvObjectBox}}\fi% \fi \fi } +\newcounter{hv@tempCNTfigA}% +\newcounter{hv@tempCNTfigB}% +\newcounter{hv@tempCNTtabA}% +\newcounter{hv@tempCNTtabB}% + +\newcounter{hv@pfigure} +\newcounter{hv@ptable} +\newcounter{subhv@pfigure} +\newcounter{subhv@ptable} + \newif\ifhv@star \newif\if@hvsubstar \setDefaults @@ -367,15 +402,20 @@ \def\hvFloat@i*{\@ifnextchar[{\do@hvFloat}{\do@hvFloat[]}} \def\do@hvFloat[#1]{% \begingroup - \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}% + \setlength\hvWideWidth{\dimexpr\columnwidth+\marginparwidth+\marginparsep}% +% \setlength\hvWideWidth{\dimexpr\textwidth+\marginparwidth+\marginparsep}% % \setlength\hvWideWidth{\dimexpr\linewidth+\marginparwidth}% \hv@maxImageWidth=\textwidth \reset@special@float - \setcounter{hv@pfigure}{\value{figure}}% - \setcounter{hv@ptable}{\value{table}}% + \global\setcounter{hv@pfigure}{\value{figure}}% + \global\setcounter{hv@ptable}{\value{table}}% + \setcounter{hv@tempCNTfigA}{\value{figure}}% + \setcounter{hv@tempCNTfigB}{\value{figure}}% + \setcounter{hv@tempCNTtabA}{\value{table}}% + \setcounter{hv@tempCNTtabB}{\value{table}}% \gdef\hv@save@setting{#1}% \ifx\relax#1\relax\else\setkeys{hvSet}{#1}\fi - \gdef\hv@floatType{figure}% + \gdef\hv@floatType{figure}% presetting \@ifnextchar+{\do@multiFloat}{\hvFloat@ii[#1]}% } @@ -425,14 +465,6 @@ \ExplSyntaxOff -\newcounter{hv@tempCNTa}\setcounter{hv@tempCNTa}{0}% defined after \refstepcounter{figure} -\newcounter{hv@tempCNTb}\setcounter{hv@tempCNTb}{0}% defined before \refstepcounter{figure} -\def\thehv@tempCNTa{\arabic{figure}} -\def\thehv@tempCNTb{\the\numexpr\arabic{figure}+1} -\newcounter{hv@pfigure} -\newcounter{hv@ptable} -\newcounter{subhv@pfigure} -\newcounter{subhv@ptable} \def\drawSepLine{% \par\noindent @@ -503,10 +535,14 @@ % % First we save the object in \hvObjectBox % - \ifx\hvSet@objectAngle\hv@Zero% rotate the object? - \savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \ifnum\hvSet@objectAngle=0 % rotate the object? + \ifhv@useOBox + \let\hvObjectBox\hvOBox + \else + \savebox\hvObjectBox{\hv@floatObject}% + \fi \else - \savebox{\hvObjectBox}{% + \savebox\hvObjectBox{% \rotatebox{\hvSet@objectAngle}{% \ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi }% @@ -559,25 +595,25 @@ \fi \fi \saveCaptionSkip% we put this space ourselve - \ifx\hvSet@capAngle\hv@Zero% need rotation? + \ifnum\hvSet@capAngle=0 % need rotation? \savebox\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 + \ifx\hv@caption@format\@empty\else\expandafter\captionsetup\expandafter{\hv@caption@format}\fi \ifhv@nonFloat \ifhv@onlyText \hv@longCap \else \ifx\hv@floatType\hv@figure \ifx\relax\hv@shortCap\relax - \figcaption{\hv@longCap\expandafter\label\expandafter{\hv@label}}% + \figcaption{\hv@longCap}% \else - \figcaption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% + \figcaption[\hv@shortCap]{\hv@longCap}% \fi \else \ifx\relax\hv@shortCap\relax - \tabcaption{\hv@longCap\expandafter\label\expandafter{\hv@label}}% + \tabcaption{\hv@longCap}% \else - \tabcaption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% + \tabcaption[\hv@shortCap]{\hv@longCap}% \fi \fi \fi @@ -586,15 +622,10 @@ \hv@longCap \else \let\@captype\hv@floatType - \expandafter\ifx\expandafter\relax\hv@shortCap\relax - \caption{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \else - \caption[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label}}% - \fi -% \fi + \ifx\hv@shortCap\@empty\caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}\fi \fi \fi -% \expandafter\label\expandafter{\hv@label}% 2.17 put label into the caption argument + \ifx\hv@label\@empty\else\label{\hv@label}\fi \end{minipage}% }% \else @@ -617,12 +648,11 @@ \hv@longCap \else \let\@captype\hv@floatType - \expandafter\ifx\expandafter\relax\hv@shortCap\relax - \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}% + \ifx\relax\hv@shortCap\relax \caption{\hv@longCap}\else\caption[\hv@shortCap]{\hv@longCap}% \fi \fi \fi - \label{\hv@label}% + \ifx\hv@label\@empty\else\label{\hv@label}\fi \end{minipage}% }% rotatebox }% \sbox @@ -638,10 +668,15 @@ \@namedef{fps@\hv@floatType}{\hvSet@floatPos}% \fi \ifhv@nonFloat + \noindent \begingroup% Start the nonfloat part \else \ifhv@star - \@nameuse{\hv@floatType*}% Start the floating environment ***************************** + \ifx\hvSet@floatPos\hv@floatBottom + \@nameuse{\hv@floatType*}[b]% Start the floating environment ***************************** + \else + \@nameuse{\hv@floatType*}% + \fi \else \begin{\hv@floatType}% Start the floating environment \fi @@ -766,7 +801,28 @@ % now we rotate the object and caption, if needed % \ifhv@wide - \ifoddpageoroneside\else\ifoddpage\else\hspace*{\dimexpr-\marginparwidth-\marginparsep}\fi\fi% <- for wide and left page + \ifoddpageoroneside + \if@twocolumn + \if@firstcolumn + \noindent + \hspace*{\dimexpr-\marginparwidth-\marginparsep}% oddpage first column + \fi + \fi + \else + \ifoddpage + \if@twocolumn + \if@firstcolumn + \noindent + \hspace*{\dimexpr-\marginparwidth-\marginparsep}% oddpage first column + \fi + \fi + \else% evenpage + \if@firstcolumn + \noindent + \hspace*{\dimexpr-\marginparwidth-\marginparsep}% <- for wide and left page + \fi + \fi + \fi \fi \ifx\hvSet@rotAngle\hv@Zero \usebox{\@tempboxa}% @@ -775,9 +831,9 @@ \fi \ifhv@nonFloat \ifx\hvSet@objectPos\hv@Center - \ifhv@nonFloat +% \ifhv@nonFloat \hspace{\fill}% - \fi +% \fi \fi \endgroup% End the nonfloat part \else @@ -827,7 +883,7 @@ \fi \fi \checkoddpage - \set@caption@object% set caption and object into a box + \set@caption@object{\hv@floatType}% set caption and object into a box \ifcase\hv@@capPos% caption before object 0-> _always_ left \setBottomCaption\setPageObject \or% caption after object 1-> _always_ right @@ -836,12 +892,7 @@ \ifoddpage \afterpage{\setBottomCaption\setPageObject}% \else% we are on an even page -% \zsaveposy{hv@currentPos}% -% \ifdim\the\dimexpr\zposy{hv@currentPos}sp-\hv@BottomSpace-1cm>\ht\TBox % enough space* - \setBottomCaption\setPageObject -% \else -% \afterpage{\afterpage{\setBottomCaption\setPageObject}}% -% \fi + \setBottomCaption\setPageObject \fi \or% caption on odd page 3->right page \if@twoside @@ -890,7 +941,7 @@ \fi \fi \or% caption on the inner column 4->inner - \set@caption@object +% \set@caption@object \if@twocolumn \ifoddpage \if@firstcolumn% on right side @@ -909,7 +960,7 @@ \setBottomCaption\setPageObject \fi \or% caption on the outer column 5->outer - \set@caption@object +% \set@caption@object \if@twocolumn \ifoddpage \if@firstcolumn @@ -957,78 +1008,122 @@ \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-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset \global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection}% + \xdef\hv@@capAngle{\hvSet@capAngle}% \checkoddpage \ifoddpage \if@twocolumn \if@firstcolumn - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% \else - \do@hvFloat@doublePageCaptionRight{#1}% + \ifhv@tugboat + \do@hvFloat@doublePageCaptionRight{#1}% + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi \fi \else - \do@hvFloat@doublePageCaptionRight{#1}% + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% \fi \else \if@twocolumn \if@firstcolumn - \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}}% \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% \fi \else - \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% \fi \fi \endgroup% started at main macro \hvFloat } % \def\do@hvFloat@doublePageCaptionRight#1{% image on left and right page with caption on the right page ---------------------------------- - \afterpage{% - \let\hv@fptop\c@fptop - \global\setlength{\@fptop}{0pt}% - \let\hv@c@topnumber\c@topnumber - \setcounter{topnumber}{1}% - \begin{\hv@floatType*}[t] - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \end{\hv@floatType*}% - \begin{\hv@floatType*}[t] - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \hspace*{\hv@tempWidthA}% - \noindent - \clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% - \ifnum#1>0 - \medskip - \ifdim\dp\hvObjectBox > \z@ - \rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - }}% - \else - \rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - }}% - \fi - \else - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% - \fi - \fi - \end{\hv@floatType*}% - \let\c@topnumber\hv@c@topnumber - \let\c@fptop\hv@fptop + \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}% + \begin{\hv@floatType*}[!thb] + \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% + \ifx\hv@label\@empty + \else + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigA}% + \else + \refstepcounter{hv@tempCNTtabA}% before caption + \fi + \label{\hv@label}% + \fi + \end{\hv@floatType*}% + \afterpage{% + \begin{\hv@floatType*}[!thb] + \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% + \hspace*{\hv@tempWidthA}% + \noindent + \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}% + }% + \ifx\hv@label\@empty\else + \ifx\hv@floatType\hv@figure + \global\refstepcounter{hv@tempCNTfigB}% + \else + \global\refstepcounter{hv@tempCNTtabB}% before caption + \fi + \label{\hv@label-2}% + \fi + \ifnum#1>0 % caption on the right +% \medskip + \ifnum\hv@@capAngle > 0 +% \ifdim\dp\hvObjectBox > \z@ +% \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% +% \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-cap}\fi +% }}% +% \else + \rotatebox[origin=c]{\hv@@capAngle}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% + \else + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% + \fi + }}% + \ifx\relax\hv@label\relax\else\label{\hv@label-cap}\fi +% \fi + \else + \hspace{\marginparsep}% + \parbox[\hv@@capVPos]{\hv@tempWidthB}{% + \vspace{0pt}% + \ifx\hv@shortCap\@empty + \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\label{\hv@label-cap}\fi}% + \else + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap} + \fi + }% + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi + \fi + \else % #1 = 0 caption below + \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-cap}\fi + \fi + \end{\hv@floatType*}% }% + \let\c@topnumber\hv@c@topnumber + \let\c@fptop\hv@fptop } % \newsavebox\hv@boxLeftPage @@ -1050,6 +1145,8 @@ \if@twocolumn \if@firstcolumn \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \else + \do@hvFloat@doublePAGECaptionRight{#1}% \fi \else \do@hvFloat@doublePAGECaptionRight{#1}% @@ -1073,40 +1170,40 @@ \afterpage{% \noindent \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \null - \global\savebox\hv@boxLeftPage{\clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% - \usebox\hv@boxLeftPage + \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \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 -% \usebox\hv@boxRightPage \clipbox*{\the\hv@leftPageObjectWidth{} -\depth{} \width{} \height{}}{\usebox\hvObjectBox}% \ifnum#1>0 \medskip \ifdim\dp\hvObjectBox > \z@ \rotatebox[origin=c]{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% \fi }}% + \ifx\hv@label\@empty\else\label{\hv@label}\fi \else \rotatebox{90}{\parbox{\the\dimexpr\ht\hvObjectBox+\dp\hvObjectBox}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% \fi }}% + \ifx\hv@label\@empty\else\label{\hv@label}\fi \fi \else - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% \fi + \ifx\hv@label\@empty\else\label{\hv@label}\fi \fi \newpage\if@twocolumn\null\newpage\fi }% @@ -1124,8 +1221,11 @@ \fi\fi \checkoddpage \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \global\setlength\hv@tempWidthA{\the\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset - \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-\hvSet@bindCorrection}% + \global\setlength\hv@tempWidthA{\dimexpr-\oddsidemargin-1in-\parindent+\hvSet@bindCorrection}% the width of the right side offset + \global\setlength\hv@tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}% + \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-\hvSet@bindCorrection}% +% \savebox\hv@leftBox{\clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}}% +% \savebox\hv@rightBox{\clipbox*{\the\hv@leftPageObjectWidth{} \depth{} \width{} \height}{\usebox\hvObjectBox}}% \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifoddpage \ifcase\hv@@capPos % =0 Caption before @@ -1137,29 +1237,40 @@ \else \afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}% \fi - \else + \else% \if@firstcolumn \set@Normal@Bottom@Caption \do@hvFloat@doubleFULLPAGE@CaptionBefore \fi - \else + \else% \if@twocolumn \set@Normal@Bottom@Caption \do@hvFloat@doubleFULLPAGE@CaptionBefore \fi \or % =1 Caption after \ifhv@twoColumnCaption - \do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol + \if@firstcolumn + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol}% + \else + \do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol + \fi \else - \do@hvFloat@doubleFULLPAGE@CaptionAfter + \if@twocolumn + \if@firstcolumn + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% + \else + \do@hvFloat@doubleFULLPAGE@CaptionAfter + \fi + \else + \do@hvFloat@doubleFULLPAGE@CaptionAfter + \fi \fi - \else% >1 all other Captions + \else% \ifcase >1 all other Captions \if@twocolumn \if@firstcolumn -% \global\setlength\hv@tempWidthA{\the\dimexpr-\evensidemargin-1in-\parindent+\hvSet@bindCorrection}% \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% \else \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% \fi - \else % >1 Caption right/bottom + \else % \if@twocolumn \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% \fi \fi% \ifcase @@ -1175,20 +1286,28 @@ \else \afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}% \fi - \else + \else% \if@twocolumn \afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}% \fi \or % capPos after \if@twocolumn \if@firstcolumn - \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% + \ifhv@twoColumnCaption + \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{#1}}}% + \else + \afterpage{\afterpage\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% + \fi \else - \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% + \ifhv@twoColumnCaption + \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{#1}}}% + \else + \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% + \fi \fi - \else + \else% \if@twocolumn \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% \fi - \else % Any other caption + \else % \ifcase Any other caption \if@twocolumn \if@firstcolumn \afterpage{\afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}}}% @@ -1198,7 +1317,7 @@ \else \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% \fi - \fi%% \ifcase + \fi% \ifcase \fi% main ifoddpage \endgroup% started at main macro \hvFloat } @@ -1208,34 +1327,44 @@ \begin{\hv@floatType}[!b] \ifhv@separatorLine\drawSepLine\fi \expandafter\captionsetup\expandafter{\hv@caption@format}% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% \fi + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \end{\hv@floatType}% } \def\set@Normal@Bottom@CaptionStar*{% - \begin{\hv@floatType*}[!b] - \ifhv@separatorLine\drawSepLine\fi - \expandafter\captionsetup\expandafter{\hv@caption@format}% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% - \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% - \fi - \end{\hv@floatType*}% + \begin{\hv@floatType*}[!b] + \ifhv@separatorLine\drawSepLine\fi + \expandafter\captionsetup\expandafter{\hv@caption@format}% + \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-cap}\fi + \end{\hv@floatType*}% } + \def\do@hvFloat@doubleFULLPAGE@CaptionBefore{% +% \setcounter{hv@tempCNTfigA}{\value{figure}}% +% \setcounter{hv@tempCNTfigB}{\value{figure}}% +% \setcounter{hv@tempCNTtabA}{\value{table}}% +% \setcounter{hv@tempCNTtabB}{\value{table}}% \afterpage{% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \thispagestyle{empty}% - \refstepcounter{hv@tempCNTa}% + \ifx\hv@floatType\hv@figure + \global\refstepcounter{hv@tempCNTfigB}% + \else + \global\refstepcounter{hv@tempCNTtabB}% before caption + \fi \expandafter\label\expandafter{\hv@label}% -%%% \global\addtocounter{\hv@floatType}{-1}% to get the same <object>-ref as "label"-cap \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% \afterpage{% \if@twocolumn\newpage\null\newpage\fi @@ -1245,7 +1374,11 @@ \hspace*{\hv@tempWidthA}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% - \refstepcounter{hv@tempCNTa}% + \ifx\hv@floatType\hv@figure + \global\refstepcounter{hv@tempCNTfigA}% + \else + \global\refstepcounter{hv@tempCNTtabA}% before caption + \fi \expandafter\label\expandafter{\hv@label-2}% \newpage\if@twocolumn\null\newpage\fi }}% @@ -1259,10 +1392,14 @@ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \thispagestyle{empty}% - \refstepcounter{hv@tempCNTb}% - \expandafter\label\expandafter{\hv@label}% - \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \afterpage{% + \clipbox*{0 \the\dp\hvObjectBox{} \the\hv@leftPageObjectWidth{} \the\ht\hvObjectBox}{\usebox\hvObjectBox}% + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigA}% + \else + \refstepcounter{hv@tempCNTtabA}% before caption + \fi + \ifx\hv@label\@empty\else\label{\hv@label}\fi +% \afterpage{% \newpage\if@twocolumn\null\newpage\fi \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \thispagestyle{empty}% @@ -1270,19 +1407,24 @@ \hspace*{\hv@tempWidthA}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% - \refstepcounter{hv@tempCNTb}% + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigB}% + \else + \refstepcounter{hv@tempCNTtabB}% before caption + \fi \expandafter\label\expandafter{\hv@label-2}% \newpage\if@twocolumn\null\newpage\fi - \begin{\hv@floatType}[b] + \begin{\hv@floatType}[!b] \ifhv@separatorLine\drawSepLine\fi \expandafter\captionsetup\expandafter{\hv@caption@format}% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% - \fi + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% + \fi + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \end{\hv@floatType}% - }}% + }%}% } \def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{% @@ -1291,10 +1433,13 @@ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% no interlineskip \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \thispagestyle{empty}% - \refstepcounter{hv@tempCNTb}% - \expandafter\label\expandafter{\hv@label}% + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigA}% + \else + \refstepcounter{hv@tempCNTtabA}% before caption + \fi + \ifx\hv@label\@empty\else\label{\hv@label}\fi \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \afterpage{% \newpage\if@twocolumn\null\newpage\fi \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \thispagestyle{empty}% @@ -1302,20 +1447,25 @@ \hspace*{\hv@tempWidthA}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% - \refstepcounter{hv@tempCNTb}% - \expandafter\label\expandafter{\hv@label-2}% - \newpage\if@twocolumn\null\newpage\fi - \begin{\hv@floatType*}[b] + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigB}% + \else + \refstepcounter{hv@tempCNTtabB}% before caption + \fi + \ifx\hv@label\@empty\else\label{\hv@label-2}\fi + \newpage + \begin{\hv@floatType*}[!b] \hv@twoColumnCaptiontrue \ifhv@separatorLine\drawSepLine\fi \expandafter\captionsetup\expandafter{\hv@caption@format}% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% - \fi + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% + \fi + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \end{\hv@floatType*}% - }}% + }% } \def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{% @@ -1325,54 +1475,64 @@ \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox \hspace*{\the\dimexpr-\evensidemargin-\parindent-1in}% \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \clipbox*{0 0 \the\hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \refstepcounter{hv@tempCNTb} - \expandafter\label\expandafter{\hv@label}% + \clipbox*{0 \depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigA}% + \else + \refstepcounter{hv@tempCNTtabA}% before caption + \fi + \label{\hv@label}% \afterpage{% \if@twocolumn\newpage\if@firstcolumn\else\null\newpage\fi\fi \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \thispagestyle{empty}% \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox \hspace*{\hv@tempWidthA}% - \clipbox*{\the\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% - \refstepcounter{hv@tempCNTb}% + \clipbox*{\hv@leftPageObjectWidth{} \dp\hvObjectBox{} \wd\hvObjectBox{} \ht\hvObjectBox}{\usebox\hvObjectBox}% + \ifx\hv@floatType\hv@figure + \refstepcounter{hv@tempCNTfigB}% + \else + \refstepcounter{hv@tempCNTtabB}% before caption + \fi \expandafter\label\expandafter{\hv@label-2}% \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv@floatType}{\hv@longCap}}}% \ifnum#1 > 0\relax % rotation with 90° - \setlength\hv@tempWidthA{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}% - \ifdim\hv@tempWidthA < 2\paperwidth - \rotatebox{90}{\qquad\parbox{0.9\ht\hvObjectBox}{% +% \setlength\hv@tempWidthB{\dimexpr\ht\hvCaptionBox+\wd\hvObjectBox+2\hvSet@bindCorrection}% + \ifdim\hv@tempWidthB < 2\paperwidth + \rotatebox[origin=lb]{90}{\makebox[\paperheight][c]{\parbox{0.8\ht\hvObjectBox}{% \expandafter\captionsetup\expandafter{\hv@caption@format}% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% \fi - }}% rotatebox + }}}% rotatebox + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \else% ifdim: no space left on page - \put(-\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering + \put(-2\ht\hvCaptionBox,0.5\ht\hvObjectBox){\makebox(0,0){\rotatebox{90}{\minipage{\textwidth}\centering \parbox{0.8\textwidth}{% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% \fi }% + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \endminipage}}}% \fi \else% ifnum, caption not rotated, under or over the right page \setlength\hv@tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}% \ifdim\hv@tempWidthA > \ht\hvCaptionBox \else -% \refstepcounter{hv@temp}%% - \put(\the\dimexpr-\textwidth-2in-\oddsidemargin,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%% + \put(\the\dimexpr1.5\paperwidth-\wd\hvObjectBox-\hvSet@bindCorrection,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][c]{\parbox{\textwidth}{%% \expandafter\captionsetup\expandafter{\hv@caption@format}% - \ifx\hv@shortCap\@empty - \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \ifx\relax\hv@shortCap\relax + \captionof{\hv@floatType}{\hv@longCap}% \else - \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap}% \fi }}}% + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \fi \fi% end \ifnum#1>0 \newpage\if@twocolumn\null\newpage\fi @@ -1407,9 +1567,8 @@ \else \hspace*{\the\dimexpr-\oddsidemargin-\parindent-1in}% \fi - %\put(0,0){% \AtBeginShipoutNext{\thispagestyle{empty}}% - \usebox\hvObjectBox%}% + \usebox\hvObjectBox% \else \usebox\hvObjectBox \fi @@ -1447,8 +1606,14 @@ \repeat \endminipage}% } + \def\getMultiObjectAndLabel{% - \global\sbox\hvObjectBox{\minipage{\linewidth}% + \global\sbox\hvObjectBox{% + \ifhv@vFill + \minipage[b][\textheight][s]{\columnwidth}% + \else + \minipage{\columnwidth}% + \fi \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 @@ -1461,6 +1626,8 @@ \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}% \ifhv@objectFrame\frame{\@temp}\else\@temp\fi \edef\@tempa{\clist_item:Nn\l_clist_Label{\hv@cnta}}% + \edef\@tempb{\clist_item:Nn\l_clist_Type{\hv@cnta}}% + \edef\@captype{hv@p\@tempb}% \ifx\@tempa\@empty \else \refstepcounter{\@captype}% @@ -1469,6 +1636,7 @@ \ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi \advance\hv@cnta by \@ne \ifnum\hv@cnta<\hv@cntb + \ifhv@vFill\vfill\fi \repeat \endminipage}% } @@ -1491,7 +1659,12 @@ } \def\getMultiSubObjectAndLabel{% - \global\sbox\hvObjectBox{\minipage{\linewidth}% + \global\sbox\hvObjectBox{% + \ifhv@vFill + \minipage[b][\textheight][s]{\columnwidth}% + \else + \minipage{\columnwidth}% + \fi \ifx\hv@subcaption@format\@empty\else \expandafter \captionsetup\expandafter[\expandafter s\expandafter u\expandafter b\expandafter]\expandafter @@ -1504,7 +1677,7 @@ \hv@cntb=\clist_count:N\l_clist_Caption \advance\hv@cntb by \@ne \hv@cnta=2 - \xdef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats + \edef\@captype{\clist_item:Nn\l_clist_Type{1}}% the same for all subfloats \loop \def\@temp{\clist_item:Nn\l_clist_Object{\hv@cnta}}% \ifhv@objectFrame\frame{\@temp}\else\@temp\fi @@ -1524,6 +1697,7 @@ \ifnum\hv@cnta<\clist_count:N\l_clist_Type\par\hv@vskip\fi \advance\hv@cnta by \@ne \ifnum\hv@cnta<\hv@cntb + \ifhv@vFill\vfill\fi \repeat \edef\@tempa{\clist_item:Nn\l_clist_Label{1}}% the main label at the end \ifx\@tempa\@empty @@ -1547,11 +1721,11 @@ \else \caption[\hv@shortCap]{\hv@longCap}% \fi - \expandafter\ifx\expandafter\relax\hv@label\relax\else\label{\hv@label-cap}\fi + \ifx\hv@label\@empty\else\label{\hv@label-cap}\fi \endminipage}% } -\def\set@caption@object{% first caption, then object +\def\set@caption@object#1{% first caption, then object #1=\hv@floatType \ifhv@multiFloat \getMultiCaptionAndLabel \else @@ -1561,7 +1735,7 @@ \getSingleCaptionAndLabel \fi \fi - \edef\@captype{hv@p\hv@floatType}% + \edef\@captype{hv@p#1}% \ifhv@multiFloat \getMultiObjectAndLabel \else diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index f91a3e17e4..2e71ec3eca 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,18 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.8] + +### Changed +- Documentation improvements +- Add `\barn`, `\knot`, `\mmHg`, `\nauticalmile` to list of + deprecated units +- Provide a fallback route for deprecated units + +### Fixed +- Correct printing of `10^{0}` (issue #459) +- Emulation of `group-four-digits` (issue #461) + ## [v3.0.7] ### Fixed @@ -1322,7 +1334,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ### Added - First public testing release (as `si`) -[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.7...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.8...HEAD +[v3.0.8]: https://github.com/josephwright/siunitx/compare/v3.0.7...v3.0.8 [v3.0.7]: https://github.com/josephwright/siunitx/compare/v3.0.6...v3.0.7 [v3.0.6]: https://github.com/josephwright/siunitx/compare/v3.0.5...v3.0.6 [v3.0.5]: https://github.com/josephwright/siunitx/compare/v3.0.4...v3.0.5 diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf Binary files differindex 09c3c9538d..6ba4bd131f 100644 --- a/macros/latex/contrib/siunitx/siunitx-code.pdf +++ b/macros/latex/contrib/siunitx/siunitx-code.pdf diff --git a/macros/latex/contrib/siunitx/siunitx-emulation.dtx b/macros/latex/contrib/siunitx/siunitx-emulation.dtx index dc2e9f9035..0878c37d74 100644 --- a/macros/latex/contrib/siunitx/siunitx-emulation.dtx +++ b/macros/latex/contrib/siunitx/siunitx-emulation.dtx @@ -446,6 +446,20 @@ } { \@@_option_removed:V \l_keys_key_tl } } , + group-four-digits .choice: , + group-four-digits / false .code:n = + { + \@@_option_deprecated:nn + { group-four-digits~=~false } + { group-minimum-digits~=~5 } + } , + group-four-digits / true .code:n = + { + \@@_option_deprecated:nn + { group-four-digits~=~false } + { group-minimum-digits~=~4 } + } , + bracket-numbers .default:n = true , omit-uncertainty .code:n = { \@@_option_deprecated:nnV @@ -996,30 +1010,69 @@ % \end{macrocode} % \end{macro} % -% Units that have been removed. +% Units that have been removed: to avoid issues, we mark them as deprecated. % \begin{macrocode} -\msg_new:nnnn { siunitx } { unit-removed } - { Unit~macro~#1~has~been~removed~in~this~release. } +\msg_new:nnnn { siunitx } { unit-deprecated } + { Unit~macro~#1~has~been~deprecated~in~this~release. } { The~BIPM~have~removed~this~unit~from~the~SI~Brochure.~ - You~will~need~to~define~it~yourself~using~\token_to_str:N \DeclareSIUnit. + You~should~define~it~yourself~using~\token_to_str:N \DeclareSIUnit + in~your~source. } -\clist_map_inline:nn +\cs_gset_protected:Npn \@@_tmp:w #1#2 { - \angstrom , - \atomicmassunit , - \bar , - \bohr , - \clight , - \electronmass , - \elementarycharge , - \hartree , - \planckbar + \quark_if_recursion_tail_stop:N #1 + \bool_new:c { g_@@_unit_warning_ \token_to_str:N #1 _bool } + \siunitx_declare_unit:Nx #1 + { + \exp_not:N \bool_if:NF + \exp_not:c { g_@@_unit_warning_ \token_to_str:N #1 _bool } + { + \exp_not:N \bool_gset_true:N + \exp_not:c { g_@@_unit_warning_ \token_to_str:N #1 _bool } + \msg_warning:nnn { siunitx } { unit-deprecated } + { \token_to_str:N #1 } + } + #2 + } + \@@_tmp:w } +\@@_tmp:w + \atomicmassunit { u } + \bar { bar } + \barn { b } + \bohr + { \text { \ensuremath { a } } \char_generate:nn { `\_ } { 8 } { 0 } } + \clight + { \text { \ensuremath { c } } \char_generate:nn { `\_ } { 8 } { 0 } } + \electronmass + { + \text { \ensuremath { m } } + \char_generate:nn { `\_ } { 8 } { \exp_not:N \mathrm { e } } + } + \elementarycharge { \text { \ensuremath { e } } } + \hartree + { + \text { \ensuremath { E } } + \char_generate:nn { `\_ } { 8 } { \exp_not:N \mathrm { h } } + } + \knot { kn } + \mmHg { mmHg } + \nauticalmile { M } + \planckbar + { \text { \ensuremath { \exp_not:N \hbar } } } + \q_recursion_tail { } + \q_recursion_stop +\@ifpackageloaded { fontspec } { - \siunitx_declare_unit:Nx #1 - { \msg_error:nnn { siunitx } { unit-removed } { \token_to_str:N #1 } } + \@@_tmp:w \angstrom { \@@_non_latin:n { "00C5 } } + } + { + \@@_tmp:w \angstrom + { \exp_not:N \text { \@@_non_latin:n { "00C5 } } } } + \q_recursion_tail { } + \q_recursion_stop % \end{macrocode} % % \begin{macrocode} diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx index cfbff37d9c..070b9c5e9d 100644 --- a/macros/latex/contrib/siunitx/siunitx-number.dtx +++ b/macros/latex/contrib/siunitx/siunitx-number.dtx @@ -3127,13 +3127,9 @@ % \begin{macrocode} \cs_new:Npn \@@_output_integer:nnn #1#2#3 { - \bool_lazy_all:nF - { - { \str_if_eq_p:nn {#1} { 1 } } - { \tl_if_blank_p:n {#2} } - { ! \str_if_eq_p:nn {#3} { 0 } } - { ! \l_@@_unity_mantissa_bool } - } + \bool_lazy_or:nnT + { \l_@@_unity_mantissa_bool } + { ! \str_if_eq_p:nn { #1 . #2 } { 1. } } { \@@_output_digits:nn { integer } {#1} } } \cs_new:Npn \@@_output_decimal:nn #1#2 @@ -3389,10 +3385,9 @@ } \cs_new:Npn \@@_output_exponent_auxi:nnnn #1#2#3#4 { - \bool_lazy_and:nnTF - { \str_if_eq_p:nn {#3} { 1. } } - { ! \l_@@_unity_mantissa_bool } - { \exp_not:n {#4} } + \bool_lazy_or:nnTF + { \l_@@_unity_mantissa_bool } + { ! \str_if_eq_p:nn {#3} { 1. } } { \bool_if:NTF \l_@@_tight_bool { \exp_not:N \mathord } @@ -3400,6 +3395,7 @@ { \exp_not:V \l_@@_exponent_product_tl } \exp_not:n {#4} } + { \exp_not:n {#4} } \exp_not:V \l_@@_exponent_base_tl ^ { \@@_output_exponent_auxiii:nn {#1} {#2} } diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index e553abc6b0..33b6776591 100644 --- a/macros/latex/contrib/siunitx/siunitx.dtx +++ b/macros/latex/contrib/siunitx/siunitx.dtx @@ -121,7 +121,7 @@ % % Identify the package and give the over all version information. % \begin{macrocode} -\ProvidesExplPackage {siunitx} {2021-05-28} {3.0.7} +\ProvidesExplPackage {siunitx} {2021-05-31} {3.0.8} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex 5e0b6c269d..4388753d2f 100644 --- a/macros/latex/contrib/siunitx/siunitx.pdf +++ b/macros/latex/contrib/siunitx/siunitx.pdf diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex index 3cb5f25ed5..76afc34861 100644 --- a/macros/latex/contrib/siunitx/siunitx.tex +++ b/macros/latex/contrib/siunitx/siunitx.tex @@ -1593,7 +1593,6 @@ conveys. The options are summarised in Table~\ref{tab:opt:num:out}. \end{table} \DescribeOption{group-digits} -\DescribeOption{group-four-digits} \DescribeOption{group-separator} Grouping digits into blocks of three is a common method to increase the ease of reading of numbers. The \opt{group-digits} choice controls whether this @@ -2849,19 +2848,14 @@ letters may be used: these must be single tokens. For example, provided the \pkg{numprint} package has not been loaded, the letter |n| could be used as this would suggest a numerical column. -\section{Upgrading from version~\texorpdfstring{$2$}{2}} +\section{Upgrading from version~\texorpdfstring{$2$}{2}% + \label{sec:upgrading}} The package has been largely re-written internally between versions $2$ and $3$. A significant number of key--value settings have new, more descriptive, names. Where possible, older names are mapped to newer ones internally: you will be warned in the log if this is the case. -Updating to the latest edition of the \acro{SI} Brochure means that a small -number of unit macros have been removed: of those accepted for use, -\cs{angstrom} is no longer present, whilst the units determined experimentally -are all no longer listed (\cs{atomicmassunit}, \cs{bohr}, \cs{clight}, -\cs{electronmass}, \cs{elementarycharge}, \cs{hartree}, \cs{planckbar}). - It is possible to use the \LaTeXe{} kernel mechanism to load the last version~$2$ release for documents that cannot be successfully processed using version~$3$. This can be achieved using @@ -2936,6 +2930,54 @@ or If you are using \opt{table-column-width} to have fixed-width columns, you also now need \opt{table-fixed-width} to set this option active. +Direct support for loading a local configuration file, \texttt{siunitx.cfg}, +has been removed. However, the approach described in +Section~\ref{sec:hint:config} may be used to achieve the same effect with the +additions more clearly shown in document sources. + +\section{Unit changes made by \acro{BIPM}% + \label{sec:BIPM8}} + +In addition to the changes in the \pkg{siunitx} package described in +Section~\ref{sec:upgrading}, there are changes in the units defined by the +\acro{BIPM} in the 9th Edition of the \acro{SI} Brochure which are reflected +here. There are two major areas of change. + +The first is in respect of units accepted for use with \acro{SI} units. In the +8th Edition of the \acro{SI} Brochure, the following units were listed as +accepted for use in specialist fields +\begin{itemize} + \item ångström (\cs{angstrom}) + \item bar (\cs{bar}) + \item barn (\cs{barn}) + \item knot (\cs{knot}) + \item millimetre of mercury (\cs{mmHg}) + \item nautical mile (\cs{nauticalmile}) +\end{itemize} +These are no longer listed in the 9th Edition, and so are deprecated as +pre-defined units by \pkg{siunitx}. These units will issue a warning on first +use, and users should add their own definitions to the start of their sources +to avoid this. + +Secondly, the move to a new definition of base units means that the table of +units determined experimentally has been removed from the \acro{SI} Brochure. +This covers the following units defined by \pkg{siunitx} in previous releases +\begin{itemize} + \item \cs{bohr} + \item \cs{clight} + \item \cs{electronmass} + \item \cs{elementarycharge} + \item \cs{hartree} + \item \cs{planckbar} +\end{itemize} +These are also deprecated in \pkg{siunitx} and users should provide their own +definitions. + +In addition to these two major blocks, the unit \cs{atomicmassunit} has similar +deprecated status: this was listed as with experimentally-determined units in +the 8th Edition of the \acro{SI} Brochure but is equivalent to the dalton, a +unit which remains accepted. + \section{Localisation} The \pkg{translations} package provides a structured framework for localisation @@ -3346,7 +3388,7 @@ output mode is known. It may be necessary to make some tokens robust using \qty{0,4066\dots}{\metre\squared} \end{LaTeXdemo} -\subsection{Demonstrating prefixes +\subsection{Demonstrating prefixes% \label{sec:hint:prefixes}} As \pkg{siunitx} contains data about the numerical values of unit prefixes, @@ -3372,6 +3414,28 @@ This may be conveniently wrapped up inside a document command, for example } \end{LaTeXdemo} +\subsection{Creating a set of pre-defined units% + \label{sec:hint:config}} + +There are many units which sit outside of those defined in the (current) +\acro{SI} Brochure which are of use to many people. Most obvious are those +which have been detailed in previous editions of the Brochure, as described +in Section~\ref{sec:BIPM8}, but there are many others. + +It is often convenient to have a pre-defined set of useful units available +without needing to copy the full set of definitions into each source file. At +the same time, it is important that such sources do show that they are using +units not defined by the core part of \pkg{siunitx}. The most straight-forward +way to acheive this is to create a separate file, for example +\texttt{siunitx-local-units.tex}, and place it in your local \TeX{} tree +(usually \verb|~/texmf/tex/latex/| on Linux, \verb|~/Library/texmf/tex/latex/| +on macOS or \verb|C:\Users\<name>\texmf\tex\latex| on Windows). This can then +be loaded in the preamble using +\begin{LaTeXdemo}[code only] + % Load useful 'local' units + \input{siunitx-local-units} +\end{LaTeXdemo} + \section{Using (\acro{SI}) units} Consistent and logical units are a necessity for scientific work, and have diff --git a/macros/latex/contrib/thuthesis/CHANGELOG.md b/macros/latex/contrib/thuthesis/CHANGELOG.md index 2532ff0458..d68be6a460 100644 --- a/macros/latex/contrib/thuthesis/CHANGELOG.md +++ b/macros/latex/contrib/thuthesis/CHANGELOG.md @@ -6,10 +6,19 @@ ## [Unreleased] +## [v7.2.3] - 2021-05-31 +### Changed +- 中文模板的公式编号改为中文括号（#297）。 + +### Fixed +- 修正硕士论文书脊的字号（#647）。 +- 修正本科生附录（调研和翻译）的目录在 TeX Live 2019 前无法生成的问题（#659）。 +- 修正本科生主要符号表的标题（#661）。 + ## [v7.2.2] - 2021-04-03 ### Changed - 修改授权说明的内容和格式，同 2020 年 12 月版 Word 模板一致（#625）。 -- 去掉参考文献的页码前与冒号之间的空格，同步 2020 年 3 月版《指南》的格式修改（#629）。 +- 参考文献的页码前与冒号之间加上空格，同步 2021 年 3 月版《指南》的格式修改（#629）。 - 著者-出版年制参考文献表的著者姓名与年份之间改为逗号。 ### Fixed @@ -686,7 +695,8 @@ -[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.2.2...HEAD +[Unreleased]: https://github.com/tuna/thuthesis/compare/v7.2.3...HEAD +[v7.2.3]: https://github.com/tuna/thuthesis/compare/v7.2.2...v7.2.3 [v7.2.2]: https://github.com/tuna/thuthesis/compare/v7.2.1...v7.2.2 [v7.2.1]: https://github.com/tuna/thuthesis/compare/v7.2.0...v7.2.1 [v7.2.0]: https://github.com/tuna/thuthesis/compare/v7.1.0...v7.2.0 diff --git a/macros/latex/contrib/thuthesis/README.md b/macros/latex/contrib/thuthesis/README.md index d427df9a14..455b858f95 100644 --- a/macros/latex/contrib/thuthesis/README.md +++ b/macros/latex/contrib/thuthesis/README.md @@ -39,7 +39,7 @@ Scroll down for the English version of README. ## 更新日志 -每个版本的详细更新日志，请见 [CHANGELOG.md](blob/master/CHANGELOG.md)。使用文档中也包含了这一内容。 +每个版本的详细更新日志，请见 [CHANGELOG.md](CHANGELOG.md)。使用文档中也包含了这一内容。 ## 升级 ### 自动更新 @@ -109,7 +109,7 @@ Developer versions contain only source code but no pre-compiled `cls` file and d ## Changelog -See [CHANGELOG.md](blob/master/CHANGELOG.md) for detailed changes in each release. They are also included in the usage documentation. +See [CHANGELOG.md](CHANGELOG.md) for detailed changes in each release. They are also included in the usage documentation. ## Updates ### Automatic diff --git a/macros/latex/contrib/thuthesis/data/abstract.tex b/macros/latex/contrib/thuthesis/data/abstract.tex index babbca3f46..b76e3756da 100644 --- a/macros/latex/contrib/thuthesis/data/abstract.tex +++ b/macros/latex/contrib/thuthesis/data/abstract.tex @@ -22,7 +22,7 @@ \begin{abstract*} An abstract of a dissertation is a summary and extraction of research work and contributions. - Included in an abstract should be description of research topic and research objective, brief introduction to methodology and research process, and summarization of conclusion and contributions of the research. + Included in an abstract should be description of research topic and research objective, brief introduction to methodology and research process, and summary of conclusion and contributions of the research. An abstract should be characterized by independence and clarity and carry identical information with the dissertation. It should be such that the general idea and major contributions of the dissertation are conveyed without reading the dissertation. @@ -32,7 +32,7 @@ Keywords are terms used in a dissertation for indexing, reflecting core information of the dissertation. An abstract may contain a maximum of 5 keywords, with semi-colons used in between to separate one another. - % Use comma as seperator when inputting + % Use comma as separator when inputting \thusetup{ keywords* = {keyword 1, keyword 2, keyword 3, keyword 4, keyword 5}, } diff --git a/macros/latex/contrib/thuthesis/data/appendix-translation.tex b/macros/latex/contrib/thuthesis/data/appendix-translation.tex index d272480bf4..812cfcc767 100644 --- a/macros/latex/contrib/thuthesis/data/appendix-translation.tex +++ b/macros/latex/contrib/thuthesis/data/appendix-translation.tex @@ -50,7 +50,7 @@ \section{数学公式} -附录中的数学公式示例（公式~\eqref{eq:appendix-translation-equation}）。 +附录中的数学公式示例（公式\eqref{eq:appendix-translation-equation}）。 \begin{equation} \frac{1}{2 \uppi \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) \label{eq:appendix-translation-equation} diff --git a/macros/latex/contrib/thuthesis/data/appendix.tex b/macros/latex/contrib/thuthesis/data/appendix.tex index 39ac664248..85b9ea6e55 100644 --- a/macros/latex/contrib/thuthesis/data/appendix.tex +++ b/macros/latex/contrib/thuthesis/data/appendix.tex @@ -43,7 +43,7 @@ \section{数学公式} -附录中的数学公式示例（公式~\eqref{eq:appendix-equation}）。 +附录中的数学公式示例（公式\eqref{eq:appendix-equation}）。 \begin{equation} \frac{1}{2 \uppi \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) \label{eq:appendix-equation} diff --git a/macros/latex/contrib/thuthesis/data/chap02.tex b/macros/latex/contrib/thuthesis/data/chap02.tex index d084a3ccc2..65630cb5d4 100644 --- a/macros/latex/contrib/thuthesis/data/chap02.tex +++ b/macros/latex/contrib/thuthesis/data/chap02.tex @@ -12,13 +12,14 @@ \begin{figure} \centering - \includegraphics[width=0.6\linewidth]{example-image-a.pdf} - \caption{示例图片} + \includegraphics[width=0.5\linewidth]{example-image-a.pdf} + \caption*{国外的期刊习惯将图表的标题和说明文字写成一段，需要改写为标题只含图表的名称，其他说明文字以注释方式写在图表下方，或者写在正文中。} + \caption{示例图片标题} \label{fig:example} \end{figure} 若图或表中有附注，采用英文小写字母顺序编号，附注写在图或表的下方。 -% LaTeX 传统上一般将附注的内容同图表的标题写在一起，形成很长的一段文字。 +国外的期刊习惯将图表的标题和说明文字写成一段，需要改写为标题只含图表的名称，其他说明文字以注释方式写在图表下方，或者写在正文中。 如果一个图由两个或两个以上分图组成时，各分图分别以 (a)、(b)、(c)...... 作为图序，并须有分图题。 推荐使用 \pkg{subcaption} 宏包来处理， 比如图~\ref{fig:subfig-a} 和图~\ref{fig:subfig-b}。 @@ -26,9 +27,9 @@ \begin{figure} \centering \subcaptionbox{分图 A\label{fig:subfig-a}} - {\includegraphics[width=0.45\linewidth]{example-image-a.pdf}} + {\includegraphics[width=0.35\linewidth]{example-image-a.pdf}} \subcaptionbox{分图 B\label{fig:subfig-b}} - {\includegraphics[width=0.45\linewidth]{example-image-b.pdf}} + {\includegraphics[width=0.35\linewidth]{example-image-b.pdf}} \caption{多个分图的示例} \label{fig:multi-image} \end{figure} @@ -50,8 +51,6 @@ thuthesis.dtx & 模板的源文件，包括文档和注释 \\ thuthesis.cls & 模板文件 \\ thuthesis-*.bst & BibTeX 参考文献表样式文件 \\ - thuthesis-*.bbx & BibLaTeX 参考文献表样式文件 \\ - thuthesis-*.cbx & BibLaTeX 引用样式文件 \\ \bottomrule \end{tabular} \label{tab:three-line} @@ -72,8 +71,6 @@ thuthesis.dtx\tnote{a} & 模板的源文件，包括文档和注释 \\ thuthesis.cls\tnote{b} & 模板文件 \\ thuthesis-*.bst & BibTeX 参考文献表样式文件 \\ - thuthesis-*.bbx & BibLaTeX 参考文献表样式文件 \\ - thuthesis-*.cbx & BibLaTeX 引用样式文件 \\ \bottomrule \end{tabular} \begin{tablenotes} @@ -110,36 +107,6 @@ Row 8 & & & \\ Row 9 & & & \\ Row 10 & & & \\ - Row 11 & & & \\ - Row 12 & & & \\ - Row 13 & & & \\ - Row 14 & & & \\ - Row 15 & & & \\ - Row 16 & & & \\ - Row 17 & & & \\ - Row 18 & & & \\ - Row 19 & & & \\ - Row 20 & & & \\ - Row 21 & & & \\ - Row 22 & & & \\ - Row 23 & & & \\ - Row 24 & & & \\ - Row 25 & & & \\ - Row 26 & & & \\ - Row 27 & & & \\ - Row 28 & & & \\ - Row 29 & & & \\ - Row 30 & & & \\ - Row 31 & & & \\ - Row 32 & & & \\ - Row 33 & & & \\ - Row 34 & & & \\ - Row 35 & & & \\ - Row 36 & & & \\ - Row 37 & & & \\ - Row 38 & & & \\ - Row 39 & & & \\ - Row 40 & & & \\ \end{longtable} @@ -156,17 +123,12 @@ \label{alg1} \small \begin{algorithmic} - \REQUIRE $n \geq 0 \vee x \neq 0$ + \REQUIRE $n \geq 0$ \ENSURE $y = x^n$ \STATE $y \leftarrow 1$ - \IF{$n < 0$} - \STATE $X \leftarrow 1 / x$ - \STATE $N \leftarrow -n$ - \ELSE - \STATE $X \leftarrow x$ - \STATE $N \leftarrow n$ - \ENDIF + \STATE $X \leftarrow x$ + \STATE $N \leftarrow n$ \WHILE{$N \neq 0$} \IF{$N$ is even} diff --git a/macros/latex/contrib/thuthesis/data/chap03.tex b/macros/latex/contrib/thuthesis/data/chap03.tex index 7106685dfe..2efdc1db96 100644 --- a/macros/latex/contrib/thuthesis/data/chap03.tex +++ b/macros/latex/contrib/thuthesis/data/chap03.tex @@ -66,7 +66,7 @@ \section{数学公式} 数学公式可以使用 \env{equation} 和 \env{equation*} 环境。 -注意数学公式的引用应前后带括号，建议使用 \cs{eqref} 命令，比如式 \eqref{eq:example}。 +注意数学公式的引用应前后带括号，建议使用 \cs{eqref} 命令，比如式\eqref{eq:example}。 \begin{equation} \frac{1}{2 \uppi \symup{i}} \int_\gamma f = \sum_{k=1}^m n(\gamma; a_k) \mathscr{R}(f; a_k) \label{eq:example} diff --git a/macros/latex/contrib/thuthesis/spine.pdf b/macros/latex/contrib/thuthesis/spine.pdf Binary files differindex 17f54571d3..63eef753e0 100644 --- a/macros/latex/contrib/thuthesis/spine.pdf +++ b/macros/latex/contrib/thuthesis/spine.pdf diff --git a/macros/latex/contrib/thuthesis/spine.tex b/macros/latex/contrib/thuthesis/spine.tex index 4b8badf5d3..54f4d29842 100644 --- a/macros/latex/contrib/thuthesis/spine.tex +++ b/macros/latex/contrib/thuthesis/spine.tex @@ -6,16 +6,14 @@ \input{thusetup.tex} +% \thusetup{ +% spine-font = {\zihao{3}}, +% spine-title = {书脊的标题}, +% spine-author = {书脊的作者姓名}, +% } \begin{document} \spine -\thusetup{ - spine-font = {\Huge}, - spine-title = {书脊的标题}, - spine-author = {书脊的作者姓名}, -} -\spine - \end{document} diff --git a/macros/latex/contrib/thuthesis/thuthesis-example.pdf b/macros/latex/contrib/thuthesis/thuthesis-example.pdf Binary files differindex e994bb2e6d..a881f81a4a 100644 --- a/macros/latex/contrib/thuthesis/thuthesis-example.pdf +++ b/macros/latex/contrib/thuthesis/thuthesis-example.pdf diff --git a/macros/latex/contrib/thuthesis/thuthesis-example.tex b/macros/latex/contrib/thuthesis/thuthesis-example.tex index 1520898b4c..7e6f698ca2 100644 --- a/macros/latex/contrib/thuthesis/thuthesis-example.tex +++ b/macros/latex/contrib/thuthesis/thuthesis-example.tex @@ -11,7 +11,7 @@ % chinese（默认）| english % 字体库 fontset % windows | mac | fandol | ubuntu - % 研究生院建议终版使用 Windows 平台的字体编译 + % 建议终版使用 Windows 平台的字体编译 % 论文基本配置，加载宏包等全局配置 @@ -73,12 +73,13 @@ % 声明 \statement -% 生成的声明页是否要插入页眉和页脚（默认 empty） -% 仅在需要进行电子签名时，才需要打开这一选项 -% 插入的扫描声明页总是会生成页眉（研究生）和页脚，不受这一选项影响 -% \statement[page-style=plain] % 将签字扫描后的声明文件 scan-statement.pdf 替换原始页面 % \statement[file=scan-statement.pdf] +% 本科生编译生成的声明页默认不加页脚，插入扫描版时再补上； +% 研究生编译生成时有页眉页脚，插入扫描版时不再重复。 +% 也可以手动控制是否加页眉页脚 +% \statement[page-style=empty] +% \statement[file=scan-statement.pdf, page-style=plain] % 个人简历、在学期间完成的相关学术成果 \input{data/resume} diff --git a/macros/latex/contrib/thuthesis/thuthesis-inline.cbx b/macros/latex/contrib/thuthesis/thuthesis-inline.cbx index bec04d1d44..d268a5b96a 100644 --- a/macros/latex/contrib/thuthesis/thuthesis-inline.cbx +++ b/macros/latex/contrib/thuthesis/thuthesis-inline.cbx @@ -7,6 +7,16 @@ autocite = inline , } +% 修改 \mkbibsuperscript 宏在最后加上一个空白使得 xeCJK 不会自动在引用标签后面加上中英文之间的空白 +\DeclareRobustCommand{\mkbibsuperscriptusp}[1]{% + \unspace\allowhyphens\textsuperscript{% + \begingroup + \protected\long\def\mkbibsuperscriptusp##1{% + \blx@warning{Nested superscript}% + \mkbibbrackets{##1}}% + #1\endgroup}} + +% 这里把 gb7714-2015.cbx 中 \parencite 定义借鉴过来 \DeclareCiteCommand{\cite}%[\mkbibbrackets] {[\usebibmacro{cite:init}%] \usebibmacro{prenote}}% @@ -15,4 +25,4 @@ {} {%[ \usebibmacro{cite:dump}]% - \mkbibsuperscript{\printfield{postnote}}} + \mkbibsuperscriptusp{\printfield{postnote}}} diff --git a/macros/latex/contrib/thuthesis/thuthesis.dtx b/macros/latex/contrib/thuthesis/thuthesis.dtx index 2a9e07f9b4..3233b5e580 100644 --- a/macros/latex/contrib/thuthesis/thuthesis.dtx +++ b/macros/latex/contrib/thuthesis/thuthesis.dtx @@ -14,7 +14,7 @@ % % \iffalse %<*driver> -\ProvidesFile{thuthesis.dtx}[2021/04/03 7.2.2 Tsinghua University Thesis Template] +\ProvidesFile{thuthesis.dtx}[2021/05/31 7.2.3 Tsinghua University Thesis Template] \documentclass{ltxdoc} \usepackage{dtx-style} @@ -344,12 +344,13 @@ % Courier & Menlo & TeX Gyre Cursor & TeX Gyre Cursor \\ % 中易宋体 & 华文宋体 & 思源宋体 & Fandol 宋体 \\ % 中易黑体 & 华文黑体 & 思源黑体 & Fandol 黑体 \\ +% 中易仿宋 & 华文仿宋 & Fandol 仿宋 & Fandol 仿宋 \\ % \bottomrule % \end{tabular} % \end{table} % -% 需要注意，研究生院建议中文字体同 Word 模板一致。 -% 也就是说，用户在提交终版前应使用 Windows 平台的字体进行编译。 +% 需要注意，建议用户在提交终版前使用 Windows 平台的字体进行编译。 +% 这样中文字体同 Word 模板一致。 % % 关于字体的配置， % 详见 \pkg{fontspec}、\pkg{xeCJK}、\pkg{ctex} 等宏包的使用说明和代码。 @@ -806,7 +807,7 @@ % 积分号上下限的位置，可选：\option{true}（在上下）、\option{false}（在右侧）。 % 这个设置只影响行间公式，行内公式统一居右侧，不受影响。 % \item \DescribeOption{partial} -% 偏微分符号的正/斜体，可选：\option{upright}、\option{slanted}。 +% 偏微分符号的正/斜体，可选：\option{upright}、\option{italic}。 % \item \DescribeOption{math-ellipsis} % 省略号 \cs{dots} 的样式，可选：\option{centered}（按照中文的习惯固定居中）、 % \option{lower} 和 \option{AMS}（取决于前后符号的位置）。 @@ -997,7 +998,7 @@ % 参考文献表采用“著者-出版年”制组织时，各篇文献首先按文种集中，然后按著者字 % 顺和出版年排列；中文文献可以按著者汉语拼音字顺排列，也可以按著者的笔画笔顺排列。 % 但由于 \hologo{BibTeX} 功能的局限性，无法自动获取著者姓名的拼音或笔画笔顺进行正确排序。 -% 一种解放方法是在 \file{.bib} 数据库的中文文献的 |key| 域手动录入著者姓名的拼音， +% 一种解决方法是在 \file{.bib} 数据库的中文文献的 |key| 域手动录入著者姓名的拼音， % 这比较适合中文文献数量较少的情况，如： % \begin{latex} % @book{capital, @@ -1006,7 +1007,7 @@ % ... % } % \end{latex} -% 另一种方式是使用 biblatex，应在在导言区设置 +% 另一种方式是使用 biblatex，应在导言区设置 % \begin{latex} % \usepackage[backend=biber,style=thuthesis-author-year]{biblatex} % \addbibresource{ref/refs.bib} @@ -1075,18 +1076,21 @@ % \statement[file=scan-statement.pdf] % \end{latex} % -% 由于本科生打印版和电子版有空白页的差别，声明的页码可能不同。 -% 所以编译声明页时默认不加页脚（\texttt{page-style=empty}）， -% 在签字后插入扫描页时再补上页脚，防止页码冲突。 +% 由于本科生的打印版和电子版有空白页的差别，声明的页码可能不同。 +% 所以编译生成声明页时默认不加页脚（\option{empty}）， +% 在签字后插入扫描页时再补上页脚（\option{plain}），防止页码冲突。 +% 研究生不存在空白页的问题，在编译生成声明时默认加页眉页脚（\option{plain}）， +% 而插入扫描版时不再重复（\option{empty}）。 % -% 如果需要编译时也加页码（如直接对电子版进行签名而不是插入扫描页）， -% 可以使用在 \cs{statement} 命令设置 +% 声明的页眉页脚也可以通过 \option{pagestyle} 参数手动控制， +% 比如编译生成时固定不加页眉页脚： % \begin{latex} % \statement[page-style=plain] % \end{latex} -% 注意，本科生插入扫描页时总是会加页码，不受该选项控制。 -% -% 研究生不存在空白页的问题，但是为了灵活性也允许用户选择是否添加页眉和页脚。 +% 插入扫面版声明补上页眉页脚： +% \begin{latex} +% \statement[file=scan-statement.pdf, page-style=plain] +% \end{latex} % % \subsubsection{附录} % @@ -1149,7 +1153,7 @@ % % \subsubsection{个人简历、在学期间完成的相关学术成果} % \DescribeEnv{resume} -% 研究生的标题为为“个人简历、在学期间完成的相关学术成果”， +% 研究生的标题为“个人简历、在学期间完成的相关学术成果”， % 本科生的标题为“在学期间参加课题的研究成果”或“PUBLICATIONS”。 % % \DescribeEnv{achievements} @@ -1194,11 +1198,11 @@ % 生成装订的书脊，为竖排格式。内容默认使用论文的标题和作者。 % 可以设置 \option{spine-title} 和 \option{spine-author} 来修改。 % -% 书脊字体默认为三号字，同研究生的示例一致。 +% 博士论文的书脊字体默认为三号字，硕士的为小三号。 % 本科生要求字体大小根据论文的薄厚而定，可以使用 \option{spine-font} 设置字号。 % \begin{latex} % \thusetup{ -% spine-font = {\Huge}, +% spine-font = {\zihao{3}}, % spine-title = {书脊的标题}, % spine-author = {书脊的作者姓名}, % } @@ -1246,7 +1250,7 @@ % \begin{macrocode} %<cls>\NeedsTeXFormat{LaTeX2e}[2017/04/15] %<cls>\ProvidesClass{thuthesis} -%<cls>[2021/04/03 7.2.2 Tsinghua University Thesis Template] +%<cls>[2021/05/31 7.2.3 Tsinghua University Thesis Template] % \end{macrocode} % % 报错 @@ -1302,7 +1306,7 @@ %<*cls> \hyphenation{Thu-Thesis} \def\thuthesis{ThuThesis} -\def\version{7.2.2} +\def\version{7.2.3} \RequirePackage{kvdefinekeys} \RequirePackage{kvsetkeys} \RequirePackage{kvoptions} @@ -1936,7 +1940,7 @@ \def\thu@list@algorithm@name{算法索引}% \def\thu@acknowledgements@name{致\qquad 谢}% \def\listequationname{公式索引}% - \def\thu@denotation@name{主要符号对照表}% + \def\thu@denotation@name{主要符号表}% \def\thu@resume@name{在学期间参加课题的研究成果}% \else \def\listfigurename{插图清单}% @@ -2223,17 +2227,29 @@ % 但是在 Linux 下没有这两个字体，所以使用它们的克隆版 TeX Gyre Termes 和 % TeX Gyre Heros。 % \begin{macrocode} -\ifthu@font@auto - \ifthu@fontset@windows - \thusetup{font=times} - \else - \ifthu@fontset@mac - \thusetup{font=times} +\newcommand\thu@set@font{% + \@nameuse{thu@set@font@\thu@font}% +} +\thu@option@hook{font}{\thu@set@font} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand\thu@set@font@auto{% + \ifthu@font@auto + \ifthu@fontset@windows + \thusetup{font=times}% \else - \thusetup{font=termes} + \ifthu@fontset@mac + \thusetup{font=times}% + \else + \thusetup{font=termes}% + \fi \fi \fi -\fi +} +\thu@option@hook{math-font}{\g@addto@macro\thu@setup@hook{\thu@set@font@auto}} +\AtBeginOfPackageFile*{siunitx}{\thu@set@font@auto} +\AtEndPreamble{\thu@set@font@auto} % \end{macrocode} % % Times New Roman + Arial @@ -2452,14 +2468,13 @@ BoldItalicFont = *-boldoblique, ]% } +% \end{macrocode} +% +% NewTX +% \begin{macrocode} \newcommand\thu@set@font@newtx{% \RequirePackage{newtxtext}% } -\newcommand\thu@set@font{% - \@nameuse{thu@set@font@\thu@font}% -} -\thu@set@font -\thu@option@hook{font}{\thu@set@font} % \end{macrocode} % % \subsubsection{中文字体} @@ -2993,6 +3008,7 @@ \fi \DeclareRobustCommand\symup[1]{{\mathrm{##1}}}% \DeclareRobustCommand\symbf[1]{{\bm{##1}}}% + \DeclareRobustCommand\symbfsf[1]{{\bm{\mathsf{##1}}}}% \let\increment\upDelta% \renewcommand\thu@qed{\openbox}% } @@ -3317,6 +3333,34 @@ % % 公式距前后文的距离由 4 个参数控制，参见 \cs{normalsize} 的定义。 % +% 中文模板的公式编号使用中文括号。需要修改 \pkg{amsmath} 的 \cs{tagform@}。 +% 这里中文的 \cs{unskip} 是为了“|式~\eqref|”这样的写法不产生额外的空格。 +% \begin{macrocode} +\newcommand\thu@put@parentheses[1]{% + \ifthu@language@chinese + \unskip + （#1）% + \else + (#1)% + \fi +} +% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr)}} +\def\tagform@#1{\maketag@@@{\thu@put@parentheses{\ignorespaces#1\unskip\@@italiccorr}}} +% \end{macrocode} +% +% 重定义 \cs{eqref}，去掉原来的的 \cs{tagform@} 中 \cs{maketag@@@} 的 \cs{hbox} 和 +% \cs{m@th}，防止中文左括号与前面文字的距离过窄。 +% \begin{macrocode} +% \newcommand{\eqref}[1]{\textup{\tagform@{\ref{#1}}}} +\renewcommand{\eqref}[1]{% + \textup{% + \normalfont\thu@put@parentheses{% + \ignorespaces\ref{#1}\unskip\@@italiccorr + }% + }% +} +% \end{macrocode} +% % \subsubsection{浮动对象：插图和表格} % \label{sec:float} % @@ -5038,7 +5082,7 @@ % \subsubsection{主要符号表} % \label{sec:denotationfmt} % \begin{environment}{denotation} -% 主要符号对照表。 +% 主要符号表。 % \begin{macrocode} \newenvironment{denotation}[1][2.5cm]{% \ifthu@degree@bachelor @@ -5355,7 +5399,6 @@ \@namedef{bibstyle@thuthesis-numeric}{\citestyle{super}} \@namedef{bibstyle@thuthesis-author-year}{\citestyle{author-year}} \@namedef{bibstyle@thuthesis-bachelor}{\citestyle{super}} - \@namedef{bibstyle@thuthesis-inline}{\citestyle{inline}} % \end{macrocode} % % 修改引用的样式。 @@ -5793,6 +5836,20 @@ % 所以这里定义 \env{survey} 和 \env{translation} 专门处理这两种情况， % 其中参考文献使用了 \pkg{bibunits} 宏包的功能。 % +% 注意 \pkg{titletoc} 在 2019/07/14 v2.11.1702 修改了 \cs{printcontents} 接口， +% 而且 \cs{@ifpackagelater} 只能用在导言区中，所以需要定义辅助宏。 +% \begin{macrocode} +\@ifpackagelater{titletoc}{2019/07/14}{ + \newcommand\thu@print@contents[5]{% + \printcontents[#1]{#2}{#3}[#4]{}% + } +}{ + \newcommand\thu@print@contents[5]{% + \printcontents[#1]{#2}{#3}{\setcounter{tocdepth}{#4}#5}% + } +} +% \end{macrocode} +% % \begin{environment}{survey} % 外文资料的调研阅读报告。 % \begin{macrocode} @@ -5805,7 +5862,7 @@ \renewcommand\tableofcontents{% \section*{Contents}% \thu@pdfbookmark{1}{Contents}% - \printcontents[survey]{l}{1}[2]{}% + \thu@print@contents{survey}{l}{1}{2}{}% \vskip 20bp% }% \renewcommand\bibname{参考文献}% @@ -5831,11 +5888,23 @@ \thusetup{language = chinese}% \let\title\thu@appendix@title \let\maketitle\thu@appendix@maketitle + \renewenvironment{abstract}{% + \ctexset{ + section = { + format += \centering, + numbering = false, + }, + }% + \section{摘要}% + \quotation + }{% + \endquotation + }% \thu@set@partial@toc@format \renewcommand\tableofcontents{% \section*{目录}% \thu@pdfbookmark{1}{目录}% - \printcontents[translation]{l}{1}[2]{}% + \thu@print@contents{translation}{l}{1}{2}{}% \vskip 20bp% }% \def\bibsection{% @@ -6310,12 +6379,12 @@ % 书脊上方写论文题目，下方写本科生姓名，距上下页边均为 3cm。 % % 研究生： +% 博士论文的书脊使用三号字，硕士的为小三号。 % 示例中上下页边距为 5.5 cm，左右边距为 1 cm。 % \begin{macrocode} \thu@define@key{ spine-font = { name = spine@font, - default = {\sanhao}, }, spine-title = { name = spine@title, @@ -6324,6 +6393,13 @@ name = spine@author, }, } +\renewcommand\thu@spine@font{% + \ifthu@degree@doctor + \fontsize{16bp}{20.8bp}\selectfont + \else + \fontsize{15bp}{19.5bp}\selectfont + \fi +} \newcommand*\CJKmovesymbol[1]{\raise.3em\hbox{#1}} \newcommand*\CJKmove{% \punctstyle{plain}% diff --git a/macros/latex/contrib/thuthesis/thuthesis.pdf b/macros/latex/contrib/thuthesis/thuthesis.pdf Binary files differindex ff10a7f10f..6925a82705 100644 --- a/macros/latex/contrib/thuthesis/thuthesis.pdf +++ b/macros/latex/contrib/thuthesis/thuthesis.pdf diff --git a/macros/latex/contrib/translator/translator-basic-dictionary-Czech.dict b/macros/latex/contrib/translator/translator-basic-dictionary-Czech.dict new file mode 100644 index 0000000000..9e56e9c920 --- /dev/null +++ b/macros/latex/contrib/translator/translator-basic-dictionary-Czech.dict @@ -0,0 +1,87 @@ +\ProvidesDictionary{translator-basic-dictionary}{Czech} + +\providetranslation{Abstract}{Abstrakt} +\providetranslation{Addresses}{Adresy} +\providetranslation{addresses}{adresy} +\providetranslation{Address}{Adresa} +\providetranslation{address}{adresa} +\providetranslation{and}{a} +\providetranslation{Appendix}{Appendix} +\providetranslation{Authors}{Auto\v{r}i} +\providetranslation{authors}{auto\v{r}i} +\providetranslation{Author}{Autor} +\providetranslation{author}{autor} +\providetranslation{Bibliography}{Bibliografie} +\providetranslation{cc}{kopie} +\providetranslation{Chapters}{Kapitoly} +\providetranslation{chapters}{kapitoly} +\providetranslation{Chapter}{Kapitola} +\providetranslation{chapter}{kapitola} +\providetranslation{Conclusion}{Z\'av\v{e}r} +\providetranslation{conclusion}{z\'av\v{e}r} +\providetranslation{Contents}{Obsah} +\providetranslation{Continuation}{Pokra\v{c}ov\'an\'\i} +\providetranslation{continuation}{pokra\v{c}ov\'an\'\i} +\providetranslation{cont}{pokr} +\providetranslation{encl (plural)}{p\v{r}\'\i lohy} +\providetranslation{encl (singular)}{p\v{r}\'\i loha} +\providetranslation{encl}{p\v{r}\'\i loha/y} +\providetranslation{Figures}{Obr\'azky} +\providetranslation{figures}{obr\'azky} +\providetranslation{Figure}{Obr\'azek} +\providetranslation{figure}{obr\'azek} +\providetranslation{From}{Od} % "Z" also possible, depends on the context +\providetranslation{from}{od} +\providetranslation{Glossary}{Slovn\'ik pojm\r{u}} +\providetranslation{Index}{Rejst\v{r}\'\i k} +\providetranslation{Introduction}{\'Uvod} +\providetranslation{introduction}{\'uvod} +\providetranslation{List of Figures and Tables}{Seznam obr\'azk\r{u} a tabulek} +\providetranslation{List of Figures}{Seznam obr\'azk\r{u}} +\providetranslation{List of Tables}{Seznam tabulek} +\providetranslation{or}{nebo} +\providetranslation{Outline}{Osnova} +\providetranslation{Overview}{P\v{r}ehled} +\providetranslation{Pages}{Str\'anky} +\providetranslation{pages}{str\'anky} +\providetranslation{Page}{Str\'anka} +\providetranslation{page}{str\'anka} +\providetranslation{Paragraphs}{Odstavce} +\providetranslation{paragraphs}{odstavce} +\providetranslation{Paragraph}{Odstavec} +\providetranslation{paragraph}{odstavec} +\providetranslation{Parts}{\v{C}\'asti} +\providetranslation{parts}{\v{c}\'asti} +\providetranslation{Part}{\v{C}\'ast} +\providetranslation{part}{\v{c}\'ast} +\providetranslation{Preface}{P\v{r}edmluva} +\providetranslation{Proofs}{D\r{u}kazy} +\providetranslation{proofs}{d\r{u}kazy} +\providetranslation{Proof}{D\r{u}kaz} +\providetranslation{proof}{d\r{u}kaz} +\providetranslation{References}{Literatura} +\providetranslation{Related work}{Souvisejic\'i pr\'ace} % questionable, "P\v{r}\'ibuzn\'e pr\'ace" also possible +\providetranslation{Related Work}{Souvisejic\'i pr\'ace} +\providetranslation{Sections}{Odd\'ily} +\providetranslation{sections}{odd\'ily} +\providetranslation{Section}{Odd\'il} +\providetranslation{section}{odd\'il} +\providetranslation{See also}{Viz tak\'e} +\providetranslation{see also}{viz tak\'e} +\providetranslation{See}{Viz} +\providetranslation{see}{viz} +\providetranslation{Sketch of Proofs}{N\'astin d\r{u}kaz\r{u}} +\providetranslation{Sketch of proofs}{N\'astin d\r{u}kaz\r{u}} +\providetranslation{Sketch of Proof}{N\'astin d\r{u}kazu} +\providetranslation{Sketch of proof}{N\'astin d\r{u}kazu} +\providetranslation{Subsections}{Pododd\'ily} +\providetranslation{subsections}{pododd\'ily} +\providetranslation{Subsection}{Pododd\'il} +\providetranslation{subsection}{pododd\'il} +\providetranslation{Summary}{Shrnut\'i} +\providetranslation{Tables}{Tabulky} +\providetranslation{tables}{tabulky} +\providetranslation{Table}{Tabulka} +\providetranslation{table}{tabulka} +\providetranslation{To}{Do} +\providetranslation{to}{do} diff --git a/macros/latex/contrib/translator/translator-basic-dictionary-Dutch.dict b/macros/latex/contrib/translator/translator-basic-dictionary-Dutch.dict new file mode 100644 index 0000000000..8781bec01b --- /dev/null +++ b/macros/latex/contrib/translator/translator-basic-dictionary-Dutch.dict @@ -0,0 +1,90 @@ +\ProvidesDictionary{translator-basic-dictionary}{Dutch} + +\providetranslation{Abstract}{Samenvatting} +\providetranslation{Addresses}{Adressen} +\providetranslation{addresses}{adressen} +\providetranslation{Address}{Adres} +\providetranslation{address}{adres} +\providetranslation{and}{en} +\providetranslation{Appendix}{Appendix} +\providetranslation{Authors}{Auteurs} +\providetranslation{authors}{auteurs} +\providetranslation{Author}{Auteur} +\providetranslation{author}{auteur} +\providetranslation{Bibliography}{Bibliografie} +\providetranslation{cc}{cc} +\providetranslation{Chapters}{Hoofdstukken} +\providetranslation{chapters}{hoofdstukken} +\providetranslation{Chapter}{Hoofdstuk} +\providetranslation{chapter}{hoofdstuk} +\providetranslation{Conclusion}{Conclusie} +\providetranslation{conclusion}{conclusie} +\providetranslation{Contents}{Inhoudsopgave} +\providetranslation{Continuation}{Vervolg} +\providetranslation{continuation}{vervolg} +\providetranslation{cont}{vervolg} +\providetranslation{encl (plural)}{b\ij lagen} +\providetranslation{encl (singular)}{b\ij lage} +\providetranslation{encl}{b\ij lage(n)} +\providetranslation{Figures}{Figuren} +\providetranslation{figures}{figuren} +\providetranslation{Figure}{Figuur} +\providetranslation{figure}{figuur} +\providetranslation{From}{Van} +\providetranslation{from}{van} +\providetranslation{Glossary}{Woordenl\ij st} +\providetranslation{Index}{Index} +\providetranslation{Introduction}{Inleiding} +\providetranslation{introduction}{inleiding} +\providetranslation{List of Figures and Tables}{Figuren- en Tabellenl\ij st} +\providetranslation{List of Figures}{Figurenl\ij st} +\providetranslation{List of Tables}{Tabellenl\ij st} +\providetranslation{or}{of} +\providetranslation{Outline}{Indeling} +\providetranslation{Overview}{Overzicht} +\providetranslation{Pages}{Pagina's} +\providetranslation{pages}{pagina's} +\providetranslation{Page}{Pagina} +\providetranslation{page}{pagina} +\providetranslation{Paragraphs}{Alinea's} +\providetranslation{paragraphs}{alinea's} +\providetranslation{Paragraph}{Alinea} +\providetranslation{paragraph}{alinea} +\providetranslation{Parts}{Delen} +\providetranslation{parts}{delen} +\providetranslation{Part}{Deel} +\providetranslation{part}{deel} +\providetranslation{Preface}{Voorwoord} +\providetranslation{Proofs}{Bew\ij zen} +\providetranslation{proofs}{bew\ij zen} +\providetranslation{Proof}{Bew\ij s} +\providetranslation{proof}{bew\ij s} +\providetranslation{References}{Referenties} +\providetranslation{Related work}{Verwant werk} +\providetranslation{Related Work}{Verwant Werk} +\providetranslation{Sections}{Paragrafen} +\providetranslation{sections}{paragrafen} +\providetranslation{Section}{Paragraaf} +\providetranslation{section}{paragraaf} +\providetranslation{See also}{Zie ook} +\providetranslation{see also}{zie ook} +\providetranslation{See}{Zie} +\providetranslation{see}{zie} +\providetranslation{Sketch of Proofs}{Bew\ij s\-schetsen} +\providetranslation{Sketch of proofs}{Bew\ij s\-schetsen} +\providetranslation{Sketch of Proof}{Bew\ij s\-schets} +\providetranslation{Sketch of proof}{Bew\ij s\-schets} +\providetranslation{Subsections}{Subparagrafen} +\providetranslation{subsections}{subparagrafen} +\providetranslation{Subsection}{Subparagraaf} +\providetranslation{subsection}{subparagraaf} +\providetranslation{Summary}{Samenvatting} +\providetranslation{Tables}{Tabellen} +\providetranslation{tables}{tabellen} +\providetranslation{Table}{Tabel} +\providetranslation{table}{tabel} +\providetranslation{To}{Naar} +\providetranslation{to}{naar} +\providetranslation{Who?}{Wie?} +\providetranslation{From?}{Waar vandaan?} +\providetranslation{When?}{Wanneer?} diff --git a/macros/latex/contrib/translator/translator-bibliography-dictionary-Czech.dict b/macros/latex/contrib/translator/translator-bibliography-dictionary-Czech.dict new file mode 100644 index 0000000000..d03a0f8403 --- /dev/null +++ b/macros/latex/contrib/translator/translator-bibliography-dictionary-Czech.dict @@ -0,0 +1,21 @@ +\ProvidesDictionary{translator-bibliography-dictionary}{Czech} + +\providetranslation{ed.}{ed.} +\providetranslation{Editions}{Vyd\'an\'i} +\providetranslation{editions}{vyd\'an\'i} +\providetranslation{Edition}{Vyd\'an\'i} +\providetranslation{edition}{vyd\'an\'i} +\providetranslation{Editors}{Edito\v{r}i} % may depend on the context: "Vydavatel\'e" or "Nakladatel\'e" +\providetranslation{editors}{edito\v{r}i} +\providetranslation{Editor}{Editor} +\providetranslation{editor}{editor} +\providetranslation{eds.}{ed.} +\providetranslation{Extended edition}{Roz\v{s}\'i\v{r}en\'e vyd\'an\'i} +\providetranslation{extended edition}{roz\v{s}\'i\v{r}en\'e vyd\'an\'i} +\providetranslation{in (bibliography)}{v} +\providetranslation{In (bibliography)}{V} +\providetranslation{Tech. Rep.}{Tech.\ zpr\'ava} +\providetranslation{Technical Reports}{Technick\'e zpr\'avy} +\providetranslation{technical reports}{technick\'e zpr\'avy} +\providetranslation{Technical Report}{Technick\'a zpr\'ava} +\providetranslation{technical report}{technick\'a zpr\'ava} diff --git a/macros/latex/contrib/translator/translator-bibliography-dictionary-Dutch.dict b/macros/latex/contrib/translator/translator-bibliography-dictionary-Dutch.dict new file mode 100644 index 0000000000..035bac6014 --- /dev/null +++ b/macros/latex/contrib/translator/translator-bibliography-dictionary-Dutch.dict @@ -0,0 +1,21 @@ +\ProvidesDictionary{translator-bibliography-dictionary}{Dutch} + +\providetranslation{ed.}{ed.} +\providetranslation{Editions}{Uitgaven} +\providetranslation{editions}{uitgaven} +\providetranslation{Edition}{Uitgave} +\providetranslation{edition}{uitgave} +\providetranslation{Editors}{Redacteuren} +\providetranslation{editors}{redacteuren} +\providetranslation{Editor}{Redacteur} +\providetranslation{editor}{redacteur} +\providetranslation{eds.}{eds.} +\providetranslation{Extended edition}{Uitgebreide uitgave} +\providetranslation{extended edition}{uitgebreide uitgave} +\providetranslation{in (bibliography)}{in} +\providetranslation{In (bibliography)}{In} +\providetranslation{Tech. Rep.}{Tech.\ Rap.} +\providetranslation{Technical Reports}{Technische Rapporten} +\providetranslation{technical reports}{technische rapporten} +\providetranslation{Technical Report}{Technisch Rapport} +\providetranslation{technical report}{technisch rapport} diff --git a/macros/latex/contrib/translator/translator-environment-dictionary-Czech.dict b/macros/latex/contrib/translator/translator-environment-dictionary-Czech.dict new file mode 100644 index 0000000000..66d500a34b --- /dev/null +++ b/macros/latex/contrib/translator/translator-environment-dictionary-Czech.dict @@ -0,0 +1,10 @@ +\ProvidesDictionary{translator-environment-dictionary}{Czech} + +\providetranslation{advantage}{v\'yhoda} +\providetranslation{Advantage}{V\'yhoda} +\providetranslation{advantages}{v\'yhody} +\providetranslation{Advantages}{V\'yhody} +\providetranslation{disadvantage}{nev\'yhoda} +\providetranslation{Disadvantage}{Nev\'yhoda} +\providetranslation{disadvantages}{nev\'yhody} +\providetranslation{Disadvantages}{Nev\'yhody} diff --git a/macros/latex/contrib/translator/translator-environment-dictionary-Dutch.dict b/macros/latex/contrib/translator/translator-environment-dictionary-Dutch.dict new file mode 100644 index 0000000000..39172cdb14 --- /dev/null +++ b/macros/latex/contrib/translator/translator-environment-dictionary-Dutch.dict @@ -0,0 +1,10 @@ +\ProvidesDictionary{translator-environment-dictionary}{Dutch} + +\providetranslation{advantage}{voordeel} +\providetranslation{Advantage}{Voordeel} +\providetranslation{advantages}{voordelen} +\providetranslation{Advantages}{Voordelen} +\providetranslation{disadvantage}{nadeel} +\providetranslation{Disadvantage}{Nadeel} +\providetranslation{disadvantages}{nadelen} +\providetranslation{Disadvantages}{Nadelen} diff --git a/macros/latex/contrib/translator/translator-months-dictionary-Czech.dict b/macros/latex/contrib/translator/translator-months-dictionary-Czech.dict new file mode 100644 index 0000000000..94d2d6dc22 --- /dev/null +++ b/macros/latex/contrib/translator/translator-months-dictionary-Czech.dict @@ -0,0 +1,43 @@ +\ProvidesDictionary{translator-month-dictionary}{Czech} + +\providetranslation{January}{leden} +\providetranslation{February}{\'unor} +\providetranslation{March}{b\v{r}ezen} +\providetranslation{April}{duben} +\providetranslation{May}{kv\v{e}ten} +\providetranslation{June}{\v{c}erven} +\providetranslation{July}{\v{c}ervenec} +\providetranslation{August}{srpen} +\providetranslation{September}{z\'a\v{r}\'i} +\providetranslation{October}{\v{r}\'ijen} +\providetranslation{November}{listopad} +\providetranslation{December}{prosinec} + +\providetranslation{Jan}{led} +\providetranslation{Feb}{\'uno} +\providetranslation{Mar}{b\v{r}e} +\providetranslation{Apr}{dub} +\providetranslation{May}{kv\v{e}} +\providetranslation{Jun}{\v{c}vn} +\providetranslation{Jul}{\v{c}vc} +\providetranslation{Aug}{srp} +\providetranslation{Sep}{z\'a\v{r}} +\providetranslation{Oct}{\v{r}\'\i j} +\providetranslation{Nov}{lis} +\providetranslation{Dec}{pro} + +\providetranslation{Monday}{pond\v{e}l\'\i} +\providetranslation{Tuesday}{\'uter\'y} +\providetranslation{Wednesday}{st\v{r}eda} +\providetranslation{Thursday}{\v{c}tvrtek} +\providetranslation{Friday}{p\'atek} +\providetranslation{Saturday}{sobota} +\providetranslation{Sunday}{ned\v{e}le} + +\providetranslation{Mon}{po} +\providetranslation{Tue}{\'ut} +\providetranslation{Wed}{st} +\providetranslation{Thu}{\v{c}t} +\providetranslation{Fri}{p\'a} +\providetranslation{Sat}{so} +\providetranslation{Sun}{ne} diff --git a/macros/latex/contrib/translator/translator-months-dictionary-Dutch.dict b/macros/latex/contrib/translator/translator-months-dictionary-Dutch.dict new file mode 100644 index 0000000000..d53c504593 --- /dev/null +++ b/macros/latex/contrib/translator/translator-months-dictionary-Dutch.dict @@ -0,0 +1,43 @@ +\ProvidesDictionary{translator-months-dictionary}{Dutch} + +\providetranslation{January}{januari} +\providetranslation{February}{februari} +\providetranslation{March}{maart} +\providetranslation{April}{april} +\providetranslation{May}{mei} +\providetranslation{June}{juni} +\providetranslation{July}{juli} +\providetranslation{August}{augustus} +\providetranslation{September}{september} +\providetranslation{October}{oktober} +\providetranslation{November}{november} +\providetranslation{December}{december} + +\providetranslation{Jan}{jan} +\providetranslation{Feb}{feb} +\providetranslation{Mar}{mrt} +\providetranslation{Apr}{apr} +\providetranslation{May}{mei} +\providetranslation{Jun}{jun} +\providetranslation{Jul}{jul} +\providetranslation{Aug}{aug} +\providetranslation{Sep}{sep} +\providetranslation{Oct}{okt} +\providetranslation{Nov}{nov} +\providetranslation{Dec}{dec} + +\providetranslation{Monday}{maandag} +\providetranslation{Tuesday}{dinsdag} +\providetranslation{Wednesday}{woensdag} +\providetranslation{Thursday}{donderdag} +\providetranslation{Friday}{vr\ij dag} +\providetranslation{Saturday}{zaterdag} +\providetranslation{Sunday}{zondag} + +\providetranslation{Mon}{ma} +\providetranslation{Tue}{di} +\providetranslation{Wed}{wo} +\providetranslation{Thu}{do} +\providetranslation{Fri}{vr} +\providetranslation{Sat}{za} +\providetranslation{Sun}{zo} diff --git a/macros/latex/contrib/translator/translator-numbers-dictionary-Czech.dict b/macros/latex/contrib/translator/translator-numbers-dictionary-Czech.dict new file mode 100644 index 0000000000..19d42485e6 --- /dev/null +++ b/macros/latex/contrib/translator/translator-numbers-dictionary-Czech.dict @@ -0,0 +1,53 @@ +\ProvidesDictionary{translator-numbers-dictionary}{Czech} + +\providetranslation{one}{jedna} +\providetranslation{two}{dv\v{e}} +\providetranslation{three}{t\v{r}i} +\providetranslation{four}{\v{c}ty\v{r}i} +\providetranslation{five}{p\v{e}t} +\providetranslation{six}{\v{s}est} +\providetranslation{seven}{sedm} +\providetranslation{eight}{osm} +\providetranslation{nine}{dev\v{e}t} +\providetranslation{ten}{deset} +\providetranslation{eleven}{jeden\'act} +\providetranslation{twelve}{dvan\'act} + +\providetranslation{One}{Jedna} +\providetranslation{Two}{Dv\v{e}} +\providetranslation{Three}{T\v{r}i} +\providetranslation{Four}{\v{C}ty\v{r}i} +\providetranslation{Five}{P\v{e}t} +\providetranslation{Six}{\v{S}est} +\providetranslation{Seven}{Sedm} +\providetranslation{Eight}{Osm} +\providetranslation{Nine}{Dev\v{e}t} +\providetranslation{Ten}{Deset} +\providetranslation{Eleven}{Jeden\'act} +\providetranslation{Twelve}{Dvan\'act} + +\providetranslation{first}{prvn\'i} +\providetranslation{second}{druh\'y} +\providetranslation{third}{t\v{r}et\'i} +\providetranslation{fourth}{\v{c}tvrt\'y} +\providetranslation{fifth}{p\'at\'y} +\providetranslation{sixth}{\v{s}est\'y} +\providetranslation{seventh}{sedm\'y} +\providetranslation{eight}{osm\'y} +\providetranslation{ninth}{dev\'at\'y} +\providetranslation{tenth}{des\'at\'y} +\providetranslation{eleventh}{jeden\'act\'y} +\providetranslation{twelfth}{dvan\'act\'y} + +\providetranslation{1st}{1.} +\providetranslation{2nd}{2.} +\providetranslation{3rd}{3.} +\providetranslation{4th}{4.} +\providetranslation{5th}{5.} +\providetranslation{6th}{6.} +\providetranslation{7th}{7.} +\providetranslation{8th}{8.} +\providetranslation{9th}{9.} +\providetranslation{10th}{10.} +\providetranslation{11th}{11.} +\providetranslation{12th}{12.} diff --git a/macros/latex/contrib/translator/translator-numbers-dictionary-Dutch.dict b/macros/latex/contrib/translator/translator-numbers-dictionary-Dutch.dict new file mode 100644 index 0000000000..f2316aaf27 --- /dev/null +++ b/macros/latex/contrib/translator/translator-numbers-dictionary-Dutch.dict @@ -0,0 +1,53 @@ +\ProvidesDictionary{translator-numbers-dictionary}{Dutch} + +\providetranslation{one}{een} +\providetranslation{two}{twee} +\providetranslation{three}{drie} +\providetranslation{four}{vier} +\providetranslation{five}{v\ij f} +\providetranslation{six}{zes} +\providetranslation{seven}{zeven} +\providetranslation{eight}{acht} +\providetranslation{nine}{negen} +\providetranslation{ten}{tien} +\providetranslation{eleven}{elf} +\providetranslation{twelve}{twaalf} + +\providetranslation{One}{Een} +\providetranslation{Two}{Twee} +\providetranslation{Three}{Drie} +\providetranslation{Four}{Vier} +\providetranslation{Five}{V\ij f} +\providetranslation{Six}{Zes} +\providetranslation{Seven}{Zeven} +\providetranslation{Eight}{Acht} +\providetranslation{Nine}{Negen} +\providetranslation{Ten}{Tien} +\providetranslation{Eleven}{Elf} +\providetranslation{Twelve}{Twaalf} + +\providetranslation{first}{eerste} +\providetranslation{second}{tweede} +\providetranslation{third}{derde} +\providetranslation{fourth}{vierde} +\providetranslation{fifth}{v\ij fde} +\providetranslation{sixth}{zesde} +\providetranslation{seventh}{zevende} +\providetranslation{eighth}{achtste} +\providetranslation{ninth}{negende} +\providetranslation{tenth}{tiende} +\providetranslation{eleventh}{elfde} +\providetranslation{twelfth}{twaalfde} + +\providetranslation{1st}{1ste} +\providetranslation{2nd}{2de} +\providetranslation{3rd}{3de} +\providetranslation{4th}{4de} +\providetranslation{5th}{5de} +\providetranslation{6th}{6de} +\providetranslation{7th}{7de} +\providetranslation{8th}{8ste} +\providetranslation{9th}{9de} +\providetranslation{10th}{10de} +\providetranslation{11th}{11de} +\providetranslation{12th}{12de} diff --git a/macros/latex/contrib/translator/translator-theorem-dictionary-Czech.dict b/macros/latex/contrib/translator/translator-theorem-dictionary-Czech.dict new file mode 100644 index 0000000000..ed843eb60a --- /dev/null +++ b/macros/latex/contrib/translator/translator-theorem-dictionary-Czech.dict @@ -0,0 +1,82 @@ +\ProvidesDictionary{translator-theorem-dictionary}{Czech} + +\providetranslation{Comments}{Koment\'a\v{r}e} +\providetranslation{comments}{koment\'a\v{r}e} +\providetranslation{Comment}{Koment\'a\v{r}} +\providetranslation{comment}{koment\'a\v{r}} +\providetranslation{Corollaries}{D\r{u}sledky} +\providetranslation{corollaries}{d\r{u}sledky} +\providetranslation{Corollary}{D\r{u}sledek} +\providetranslation{corollary}{d\r{u}sledek} +\providetranslation{Definitions}{Definice} +\providetranslation{definitions}{definice} +\providetranslation{Definition}{Definice} +\providetranslation{definition}{definice} +\providetranslation{Examples}{P\v{r}\'iklady} +\providetranslation{examples}{p\v{r}\'iklady} +\providetranslation{Example}{P\v{r}\'iklad} +\providetranslation{example}{p\v{r}\'iklad} +\providetranslation{Exercises}{Cvi\v{c}en\'i} +\providetranslation{exercises}{cvi\v{c}en\'i} +\providetranslation{Exercise}{Cvi\v{c}en\'i} +\providetranslation{exercise}{cvi\v{c}en\'i} +\providetranslation{Facts}{Fakta} +\providetranslation{facts}{fakta} +\providetranslation{Fact}{Fakt} +\providetranslation{fact}{fakt} +\providetranslation{Key Lemmas}{Kl\'i\v{c}ov\'a lemmata} +\providetranslation{key lemmas}{kl\'i\v{c}ov\'a lemmata} +\providetranslation{Key Lemma}{Kl\'i\v{c}ov\'e lemma} +\providetranslation{key lemma}{kl\'i\v{c}ov\'e lemma} +\providetranslation{Key Observations}{Kl\'i\v{c}ov\'a pozorov\'an\'i} +\providetranslation{key observations}{kl\'i\v{c}ov\'a pozorov\'an\'i} +\providetranslation{Key Observation}{Kl\'i\v{c}ov\'e pozorov\'an\'i} +\providetranslation{key observation}{kl\'i\v{c}ov\'e pozorov\'an\'i} +\providetranslation{Lemmas}{Lemmata} +\providetranslation{lemmas}{lemmata} +\providetranslation{Lemma}{Lemma} +\providetranslation{lemma}{Lemma} +\providetranslation{Main Theorems}{Hlavn\'i v\v{e}ty} +\providetranslation{main theorems}{hlavn\'i v\v{e}ty} +\providetranslation{Main Theorem}{Hlavn\'i v\v{e}ta} +\providetranslation{main theorem}{hlavn\'i v\v{e}ta} +\providetranslation{Observations}{Pozorov\'an\'i} +\providetranslation{observations}{pozorov\'an\'i} +\providetranslation{Observation}{Pozorov\'an\'i} +\providetranslation{observation}{pozorov\'an\'i} +\providetranslation{Problems}{Probl\'emy} +\providetranslation{problems}{probl\'emy} +\providetranslation{Problem}{Probl\'em} +\providetranslation{problem}{probl\'em} +\providetranslation{Proofs}{D\r{u}kazy} +\providetranslation{proofs}{d\r{u}kazy} +\providetranslation{Proof}{D\r{u}kaz} +\providetranslation{proof}{d\r{u}kaz} +\providetranslation{Proof Sketch}{N\'astin d\r{u}kazu} % this translation is questionable and also it is not entirely clear wheter there should be small "d" +\providetranslation{Proof sketch}{N\'astin d\r{u}kazu} +\providetranslation{proof sketch}{n\'astin d\r{u}kazu} +\providetranslation{Proof Sketches}{N\'astiny d\r{u}kaz\r{u}} +\providetranslation{Proof sketches}{N\'astiny d\r{u}kaz\r{u}} +\providetranslation{proof sketches}{n\'astiny d\r{u}kaz\r{u}} +\providetranslation{Sketch of Proof}{N\'astin d\r{u}kazu} % also questionable +\providetranslation{Sketch of Proofs}{N\'astin d\r{u}kaz\r{u}} +\providetranslation{Sketch of proof}{N\'astin d\r{u}kazu} +\providetranslation{Sketch of proofs}{N\'astin d\r{u}kaz\r{u}} +\providetranslation{sketch of proof}{n\'astin d\r{u}kazu} +\providetranslation{sketch of proofs}{N\'astin d\r{u}kaz\r{u}} +\providetranslation{Propositions}{Tvrzen\'i} +\providetranslation{propositions}{tvrzen\'i} +\providetranslation{Proposition}{Tvrzen\'i} +\providetranslation{proposition}{tvrzen\'i} +\providetranslation{Remarks}{Pozn\'amky} +\providetranslation{remarks}{pozn\'amky} +\providetranslation{Remark}{Pozn\'amka} +\providetranslation{remark}{pozn\'amka} +\providetranslation{Solutions}{\v{R}e\v{s}en\'i} +\providetranslation{solutions}{\v{r}e\v{s}en\'i} +\providetranslation{Solution}{\v{R}e\v{s}en\'i} +\providetranslation{solution}{\v{r}e\v{s}en\'i} +\providetranslation{Theorems}{V\v{e}ty} +\providetranslation{theorems}{v\v{e}ty} +\providetranslation{Theorem}{V\v{e}ta} +\providetranslation{theorem}{v\v{e}ta} diff --git a/macros/latex/contrib/translator/translator-theorem-dictionary-Dutch.dict b/macros/latex/contrib/translator/translator-theorem-dictionary-Dutch.dict new file mode 100644 index 0000000000..719bc910fc --- /dev/null +++ b/macros/latex/contrib/translator/translator-theorem-dictionary-Dutch.dict @@ -0,0 +1,82 @@ +\ProvidesDictionary{translator-theorem-dictionary}{Dutch} + +\providetranslation{Comments}{Commentaar} +\providetranslation{comments}{commentaar} +\providetranslation{Comment}{Commentaar} +\providetranslation{comment}{commentaar} +\providetranslation{Corollaries}{Gevolgen} +\providetranslation{corollaries}{gevolgen} +\providetranslation{Corollary}{Gevolg} +\providetranslation{corollary}{gevolg} +\providetranslation{Definitions}{Definities} +\providetranslation{definitions}{definities} +\providetranslation{Definition}{Definitie} +\providetranslation{definition}{definitie} +\providetranslation{Examples}{Voorbeelden} +\providetranslation{examples}{voorbeelden} +\providetranslation{Example}{Voorbeeld} +\providetranslation{example}{voorbeeld} +\providetranslation{Exercises}{Opgaven} +\providetranslation{exercises}{opgaven} +\providetranslation{Exercise}{Opgave} +\providetranslation{exercise}{opgave} +\providetranslation{Facts}{Feiten} +\providetranslation{facts}{feiten} +\providetranslation{Fact}{Feit} +\providetranslation{fact}{feit} +\providetranslation{Key Lemmas}{Sleutel\-lemma's} +\providetranslation{key lemmas}{sleutel\-lemma's} +\providetranslation{Key Lemma}{Sleutel\-lemma} +\providetranslation{key lemma}{sleutel\-lemma} +\providetranslation{Key Observations}{Sleutel\-observaties} +\providetranslation{key observations}{sleutel\-observaties} +\providetranslation{Key Observation}{Sleutel\-observatie} +\providetranslation{key observation}{sleutel\-observatie} +\providetranslation{Lemmas}{Lemma's} +\providetranslation{lemmas}{lemma's} +\providetranslation{Lemma}{Lemma} +\providetranslation{lemma}{lemma} +\providetranslation{Main Theorems}{Hoofd\-stellingen} +\providetranslation{main theorems}{hoofd\-stellingen} +\providetranslation{Main Theorem}{Hoofd\-stelling} +\providetranslation{main theorem}{hoofd\-stelling} +\providetranslation{Observations}{Observaties} +\providetranslation{observations}{observaties} +\providetranslation{Observation}{Observatie} +\providetranslation{observation}{observatie} +\providetranslation{Problems}{Problemen} +\providetranslation{problems}{problemen} +\providetranslation{Problem}{Probleem} +\providetranslation{problem}{probleem} +\providetranslation{Proofs}{Bew\ij zen} +\providetranslation{proofs}{bew\ij zen} +\providetranslation{Proof}{Bew\ij s} +\providetranslation{proof}{bew\ij s} +\providetranslation{Proof Sketch}{Bew\ij s\-schets} +\providetranslation{Proof sketch}{Bew\ij s\-schets} +\providetranslation{proof sketch}{bew\ij s\-schets} +\providetranslation{Proof Sketches}{Bew\ij s\-schetsen} +\providetranslation{Proof sketches}{Bew\ij s\-schetsen} +\providetranslation{proof sketches}{bew\ij s\-schetsen} +\providetranslation{Sketch of Proof}{Bew\ij s\-schets} +\providetranslation{Sketch of Proofs}{Bew\ij s\-schetsen} +\providetranslation{Sketch of proof}{Bew\ij s\-schets} +\providetranslation{Sketch of proofs}{Bew\ij s\-schetsen} +\providetranslation{sketch of proof}{bew\ij s\-schets} +\providetranslation{sketch of proofs}{bew\ij s\-schetsen} +\providetranslation{Propositions}{Proposities} +\providetranslation{propositions}{proposities} +\providetranslation{Proposition}{Propositie} +\providetranslation{proposition}{propositie} +\providetranslation{Remarks}{Opmerkingen} +\providetranslation{remarks}{opmerkingen} +\providetranslation{Remark}{Opmerking} +\providetranslation{remark}{opmerking} +\providetranslation{Solutions}{Oplossingen} +\providetranslation{solutions}{oplossingen} +\providetranslation{Solution}{Oplossing} +\providetranslation{solution}{oplossing} +\providetranslation{Theorems}{Stellingen} +\providetranslation{theorems}{stellingen} +\providetranslation{Theorem}{Stelling} +\providetranslation{theorem}{stelling} diff --git a/macros/latex/contrib/translator/translator.pdf b/macros/latex/contrib/translator/translator.pdf Binary files differindex 4a174bbfe2..61098839d5 100644 --- a/macros/latex/contrib/translator/translator.pdf +++ b/macros/latex/contrib/translator/translator.pdf diff --git a/macros/latex/contrib/translator/translator.sty b/macros/latex/contrib/translator/translator.sty index e87dc2b2bd..182ff2163e 100644 --- a/macros/latex/contrib/translator/translator.sty +++ b/macros/latex/contrib/translator/translator.sty @@ -1,7 +1,7 @@ % Copyright 2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2105 by Vedran Mileti\'c, Joseph Wright -% Copyright 2017-2020 Joseph Wright +% Copyright 2017-2021 Joseph Wright % % This file may be distributed and/or modified % @@ -11,7 +11,7 @@ % See the documentation file for more details. \ProvidesPackage{translator} - [2020-08-03 v1.12c Easy translation of strings in LaTeX] + [2021-05-31 v1.12d Easy translation of strings in LaTeX] \RequirePackage{keyval} |