diff options
author | Norbert Preining <norbert@preining.info> | 2021-05-19 03:01:49 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-05-19 03:01:49 +0000 |
commit | 94c996b5f40175b4a858ddd1f19e3947198b9bd0 (patch) | |
tree | 3ab5124a874983f13f00d3c7d8e29842cca36933 /macros/latex/contrib | |
parent | 97eca13a92a0b8ad423b606c8970c9ce64d9b2bf (diff) |
CTAN sync 202105190301
Diffstat (limited to 'macros/latex/contrib')
81 files changed, 1797 insertions, 411 deletions
diff --git a/macros/latex/contrib/apa7/apa7.dtx b/macros/latex/contrib/apa7/apa7.dtx index 10da0cabda..27abc04e06 100644 --- a/macros/latex/contrib/apa7/apa7.dtx +++ b/macros/latex/contrib/apa7/apa7.dtx @@ -4,11 +4,11 @@ % % % CHANGE THESE VALUES WITH EACH NEW RELEASE: % % % -%<class>\ProvidesClass{apa7}[2021/04/08 v2.12 APA formatting (7th edition)] +%<class>\ProvidesClass{apa7}[2021/05/17 v2.13 APA formatting (7th edition)] % % %<*internal> % -\def\apaSevenVersionDate{2021/04/08} -\def\apaSevenVersionNumber{2.12} +\def\apaSevenVersionDate{2021/05/17} +\def\apaSevenVersionNumber{2.13} % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -273,6 +273,8 @@ and the derived files apa7.ins, % % \changes{v2.12}{2021/04/08}{Reset equation counter for every appendix (like for figures and tables). Thanks mmrabe. } % +% \changes{v2.13}{2021/05/17}{Fix headers for jou style when journal command is provided. } +% % \begin{abstract} % The \textit{Publication Manual} of the American Psychological % Association is widely used in the social sciences. The most @@ -1941,7 +1943,7 @@ and the derived files apa7.ins, \long\def\keywords#1{\long\def\@keywords{#1}} %\long\def\acknowledgements#1{\long\def\@acks{#1}} \long\def\authornote#1{\long\def\@acks{#1}} -\def\journal#1{\RequirePackage{fancyhdr}\def\@journal{#1}} +\def\journal#1{\def\@journal{#1}} \def\volume#1{\def\@vvolume{#1}} \def\ccoppy#1{\def\@ccoppy{#1}} \def\copnum#1{\def\@copnum{#1}} @@ -2777,6 +2779,8 @@ and the derived files apa7.ins, \@ifundefined{def@jou}{}{% +\RequirePackage{fancyhdr} + \renewcommand{\addORCIDlink}[2]{\href{https://orcid.org/#2}{{\mbox{\scalerel*{ \begin{tikzpicture}[yscale=-1,transform shape] \pic{orcidlogo}; @@ -2846,28 +2850,22 @@ and the derived files apa7.ins, } \end{center} ] % end of \twocolumn[] + + \renewcommand{\headrulewidth}{0pt}% \pagenumbering{arabic} \@ifundefined{@journal}{\thispagestyle{empty}}{% \@ifundefined{@vvolume}{\def\@vvolume{\strut}}{}% \@ifundefined{@copnum}{\def\@copnum{\strut}}{}% \@ifundefined{@ccoppy}{\def\@ccoppy{\strut}}{}% - \fancyhead{} - \fancyhead[LO]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\ - \stiny{\@vvolume}} - \fancyhead[RO]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\ - \stiny{\@copnum}} - \fancyfoot[CO]{\small\rm\thepage} - % the following are needed if the starting page number is changed to - % an even number: - \fancyhead[LE]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\ - \stiny{\@vvolume}} - \fancyhead[RE]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\ - \stiny{\@copnum}} - \fancyfoot[CE]{\small\rm\thepage} - \renewcommand{\headrulewidth}{0pt} - \renewcommand{\footrulewidth}{0pt} - \thispagestyle{fancy} + \fancypagestyle{pageone}{% + \fancyhf{}% + \fancyhead[L]{\stiny{\@journal}\vspace{-0.15\baselineskip}\\ + \stiny{\@vvolume}}% + \fancyhead[R]{\stiny{\@ccoppy}\vspace{-0.15\baselineskip}\\ + \stiny{\@copnum}}% + } + \thispagestyle{pageone} } \@ifundefined{apaSeven@maskauthoridentity}{% BDB @@ -2881,11 +2879,6 @@ and the derived files apa7.ins, }{% mask author identity -- show nothing in the author note space } - \@ifundefined{apaSeven@maskauthoridentity}{% BDB - \markboth{\hfill\r@headl\hfill}{\hfill\r@headr\hfill} - }{% mask author identity -- show the short title for both the left and right headers - \markboth{\hfill\r@headr\hfill}{\hfill\r@headr\hfill} - } \@ifundefined{no@tab}{\let\tabular\apaSeventabular}{} %\noindent } @@ -2912,16 +2905,25 @@ and the derived files apa7.ins, \setcounter{secnumdepth}{0} -\def\ps@myheadings{% - \let\@mkboth\@gobbletwo - \def\@oddhead{\hbox{}\rightmark \hfil\rm\thepage} - \def\@oddfoot{} - \def\@evenhead{\rm\thepage\hfil\leftmark\hbox{}} - \def\@evenfoot{} + \fancypagestyle{journalbase}{% + \fancyhf{}% + \fancyhead[LE]{\thepage}% + \fancyhead[RO]{\thepage}% + \fancyhead[CO]{\r@headr}% \def\sectionmark##1{} \def\subsectionmark##1{} } -\pagestyle{myheadings} + +\@ifundefined{apaSeven@maskauthoridentity}{% BDB + \fancypagestyle{journal}[journalbase]{% + \fancyhead[CE]{\r@headl}% + } +}{% mask author identity -- show the short title for both the left and right headers + \fancypagestyle{journal}[journalbase]{% + \fancyhead[CE]{\r@headr}% + } + } + \pagestyle{journal} %\long\def\@makecaption#1#2{% % \let\BBAB\table@BBAB % thp 2005/07/23 diff --git a/macros/latex/contrib/apa7/apa7.pdf b/macros/latex/contrib/apa7/apa7.pdf Binary files differindex 710740e416..593afa5e20 100644 --- a/macros/latex/contrib/apa7/apa7.pdf +++ b/macros/latex/contrib/apa7/apa7.pdf diff --git a/macros/latex/contrib/apa7/samples/longsample.pdf b/macros/latex/contrib/apa7/samples/longsample.pdf Binary files differindex 1fe1ad8736..2c1ddfa313 100644 --- a/macros/latex/contrib/apa7/samples/longsample.pdf +++ b/macros/latex/contrib/apa7/samples/longsample.pdf diff --git a/macros/latex/contrib/apa7/samples/shortsample.pdf b/macros/latex/contrib/apa7/samples/shortsample.pdf Binary files differindex 10623740d3..0fbe41f67c 100644 --- a/macros/latex/contrib/apa7/samples/shortsample.pdf +++ b/macros/latex/contrib/apa7/samples/shortsample.pdf diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 8d861d4773..81f9679ad5 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -23,12 +23,11 @@ % % \changes{v1.20}{2021/01/09}{修改和完善用户文档。} % \changes{v1.20}{2021/01/09}{模板更改为使用 CC-BY 许可协议。} -% \changes{v1.23}{2021/03/19}{修复在 \pkg{ctex} v2.5.6 更新后 \cls{easybook} 与 \pkg{hyperref} 冲突问题。} -% \changes{v1.25k}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。} +% \changes{v1.25l}{2021/05/03}{取消附带的示例文件,可查看历史版本及其它来源的使用样例。} % % \title{\sffamily easybook 文档类手册} % \author{瞿毅} -% \date{2021/05/17\hskip\ccwd\relax v1.25k\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/05/18\hskip\ccwd\relax v1.25l\thanks{\url{https://gitee.com/texl3/easybook}}} % % \maketitle % \begin{abstract} @@ -118,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.25k}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。} +% \changes{v1.25l}{2021/05/04}{修复使用 \pkg{xeCJK} 与 \pkg{fontspec} 宏包的字体设置命令在 \hologo{LuaLaTeX} 下失效的问题。} % \end{function} % % \begin{function}[rEXP,added = 2021-01-05,updated = 2021-01-13]{paper} @@ -169,7 +168,7 @@ % \tn{listoflistings*+}\oarg{键值列表} % \end{syntax} % \tn{listoffigures} 命令输出图片目录,\tn{listoftables} 输出表格目录,\tn{listoflistings} 输出代码目录。带有星号的目录命令不将标题添加进主文档目录,带有+号的目录命令可以使当前标题编号。\tn{tableofcontents+} 与其它命令不同是用于输出双语目录,需要与双语目录标题命令 \tn{bichapter} 等或设置图片、表格和代码等英文目录的标题配合使用,附加代码是中文与英文目录之间的代码,可以插入文本和换页命令等。目录的键值列表选项如下 -% \changes{v1.25k}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。} +% \changes{v1.25l}{2021/05/05}{命令 \tn{tableofcontents} 可以输出双语目录。} % \end{function} % % \begin{function}{multoc,title,format,aftertitle,pagestyle,book,article} @@ -200,7 +199,7 @@ % 双语目录的标题命令目前设置了常用的三个级别,它们将中文标题正常输出,并使中英文标题加入双语目录,这个功能是为国内一些大学的学位论文模板的要求设计,在一般情况和英文模式下不需要使用。 % % 它们的星号变体命令使文中标题不编号,但是仍然加入双语目录,若英文标题参数空置那么仅加入中文目录而不加入英文目录,这一特点与 \tn{chapter*} 等命令的行为不太一样,在一些情况下会用到。可选参数是目录中的中文标题,默认与中文标题一致,正文标题过长时可用它设置在目录中显示的标题。双语目录的格式是一致的,共享使用 \tn{tocset} 的设置,英文目录的章级别标题名及编号的修改方式如下 -% \changes{v1.25k}{2021/05/05}{增加与双语目录配合的标题命令。} +% \changes{v1.25l}{2021/05/05}{增加与双语目录配合的标题命令。} % \end{function} % % \begin{function}{biname,binmuber} @@ -300,8 +299,9 @@ % \ding{229} 以上选项路径为 \opt{refset/...} \\ % \opt{refset} 将超链接选项(包括以上选项)交给 \pkg{hyperref} 处理,除了一些关于 pdf 书签的选项可能会失效,其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。 % \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.25k}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。} +% \changes{v1.25l}{2021/05/06}{模块名 \opt{link} 改为 \opt{refset},\opt{link} 作为兼容性保留。} % \end{function} % % \begin{optdesc} @@ -380,7 +380,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.25k}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。} +% \changes{v1.25l}{2021/05/12}{取消 \opt{bib-loadpkg} 选项,由是否设置参考文献数据库来决定载入宏包。} % \end{function} % % \begin{optdesc} @@ -526,7 +526,7 @@ % footnoterule = <脚注横线格式> % \end{syntax} % \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{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{headrule}、\opt{footrule} 和 \opt{footnoterule} 三个横线选项一般可以使用 \tn{hrule} width \meta{长度} height \meta{高度} 命令来绘制,脚注横线默认为空。当然,手动绘制横线时线条粗细选项 \opt{style/rulewidth} 会失效。 % \changes{v1.21}{2021/01/11}{修复单面文档时页眉横线消失的问题。} @@ -574,7 +574,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{elsefont/footnote} 的设置,最后一个格式命令可以带有一个参数,这个参数接受脚注编号,一般配合 \opt{fnmark-num = plain} 使用。\opt{afterfnmark} 是脚注标记后的代码,一般用于设置标记与文本间的距离。 -% \changes{v1.25k}{2021/05/12}{增加脚注样式设置选项。} +% \changes{v1.25l}{2021/05/12}{增加脚注样式设置选项。} % \end{function} % % \subsection{目录样式} @@ -593,7 +593,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.25k}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。} +% \changes{v1.25l}{2021/05/14}{可以分别设置图片、表格和代码目录的格式。} % \end{function} % % \begin{function}[added = 2021-01-13,updated = 2021-04-20]{\tocrule,\EbNumberline} @@ -603,7 +603,7 @@ % \end{syntax} % \tn{tocrule} 命令生成目录引导线,需要在 \opt{rule} 选项中使用。带有星号的命令会使当前级别的目录引导线右边与页码连接而不是对齐。引导点间距需带有长度单位,引导点大小不带单位,为引导点符号正常大小的倍数,引导点一般为英文句号或 \tn{cdot} 中心点符号。页码格式的内容位于页码前面,可以设置页码字体、距离。 % -% \tn{EbNumberline} 命令类似 \CTeX 的 \tn{CTEXnumberline} 命令,用于 \opt{tocline} 选项中设置目录标签的编号。区别是它需要在 \opt{tocset/hang = false} 时使用,否则目录中无法显示标题编号,使用它的时候 \opt{numsep} 选项仍然有效。\meta{编号类型} 为 \opt{chapter} 和 \opt{section} 等,也可用参数\#1代替当前级别类型,标题名用参数\#2代替一般不变。 +% \tn{EbNumberline} 命令类似 \CTeX 的 \tn{CTEXnumberline} 命令,用于 \opt{tocline} 选项中设置目录标签的编号。区别是它需要在 \opt{tocset/hang = false} 时使用,否则目录中无法显示标题编号,使用它的时候 \opt{numsep} 选项仍然有效。\meta{编号类型} 为 \opt{chapter} 和 \opt{section} 等,也可用参数 \#1 代替当前级别类型,标题名用参数 \#2 代替一般不变。 % \end{function} % % \begin{ctexexam} @@ -642,7 +642,7 @@ % \begin{optdesc} % \item[lolskip] \opt{lolskip} 是代码目录中章之间的代码标题的距离,与 \CTeX 的表格目录和图片目录中章之间的标题距离选项 \opt{lotskip} 和 \opt{lofskip} 类似,它们的值均默认0.8 pc,在 \opt{article} 模式中此选项失效。 % \item[belowoffset] \opt{belowoffset} 选项为主目录标题 \tn{contentsname} 后的间距补偿,一般为负值,用于抵消 \opt{format} 中设置的垂直间距。\opt{(level)} 中的 \opt{belowoffset} 与之意义类似,代表 figure、table 和 lstlisting 三个级别,也可以使用 \opt{list} 统一设置,一般为正值。建议距离 \opt{lolskip(0.8pc) + (level)/format/addvspace(0.2pc) + (level)/belowoffset(0pc) = belowoffset(-1pc)}。 -% \item[tocline] 目录标签整体使用 \opt{tocline} 设置,在图表标签的参数中\#1代表编号,代码标签中则是 \tn{thelstlisting} 代表编号,标签中还可包含标签名称,默认标签名称与图、表和代码环境的标题名称一致。下面举个设置标签的例子 +% \item[tocline] 目录标签整体使用 \opt{tocline} 设置,在图表标签的参数中 \#1 代表编号,代码标签中则是 \tn{thelstlisting} 代表编号,标签中还可包含标签名称,默认标签名称与图、表和代码环境的标题名称一致。下面举个设置标签的例子 % \begin{ctexexam} % \tocset % { @@ -678,7 +678,7 @@ % \tn{end}\marg{环境名} % \end{syntax} % \pkg{tabularray} 是一个较新的宏包,不仅提供了 \pkg{tabularx}、\pkg{multirow}、和 \pkg{booktabs} 宏包的功能,并且不依赖其它宏包与它们同时使用不会产生冲突,还实现了用简便的键值列表方式设置表格样式。目前除了表头斜线以及跨页功能存在不足,其它方面已满足对表格绝大多数格式的需求,具体用法可见宏包的说明文档。 -% \changes{v1.25k}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。} +% \changes{v1.25l}{2021/05/17}{使用功能更便捷齐全的 \pkg{tabularray} 宏包设置表格样式。} % \end{function} % % \subsection{列表} @@ -834,21 +834,22 @@ % \end{function} % % \subsection{物理量} -% \begin{function}[added = 2021-01-05,updated = 2021-02-23]{\num,\si,\SI,\SIrange} +% \begin{function}[added = 2021-01-05,updated = 2021-05-18]{\num,\unit,\qty,\qtyrange} % \begin{syntax} % \tn{num}\oarg{键值列表}\marg{数字} -% \tn{si}\oarg{键值列表}\marg{单位} -% \tn{SI}\oarg{键值列表}\marg{数字}\oarg{前缀}\marg{单位} -% \tn{SIrange}\oarg{键值列表}\marg{数字1}\marg{数字2}\marg{单位} +% \tn{unit}\oarg{键值列表}\marg{单位} +% \tn{qty}\oarg{键值列表}\marg{数字}\oarg{前缀}\marg{单位} +% \tn{qtyrange}\oarg{键值列表}\marg{数字1}\marg{数字2}\marg{单位} % \end{syntax} -% \pkg{siunitx} 宏包的 \tn{num} 命令可以输出科学计数法,\tn{si} 命令支持数学模式,可以代替数学行内公式输入,而 \tn{SI} 命令可用来输出带有单位的量,\tn{SIrange} 可以输出带有范围和单位的量。 +% \pkg{siunitx} 宏包的 \tn{num} 命令可以输出以科学计数法表示的数值,单位格式化命令 \tn{unit} 包含文字项目(例如字母或数字)时,使用 . 和 \~{} 放置在单元乘积中间,并使用 \_ 和 \^{} 正确放置指定的下标和上标。格式化方法可在数学和文本模式下使用。而 \tn{qty} 命令可用来输出带有单位的量,\tn{qtyrange} 可以输出带有范围和单位的量。 +% \changes{v1.25l}{2021/05/18}{\pkg{siunitx} 宏包 v3.0.0 更新后用法改变,修改相关配置选项。} % \end{function} % % \begin{ctexexam} -% \num{-21x.3e5} -% \si{mL.min^{-1}} -% \SI{5}{\mole} -% \SIrange[unit-color = green]{1.5}{4}{kg} +% \numproduct{-21x3e5} +% \unit{mL~min^{-1}} +% \qty{5}{\mole} +% \qtyrange[unit-color = green]{1.5}{4}{kg} % \end{ctexexam} % % \subsection{化学式} @@ -866,7 +867,7 @@ % \tn{ref}\marg{标签} % \tn{labelformat}\marg{计数器}\marg{标签引用格式} % \end{syntax} -% 使用 \tn{ref} 命令引用 \tn{label} 设置的标签,将会检测临近计数器并添加相应的前缀,比如图表、章节标题和定理等。\tn{labelformat} 可以设置标签引用格式,第二个参数中\#1代表 \tn{the}\meta{计数器},可以设置引用序号的前缀和后缀。 +% 使用 \tn{ref} 命令引用 \tn{label} 设置的标签,将会检测临近计数器并添加相应的前缀,比如图表、章节标题和定理等。\tn{labelformat} 可以设置标签引用格式,第二个参数中 \#1 代表 \tn{the}\meta{计数器},可以设置引用序号的前缀和后缀。 % \changes{v1.24}{2021/04/11}{取消载入 \pkg{cleveref} 宏包来交叉引用。} % \end{function} % @@ -978,7 +979,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplClass{easybook}{2021/05/17}{1.25k}{beta} +\ProvidesExplClass{easybook}{2021/05/18}{1.25l}{beta} \cs_generate_variant:Nn \eb_ctex_define:nn { nx } \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -1200,7 +1201,8 @@ { l3keys2e } { 2020/10/27 }, { ctex } { 2021/03/14 }, { thmtools } { 2020/08/01 }, - { caption } { 2020/08/24 } + { caption } { 2020/08/24 }, + { siunitx } { 2021/05/17 } } { \eb_package_later_bool:nn #1 } @@ -1216,7 +1218,7 @@ \cs_new_protected:Npn \eb_font_double_engine_set:n #1 { \exp_args:Nc \RenewDocumentCommand {set#1font}{O{}mO{}} - {\use:c { eb_set#1font:nn }{##2}{##1,##3}} + {\use:c { eb_set#1font:nn } {##2} {##1,##3}} } \seq_const_from_clist:Nn \c__eb_font_reset_family_seq { main,sans,mono,CJKmain,CJKsans,CJKmono } @@ -1934,8 +1936,7 @@ \tl_if_eq:NnTF \l__eb_toc_type_tl { book } { \bichapter{\eb@toc@title}{\eb@bitoc@title} } { \bisection{\eb@toc@title}{\eb@bitoc@title} } - } - { + }{ \IfBooleanTF{#2} { \eb_title_mark_notoc:n {\eb@toc@title} } { \eb_title_mark_intoc:n {\eb@toc@title} } @@ -2379,16 +2380,18 @@ } \sisetup { - detect-shape, - detect-family, - detect-weight, + mode = match, table-parse-only, - detect-display-math, - detect-inline-family = math, - detect-inline-weight = math, - range-phrase = \ensuremath{\sim}, - range-units = single, - group-digits = false + propagate-math-font, + text-family-to-math, + text-series-to-math, + reset-text-family = false, + reset-text-series = false, + reset-text-shape = false, + reset-math-version = false, + range-phrase = \ensuremath{\sim}, + range-units = single, + group-digits = none } \eb_at_begin_environment:nn { diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 308ff83a69..f9dffdf646 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 0ac4371d38..c6fc9698b4 100644 --- a/macros/latex/contrib/hvfloat/Changes +++ b/macros/latex/contrib/hvfloat/Changes @@ -1,4 +1,5 @@ hvfloat.sty: +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) - new option for a binding correction of doublepage floats diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.pdf Binary files differindex 6728d631fd..84a90a4282 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/doublepage2s1c.tex b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex index 4f95b4b67b..656cbe68c8 100644 --- a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s1c.tex @@ -1,5 +1,5 @@ \documentclass[twoside]{scrartcl} -%% $Id: doublepage2s1c.tex 86 2021-05-12 19:25:56Z herbert $ +%% $Id: doublepage2s1c.tex 92 2021-05-18 09:46:55Z herbert $ \input{preamble.ltx} \usepackage{blindtext,xcolor,marginnote} @@ -65,6 +65,7 @@ \Blindtext + \subsubsection{\texttt{bindCorr=1cm}} \begin{lstlisting} @@ -159,11 +160,13 @@ \Blindtext -\Blindtext - -\subsection{Definition on an even page} +%\Blindtext +\hvblindtext \hvblindtext +\hvblindtext + +\subsection{Definition on an even page} \subsubsection{The default} \begin{lstlisting} @@ -575,7 +578,7 @@ \begin{lstlisting} \hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% [A doublepage image with a caption on the right side of the right part.]% {A caption for a double-sided image that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of @@ -588,7 +591,7 @@ \marginnote{Fig. \ref{fig:doubleFULLPAGE0}} \hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% {figure}% - {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% [A doublepage image with a caption on the right side of the right part.]% {A caption for a double-sided image that will be placed on the right side of the right-hand part of the illustration. The illustration begins on the left edge of diff --git a/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.pdf Binary files differnew file mode 100644 index 0000000000..3099998bdf --- /dev/null +++ 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 new file mode 100644 index 0000000000..5c579160cc --- /dev/null +++ b/macros/latex/contrib/hvfloat/doc/examples/doublepage2s2c.tex @@ -0,0 +1,1054 @@ +\documentclass[twoside,twocolumn]{scrartcl} +%% $Id: doublepage2s2c.tex 92 2021-05-18 09:46:55Z herbert $ + +\input{preamble.ltx} +\usepackage{blindtext,xcolor,marginnote} + +\let\hvBlindtext\Blindtext +\def\Blindtext{\par\color{black!40}\hvBlindtext\par\normalcolor} +\makeatletter +\def\hvblindtext{\textcolor{black!40}{\blindtext@text}} +\makeatother +\usepackage{marginnote,showframe} +\setcounter{tocdepth}{2} + +\begin{document} +\title{Examples for doublepage floats \newline with bind correction} +\author{Herbert Voß} +\maketitle + +\tableofcontents + + +\onecolumn +\listoffigures + +\newpage\null +\twocolumn +\section{Argument \texttt{doublePage}} +\subsection{Definition on an odd page} + +\Blindtext\hvblindtext + +\hvblindtext + +\subsubsection{The default} + + +\begin{lstlisting} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePage0}} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0} + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage1}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1} + +\hvblindtext + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=3mm}} +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage2}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2} + + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=<inside textwidth>}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage3}} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3} + + +\Blindtext + +\Blindtext + +\subsection{Definition on an even page} + + +\subsubsection{The default} +\begin{lstlisting} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0a} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePage0a}} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage0a} + + +\hvblindtext + +\Blindtext + +\Blindtext + +\Blindtext + + + + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage1a}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage1a} + +\hvblindtext + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage2a}} +\hvFloat[doublePage,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage2a} + + +\Blindtext + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=<inside textwidth>}} + +\begin{lstlisting} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePage3a}} +\hvFloat[doublePage,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePage}}% + {fig:doublePage3a} + + +\Blindtext + +\Blindtext + +\Blindtext + + + +\clearpage + +\section{Argument \texttt{doublePAGE}} +\subsection{Definition on an odd page} + +\Blindtext + +\hvblindtext + +\subsubsection{The default} + +\begin{lstlisting} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePAGE0}} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE1}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE2}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2} + + + +\Blindtext + +\Blindtext + +\hvblindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=<inside textwidth>}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE3}} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3} + + +%\hvblindtext + +\Blindtext + + +\subsection{Definition on an even page} + + +\subsubsection{The default} + +\begin{lstlisting} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0a} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doublePAGE0a}} +\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.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE0a} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE1a}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE1a} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE2a}} +\hvFloat[doublePAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE2a} + + + +\Blindtext + +\Blindtext + +\hvblindtext +\subsubsection{\texttt{bindCorr=<inside textwidth>}} + +\begin{lstlisting} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doublePAGE3a}} +\hvFloat[doublePAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[width=2\textwidth]{images/sonne-meer}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doublePAGE}}% + {fig:doublePAGE3a} + + +\Blindtext + +\Blindtext + + +\section{Argument \texttt{doubleFULLPAGE}} +\subsection{Definition on an odd page} + +\Blindtext +\hvblindtext + +\subsubsection{The default} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain}]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0} + +\Blindtext + +\Blindtext + +\hvblindtext + + +\subsubsection{Caption \emph{before} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0before-cap} (internal label \texttt{fig:doubleFULLPAGE0before-cap}) is on +page~\pageref{fig:doubleFULLPAGE0before-cap} and the first page of the image +is on the page~\pageref{fig:doubleFULLPAGE0before} (main label \texttt{fig:doubleFULLPAGE0before}) and the +second (right) part is on page~\pageref{fig:doubleFULLPAGE0before-2} (internal label \texttt{fig:doubleFULLPAGE0before-2}). + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0before}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before} + +\Blindtext + +\Blindtext + +%\hvblindtext + +%\hvblindtext + + + +\subsubsection{Double column caption \emph{before} doublepage image } + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=before,twoColumnCaption,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before2col} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0before2col}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=before,twoColumnCaption,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0before2col} + +\Blindtext + +\Blindtext + +\hvblindtext + +\hvblindtext + + +\subsubsection{Caption \emph{after} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0after-cap} is on page~\pageref{fig:doubleFULLPAGE0after-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0after}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0after}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after} + +\Blindtext + +%\hvblindtext + +\hvblindtext +\Blindtext + + +\subsubsection{Two column caption \emph{after} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0after2col-cap} is on page~\pageref{fig:doubleFULLPAGE0after2col-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0after2col}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,twoColumnCaption,capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after2col} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0after2col}} +\hvFloat[doubleFULLPAGE,capWidth=n,twoColumnCaption,capPos=after,separatorLine]% + {figure}% + {\includegraphics[doubleFULLPAGE]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0after2col} + +\Blindtext + +%\hvblindtext + +%\hvblindtext +\Blindtext + + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=1cm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2} + + + +\Blindtext + +\Blindtext + +%\hvblindtext +%\hvblindtext + + +\subsubsection{\texttt{bindCorr=<inside textwidth>}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE33} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE33}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[doubleFULLPAGEbindCorr]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE33} + + +\Blindtext + +\subsection{Definition on an even page} +\subsubsection{The default} + + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0a} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{Caption \emph{before} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0beforeA-cap} is on page~\pageref{fig:doubleFULLPAGE0beforeA-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0beforeA}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0beforeA} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0beforeA}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=before,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption before the double page image on the bottom of the page.]% + {A caption for a double-sided image that will be placed on the bottom of the page and before + the doublepage illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0beforeA} + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{Caption \emph{after} doublepage image} +The caption of image~\ref{fig:doubleFULLPAGE0afterA-cap} is on page~\pageref{fig:doubleFULLPAGE0afterA-cap} and the image +is on the pages~\pageref{fig:doubleFULLPAGE0afterA}f. + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins o4n the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0afterA} +\end{lstlisting} + + +\marginnote{Fig. \ref{fig:doubleFULLPAGE0afterA}} +\hvFloat[doubleFULLPAGE,capWidth=n,capFormat={labelfont=sf,font=sf,format=plain},capPos=after,separatorLine]% + {figure}% + {\includegraphics[height=\paperheight,width=2\paperwidth,keepaspectratio=false]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE0afterA} + +\Blindtext + +\hvblindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=1cm}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE1a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=1cm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE1a} + +\hvblindtext + +\Blindtext + +\Blindtext + +\subsubsection{\texttt{bindCorr=3mm}} +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE2a}} +\hvFloat[doubleFULLPAGE,capWidth=n,capPos=right,bindCorr=3mm]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE2a} + + + +\Blindtext + +\Blindtext + +\hvblindtext + +\subsubsection{\texttt{bindCorr=<inside textwidth>}} + +\begin{lstlisting} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a} +\end{lstlisting} + +\marginnote{Fig. \ref{fig:doubleFULLPAGE3a}} +\hvFloat[doubleFULLPAGE,capWidth=n,bindCorr=\the\dimexpr1in+\oddsidemargin]% + {figure}% + {\includegraphics[height=\paperheight]{images/rheinsberg}}% + [A doublepage image with a caption on the right side of the right part.]% + {A caption for a double-sided image that will be placed on the right side of the + right-hand part of the illustration. The illustration begins on the left edge of + the paper. A short form is used for the LOF. + The parameter is \texttt{doubleFULLPAGE}}% + {fig:doubleFULLPAGE3a} + + +\Blindtext + +\Blindtext + +\Blindtext + +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/hvfloat/doc/hvfloat.pdf b/macros/latex/contrib/hvfloat/doc/hvfloat.pdf Binary files differindex 2f71b515f9..fe878066ec 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 4d546a3f63..902f9c0754 100644 --- a/macros/latex/contrib/hvfloat/doc/hvfloat.tex +++ b/macros/latex/contrib/hvfloat/doc/hvfloat.tex @@ -1,4 +1,4 @@ -%% $Id: hvfloat.tex 86 2021-05-12 19:25:56Z herbert $ +%% $Id: hvfloat.tex 90 2021-05-14 09:08:46Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,paper=a4,]{scrartcl} @@ -56,7 +56,6 @@ \usepackage{hvindex} \usepackage[all=!htb]{hvfloat-fps} \usepackage[fbox,hyperref]{hvfloat} -\hvFloatSet{floatRef=caption} \captionsetup{format=plain,font=sf,labelfont={sf,bf}} @@ -2585,6 +2584,7 @@ and the right part on page~\pageref{bar-2}. All three labels points to the same \verb/\ref{foo} | \ref{foo-cap} | \ref{foo-2}/ $\rightarrow$ \ref{foo} | \ref{foo-cap} | \ref{foo-2} +\verb/\pageref{foo} | \pageref{foo-cap} | \pageref{foo-2}/ $\rightarrow$ \pageref{foo} | \pageref{foo-cap} | \pageref{foo-2} \begin{lstlisting} \hvFloat[doubleFULLPAGE,capPos=before]% diff --git a/macros/latex/contrib/hvfloat/latex/hvfloat.sty b/macros/latex/contrib/hvfloat/latex/hvfloat.sty index 1f56977f93..59bfd20a45 100644 --- a/macros/latex/contrib/hvfloat/latex/hvfloat.sty +++ b/macros/latex/contrib/hvfloat/latex/hvfloat.sty @@ -1,4 +1,4 @@ -%% $Id: hvfloat.sty 86 2021-05-12 19:25:56Z herbert $ +%% $Id: hvfloat.sty 92 2021-05-18 09:46:55Z herbert $ %% %% %% IMPORTANT NOTICE: @@ -15,16 +15,19 @@ %% `hvfloat' offers rotating of captions and objects for floats %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{2.24} -\def\filedate{2021/05/09} +\def\fileversion{2.25} +\def\filedate{2021/05/18} \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 + \DeclareOption{fbox}{\hv@fboxtrue\setlength{\fboxsep}{1pt}} \DeclareOption{hyperref}{\hv@hyperreftrue} +\DeclareOption{stfloats}{\hv@stfloatstrue} \ProcessOptions @@ -32,7 +35,7 @@ \RequirePackage{caption} \PassOptionsToPackage{hypcap}{subcaption} \RequirePackage{subcaption} -\RequirePackage{atbegshi,picture,trimclip} +\RequirePackage{picture,trimclip} \RequirePackage{expl3,multido} \RequirePackage{graphicx} @@ -40,14 +43,14 @@ \RequirePackage{xkeyval} \RequirePackage{ifoddpage} \RequirePackage{afterpage} -%\RequirePackage{zref-abspos} \ifhv@hyperref \RequirePackage{hyperref} -% \RequirePackage{hypcap} +\fi +\ifhv@stfloats + \RequirePackage{stfloats}% for bottom floats in a twocolumn mode \fi % -%\unitlength=1cm \providecommand*\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength} \newlength\hvObjectWidth @@ -127,16 +130,16 @@ \def\hvSet@capVPos{center}% it is relativ to the object } -\newif\ifhv@floatRefToObject -\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to (inactive) - \ifcase\nr\relax - \hv@floatRefToObjectfalse - \else - \hv@floatRefToObjecttrue - \fi -}{\PackageWarning{hvfloat}{erroneous input (#1) for floatRef ignored. Using option object.}% - \hv@floatRefToObjecttrue - } +%\newif\ifhv@floatRefToObject +%\define@choicekey*+{hvSet}{floatRef}[\val\nr]{caption,object}[object]{% where the LOF entry should point to (inactive) +% \ifcase\nr\relax +% \hv@floatRefToObjectfalse +% \else +% \hv@floatRefToObjecttrue +% \fi +%}{\PackageWarning{hvfloat}{erroneous input (#1) for floatRef ignored. Using option object.}% +% \hv@floatRefToObjecttrue +% } \define@key{hvSet}{objectAngle}[0]{% -360..+360 \def\hvSet@objectAngle{#1}% @@ -151,6 +154,14 @@ \define@boolkey{hvSet}[hv@]{nonFloat}[true]{}% Do not use float environment \define@boolkey{hvSet}[hv@]{onlyText}[true]{}% Write the caption only as text \define@boolkey{hvSet}[hv@]{wide}[true]{}% Write the caption only as text +\define@boolkey{hvSet}[hv@]{twoColumnCaption}[true]{% Write the caption only as text +% \ifhv@stfloats +% \global\@nameuse{hv@twoColumnCaption#1}% +% \else +% \PackageWarning{hvfloat}{Please use the package option stfloats!}% +% \global\hv@twoColumnCaptionfalse +% \fi +} \define@boolkey{hvSet}[hv@]{Debug}[true]{}% give more infos in the terminal \newcommand\hv@typeout[1]{\ifhv@Debug\typeout{#1}\fi} @@ -163,6 +174,7 @@ \newif\ifhv@setObjectLabel \newlength\hvSet@bindCorrection +\newlength\hvSet@sepLineskip \newlength\hv@leftPageObjectWidth% for doublepage images \newlength\hv@tempWidthA \newlength\hv@tempWidthB @@ -181,6 +193,7 @@ \ifhv@multiFloat\setkeys{hvSet}{subFloat=false}\fi% }% \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 \define@key{hvSet}{style}{% \@ifundefined{hv@#1}% @@ -197,7 +210,7 @@ \def\defhvstyle#1#2{\@namedef{hv@#1}{#2}} \let\hvDefFloatStyle\defhvstyle % better name % -\newcommand{\setDefaults}{% +\newcommand\setDefaults{% \hv@set{% floatPos=, rotAngle=0, capWidth=n, capAngle=0, capPos=bottom, capVPos=center, objectPos=center, objectAngle=0, @@ -206,8 +219,9 @@ doubleFULLPAGE=false, doublePage=false, doublePAGE=false, multiFloat=false,subFloat=false, separatorLine,objectFrame=false,multiFloatSkip=\normalbaselineskip, - capFormat={}, subcapFormat={}, - floatRef=object, bindCorr=\z@, + capFormat={}, subcapFormat={}, twoColumnCaption=false, +% floatRef=object, + bindCorr=\z@,sepLineskip=0pt, }% } @@ -236,7 +250,7 @@ \setlength{\abovecaptionskip}{0pt}% \setlength{\belowcaptionskip}{0pt}% } -\newcommand{\restoreCaptionSkip}{% +\newcommand\restoreCaptionSkip{% \setlength\abovecaptionskip{\hvAboveCaptionSkip}% \setlength\belowcaptionskip{\hvBelowCaptionSkip}% } @@ -271,6 +285,17 @@ \def\Gin@eheight{\paperheight}% \Gin@boolkey{false}{iso}% } +\define@key{Gin}{doubleFULLPAGE}[true]{% + \def\Gin@ewidth{2\paperwidth}% + \def\Gin@eheight{\paperheight}% + \Gin@boolkey{false}{iso}% +} +\define@key{Gin}{doubleFULLPAGEbindCorr}[true]{% + \def\Gin@ewidth{\the\dimexpr2\paperwidth-2\hvSet@bindCorrection}% + \def\Gin@eheight{\paperheight}% + \Gin@boolkey{false}{iso}% +} + \newcommand\IncludeGraphics[2][]{% \vspace*{\the\dimexpr-1in-\voffset+\topskip-\headheight-0.5\baselineskip}% \leavevmode\checkoddpage @@ -400,6 +425,10 @@ \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} @@ -407,8 +436,16 @@ \def\drawSepLine{% \par\noindent - \if@twocolumn\rule{\columnwidth}{0.4pt}\else\rule{\linewidth}{0.4pt}\fi - \vspace{0pt}% + \if@twocolumn + \ifhv@twoColumnCaption + \rule{\linewidth}{0.4pt}\\[-2.5ex] + \else + \rule{\columnwidth}{0.4pt}\\[-2.5ex] + \fi + \else + \rule{\linewidth}{0.4pt}\\[-2.5ex] + \fi + \vspace{\hv@sepLineskip}% } \newcount\hv@cnta @@ -914,74 +951,50 @@ \endgroup% startet at main \hvFloat } % +%% ------------------------------------- the doublepage obejcts --------------------------- %% ||1in+evenside --- |1in+oddside ---|| % -\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page ---------------------------------- +\def\do@hvFloat@doublePage#1{% image on left and right page with caption on the right page % #1-> 0/1 caption under/right - \checkoddpage \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% - \global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection-\parindent}% - \hv@typeout{>>>>do@hvFloat@doublePage #1}% +% \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}% + \checkoddpage \ifoddpage - \hv@typeout{>>>>do@hvFloat@doublePage->oddpage}% - \hv@typeout{>>>>do@hvFloat@doublePage->oddpage->bindCorr=\the\hvSet@bindCorrection}% - \hv@typeout{>>>>do@hvFloat@doublePage->oddpage->hv@leftPageObjectWidth=\the\hv@leftPageObjectWidth}% - \afterpage{% - \noindent - \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% - \clipbox*{0 -\depth{} \hv@leftPageObjectWidth{} \height}{\usebox\hvObjectBox}% - \par\bigskip - \afterpage{% - \newpage - \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 - }% - }% + \if@twocolumn + \if@firstcolumn + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \else + \do@hvFloat@doublePageCaptionRight{#1}% + \fi + \else + \do@hvFloat@doublePageCaptionRight{#1}% + \fi \else - \hv@typeout{>>>>do@hvFloat@doublePage->evenpage}% - \hv@typeout{>>>>do@hvFloat@doublePage->evenpage->bindCorr=\the\hvSet@bindCorrection}% - \hv@typeout{>>>>do@hvFloat@doublePage->evenpage->hv@leftPageObjectWidth=\the\hv@leftPageObjectWidth}% - \global\setlength\hv@tempWidthA{\the\dimexpr-1in-\oddsidemargin+\hvSet@bindCorrection}% - \global\setlength\hv@leftPageObjectWidth{\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\do@hvFloat@doublePageCaptionRight{#1}}}% + \else + \afterpage{\do@hvFloat@doublePageCaptionRight{#1}}% + \fi + \else + \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{% - \afterpage{% \let\hv@fptop\c@fptop \global\setlength{\@fptop}{0pt}% \let\hv@c@topnumber\c@topnumber \setcounter{topnumber}{1}% - \begin{\hv@floatType}[t] + \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] + \end{\hv@floatType*}% + \begin{\hv@floatType*}[t] \global\savebox{\hvObjectBox}{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% \hspace*{\hv@tempWidthA}% \noindent @@ -1012,21 +1025,21 @@ \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}% + \end{\hv@floatType*}% \let\c@topnumber\hv@c@topnumber \let\c@fptop\hv@fptop - }}% - \fi - \endgroup% started at main macro \hvFloat + }% } +% \newsavebox\hv@boxLeftPage \newsavebox\hv@boxRightPage % %% ||1in+evenside --- |1in+oddside ---|| % +\newif\ifhv@save@twocolumn + \def\do@hvFloat@doublePAGE#1{% image on left and right page with caption on the right ---------------------------------- % #1-> 0/1 caption under/right - \hv@typeout{>>>>do@hvFloat@doublePAGE}% \global\setlength\hv@tempWidthA{\the\dimexpr1in+\oddsidemargin-\hvSet@bindCorrection+\parindent}% \global\setlength\hv@leftPageObjectWidth{\the\dimexpr\paperwidth-1in-\evensidemargin-\hvSet@bindCorrection}% \expandafter\global\expandafter\savebox\expandafter\hvObjectBox\expandafter{\ifhv@useOBox\usebox{\hvOBox}\else\hv@floatObject\fi}% @@ -1034,58 +1047,36 @@ \expandafter\global\expandafter\savebox\expandafter\hv@boxRightPage\expandafter{\clipbox*{\hv@leftPageObjectWidth{} -\depth{} \width{} \height}{\usebox\hvObjectBox}}% \checkoddpage \ifoddpage - \hv@typeout{>>>>do@hvFloat@doublePAGE->oddpage}% - \hv@typeout{>>>>do@hvFloat@doublePAGE->oddpage->bindCorr=\the\hvSet@bindCorrection}% - \hv@typeout{>>>>do@hvFloat@doublePAGE->oddpage->hv@leftPageObjectWidth=\the\hv@leftPageObjectWidth}% - \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 - \newpage - \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}% - \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 - \newpage - }% + \if@twocolumn + \if@firstcolumn + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \fi + \else + \do@hvFloat@doublePAGECaptionRight{#1}% + \fi \else + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}}% + \else + \afterpage{\afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}}% + \fi + \else + \afterpage{\do@hvFloat@doublePAGECaptionRight{#1}}% + \fi + \fi + \endgroup +} +% +\def\do@hvFloat@doublePAGECaptionRight#1{% image on left and right page with caption on the right ---------------------------------- + % #1-> 0/1 caption under/right \afterpage{% - \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 - \newpage + \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 @@ -1117,10 +1108,8 @@ \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\ifx\hv@label\@empty\else\expandafter\global\expandafter\label\expandafter{\hv@label}\fi}% \fi \fi - \newpage - }}% - \fi - \endgroup + \newpage\if@twocolumn\null\newpage\fi + }% } % %% ||1in+evenside --- |1in+oddside ---|| @@ -1135,86 +1124,157 @@ \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}% + \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}% \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifoddpage - \ifcase\hv@@capPos - \do@hvFloat@doubleFULLPAGE@CaptionBefore - \or - \do@hvFloat@doubleFULLPAGE@CaptionAfter - \else - \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% + \ifcase\hv@@capPos % =0 Caption before + \if@twocolumn + \if@firstcolumn + \ifhv@twoColumnCaption + \set@Normal@Bottom@Caption* + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore}% + \else + \afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore}% + \fi + \else + \set@Normal@Bottom@Caption + \do@hvFloat@doubleFULLPAGE@CaptionBefore + \fi + \else + \set@Normal@Bottom@Caption + \do@hvFloat@doubleFULLPAGE@CaptionBefore + \fi + \or % =1 Caption after + \ifhv@twoColumnCaption + \do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol + \else + \do@hvFloat@doubleFULLPAGE@CaptionAfter + \fi + \else% >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 + \do@hvFloat@doubleFULLPAGE@CaptionOther{#1}% + \fi \fi% \ifcase \else% we have an even page - \hv@typeout{>>>>>doubleFULLPAGE->evenpage}% \ifcase\hv@@capPos% Before - \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore}% - \or - \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% + \if@twocolumn + \if@firstcolumn + \ifhv@twoColumnCaption + \afterpage{\afterpage\set@Normal@Bottom@Caption*\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}% + \else + \afterpage{\afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}}% + \fi + \else + \afterpage{\afterpage{\set@Normal@Bottom@Caption\do@hvFloat@doubleFULLPAGE@CaptionBefore{#1}}}% + \fi + \else + \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}}}% + \else + \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter{#1}}}% + \fi + \else + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionAfter}% + \fi \else % Any other caption - \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% - \fi%% \ifcase + \if@twocolumn + \if@firstcolumn + \afterpage{\afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}}}% + \else + \afterpage{\afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}}% + \fi + \else + \afterpage{\do@hvFloat@doubleFULLPAGE@CaptionOther{#1}}% + \fi + \fi%% \ifcase \fi% main ifoddpage \endgroup% started at main macro \hvFloat } +\def\set@Normal@Bottom@Caption{\@ifnextchar*\set@Normal@Bottom@CaptionStar\set@Normal@Bottom@Caption@} +\def\set@Normal@Bottom@Caption@{% + \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}% +} +\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*}% +} + \def\do@hvFloat@doubleFULLPAGE@CaptionBefore{% - \begin{\hv@floatType}[b] - \ifhv@separatorLine\drawSepLine\vspace{\smallskipamount}\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 - \global\addtocounter{\hv@floatType}{-1}% to get the same <object>-ref as "label"-cap - \end{\hv@floatType}% \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@floatType}% + \refstepcounter{hv@tempCNTa}% \expandafter\label\expandafter{\hv@label}% - \global\addtocounter{\hv@floatType}{-1}% to get the same <object>-ref as "label"-cap +%%% \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 \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}% \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@floatType}% + \refstepcounter{hv@tempCNTa}% \expandafter\label\expandafter{\hv@label-2}% - \newpage + \newpage\if@twocolumn\null\newpage\fi }}% } +\newif\ifhv@temp + \def\do@hvFloat@doubleFULLPAGE@CaptionAfter{% \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@floatType}% + \refstepcounter{hv@tempCNTb}% \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{% + \newpage\if@twocolumn\null\newpage\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}% \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@floatType}% + \refstepcounter{hv@tempCNTb}% \expandafter\label\expandafter{\hv@label-2}% - \global\addtocounter{\hv@floatType}{-1}% to get the same <object>-ref as "label"-cap - \newpage + \newpage\if@twocolumn\null\newpage\fi \begin{\hv@floatType}[b] - \ifhv@separatorLine\drawSepLine\vspace{\smallskipamount}\fi + \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}}% @@ -1225,29 +1285,60 @@ }}% } +\def\do@hvFloat@doubleFULLPAGE@CaptionAfterTwoCol{% + \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@tempCNTb}% + \expandafter\label\expandafter{\hv@label}% + \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}% + \vspace*{\the\dimexpr-1in-\voffset-\topmargin-\headheight-\headsep-\baselineskip+2\lineskip}% -0.5\paperheight+0.5\ht\hvObjectBox + \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] + \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}}% + \else + \captionof{\hv@floatType}[\hv@shortCap]{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% + \fi + \end{\hv@floatType*}% + }}% +} + \def\do@hvFloat@doubleFULLPAGE@CaptionOther#1{% \afterpage{% \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}% + \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@floatType}% + \refstepcounter{hv@tempCNTb} \expandafter\label\expandafter{\hv@label}% - \global\addtocounter{\hv@floatType}{-1}% to get the same <object>-ref as "label"-cap \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}% - \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@floatType}% + \refstepcounter{hv@tempCNTb}% \expandafter\label\expandafter{\hv@label-2}% - \global\addtocounter{\hv@floatType}{-1}% to get the same <object>-ref as "label"-cap \savebox\hvCaptionBox{\parbox{0.9\ht\hvObjectBox}{\captionof*{\hv@floatType}{\hv@longCap}}}% - \ifnum#1 > 0 + \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}{% @@ -1273,7 +1364,8 @@ \setlength\hv@tempWidthA{\dimexpr\paperheight-\ht\hvObjectBox}% \ifdim\hv@tempWidthA > \ht\hvCaptionBox \else - \put(\the\dimexpr-\textwidth-1in,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%% +% \refstepcounter{hv@temp}%% + \put(\the\dimexpr-\textwidth-2in-\oddsidemargin,\the\dimexpr\ht\hvCaptionBox+\abovecaptionskip+\belowcaptionskip){\makebox[0pt][l]{\parbox{\textwidth}{%% \expandafter\captionsetup\expandafter{\hv@caption@format}% \ifx\hv@shortCap\@empty \captionof{\hv@floatType}{\hv@longCap\expandafter\label\expandafter{\hv@label-cap}}% @@ -1283,7 +1375,7 @@ }}}% \fi \fi% end \ifnum#1>0 - \newpage + \newpage\if@twocolumn\null\newpage\fi }% }% } diff --git a/macros/latex/contrib/hvqrurl/Changes b/macros/latex/contrib/hvqrurl/Changes index 85dfdd189e..e56ba4a168 100644 --- a/macros/latex/contrib/hvqrurl/Changes +++ b/macros/latex/contrib/hvqrurl/Changes @@ -1,3 +1,5 @@ hvqrurl.sty: +0.02 2021-05-18 - added optional argument qrreverse to the set + the qr code in the opposite margin 0.01a 2019-12-01 - fixes to the documentation 0.01 2019-11-27 - first CTAN version diff --git a/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf b/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf Binary files differindex 7a0aa0aa49..c2d85e3b27 100644 --- a/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf +++ b/macros/latex/contrib/hvqrurl/doc/hvqrurl.pdf diff --git a/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex b/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex index 7125c0d723..6f9d96953f 100644 --- a/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex +++ b/macros/latex/contrib/hvqrurl/doc/hvqrurl.tex @@ -1,4 +1,4 @@ -%% $Id: hvqrurl.tex 1119 2019-11-30 17:36:28Z herbert $ +%% $Id: hvqrurl.tex 1123 2019-12-01 09:16:34Z herbert $ \listfiles \errorcontextlines=100 \documentclass[twoside,usegeometry]{scrartcl} @@ -11,6 +11,7 @@ \usepackage[showframe=false]{geometry} \usepackage{listings} +\usepackage{makeidx}\makeindex % \lstset{% language=[LaTeX]TeX,% @@ -37,7 +38,7 @@ \hypersetup{urlcolor=blue, linktocpage, colorlinks=true}% \begin{document} -\title{Package \texttt{hvqrurl}\\Creating a QR-code of an URL in the margin \\\small ver 0.01a} +\title{Package \texttt{hvqrurl}\\Creating a QR-code of an URL in the margin \\\small ver 0.02} \author{Herbert Voß\thanks{\protect\url{hvoss@tug.org}}} \date{\today} \maketitle @@ -79,8 +80,8 @@ QR codes not as a link when using \LPack{hyperref}: \subsection{No link with \LPack{hyperref}} \begin{lstlisting} -With \Lkeyset{qrlink=nolink} the QR code is no link: \hvqrurl[qrlink=nolink]{https://mirror.ctan.org/pkg/hvqrurl}. -The default setting is \Lkeyset{qrlink=link}. +With qrlink=nolink the QR code is no link: \hvqrurl[qrlink=nolink]{https://mirror.ctan.org/pkg/hvqrurl}. +The default setting is qrlink=link. \end{lstlisting} With \Lkeyset{qrlink=nolink} the QR code is no link: \hvqrurl[qrlink=nolink]{https://mirror.ctan.org/pkg/hvqrurl}. The default setting is \Lkeyset{qrlink=link}. Without using \LPack{hyperref} this optional argument @@ -93,7 +94,7 @@ the optional argument \Lkeyword{qrcolor}. The package \LPack{xcolor}\hvqrurl*[qr the reason why an extended color definition is possible. For this example we used \begin{lstlisting} -The package \LPack{xcolor}\hvqrurl*[qrcolor=red!40!white]{http://mirror.ctan.org/pkg/xcolor} +The package xcolor\hvqrurl*[qrcolor=red!40!white]{http://mirror.ctan.org/pkg/xcolor} is loaded by default, ... \end{lstlisting} @@ -105,7 +106,7 @@ to 0pt the QR code \hvqrurl*[qrlink=nolink,qradjust=0pt]{http://ctan.org/} is mo setting without a vertical adjustment. \begin{lstlisting} -The default value of \Lkeyword{qradjust} is \verb|-1.5\normalbaselineskip|. Setting the value +The default value of qradjust is \verb|-1.5\normalbaselineskip|. Setting the value to 0pt the QR code \hvqrurl*[qradjust=0pt]{http://ctan.org/} is moved down which is the default setting without a vertical adjustment. \end{lstlisting} @@ -118,7 +119,7 @@ it can be changed by setting \Lkeyword{qrheight} to another value, for example t This is an exetremely long url where it may make sense to use a larger QR code. \begin{lstlisting} -it can be changed by setting \Lkeyword{qrheight} to another value, for example to 2cm: +it can be changed by setting qrheight to another value, for example to 2cm: \hvqrurl*[qrheight=2cm]{https://identity.fu-berlin.de/idp-fub/profile/SAML2/Redirect/SSO;jsessionid=71C984647E3B8F2E716CA067CB13387E?execution=e1s1} This is an exetremely long url where it may make sense to use a larger QR code. \end{lstlisting} @@ -144,6 +145,18 @@ level \Lkeyval{H}. In general the user has not to set this keyword it will be controlled internally by the package. +\subsection{Inner or outer margin for the QR code} +By default the QR code is set in the right (oneside document) or outer margin (twoside) of the +document. This one (\hvqrurl{http://hvoss.org}) is at the default position. +With the optional argument \Lkeyword{qrreverse} it can be placed in the left or inner margin. +This one (\hvqrurl[qrreverse]{http://latex.texnik.de}) is in the other margin. + +\begin{lstlisting} +This one (\hvqrurl{http://hvoss.org}) is at the default position. +With the optional argument \Lkeyword{qrreverse} it can be placed in the left or inner margin. +This one (\hvqrurl[qrreverse]{http://latex.texnik.de}) is in the other margin. +\end{lstlisting} + \printindex diff --git a/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty b/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty index bf27b32006..64bc0ead4a 100644 --- a/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty +++ b/macros/latex/contrib/hvqrurl/latex/hvqrurl.sty @@ -1,13 +1,13 @@ -%% $Id: hvqrurl.sty 1117 2019-11-28 20:54:41Z herbert $ +%% $Id: hvqrurl.sty 1123 2019-12-01 09:16:34Z herbert $ %% %% This file is distributed under the terms of the LaTeX Project Public %% License from CTAN archives in directory macros/latex/base/lppl.txt. %% Either version 1.3 or, at your option, any later version. %% -% Copyright 2019 Herbert Voss hvoss@tug.org +% Copyright 2019,21 Herbert Voss hvoss@tug.org %% \ProvidesPackage{hvqrurl}[% - 2019/12/01 v.0.01a (Herbert Voss) Supports qr images into the margin (hv)] + 2021/05/18 v.0.02 (Herbert Voss) Supports qr images into the margin (hv)] % \NeedsTeXFormat{LaTeX2e} \RequirePackage{url} @@ -24,12 +24,14 @@ \define@key{hvqr}{qrcolor}[black]{\colorlet{qr@url@qrcolor}{#1}} \define@key{hvqr}{qrlevel}[M]{\def\qr@url@qrlevel{#1}} \define@key{hvqr}{qrlink}[link]{\def\qr@url@qrlink{#1}} +\define@boolkey{hvqr}[hv@]{qrreverse}[true]{}% use of the hvOBox contents -\setkeys{hvqr}{qrheight,qrcolor=black,qradjust,qrlevel,qrlink=link}% the default setting +\setkeys{hvqr}{qrheight,qrcolor=black,qradjust,qrlevel,qrlink=link,qrreverse=false}% the default setting \newcommand*\hvqrset[1]{\setkeys{hvqr}{#1}} \def\hvqrurl{\@ifnextchar*{\@tempswafalse\hvqr@url}{\@tempswatrue\hvqr@@url}} + \def\hvqr@url*{\hvqr@@url} \newcommand*\hvqr@@url[2][]{% @@ -37,6 +39,7 @@ \providecommand*\qr@blank{0}% \ifx\relax#1\relax \else\hvqrset{#1}\fi \expandafter\qrset\expandafter{\qr@url@qrlink,height=\qr@url@qrheight,level=\qr@url@qrlevel}% + \ifhv@qrreverse\reversemarginpar\fi \if@tempswa\url{#2}\fi \edef\reserved@a{\noexpand\marginnote{\noexpand\color{qr@url@qrcolor}\noexpand\qrcode{% \detokenize\expandafter{#2}}}[\qr@url@qradjust]}% diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md index be1b3b2ac1..958d0b50d6 100644 --- a/macros/latex/contrib/siunitx/CHANGELOG.md +++ b/macros/latex/contrib/siunitx/CHANGELOG.md @@ -7,6 +7,20 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to ## [Unreleased] +## [v3.0.1] + +### Added +- Public `\l_siunitx_unit_fraction_tl` variable + +### Changed +- Documentation improvements + +### Fixed +- Printing of fractional units in text mode (issue #418) +- Include `siunitx-abbreviations.cfg` in fallback v2 files + (issue #419) +- French translation of 'to' for ranges (issue #421) + ## [v3.0.0] ### Added @@ -1239,7 +1253,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.0...HEAD +[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.1...HEAD +[v3.0.1]: https://github.com/josephwright/siunitx/compare/v3.0.0...v3.0.1 [v3.0.0]: https://github.com/josephwright/siunitx/compare/v2.8e...v3.0.0 [v2.8e]: https://github.com/josephwright/siunitx/compare/v2.8d...v2.8e [v2.8d]: https://github.com/josephwright/siunitx/compare/v2.8c...v2.8d diff --git a/macros/latex/contrib/siunitx/siunitx-abbreviations.cfg b/macros/latex/contrib/siunitx/siunitx-abbreviations.cfg new file mode 100644 index 0000000000..85d87c1245 --- /dev/null +++ b/macros/latex/contrib/siunitx/siunitx-abbreviations.cfg @@ -0,0 +1,124 @@ +%% +%% This is file `siunitx-abbreviations.cfg', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% siunitx-v2.dtx (with options: `config,abbreviations') +%% --------------------------------------------------------------- +%% The siunitx package --- A comprehensive (SI) units package +%% Maintained by Joseph Wright +%% E-mail: joseph.wright@morningstar2.co.uk +%% Released under the LaTeX Project Public License v1.3c or later +%% See http://www.latex-project.org/lppl.txt +%% --------------------------------------------------------------- +%% +\ProvidesExplFile {siunitx-abbreviations.cfg} {2021-04-17} {2.8e} + {siunitx: Abbreviated units} +\DeclareSIUnit \A { \ampere } +\DeclareSIUnit \pA { \pico \ampere } +\DeclareSIUnit \nA { \nano \ampere } +\DeclareSIUnit \uA { \micro \ampere } +\DeclareSIUnit \mA { \milli \ampere } +\DeclareSIUnit \kA { \kilo \ampere } +\DeclareSIUnit \Hz { \hertz } +\DeclareSIUnit \mHz { \milli \hertz } +\DeclareSIUnit \kHz { \kilo \hertz } +\DeclareSIUnit \MHz { \mega \hertz } +\DeclareSIUnit \GHz { \giga \hertz } +\DeclareSIUnit \THz { \tera \hertz } +\DeclareSIUnit \mol { \mole } +\DeclareSIUnit \fmol { \femto \mole } +\DeclareSIUnit \pmol { \pico \mole } +\DeclareSIUnit \nmol { \nano \mole } +\DeclareSIUnit \umol { \micro \mole } +\DeclareSIUnit \mmol { \milli \mole } +\DeclareSIUnit \kmol { \kilo \mole } +\DeclareSIUnit \V { \volt } +\DeclareSIUnit \pV { \pico \volt } +\DeclareSIUnit \nV { \nano \volt } +\DeclareSIUnit \uV { \micro \volt } +\DeclareSIUnit \mV { \milli \volt } +\DeclareSIUnit \kV { \kilo \volt } +\DeclareSIUnit \hl { \hecto \litre } +\DeclareSIUnit \l { \litre } +\DeclareSIUnit \ml { \milli \litre } +\DeclareSIUnit \ul { \micro \litre } +\DeclareSIUnit \hL { \hecto \liter } +\DeclareSIUnit \L { \liter } +\DeclareSIUnit \mL { \milli \liter } +\DeclareSIUnit \uL { \micro \liter } +\DeclareSIUnit \fg { \femto \gram } +\DeclareSIUnit \pg { \pico \gram } +\DeclareSIUnit \ng { \nano \gram } +\DeclareSIUnit \ug { \micro \gram } +\DeclareSIUnit \mg { \milli \gram } +\DeclareSIUnit \g { \gram } +\DeclareSIUnit \kg { \kilo \gram } +\DeclareSIUnit \amu { \atomicmassunit } +\DeclareSIUnit \W { \watt } +\DeclareSIUnit \uW { \micro \watt } +\DeclareSIUnit \mW { \milli \watt } +\DeclareSIUnit \kW { \kilo \watt } +\DeclareSIUnit \MW { \mega \watt } +\DeclareSIUnit \GW { \giga \watt } +\DeclareSIUnit \J { \joule } +\DeclareSIUnit \uJ { \micro \joule } +\DeclareSIUnit \mJ { \milli \joule } +\DeclareSIUnit \kJ { \kilo \joule } +\DeclareSIUnit \eV { \electronvolt } +\DeclareSIUnit \meV { \milli \electronvolt } +\DeclareSIUnit \keV { \kilo \electronvolt } +\DeclareSIUnit \MeV { \mega \electronvolt } +\DeclareSIUnit \GeV { \giga \electronvolt } +\DeclareSIUnit \TeV { \tera \electronvolt } +\DeclareSIUnit [ inter-unit-product = ] \kWh { \kilo \watt \hour } +\DeclareSIUnit \m { \metre } +\DeclareSIUnit \pm { \pico \metre } +\DeclareSIUnit \nm { \nano \metre } +\DeclareSIUnit \um { \micro \metre } +\DeclareSIUnit \mm { \milli \metre } +\DeclareSIUnit \cm { \centi \metre } +\DeclareSIUnit \dm { \deci \metre } +\DeclareSIUnit \km { \kilo \metre } +\DeclareSIUnit \K { \kelvin } +\DeclareSIUnit \dB { \deci \bel } +\DeclareSIUnit \F { \farad } +\DeclareSIUnit \fF { \femto \farad } +\DeclareSIUnit \pF { \pico \farad } +\DeclareSIUnit \N { \newton } +\DeclareSIUnit \mN { \milli \newton } +\DeclareSIUnit \kN { \kilo \newton } +\DeclareSIUnit \MN { \mega \newton } +\DeclareSIUnit \Pa { \pascal } +\DeclareSIUnit \kPa { \kilo \pascal } +\DeclareSIUnit \MPa { \mega \pascal } +\DeclareSIUnit \GPa { \giga \pascal } +\DeclareSIUnit \mohm { \milli \ohm } +\DeclareSIUnit \kohm { \kilo \ohm } +\DeclareSIUnit \Mohm { \mega \ohm } +\DeclareSIUnit \s { \second } +\DeclareSIUnit \as { \atto \second } +\DeclareSIUnit \fs { \femto \second } +\DeclareSIUnit \ps { \pico \second } +\DeclareSIUnit \ns { \nano \second } +\DeclareSIUnit \us { \micro \second } +\DeclareSIUnit \ms { \milli \second } +%% Copyright (C) 2008-2021 by +%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% +%% It may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License (LPPL), either version 1.3c of +%% this license or (at your option) any later version. The latest +%% version of this license is in the file: +%% http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Joseph Wright. +%% +%% This work consists of the file siunitx.dtx +%% and the derived files siunitx.pdf, +%% siunitx.sty and +%% siunitx.ins. +%% +%% End of file `siunitx-abbreviations.cfg'. diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf Binary files differindex 7a34f865a8..dd338db3ac 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-locale.dtx b/macros/latex/contrib/siunitx/siunitx-locale.dtx index 07a934b2fe..f037fcfae3 100644 --- a/macros/latex/contrib/siunitx/siunitx-locale.dtx +++ b/macros/latex/contrib/siunitx/siunitx-locale.dtx @@ -137,7 +137,7 @@ { \RequirePackage { translations } \DeclareTranslation { English } { to~(numerical~range) } { to } - \DeclareTranslation { French } { to~(numerical~range) } { á } + \DeclareTranslation { French } { to~(numerical~range) } { à } \DeclareTranslation { German } { to~(numerical~range) } { bis } \DeclareTranslation { Spanish } { to~(numerical~range) } { a } \keys_set:nn { siunitx } diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx index 0885d4f1aa..8cdc068b91 100644 --- a/macros/latex/contrib/siunitx/siunitx-print.dtx +++ b/macros/latex/contrib/siunitx/siunitx-print.dtx @@ -73,7 +73,7 @@ % \cs{fontfamily}, \cs{fontseries} and \cs{fontshape}, \cs{familydefault}, % \cs{seriesdefault}, \cs{shapedefault} and \cs{selectfont}. % It also requires the standard -% \LaTeXe{} kernel commands \cs{ensuremath}, \cs{textsubscript} and +% \LaTeXe{} kernel commands \cs{ensuremath}, \cs{mbox}, \cs{textsubscript} and % \cs{textsuperscript} for printing in text mode. The following packages are % also required to provide the functionality detailed. % \begin{itemize} @@ -756,6 +756,7 @@ % \begin{macro}{\@@_text_scripts_two:NnNn} % \begin{macro}{\@@_text_scripts_two:nn} % \begin{macro}{\@@_text_scripts_two:n} +% \begin{macro}{\@@_text_fraction:Nnn} % Typesetting in text mode is easy in font control terms but more tricky % in the manipulation of the input. The easy part comes first. % \begin{macrocode} @@ -777,7 +778,9 @@ } { \selectfont } \tl_use:N \l_@@_text_font_tl - \@@_text_replace:n {#1} + \exp_args:NnV \tl_if_head_eq_meaning:nNTF {#1} \l_siunitx_unit_fraction_tl + { \@@_text_fraction:Nnn #1 } + { \@@_text_replace:n {#1} } } } % \end{macrocode} @@ -913,6 +916,20 @@ } } % \end{macrocode} +% Fraction commands are always math mode, so we have to go back and forth: +% this is done after general font setting for performance reasons. +% \begin{macrocode} +\cs_new_protected:Npn \@@_text_fraction:Nnn #1#2#3 + { + \ensuremath + { + #1 + { \mbox { \@@_text_replace:n {#2} } } + { \mbox { \@@_text_replace:n {#3} } } + } + } +% \end{macrocode} +% \end{macro} % \end{macro} % \end{macro} % \end{macro} diff --git a/macros/latex/contrib/siunitx/siunitx-unit.dtx b/macros/latex/contrib/siunitx/siunitx-unit.dtx index 8eaf45c5ac..f066530439 100644 --- a/macros/latex/contrib/siunitx/siunitx-unit.dtx +++ b/macros/latex/contrib/siunitx/siunitx-unit.dtx @@ -270,6 +270,11 @@ % formatted units: set by |font-command|. % \end{variable} % +% \begin{variable}{\l_siunitx_unit_fraction_tl} +% The fraction function which is applied whne constructing fractional units: +% set by |fraction-command|. +% \end{variable} +% % \begin{variable}{\l_siunitx_unit_symbolic_seq} % This sequence contains all of the symbolic names defined: % these will be in the form of control sequences such as |\kilogram|. @@ -1631,9 +1636,9 @@ % % \begin{variable} % { +% \l_siunitx_unit_fraction_tl , % \l_@@_denominator_bracket_bool , % \l_@@_forbid_literal_bool , -% \l_@@_fraction_function_tl , % \l_@@_parse_bool , % \l_@@_per_symbol_tl , % \l_@@_qualifier_mode_tl , @@ -1648,7 +1653,7 @@ forbid-literal-units .bool_set:N = \l_@@_forbid_literal_bool , fraction-command .tl_set:N = - \l_@@_fraction_function_tl , + \l_siunitx_unit_fraction_tl , parse-units .bool_set:N = \l_@@_parse_bool , per-mode .choice: , @@ -2416,7 +2421,7 @@ { \tl_set:Nx \l_@@_formatted_tl { - \exp_not:V \l_@@_fraction_function_tl + \exp_not:V \l_siunitx_unit_fraction_tl { \exp_not:V \l_@@_formatted_tl } { \exp_not:V \l_@@_denominator_tl } } diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx index 887d0c0311..99932bd943 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-17} {3.0.0} +\ProvidesExplPackage {siunitx} {2021-05-18} {3.0.1} {A comprehensive (SI) units package} % \end{macrocode} % diff --git a/macros/latex/contrib/siunitx/siunitx.ins b/macros/latex/contrib/siunitx/siunitx.ins index 18e3a12736..32ef6f900a 100644 --- a/macros/latex/contrib/siunitx/siunitx.ins +++ b/macros/latex/contrib/siunitx/siunitx.ins @@ -49,7 +49,7 @@ This work is "maintained" (as per LPPL maintenance status) by This work consists of the files siunitx.dtx, siunitx.ins, siunitx.tex, - siunitx-abbreviation.cfg, + siunitx-abbreviations.cfg, siunitx-abbreviation.dtx, siunitx-angle.dtx, siunitx-binary.cfg, diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf Binary files differindex 23c1e8fea4..d09687fc0d 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 2637236df4..2fc9e465d0 100644 --- a/macros/latex/contrib/siunitx/siunitx.tex +++ b/macros/latex/contrib/siunitx/siunitx.tex @@ -2856,12 +2856,16 @@ or \begin{LaTeXdemo}[code only] \usepackage{siunitx}[=v2] \end{LaTeXdemo} +This approach will work with older systems which still have version~$2$ +installed, meaning that you can reliably use it to work between systems +with different versions of \pkg{siunitx}. \begin{function}{\SI, \SIlist, \SIrange, \si} In version~$3$, the document commands have been revised to be more descriptive. As such, the commands \cs{SI}, \cs{SIlist}, \cs{SIrange} and \cs{si} remain available but are not recommended for use in new - documents. + documents. Use the new \cs{qty\ldots} commands instead: they are clearer + and in some cases very slightly faster. \end{function} Some changes have been made to the semantics of commands or options. Most @@ -2873,7 +2877,7 @@ notably \end{itemize} The font control system has been completely re-written for version~$3$. The -method used in entirely different from version~$2$. Emulation is therefore not +method used is entirely different from version~$2$. Emulation is therefore not provided for all outcomes: if you need non-standard font settings, you will need to adjust your source. See Section~\ref{sec:print} for more details on the options available in this area. diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md index 2a29ef526c..bb5bc52a24 100644 --- a/macros/latex/contrib/tuda-ci/README.md +++ b/macros/latex/contrib/tuda-ci/README.md @@ -2,7 +2,7 @@ Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2021 - tuda-ci 2021/03/19 v3.13a + tuda-ci 2021/05/18 v3.14 *************************************************************************** @@ -15,7 +15,7 @@ [English version below](#summary) -# Zusammenfassung +## Zusammenfassung Das TUDa-CI-Bundle ist die Umsetzung des Corporate Designs der TU Darmstadt in LaTeX. Es liefert neben den Klassen-, Paket- und Konfigurationsdateien auch Anwenderdokumentation in Form von Templatedateien für verschiedene Dokumententypen. @@ -60,7 +60,9 @@ ein Paket mit entsprechenden Hinweisen. Für Nicht-Mitglieder ist eine Möglichkeit zur Platzierung eines Ersatzlogos dokumentiert. +## TeXnischer Support für TUDa-Mitglieder +Neben dem Supportangebot zu TUDa-CI gibt es ab April 2021 eine TeXnische Sprechstunde. Details und die für den Zugang notwendigen Informationen finden TUDa-Mitglieder unter https://www.ce.tu-darmstadt.de/ce/latex_tuda/index.de.jsp ## Enthaltene Templatedateien @@ -268,4 +270,7 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls - convert points to a floating point variable * v3.13a (2021-03-19) - patch to fix the automatic reset of points=auto option (tudaexercise) -
\ No newline at end of file + * v3.14 (2021-05-18) + - fix bug in pagestyle init for department=mecheng + - fix beamer mode selection + - fix error in tudaexercise documentation diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf Binary files differindex 83a67e1605..4c45ff1c3d 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaAnnouncement.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf Binary files differindex d00214c57f..cbdf3543e9 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaBeamer.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf Binary files differindex 2e1f0e71ab..e15b0410cb 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaExercise.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf Binary files differindex 062dd0b53d..3f028308b6 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLeaflet.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf Binary files differindex badedb9742..06c69710aa 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaLetter.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf Binary files differindex 4ac8303526..b03f57e408 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPhD.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf Binary files differindex 0b5154fce3..76ba706409 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPoster.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf Binary files differindex 8b27ab91a8..8d91fce4d7 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf Binary files differindex 2f4cc61bbe..f0ab8196b6 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaReport.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf Binary files differindex 3634547218..2901b00072 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaSciPoster.pdf diff --git a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf Binary files differindex 6d15accbec..af36368b2b 100644 --- a/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaThesis.pdf diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex index f59361b19e..bbf82d85b4 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaAnnouncement.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaAnnouncement.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaAnnouncement.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex index dc2bd54e8a..ad3723f538 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBeamer.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBeamer.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaBeamer.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib index 5c3f6bdef0..83a74bc4b0 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaBibliography.bib @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBibliography.bib' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaBibliography.bib' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex index efa5c13acc..3559a68c65 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaExercise.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaExercise.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaExercise.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -35,7 +35,7 @@ \documentclass[ ngerman, - points=true,% für die Aktivierung der Punktereferenzen + points=true,% für die Aktivierung der Punktereferenzen funktioniert nicht für TeX Versionen vor 2020 ]{tudaexercise} \usepackage[english, main=ngerman]{babel} @@ -163,7 +163,7 @@ Zusätzlich sind einige Werte vorbelegt und platzieren die Einträge nach dem se \end{subtask} \begin{subtask}[Kopfzeile auch auf der Titelseite] -Da die Kopfzeile häufig für die Angabe von Studentendaten genutzt wird, ist es mit der Klassenoption \code{headtotitle} auch möglich die Kopfzeile ebenfalls auf der Titelseite einzufügen. +Da die Kopfzeile häufig für die Angabe von Studentendaten genutzt wird, ist es mit der Klassenoption \code{headontitle} auch möglich die Kopfzeile ebenfalls auf der Titelseite einzufügen. \end{subtask} \end{task} diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco index 0a11916b18..92bf90703e 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaFromaddress.lco' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaFromaddress.lco' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex index 5f8bd41518..03cd239362 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLeaflet.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLeaflet.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaLeaflet.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex index bca895f4b7..60ee85e800 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaLetter.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLetter.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaLetter.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex index d4d92a8095..851a546d60 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPhD.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaPhD.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex index 275e537c72..468ccbfe23 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPoster.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaPoster.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex index a3d26dd98a..3e942229c4 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPub.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPub.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaPub.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex index 1f175b030a..f741f34e5a 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaReport.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaReport.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex index 3c474a6482..03f6213846 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaSciPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaSciPoster.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaSciPoster.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex index 04365f25cb..5fae06fa97 100644 --- a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex +++ b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaThesis.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaThesis.tex' version 3.13a (2021/03/19), +%% This is file `DEMO-TUDaThesis.tex' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty index a20e86d8a6..bd9171148a 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamercolorthemeTUDa.sty' version 3.13a (2021/03/19), +%% This is file `beamercolorthemeTUDa.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamercolorthemeTUDa} [\filedate\space\fileversion] @@ -51,7 +51,7 @@ \ExplSyntaxOff \RequirePackage[RGB]{tudacolors} -\mode<beamer> +\mode<presentation> \setbeamercolor*{smallrule}{bg=black} \setbeamercolor*{identbar}{bg=identbarcolor} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty index 3c591d91d9..d77af02575 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerfontthemeTUDa.sty' version 3.13a (2021/03/19), +%% This is file `beamerfontthemeTUDa.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerfontthemeTUDa} [\filedate\space\fileversion] diff --git a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty index 4c113d8943..f41ba1b2fd 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerinnerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerinnerthemeTUDa.sty' version 3.13a (2021/03/19), +%% This is file `beamerinnerthemeTUDa.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerinnerthemeTUDa}{\filedate}{\fileversion}{Inner~beamer~theme~of~tuda-ci} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty index 2c9cb53679..138e562134 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerouterthemeTUDa.sty' version 3.13a (2021/03/19), +%% This is file `beamerouterthemeTUDa.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerouterthemeTUDa}{\filedate}{\fileversion}{Outer~beamer~theme~of~tuda-ci} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty index 62f6bbd109..730804e62b 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa-mecheng.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa-mecheng.sty' version 3.13a (2021/03/19), +%% This is file `beamerthemeTUDa-mecheng.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \RequirePackage{expl3} \ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering} @@ -37,7 +37,7 @@ } -\mode<beamer> +\mode<presentation> % Setup Arrow diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty index 1b8032c0ef..42b69a7e26 100644 --- a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty +++ b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa.sty' version 3.13a (2021/03/19), +%% This is file `beamerthemeTUDa.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthemeTUDa} [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt] diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo index 139baded6c..42bc39b8cc 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a0paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a0paper.clo' version 3.13a (2021/03/19), +%% This is file `tuda-a0paper.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo index f521c1c7b5..0af67bac45 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a1paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a1paper.clo' version 3.13a (2021/03/19), +%% This is file `tuda-a1paper.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo index 6a57d509e0..d54f753cca 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a2paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a2paper.clo' version 3.13a (2021/03/19), +%% This is file `tuda-a2paper.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo index f0c983ff3c..4694821d81 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a3paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a3paper.clo' version 3.13a (2021/03/19), +%% This is file `tuda-a3paper.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo index ab0aa99b87..5acd1c2b3d 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a4paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a4paper.clo' version 3.13a (2021/03/19), +%% This is file `tuda-a4paper.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo index 73afb902c2..af5edcb6a5 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo +++ b/macros/latex/contrib/tuda-ci/tex/tuda-a5paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a5paper.clo' version 3.13a (2021/03/19), +%% This is file `tuda-a5paper.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}} diff --git a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty index df968de505..270940ba51 100644 --- a/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty +++ b/macros/latex/contrib/tuda-ci/tex/tuda-pgfplots.sty @@ -1,4 +1,4 @@ -%% This is file `tuda-pgfplots.sty' version 3.13a (2021/03/19), +%% This is file `tuda-pgfplots.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} % Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt % The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme \ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes] diff --git a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls index 27257ec199..48577a1a62 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudabeamer.cls @@ -1,4 +1,4 @@ -%% This is file `tudabeamer.cls' version 3.13a (2021/03/19), +%% This is file `tudabeamer.cls' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{tudabeamer} [\filedate\space\fileversion\space] diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def index c4a6ada6ba..41d9ccf38e 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudacolors.def +++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.def @@ -1,4 +1,4 @@ -%% This is file `tudacolors.def' version 3.13a (2021/03/19), +%% This is file `tudacolors.def' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \ProvidesFile{tudacolors.def} [\filedate\space\fileversion\space Color definitions for tuda-ci] diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty index d080197bf3..4d3046fdd0 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudacolors.sty +++ b/macros/latex/contrib/tuda-ci/tex/tudacolors.sty @@ -1,4 +1,4 @@ -%% This is file `tudacolors.sty' version 3.13a (2021/03/19), +%% This is file `tudacolors.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls index 778bbc9508..b898c90ff3 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaexercise.cls @@ -1,4 +1,4 @@ -%% This is file `tudaexercise.cls' version 3.13a (2021/03/19), +%% This is file `tudaexercise.cls' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaexercise} @@ -35,6 +35,14 @@ \RequirePackage{l3keys2e} +\msg_new:nnnn {tudaexercise} {outdated-koma-script} { + Your~KOMA-Script~is~outdated.\\ + To~use~the~feature~'#1'~you~will~be~required~to~update. +} { + Please~do~not~use~this~feature~or~update~your~TeX~distribution.\\ + The~feature~requires~KOMA-Script~v#2~or~newer. +} + \str_const:Nn \c__ptxcd_base_str {exercise} \prop_new:N \g_ptxcd_clsopts_prop \prop_new:N \g_ptxcd_unknown_clsopts_prop @@ -278,6 +286,13 @@ \LoadClass{scrartcl} +\bool_if:NT \g__ptxcd_points_bool { + \cs_if_exist:NF \AddtoDoHook{ + \msg_error:nnnn {tudaexercise} {outdated-koma-script} {points=true/auto} {3.27} + \keys_set:nn {ptxcd/exercise} {points=false} + } +} + \RequirePackage{tudarules} %Has to be loaded here due to headwidth options @@ -322,7 +337,7 @@ }} -\usepackage{tudafonts} +\RequirePackage{tudafonts} \dim_new:N \g_ptxcd_innerMargin_dim \dim_new:N \g_ptxcd_outerMargin_dim @@ -774,12 +789,16 @@ \IfNoValueF{#1}{\keys_set:nn {ptxcd/task}{#1}} \@task{#2} \bool_if:NF \l__ptxcd_points_auto_bool { - \prop_gput:Nxx \g__ptxcd_points_collector_prop + \cs_if_exist_use:NF \prop_gput:Nxx + {\exp_args:NNx \prop_gput:Nnx} + \g__ptxcd_points_collector_prop {\thetask} {\fp_to_decimal:N \l_ptxcd_ex_task_points_fp} } }{ - \bool_if:NT \l__ptxcd_points_auto_bool { - \prop_gput:Nxx \g__ptxcd_points_collector_prop + \bool_if:NT \l__ptxcd_points_auto_bool { + \cs_if_exist_use:NF \prop_gput:Nxx + {\exp_args:NNx \prop_gput:Nnx} + \g__ptxcd_points_collector_prop {\thetask} {\fp_to_decimal:N \g__ptxcd_ex_collected_points_fp} \fp_gzero:N \g__ptxcd_ex_collected_points_fp } @@ -886,17 +905,22 @@ \ptxcd_makeheadrule[color=identbarcolor, width=\textwidth]{ptxcd_headrule} % Point referencing -\AddtoDoHook{heading/preinit/subtask}{ - \bool_if:NT \g__ptxcd_points_bool { - \fp_gadd:Nn \g__ptxcd_ex_collected_points_fp {\l_ptxcd_ex_subtask_points_fp} - } -} +\cs_if_exist:NTF \AddtoDoHook { + \AddtoDoHook{heading/preinit/subtask}{ + \bool_if:NT \g__ptxcd_points_bool { + \fp_gadd:Nn \g__ptxcd_ex_collected_points_fp {\l_ptxcd_ex_subtask_points_fp} + } + } -\AddtoDoHook{heading/preinit/task}{ - \fp_gzero:N \g__ptxcd_ex_collected_points_fp + \AddtoDoHook{heading/preinit/task}{ + \fp_gzero:N \g__ptxcd_ex_collected_points_fp + } +} { + \msg_warning:nnnn {tudaexercise} {outdated-koma-script} {point~references} {3.27} } + \msg_new:nnn {tudaexercise} {points-differ} { Value~of~points~changed~for~at~least~one~task.\\ Please~rerun~LaTeX~to~get~correct~references~and~calculations. @@ -949,20 +973,8 @@ \newcommand{\getPointsTotal}{ \fp_use:N \g__ptxcd_points_total_fp } -} { - \newcommand{\getPoints}[1]{ - \msg_error:nnn {tudaexercise} {point-referencing-disabled} {\getPoints} - } - \newcommand{\refPoints}[1]{ - \msg_error:nnn {tudaexercise} {point-referencing-disabled} {\refPoints} - } - \newcommand{\getPointsTotal}[1]{ - \msg_error:nnn {tudaexercise} {point-referencing-disabled} {\getPointsTotal} - } -} -\cs_new:Nn \__ptxcd_map_points_helper:nn {#1-#2} -\NewDocumentCommand{\mapPoints}{sO{1}m}{ + \NewDocumentCommand{\mapPoints}{sO{1}m}{ \cs_gset_nopar:Nn \__ptxcd_map_points_helper:nn {#3} \prop_if_empty:NTF \g__ptxcd_loaded_points_prop { \msg_warning:nn {tudaexercise} {empty-point-mapping} @@ -988,8 +1000,26 @@ \setcounter{task}{\int_use:N \g_ptxcd_tmp_int} \g_ptxcd_tmp_tl } + } + +} { + \newcommand{\getPoints}[1]{ + \msg_error:nnn {tudaexercise} {point-referencing-disabled} {\getPoints} + } + \newcommand{\refPoints}[1]{ + \msg_error:nnn {tudaexercise} {point-referencing-disabled} {\refPoints} + } + \newcommand{\getPointsTotal}[1]{ + \msg_error:nnn {tudaexercise} {point-referencing-disabled} {\getPointsTotal} + } + + \NewDocumentCommand{\mapPoints}{som} { + \msg_error:nnn {tudaexercise} {point-referencing-disabled} {\mapPoints} + } } +\cs_new:Nn \__ptxcd_map_points_helper:nn {#1-#2} + \newcommand*{\ptxcd@LoadPoints}[2][]{ \prop_gset_from_keyval:Nn \g__ptxcd_loaded_points_prop { diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty index a0281b6297..b14d4c077b 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty +++ b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty @@ -1,4 +1,4 @@ -%% This is file `tudafonts.sty' version 3.13a (2021/03/19), +%% This is file `tudafonts.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tudafonts} [\filedate\space\fileversion\space diff --git a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls index 42aee5ebff..3986fad993 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaleaflet.cls @@ -1,4 +1,4 @@ -%% This is file `tudaleaflet.cls' version 3.13a (2021/03/19), +%% This is file `tudaleaflet.cls' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls index 79560854e5..b8310c79e7 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaletter.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaletter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaletter.cls' version 3.13a (2021/03/19), +%% This is file `tudaletter.cls' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaletter} diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo index 965cec6cac..8bc5d23fd4 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo +++ b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudalettersize10pt.clo' version 3.13a (2021/03/19), +%% This is file `tudalettersize10pt.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg index c9c60cdcf7..e406d5f8e1 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg +++ b/macros/latex/contrib/tuda-ci/tex/tudamecheng.cfg @@ -1,4 +1,4 @@ -%% This is file `tudamecheng.cfg' version 3.13a (2021/03/19), +%% This is file `tudamecheng.cfg' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \RequirePackage{expl3} \ProvidesExplFile{tudamecheng.cfg} {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)} @@ -117,7 +117,7 @@ } { \addtokomafont{footsepline}{\color{accentcolor}} - + \box_new:N \g_ptxcd_departmentlogo_box \newpairofpagestyles[TUDa.\c__ptxcd_base_str]{TUDa.mecheng}{ \KOMAoptions{plainfootsepline,footsepline=5pt} \ptxcd_makeheadrule[color=TUDa-Primary1, width=\sls@headwidth]{ptxcd_headrule} @@ -129,7 +129,6 @@ contents=\smash{\ptxcd_headrule} ]{plain.TUDa.mecheng.head.above.line} - \ModifyLayer[ contents={ \dim_compare:nF {\box_wd:N \g_ptxcd_footline_box=\layerwidth} { @@ -150,7 +149,6 @@ \clearpairofpagestyles \cfoot[\pagemark]{\pagemark} - \box_new:N \g_ptxcd_departmentlogo_box \hbox_gset:Nn \g_ptxcd_departmentlogo_box { \raisebox{-\height}{ \tl_if_empty:NTF \g_ptxcd_departmentlogo_tl diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls index 2cb3003ace..d4d49d1bcd 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaposter.cls' version 3.13a (2021/03/19), +%% This is file `tudaposter.cls' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls index a7139b4da4..6651004b7f 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudapub.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudapub.cls @@ -1,4 +1,4 @@ -%% This is file `tudapub.cls' version 3.13a (2021/03/19), +%% This is file `tudapub.cls' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} @@ -1135,7 +1135,12 @@ \newcommand*{\SetPaperID}[2]{ \hbox_gset:Nn \g_ptxcd_PaperID_box { \usekomafont{paperid} + \if@titlepage \dim_set:Nn \l_tmpa_dim {\exp_last_unbraced:No \use_i:nn \ptxcd_title_fontsize: + \exp_last_unbraced:No \use_ii:nn \ptxcd_title_fontsize:} + \else + \Huge + \dim_set:Nn \l_tmpa_dim {1.8\baselineskip} + \fi \fontsize{1.1\l_tmpa_dim}{1.1\l_tmpa_dim} \selectfont #1{\Huge #2} @@ -1158,21 +1163,30 @@ \usekomafont{disposition} \hsize=\g_ptxcd_headwidth_dim \setlength{\fboxsep}{\z@} - \bool_if:NT \g_ptxcd_colorback_bool {\colorbox{accentcolor}}{\parbox[t]{\g_ptxcd_headwidth_dim}{ + \bool_if:NT \g_ptxcd_colorback_bool {\bool_set_true:N \g_ptxcd_colorbacktitle_bool} + \bool_if:NT \g_ptxcd_colorbacktitle_bool {\colorbox{identbarcolor}} + {\parbox[t]{\g_ptxcd_headwidth_dim}{ \rule{\z@}{.5\c_ptxcd_logoheight_dim}\par\nointerlineskip \raisebox{-\height}{% \begin{minipage}[t]{\dimexpr\linewidth-2.2\c_ptxcd_logoheight_dim-1ex} - \bool_if:NT \g_ptxcd_colorback_bool {\begin{addmargin}{.5\c_ptxcd_largerule_dim}} + \bool_if:NT \g_ptxcd_colorbacktitle_bool {\begin{addmargin}{.5\c_ptxcd_largerule_dim}} \raggedright \bool_if:NT \g_ptxcd_colorback_bool {\color{textonaccentcolor}} \tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}} - \leavevmode - {\Huge\usekomafont{title}{ - \Huge - \@title \par - }}% - \vskip 1em - \bool_if:NTF \g_ptxcd_colorback_bool {\end{addmargin}} {\par} + \box_if_empty:NF \g_ptxcd_PaperID_box {\begin{addmargin}[\dim_eval:n {\box_wd:N\g_ptxcd_PaperID_box+.5\c_ptxcd_logoheight_dim}]{0pt}} + \raggedright + \bool_if:NT \g_ptxcd_colorback_bool {\color{textonaccentcolor}} + \tl_if_empty:NF \@titlehead {\usekomafont{titlehead}{\@titlehead\par}} + \leavevmode\usekomafont{title}% + \Huge + \llap{\raisebox{\dimexpr-\height+.5\baselineskip}[0pt][0pt]{\box_use:N \g_ptxcd_PaperID_box}\hspace{.5\c_ptxcd_logoheight_dim}} + \@title\strut + \par + \box_if_empty:NTF \g_ptxcd_PaperID_box + {\vskip1em} + {\rule{0pt}{.5\c_ptxcd_logoheight_dim}} + \box_if_empty:NF \g_ptxcd_PaperID_box {\end{addmargin}} + \bool_if:NTF \g_ptxcd_colorbacktitle_bool {\end{addmargin}} {\par} \vspace{\dim_eval:n {\c_ptxcd_largerule_dim+\c_ptxcd_rulesep_dim}} \end{minipage} } diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty index bf3e14e83c..0cf872730b 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudarules.sty +++ b/macros/latex/contrib/tuda-ci/tex/tudarules.sty @@ -1,4 +1,4 @@ -%% This is file `tudarules.sty' version 3.13a (2021/03/19), +%% This is file `tudarules.sty' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle} @@ -106,7 +106,8 @@ } -\str_case:Vn \g_ptxcd_department_str { +\cs_if_exist_use:NF \str_case:Vn \str_case:on + \g_ptxcd_department_str { {mecheng} {\bool_gset_true:N \g_ptxcd_simple_rules_bool} } diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls index 4148fd0ca9..fa6d35659a 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls +++ b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudasciposter.cls' version 3.13a (2021/03/19), +%% This is file `tudasciposter.cls' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt} diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo index 68b7236324..fb59c2ecf9 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo +++ b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudasize9pt.clo' version 3.13a (2021/03/19), +%% This is file `tudasize9pt.clo' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg index 8bfcaccf9f..a668ce375d 100644 --- a/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg +++ b/macros/latex/contrib/tuda-ci/tex/tudathesis.cfg @@ -1,4 +1,4 @@ -%% This is file `tudathesis.cfg' version 3.13a (2021/03/19), +%% This is file `tudathesis.cfg' version 3.14 (2021/05/18), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.13a} -\def\filedate{2021/03/19} +\def\fileversion{3.14} +\def\filedate{2021/05/18} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)} |