diff options
Diffstat (limited to 'macros/latex/contrib')
64 files changed, 402 insertions, 345 deletions
diff --git a/macros/latex/contrib/curve2e/README.txt b/macros/latex/contrib/curve2e/README.txt index 32a6f31005..4fc8d958be 100644 --- a/macros/latex/contrib/curve2e/README.txt +++ b/macros/latex/contrib/curve2e/README.txt @@ -1,11 +1,11 @@ %% %% This is file `README.txt', %% -%% Copyright (C) 2005--2020 Claudio Beccari all rights reserved. +%% Copyright (C) 2005--2021 Claudio Beccari all rights reserved. %% License information appended %% File README.txt for package curve2e - [2021-01-10 v.2.2.14 Extension package for pict2e] + [2021-01-12 v.2.2.15 Extension package for pict2e] The package bundle curve2e is composed of the following files curve2e.dtx diff --git a/macros/latex/contrib/curve2e/curve2e-manual.pdf b/macros/latex/contrib/curve2e/curve2e-manual.pdf Binary files differindex 11e45b42be..9b7de7d266 100644 --- a/macros/latex/contrib/curve2e/curve2e-manual.pdf +++ b/macros/latex/contrib/curve2e/curve2e-manual.pdf diff --git a/macros/latex/contrib/curve2e/curve2e-manual.tex b/macros/latex/contrib/curve2e/curve2e-manual.tex index 614f853cbd..e53535f1b9 100644 --- a/macros/latex/contrib/curve2e/curve2e-manual.tex +++ b/macros/latex/contrib/curve2e/curve2e-manual.tex @@ -36,22 +36,6 @@ \providecommand\cs{} \renewcommand\cs[1]{{\normalfont\texttt{\char92#1}}} -\providecommand\Pbox{} -\newlength\PbDim -\RenewDocumentCommand\Pbox{D(){0,0} O{cc} m O{0.5ex} s D<>{0}}{% -\put(#1){\rotatebox{#6}{\makebox(0,0){% -\settowidth\PbDim{#2}% -\edef\Rapp{\fpeval{\PbDim/{1ex}}}% -\fptest{\Rapp > 1.5}{\fboxsep=0.5ex}{\fboxsep=0.75ex}% -\IfBooleanTF{#5}{\fboxrule=0.4pt}{\fboxrule=0pt}% -\fptest{#4 = 0sp}% - {\makebox(0,0)[#2]{\fbox{$\relax#3\relax$}}}% - {\edef\Diam{\fpeval{(#4)/\unitlength}}% - \makebox(0,0){\circle*{\Diam}}% - \makebox(0,0)[#2]{\fbox{$\relax\mathsf#3\relax$}}% - }}}% -}\ignorespaces} - \def\LissajousCoefs#1,#2,#3,#4,#5,#6!{% \edef\LAu{#1}\edef\LNu{#2}\edef\LFu{#3}% \edef\LAd{#4}\edef\LNd{#5}\edef\LFd{#6}} diff --git a/macros/latex/contrib/curve2e/curve2e.dtx b/macros/latex/contrib/curve2e/curve2e.dtx index 1062faf737..396d8e6000 100644 --- a/macros/latex/contrib/curve2e/curve2e.dtx +++ b/macros/latex/contrib/curve2e/curve2e.dtx @@ -6,7 +6,7 @@ \keepsilent \preamble - Copyright (C) 2005--2020 Claudio Beccari all rights reserved. + Copyright (C) 2005--2021 Claudio Beccari all rights reserved. License information appended \endpreamble @@ -46,7 +46,7 @@ README.txt and curve2e-v161.sty. %<+package>\ProvidesPackage{curve2e}% %<+readme>File README.txt for package curve2e %<*package|readme> - [2021-01-10 v.2.2.14 Extension package for pict2e] + [2021-01-12 v.2.2.15 Extension package for pict2e] %</package|readme> %<*driver> \documentclass{ltxdoc}\errorcontextlines=9 @@ -82,22 +82,6 @@ README.txt and curve2e-v161.sty. \providecommand\pack{} \renewcommand\pack[1]{{\normalfont\texttt{#1}}} -\providecommand\Pbox{} -\newlength\PbDim -\RenewDocumentCommand\Pbox{D(){0,0} O{cc} m O{0.5ex} s D<>{0}}{% -\put(#1){\rotatebox{#6}{\makebox(0,0){% -\settowidth\PbDim{#2}% -\edef\Rapp{\fpeval{\PbDim/{1ex}}}% -\fptest{\Rapp > 1.5}{\fboxsep=0.5ex}{\fboxsep=0.75ex}% -\IfBooleanTF{#5}{\fboxrule=0.4pt}{\fboxrule=0pt}% -\fptest{#4 = 0sp}% - {\makebox(0,0)[#2]{\fbox{$\relax#3\relax$}}}% - {\edef\Diam{\fpeval{(#4)/\unitlength}}% - \makebox(0,0){\circle*{\Diam}}% - \makebox(0,0)[#2]{\fbox{$\relax\mathsf#3\relax$}}% - }}}% -}\ignorespaces} - \def\LissajousCoefs#1,#2,#3,#4,#5,#6!{% \edef\LAu{#1}\edef\LNu{#2}\edef\LFu{#3}% \edef\LAd{#4}\edef\LNd{#5}\edef\LFd{#6}} @@ -177,7 +161,7 @@ README.txt and curve2e-v161.sty. %</driver> % \fi % -% \CheckSum{5582} +% \CheckSum{5584} % \begin{abstract} % This file documents the |curve2e| extension package to the |pict2e| % bundle implementation; the latter was described by Lamport @@ -1449,6 +1433,7 @@ README.txt and curve2e-v161.sty. % % \begin{macrocode} \providecommand\Pbox{} +\newlength\PbDim \RenewDocumentCommand\Pbox{D(){0,0} O{cc} m O{0.5ex} s D<>{0}}{% \put(#1){\rotatebox{#6}{\makebox(0,0){% \settowidth\PbDim{#2}% diff --git a/macros/latex/contrib/curve2e/curve2e.pdf b/macros/latex/contrib/curve2e/curve2e.pdf Binary files differindex 708b73d581..3b408efc47 100644 --- a/macros/latex/contrib/curve2e/curve2e.pdf +++ b/macros/latex/contrib/curve2e/curve2e.pdf diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md index 5744607360..216ecd2fb7 100644 --- a/macros/latex/contrib/easybook/README.md +++ b/macros/latex/contrib/easybook/README.md @@ -1,6 +1,6 @@ # Easybook book document class -Easybook is a minimalist style template based on the ctexbook book document class. It is mainly suitable for typesetting Chinese books or notes, and can even be slightly modified to become a dissertation template. Some commonly used macro packages have been loaded to achieve general typesetting requirements. Although some details have been considered as much as possible, there are still deficiencies. +Easybook is a minimalist style template based on the ctexbook book document class. It is mainly suitable for typesetting Chinese books or notes, and can even be slightly modified to become a dissertation template. Some commonly used macro packages have been loaded to achieve general typesetting requirements. Although some details have been considered as much as possible, there are still deficiencies. This project is currently under active development. If you have good suggestions, please feel free to give feedback. ## Compilation method @@ -32,7 +32,7 @@ This work may be distributed and/or modified under the conditions of the CC-BY 4 # easybook 书籍文档类 -easybook 是基于 ctexbook 书籍文档类的极简风格模板。它主要适用于中文书籍或笔记的排版,甚至可以稍作修改成为学位论文模板。已加载一些常用的宏包以实现一般的排版要求。尽管已尽可能多地考虑了一些细节,但仍然存在不足。 +easybook 是基于 ctexbook 书籍文档类的极简风格模板。它主要适用于中文书籍或笔记的排版,甚至可以稍作修改成为学位论文模板。已加载一些常用的宏包以实现一般的排版要求。尽管已尽可能多地考虑了一些细节,但仍然存在不足。目前本项目处于活跃的开发状态,如果您有好的建议欢迎进行反馈。 ## 编译方法 diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex 764f18f446..14cd62c1c5 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index ab7a864b75..836d9c8e7b 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -1,10 +1,14 @@ -\documentclass[zihao = -4,openany]{easybook} +\documentclass[ + zihao = -4, + font = myfont, + openany + ]{easybook} + \ctexset { style = { color = forest, - thmbox = true, % capdash = true, % multoc = true, % withpart = true, @@ -23,7 +27,8 @@ tabspread = 1.05, mathspread = 1, capspread = 1, - fnspread = 1 + fnspread = 1.05, + fnsep = 0.5ex }, elfont = { @@ -33,6 +38,13 @@ fnfont = \rmfamily, marfont = \sffamily\footnotesize }, + thmset = + { + thmbox = true, + numberwith = {chapter}, + bodyfont = \normalfont, + headpunct = {.} + }, bibset = { backend = bibtex, @@ -53,7 +65,7 @@ \textcolor[HTML]{00c2ff}{\faEdge}~\url{https://latexstudio.net} \\ \url{https://ctan.org/pkg/easybook} } - \date{2021/01/11\hskip\ccwd\relax v1.21} + \date{2021/01/12\hskip\ccwd\relax v1.21b} } \begin{document} diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex dc02797df4..8e66427d4a 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex index 0ccfde03c0..44fc91afd6 100644 --- a/macros/latex/contrib/easybook/doc/easybook.tex +++ b/macros/latex/contrib/easybook/doc/easybook.tex @@ -8,7 +8,7 @@ \title{\sffamily easybook书籍文档类} \author{瞿毅} -\date{2021/01/11\hskip\ccwd\relax v1.21\thanks{\url{https://gitee.com/TeX-doc/easybook}}} +\date{2021/01/12\hskip\ccwd\relax v1.21b\thanks{\url{https://gitee.com/TeX-doc/easybook}}} \begin{document} \maketitle @@ -20,15 +20,16 @@ \end{abstract} \tableofcontents -\section{编译文档} -成功地编译演示文档,可能需要满足以下的条件 +\section{编译方式} +模板含有一个使用示例文件,编译前建议满足以下的条件 \begin{itemize} - \item 使用 \hologo{XeLaTeX}(推荐)或 \hologo{LuaLaTeX} 两种编译方式,参考文献使用 \hologo{BibTeX} 编译。 - \item 默认情况下安装方正与思源字体。 - \item 安装最新的\TeX 发行版并将宏包升级为最新。 + \item 使用 \hologo{XeLaTeX}(推荐)或 \hologo{LuaLaTeX} 两种编译方式, + \item 参考文献支持用 \hologo{BibTeX}(默认)或 \hologo{biber} 后端处理。 + \item 由于用到了一些较新的宏包,建议安装最新的\TeX 发行版并将宏包升级为最新。 \end{itemize} \subsection{编译步骤} + \begin{frameverb} xelatex -shell-escape easybook-demo bibtex easybook-demo @@ -42,10 +43,10 @@ LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right. \end{frameverb} -\subsection{字体设置} -默认中文使用方正系列的{\songti 方正书宋}、{\heiti 方正黑体}、{\kaishu 方正楷体}和{\fangsong 方正仿宋},英文使用思源系列的{\rmfamily Noto Serif}、{\sffamily Noto Sans}和{\ttfamily Noto Sans Mono},数学字体使用 \pkg{notomath}。字体点击此处下载\href{https://wws.lanzous.com/b01ns361i}{下载地址}。 +\subsection{字体设置}\label{subsec1} +默认使用\CTeX 预置中文字库,当开启 \opt{font = myfont} 选项时需要安装开源字体,中文使用方正系列的{\songti 方正书宋}、{\heiti 方正黑体}、{\kaishu 方正楷体}和{\fangsong 方正仿宋},英文使用思源系列的{\rmfamily Noto Serif}、{\sffamily Noto Sans}和{\ttfamily Noto Sans Mono},数学字体使用 \pkg{notomath}。相关选项可以见小节 \ref{subsec2},字体点击此处下载\href{https://wws.lanzous.com/b01ns361i}{下载地址}。 -如果您\textsf{懒于安装字体},可以见小节 \ref{subsec1} 使用\CTeX 预置中文字库。如果您不喜欢方正、思源字体,\textsf{自定义字体}需启用选项 \opt{font = none},并可在导言区设置中文字体,粗体与斜体不设置会产生警告。 +如果您不想使用\CTeX 默认字体和方正、思源字体,\textsf{自定义字体}需启用选项 \opt{font = none},并可在导言区设置中文字体,粗体与斜体不设置会产生警告。 \begin{ctexexam} \setCJKmainfont{SimSun}[BoldFont = SimHei,ItalicFont = KaiTi] \setCJKsansfont{SimHei} @@ -59,7 +60,7 @@ \item 带有 \exptarget\expstar{} 号的选项,需要通过\CTeX 宏集提供的用户接口命令 \tn{ctexset} 设定。 \end{itemize} -\subsection{文档类选项}\label{subsec1} +\subsection{文档类选项}\label{subsec2} \begin{function}[rEXP,added = 2021-01-05]{draft} 开启草稿模式会加快编译速度,表现有显示页面边框、行溢出的地方显示黑色方块、图片变成占位方框、显示当前日期和关闭超链接渲染。 \end{function} @@ -82,11 +83,12 @@ 同时开启 \opt{newline}、\opt{entitle} 和 \opt{english} 三个选项以符合英文原生风格。 \end{function} -\begin{function}[rEXP,added = 2021-01-05]{font} +\begin{function}[rEXP,added = 2021-01-05,updated = 2021-01-12]{font} \begin{syntax} - font = <adobe|founder|mac|windows|linux|overleaf|none> + font = <adobe|founder|mac|windows|linux|(overleaf)|none|myfont> \end{syntax} -传递给 \cls{ctexbook} 设置字体,最好不要使用原有的 \opt{fontset} 选项,默认情况下使用自定义字体而不开启这个选项,可根据安装的字体及电脑系统选取。\opt{overleaf} 是一个各系统通用选项,会检测系统环境选取对应字体。 +\changes{v1.21b}{2021/01/12}{默认字体与\CTeX 一致,不再是自定义字体。} +传递给 \cls{ctexbook} 设置字体,最好不要使用原有的 \opt{fontset} 选项,默认情况下使用自定义字体而不开启这个选项,可根据安装的字体及电脑系统选取。\opt{myfont} 与 \opt{none} 选项的相关描述见小节 \ref{subsec1},\opt{overleaf} 是一个各系统通用选项,会检测系统环境选取对应字体。 \end{function} \begin{function}[rEXP,added = 2021-01-05]{paper} @@ -113,10 +115,9 @@ \end{function} \subsubsection{风格} -\begin{function}[EXP,updated = 2021-01-08]{style/color,style/thmbox,style/capdash,style/multoc,style/withpart,style/perchap,style/perpage} +\begin{function}[EXP,added = 2021-01-05,updated = 2021-01-12]{style/color,style/capdash,style/multoc,style/withpart,style/perchap,style/perpage} \begin{syntax} color = <(none)|forest|energy|cyberpunk> - thmbox = <true|(false)> capdash = <true|(false)> multoc = <true|(false)> withpart = <true|(false)> @@ -136,7 +137,6 @@ \changes{v1.10}{2021/01/08}{可以自定义主题颜色。} 主题颜色用到这三个颜色,可以使用 \tn{definecolor} 命令进行更改,类似地更改超链接颜色见小节 \ref{ssubsec1}。 \end{function} - \item[thmbox] 开启定理及习题环境的盒子边框。 \item[capdash] 将图表代码标题风格由例如\textsf{图1.1}变为\textsf{图1\textendash 1}的形式。 \item[multoc] 开启双栏目录,可与 \opt{onecolumn} 和 \opt{twocolumn} 选项配合出单栏正文、单栏目录,双栏正文、单栏目录,单栏正文、双栏目录和双栏正文、双栏目录四种方式 。 \item[withpart] 使章跟随每一部分编号,默认不跟随。 @@ -145,7 +145,7 @@ \end{optdesc} \subsubsection{超链接}\label{ssubsec1} -\begin{function}[EXP,updated = 2021-01-08]{link/hyperlink,link/linkcolor,link/linktopage} +\begin{function}[EXP,added = 2021-01-05,updated = 2021-01-08]{link/hyperlink,link/linkcolor,link/linktopage} \begin{syntax} hyperlink = <(edge)|various|none> linkcolor = <(graphite)|cutepink|skyblue|crimson> @@ -167,15 +167,17 @@ \end{optdesc} \subsubsection{行距} -\begin{function}[EXP,added = 2021-01-05]{spread/linespread,spread/tabspread,spread/mathspread,spread/capspread,spread/fnspread} +\begin{function}[EXP,added = 2021-01-05,updated = 2021-01-12]{spread/linespread,spread/tabspread,spread/mathspread,spread/capspread,spread/fnspread,spread/fnsep} \begin{syntax} linespread = <(1.3)> tabspread = <(1)> mathspread = <(1)> capspread = <(1)> fnspread = <(1)> + fnsep = <(0ex)> \end{syntax} -行距因子用于设置各种行距倍数,只能是浮点数,不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效,行距的意义为 +\changes{v1.21b}{2021/01/12}{增加脚注线间的距离选项。} +除了 \opt{fnsep} 选项,其它是行距因子用于设置各种行距倍数,只能是浮点数,不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效,行距的意义为 \end{function} \begin{optdesc} @@ -184,6 +186,7 @@ \item[mathspread] 数学环境行距。 \item[capspread] 图表代码标题行距。 \item[fnspread] 脚注行距。 + \item[fnspread] 脚注与脚注线间的距离,需带有长度单位。 \end{optdesc} \subsubsection{其它字体} @@ -226,6 +229,38 @@ \item[\tn{printbibliography}] 两种方式\textsf{均使用}此命令打印参考文献,其中可选项仅在 \hologo{biber} 处理时有效。 \end{optdesc} +\subsubsection{定理样式} +\begin{function}[EXP,added = 2021-01-12]{thmset/thmbox,thmset/numberwith,thmset/headpunct,thmset/bodyfont,thmset/notefont,thmset/headindent,thmset/spaceabove,thmset/spacebelow} +\begin{syntax} + thmbox = <true|(false))> + numberwith = <(chapter)|section|其它环境|空置> + headpunct = <(未设置)> + bodyfont = <(未设置)> + notefont = <(未设置)> + headindent = <(0\tn{ccwd})> + spaceabove = <(0.75ex plus .1ex)> + spacebelow = <(0.75ex plus .1ex)> +\end{syntax} +\changes{v1.21b}{2021/01/12}{增加配置定理环境样式的选项。} +\end{function} + +\begin{optdesc} + \item[thmbox] 开启定理及习题环境的盒子边框。 + \item[numberwith] 定理编号格式,默认跟随章的编号,也可以与其它定理环境共享编号,空置时不跟随其它计数器编号。 + \item[headpunct] 定理标题后的标记。 + \item[bodyfont] 定理内容部分的字体。 + \item[notefont] 定理标题内容的字体。 + \item[headindent] 定理标题的缩进,默认无缩进,可用 \tn{parindent} 命令设置为段落缩进。 + \item[spaceabove] 定理环境前的间距。 + \item[spacebelow] 定理环境后的间距。 +\end{optdesc} + +\subsubsection{新的定理样式} +定理由 \pkg{thmtools} 设置,自带定理的样式为 \opt{mythm},如果使用这个样式而只是增加新的定理名称,可以这样 +\begin{ctexexam} + \declaretheorem[style = mythm,name = 定理名]{定理环境名} +\end{ctexexam} +若要重新定义一个全新的定理样式,具体参数可以查看 \pkg{thmtools} 宏包帮助文档。 \section{常用环境} \subsection{公式} @@ -272,14 +307,14 @@ \subsubsection{主题列表} 使用 \opt{description} 环境可创建带有主题词的列表。 \begin{ctexexam} -\begin{description} - \item[主题一] 内容一 - \item[主题二] 内容二 -\end{description} + \begin{description} + \item[主题一] 内容一 + \item[主题二] 内容二 + \end{description} \end{ctexexam} \subsection{定理} -\begin{function}[updated = 2021-01-08]{theorem,definition,lemma,corollary,proposition,example,remark,proof} +\begin{function}[added = 2021-01-05,updated = 2021-01-08]{theorem,definition,lemma,corollary,proposition,example,remark,proof} \begin{syntax} \tn{begin}\marg{环境名} <定理内容> diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls index 48f079ad66..3102ff922f 100644 --- a/macros/latex/contrib/easybook/easybook.cls +++ b/macros/latex/contrib/easybook/easybook.cls @@ -9,10 +9,12 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/01/11}{v1.21}{} +\ProvidesExplClass{easybook}{2021/01/12}{v1.21b}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} +\cs_new_protected:Npn \__ctex_define:n #1 + {\keys_define:nn {ctex/#1}} \cs_new_protected:Npn \__put_ctexbook:n #1 {\PassOptionsToClass{#1}{ctexbook}} \cs_new_protected:Npn \__patch_cmd:Nnn #1#2#3 @@ -23,10 +25,9 @@ \bool_set_false:N \l__draft_bool \bool_set_false:N \l__newline_bool \bool_set_false:N \l__enstyle_bool +\bool_set_false:N \l__myfont_bool \bool_set_true:N \l__zhtitle_bool -\bool_set_true:N \l__myfont_bool \bool_set_true:N \l__lang_chinese_bool -\bool_set_false:N \l__paper_bfive_bool \bool_set_true:N \l__paper_afour_bool \bool_set_true:N \l__page_twoside_bool \clist_new:N \g__options_clist @@ -40,43 +41,32 @@ english .code:n = {\bool_set_false:N \l__lang_chinese_bool}, font .choice:, + font .value_required:n = true, + font/overleaf .code:n = {}, font/adobe .code:n = - { - \__put_ctexbook:n {fontset = #1} - \bool_set_false:N \l__myfont_bool - }, + {\__put_ctexbook:n {fontset = #1}}, font/founder .code:n = - { - \__put_ctexbook:n {fontset = #1} - \bool_set_false:N \l__myfont_bool - }, + {\__put_ctexbook:n {fontset = #1}}, font/mac .code:n = - { - \__put_ctexbook:n {fontset = #1} - \bool_set_false:N \l__myfont_bool - }, + {\__put_ctexbook:n {fontset = #1}}, font/windows .code:n = - { - \__put_ctexbook:n {fontset = #1} - \bool_set_false:N \l__myfont_bool - }, + {\__put_ctexbook:n {fontset = #1}}, font/linux .code:n = - { - \__put_ctexbook:n {fontset = ubuntu} - \bool_set_false:N \l__myfont_bool - }, - font/overleaf .code:n = - {\bool_set_false:N \l__myfont_bool}, + {\__put_ctexbook:n {fontset = ubuntu}}, font/none .code:n = + {\__put_ctexbook:n {fontset = #1}}, + font/myfont .code:n = { - \__put_ctexbook:n {fontset = #1} - \bool_set_false:N \l__myfont_bool + \bool_set_true:N \l__myfont_bool + \__put_ctexbook:n {fontset = none} }, - font .default:n = windows, + font .initial:n = overleaf, paper .choice:, + paper .value_required:n = true, paper/a4 .code:n = {}, - paper/b5 .code:n = {\bool_set_true:N \l__paper_bfive_bool}, + paper/b5 .code:n = + {\bool_set_false:N \l__paper_afour_bool}, paper .initial:n = a4, oneside .value_forbidden:n = true, @@ -90,7 +80,6 @@ \ProcessKeysOptions{easybook} -\bool_if:NT \l__myfont_bool{\__put_ctexbook:n {fontset = none}} \bool_if:NT \l__enstyle_bool { \bool_set_false:N \l__lang_chinese_bool @@ -106,28 +95,13 @@ \LoadClass[UTF8]{ctexbook} \bool_set_true:N \l__backend_bibtex_bool -\clist_new:N \l__hyperref_clist -\bool_new:N \l__thmbox_bool -\bool_new:N \l__capdash_bool -\bool_new:N \l__multoc_bool -\bool_new:N \l__chap_withpart_bool -\bool_new:N \l__foot_perpart_bool -\bool_new:N \l__foot_perpage_bool -\fp_new:N \l__line_spread_fp -\fp_new:N \l__tab_spread_fp -\tl_new:N \l__math_spread_tl -\tl_new:N \l__cap_spread_tl -\tl_new:N \l__foot_spread_tl -\tl_new:N \l__tab_font_tl -\tl_new:N \l__fig_font_tl -\tl_new:N \l__lst_font_tl -\tl_new:N \l__foot_font_tl -\tl_new:N \l__margin_font_tl -\tl_new:N \l__bib_mysty_tl -\tl_new:N \l__bib_style_tl -\tl_new:N \l__bib_citesty_tl -\tl_new:N \l__bib_file_tl -\tl_new:N \g__config_tl +\bool_new:N \l__capdash_bool +\bool_new:N \l__multoc_bool +\bool_new:N \l__chap_withpart_bool +\bool_new:N \l__foot_perpart_bool +\bool_new:N \l__foot_perpage_bool +\clist_new:N \l__hyperref_clist +\tl_new:N \g__config_tl \ctex_define:n { @@ -136,75 +110,28 @@ spread .meta:nn = {ctex/spread}{#1}, elfont .meta:nn = {ctex/elfont}{#1}, bibset .meta:nn = {ctex/bibset}{#1}, + thmset .meta:nn = {ctex/thmset}{#1}, config .tl_set:N = \g__config_tl, - - style/thmbox .bool_set:N = \l__thmbox_bool, - style/thmbox .default:n = true, - style/thmbox .initial:n = false, - style/capdash .bool_set:N = \l__capdash_bool, - style/capdash .default:n = true, - style/capdash .initial:n = false, - style/multoc .bool_set:N = \l__multoc_bool, - style/multoc .default:n = true, - style/multoc .initial:n = false, - style/withpart .bool_set:N = \l__chap_withpart_bool, - style/withpart .default:n = true, - style/withpart .initial:n = false, - style/perpart .bool_set:N = \l__foot_perpart_bool, - style/perpart .default:n = true, - style/perpart .initial:n = false, - style/perpage .bool_set:N = \l__foot_perpage_bool, - style/perpage .default:n = true, - style/perpage .initial:n = false, - - spread/linespread .fp_set:N = \l__line_spread_fp, - spread/linespread .initial:n = 1.3, - spread/tabspread .fp_set:N = \l__tab_spread_fp, - spread/tabspread .initial:n = 1, - spread/mathspread .tl_set:N = \l__math_spread_tl, - spread/mathspread .initial:n = 1, - spread/capspread .tl_set:N = \l__cap_spread_tl, - spread/capspread .initial:n = 1, - spread/fnspread .tl_set:N = \l__foot_spread_tl, - spread/fnspread .initial:n = 1, - - elfont/tabfont .tl_set:N = \l__tab_font_tl, - elfont/tabfont .initial:n = \sffamily\small, - elfont/figfont .tl_set:N = \l__fig_font_tl, - elfont/figfont .initial:n = \sffamily\small, - elfont/lstfont .tl_set:N = \l__lst_font_tl, - elfont/lstfont .initial:n = \sffamily\small, - elfont/fnfont .tl_set:N = \l__foot_font_tl, - elfont/fnfont .initial:n = \rmfamily, - elfont/marfont .tl_set:N = \l__margin_font_tl, - elfont/marfont .initial:n = \rmfamily\footnotesize, - - bibset/backend .choice:, - bibset/backend/bibtex .code:n = {}, - bibset/backend/biblatex .code:n = - {\bool_set_false:N \l__backend_bibtex_bool}, - bibset/bibstyle .choice:, - bibset/bibstyle .value_required:n = true, - bibset/bibstyle/number .code:n = - { - \tl_set:Nn \l__bib_style_tl{number} - \tl_clear:N \l__bib_mysty_tl - }, - bibset/bibstyle/authoryear .code:n = - { - \tl_set:Nn \l__bib_style_tl{authoryear} - \tl_clear:N \l__bib_mysty_tl - }, - bibset/bibstyle/unknown .code:n = - {\tl_set_eq:NN \l__bib_mysty_tl\l_keys_value_tl}, - bibset/bibstyle .initial:n = number, - bibset/citestyle .code:n = - {\tl_set:Nn \l__bib_citesty_tl{#1}}, - bibset/bibfile .tl_set:N = \l__bib_file_tl, - bibset/bibfile .initial:n = ref/refs.bib, - - lstlistlistingname .tl_set:N = \lstlistlistingname, - lstlistingname .tl_set:N = \lstlistingname + lstlistlistingname .tl_set:N = \lstlistlistingname, + lstlistingname .tl_set:N = \lstlistingname + } +\__ctex_define:n {style} + { + capdash .bool_set:N = \l__capdash_bool, + capdash .default:n = true, + capdash .initial:n = false, + multoc .bool_set:N = \l__multoc_bool, + multoc .default:n = true, + multoc .initial:n = false, + withpart .bool_set:N = \l__chap_withpart_bool, + withpart .default:n = true, + withpart .initial:n = false, + perpart .bool_set:N = \l__foot_perpart_bool, + perpart .default:n = true, + perpart .initial:n = false, + perpage .bool_set:N = \l__foot_perpage_bool, + perpage .default:n = true, + perpage .initial:n = false } \RequirePackage[svgnames]{xcolor} @@ -333,7 +260,7 @@ } \cs_if_exist:NF \kaishu{\cs_gset_eq:NN \kaishu\normalfont} -\bool_if:NT \l__paper_afour_bool +\bool_if:NTF \l__paper_afour_bool { \geometry { @@ -348,9 +275,7 @@ marginparsep = 8pt, marginparwidth = 2.54cm } - } -\bool_if:NT \l__paper_bfive_bool - { + }{ \geometry { b5paper, @@ -628,6 +553,26 @@ {\@mkboth{\MakeUppercase\indexname}{\MakeUppercase\indexname}} {\__markboth:n \indexname} +\tl_new:N \l__tab_font_tl +\tl_new:N \l__fig_font_tl +\tl_new:N \l__lst_font_tl +\tl_new:N \l__foot_font_tl +\tl_new:N \l__margin_font_tl + +\__ctex_define:n {elfont} + { + tabfont .tl_set:N = \l__tab_font_tl, + tabfont .initial:n = \sffamily\small, + figfont .tl_set:N = \l__fig_font_tl, + figfont .initial:n = \sffamily\small, + lstfont .tl_set:N = \l__lst_font_tl, + lstfont .initial:n = \sffamily\small, + fnfont .tl_set:N = \l__foot_font_tl, + fnfont .initial:n = \rmfamily, + marfont .tl_set:N = \l__margin_font_tl, + marfont .initial:n = \rmfamily\footnotesize + } + \DeclareCaptionLabelSeparator{ccwd}{\hspace{\ccwd}} \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)} \DeclareCaptionFont{tabfont}{\l__tab_font_tl} @@ -679,6 +624,29 @@ \AtBeginEnvironment{tabular} {\exp_args:Nx \linespread{\fp_use:N \l__tab_spread_fp}\selectfont\ignorespaces} +\fp_new:N \l__line_spread_fp +\fp_new:N \l__tab_spread_fp +\tl_new:N \l__math_spread_tl +\tl_new:N \l__cap_spread_tl +\tl_new:N \l__foot_spread_tl +\tl_new:N \l__foot_fnsep_tl + +\__ctex_define:n {spread} + { + linespread .fp_set:N = \l__line_spread_fp, + linespread .initial:n = 1.3, + tabspread .fp_set:N = \l__tab_spread_fp, + tabspread .initial:n = 1, + mathspread .tl_set:N = \l__math_spread_tl, + mathspread .initial:n = 1, + capspread .tl_set:N = \l__cap_spread_tl, + capspread .initial:n = 1, + fnspread .tl_set:N = \l__foot_spread_tl, + fnspread .initial:n = 1, + fnsep .tl_set:N = \l__foot_fnsep_tl, + fnsep .initial:n = 0ex + } + \skip_set:Nn \parskip{0pt plus 2pt minus 1pt} \skip_set:Nn \floatsep{12pt plus 2pt minus 2pt} \skip_set:Nn \intextsep{14pt plus 2pt minus 2pt} @@ -758,37 +726,69 @@ }{\__thmname_set:nn #1} } -\declaretheoremstyle[ - spaceabove = .75ex plus .1ex, - spacebelow = .75ex plus .1ex, - headindent = 0\ccwd, - headfont = \color{ctex@emph}\sffamily, - notefont = {}, - notebraces = {}{}, - bodyfont = \normalfont, - headpunct = {.}, - postheadspace = \ccwd, - numberwithin = chapter, - headformat = \NAME\space\NUMBER\NOTE - ]{mythm} -\declaretheorem[style = mythm,name = \c__name_theorem_tl]{theorem} -\declaretheorem[style = mythm,name = \c__name_definition_tl]{definition} -\declaretheorem[style = mythm,name = \c__name_lemma_tl]{lemma} -\declaretheorem[style = mythm,name = \c__name_corollary_tl]{corollary} -\declaretheorem[style = mythm,name = \c__name_proposition_tl]{proposition} -\declaretheorem[style = mythm,name = \c__name_example_tl]{example} -\cs_gset_eq:NN \proof\relax -\declaretheorem{remark}[ - style = mythm, - name = \faCommentingO\space\c__name_remark_tl, - numbered = no - ] -\declaretheorem{proof}[ - style = mythm, - name = \faPencilSquareO\space\proofname, - numbered = no, - qed = \qedsymbol - ] +\bool_new:N \l__thmbox_bool +\tl_new:N \l__thm_numberwith_tl +\tl_new:N \l__thm_headpunct_tl +\tl_new:N \l__thm_bodyfont_tl +\tl_new:N \l__thm_notefont_tl +\tl_new:N \l__thm_headindent_tl +\tl_new:N \l__thm_spaceabove_tl +\tl_new:N \l__thm_spacebelow_tl + +\__ctex_define:n {thmset} + { + thmbox .bool_set:N = \l__thmbox_bool, + thmbox .default:n = true, + thmbox .initial:n = false, + numberwith .tl_set:N = \l__thm_numberwith_tl, + numberwith .initial:n = {chapter}, + headpunct .tl_set:N = \l__thm_headpunct_tl, + headpunct .initial:n = {}, + bodyfont .tl_set:N = \l__thm_bodyfont_tl, + bodyfont .initial:n = {}, + notefont .tl_set:N = \l__thm_notefont_tl, + notefont .initial:n = {}, + headindent .tl_set:N = \l__thm_headindent_tl, + headindent .initial:n = {0\ccwd}, + spaceabove .tl_set:N = \l__thm_spaceabove_tl, + spaceabove .initial:n = {.75ex plus .1ex}, + spacebelow .tl_set:N = \l__thm_spacebelow_tl, + spacebelow .initial:n = {.75ex plus .1ex} + } +\ctex_at_end_preamble:n + { + \declaretheoremstyle[ + spaceabove = \l__thm_spaceabove_tl, + spacebelow = \l__thm_spacebelow_tl, + headindent = \l__thm_headindent_tl, + headfont = \color{ctex@emph}\sffamily, + notefont = \l__thm_notefont_tl, + notebraces = {}{}, + bodyfont = \l__thm_bodyfont_tl, + headpunct = \l__thm_headpunct_tl, + postheadspace = \ccwd, + numberwithin = \l__thm_numberwith_tl, + headformat = \NAME\space\NUMBER\NOTE + ]{mythm} + \declaretheorem[style = mythm,name = \c__name_theorem_tl]{theorem} + \declaretheorem[style = mythm,name = \c__name_definition_tl]{definition} + \declaretheorem[style = mythm,name = \c__name_lemma_tl]{lemma} + \declaretheorem[style = mythm,name = \c__name_corollary_tl]{corollary} + \declaretheorem[style = mythm,name = \c__name_proposition_tl]{proposition} + \declaretheorem[style = mythm,name = \c__name_example_tl]{example} + \cs_gset_eq:NN \proof\relax + \declaretheorem{remark}[ + style = mythm, + name = \c__name_remark_tl, + numbered = no + ] + \declaretheorem{proof}[ + style = mythm, + name = \proofname, + numbered = no, + qed = \qedsymbol + ] + } \settasks { @@ -930,7 +930,7 @@ center~title, IfValueT = {#2}{title = #2} } -\NewTCBox{\fuzzy}{O{yellow}O{}} +\NewTCBox{\fuzzy}{O{DarkSeaGreen}O{}} {nobeforeafter,tcbox~raise~base,blank,fuzzy~halo = 2pt~with~#1,#2} \DeclareTotalTCBox{\concise}{O{Aqua}O{}v} { @@ -940,6 +940,38 @@ colback = #1!15!white,#2 }{#3} +\tl_new:N \l__bib_mysty_tl +\tl_new:N \l__bib_style_tl +\tl_new:N \l__bib_citesty_tl +\tl_new:N \l__bib_file_tl + +\__ctex_define:n {bibset} + { + backend .choice:, + backend/bibtex .code:n = {}, + backend/biblatex .code:n = + {\bool_set_false:N \l__backend_bibtex_bool}, + bibstyle .choice:, + bibstyle .value_required:n = true, + bibstyle/number .code:n = + { + \tl_set:Nn \l__bib_style_tl{#1} + \tl_clear:N \l__bib_mysty_tl + }, + bibstyle/authoryear .code:n = + { + \tl_set:Nn \l__bib_style_tl{#1} + \tl_clear:N \l__bib_mysty_tl + }, + bibstyle/unknown .code:n = + {\tl_set_eq:NN \l__bib_mysty_tl\l_keys_value_tl}, + bibstyle .initial:n = number, + citestyle .code:n = + {\tl_set:Nn \l__bib_citesty_tl{#1}}, + bibfile .tl_set:N = \l__bib_file_tl, + bibfile .initial:n = ref/refs.bib + } + \cs_new_protected:Npn \__bibtex_set: { \tl_if_empty:NTF \l__bib_mysty_tl @@ -952,7 +984,7 @@ {\bibliographystyle{gbt7714-author-year}} \cs_set_eq:NN \cite\citep } - }{ + }{ \exp_args:NV \bibliographystyle\l__bib_mysty_tl } \cs_set:Npn \bibsection{\__title_mark_intoc:n \bibname} @@ -998,18 +1030,18 @@ } } -\skip_set:Nn \footnotemargin{0.5\ccwd} -\skip_set:Nn \footnotesep{0ex} -\cs_gset:Npn \hangfootparskip{0ex} -\cs_gset:Npn \footnoterule - { - \color{ctex@frame}\hrule width 0.35\columnwidth height 0.75pt - \vspace*{2.6pt}\color{black} - } -\bool_if:NT \l__lang_chinese_bool - {\cs_gset:Npn \hangfootparindent{2\ccwd}} \ctex_at_end_preamble:n { + \skip_set:Nn \footnotemargin{0.5\ccwd} + \skip_set:Nn \footnotesep{\l__foot_fnsep_tl} + \cs_gset:Npn \hangfootparskip{0ex} + \cs_gset:Npn \footnoterule + { + \color{ctex@frame}\hrule width 0.35\columnwidth height 0.75pt + \vspace*{2.6pt}\color{black} + } + \bool_if:NT \l__lang_chinese_bool + {\cs_gset:Npn \hangfootparindent{2\ccwd}} \bool_if:NT \l__chap_withpart_bool {\counterwithin*{chapter}{part}} \bool_if:NT \l__foot_perpart_bool @@ -1249,10 +1281,10 @@ \bool_if:NTF \l__newline_bool {\par\nobreak\vskip 1.5pc}{\hspace{\ccwd}} }, - beforeskip = -1.5ex, - afterskip = 3ex, - lotskip = 0.8pc, - lofskip = 0.8pc, + beforeskip = {-1.5ex}, + afterskip = {3ex}, + lotskip = {0.8pc}, + lofskip = {0.8pc}, tocline = {\CTEXifname{\CTEXthechapter\hspace{\ccwd}}{}#2} }, section = @@ -1260,8 +1292,8 @@ hang = true, format = {\color{ctex@frame}\sffamily\Large}, aftername = {\hspace{0.5\ccwd}}, - beforeskip = 1.5ex plus .2ex minus .1ex, - afterskip = 1.5ex plus .2ex minus .1ex, + beforeskip = {1.5ex plus .2ex minus .1ex}, + afterskip = {1.5ex plus .2ex minus .1ex}, tocline = {\CTEXifname{\CTEXthesection\hspace{\ccwd}}{}#2} }, subsection = @@ -1269,8 +1301,8 @@ hang = true, format = {\color{ctex@frame}\sffamily\large}, aftername = {\hspace{0.5\ccwd}}, - beforeskip = 1.3ex plus .2ex minus .1ex, - afterskip = 1.3ex plus .2ex minus .1ex, + beforeskip = {1.3ex plus .2ex minus .1ex}, + afterskip = {1.3ex plus .2ex minus .1ex}, tocline = {\CTEXifname{\CTEXthesubsection\hspace{\ccwd}}{}#2} }, subsubsection = @@ -1278,8 +1310,8 @@ hang = true, format = {\color{ctex@frame}\sffamily}, aftername = {\hspace{0.5\ccwd}}, - beforeskip = \parskip, - afterskip = \parskip + beforeskip = {\parskip}, + afterskip = {\parskip} } } diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md index a10670e38d..5a81783008 100644 --- a/macros/latex/contrib/tuda-ci/README.md +++ b/macros/latex/contrib/tuda-ci/README.md @@ -1,8 +1,8 @@ # TUDa-CI – Corporate Design LaTeX-Templates for TU Darmstadt - Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2020 + Copyright (C) Marei Peischl <marei@peitex.de>, 2018–2021 - tuda-ci 2020/11/12 v3.08 + tuda-ci 2021/01/12 v3.09 *************************************************************************** @@ -220,3 +220,5 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls - fix titleback margins - add predefined values for some cc licenses in tudathesis - additional options to adjust titlepage color scheme + * v3.09 (2021-01-12) + - small patch including layout adjustments for department=mecheng 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 b1a0b5180a..8de312940f 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 3017dd8756..8edd5fee14 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 6a24af761d..1ddc03da5a 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 afb90f4fd1..5f4b5e6670 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 ccc622add2..6f7c5b4a7d 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 b6b23c815a..dcdc21c3a9 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 0546fa5a5b..72870c3e57 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 4513ac09c2..8738115c85 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 7d14e3ce21..c4c7d571af 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 4bcf4e2f01..4fe2f0763e 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 4d13dd084e..c82924bdb5 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 5d360c6983..1f51b96269 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.08 (2020/11/12), +%% This is file `DEMO-TUDaAnnouncement.tex' version 3.09 (2021/01/12), %% 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 0840efd91e..783bffcef2 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.08 (2020/11/12), +%% This is file `DEMO-TUDaBeamer.tex' version 3.09 (2021/01/12), %% 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 f25abfb1d6..960fe16096 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.08 (2020/11/12), +%% This is file `DEMO-TUDaBibliography.bib' version 3.09 (2021/01/12), %% 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 898485ef09..6df89b6b32 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.08 (2020/11/12), +%% This is file `DEMO-TUDaExercise.tex' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaFromaddress.lco index f08bac22d0..b19be8ca74 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.08 (2020/11/12), +%% This is file `DEMO-TUDaFromaddress.lco' version 3.09 (2021/01/12), %% 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 e74ecf4602..770caadc3c 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.08 (2020/11/12), +%% This is file `DEMO-TUDaLeaflet.tex' version 3.09 (2021/01/12), %% 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 d7a47a9b37..995757a467 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.08 (2020/11/12), +%% This is file `DEMO-TUDaLetter.tex' version 3.09 (2021/01/12), %% 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 e451ced49f..3cdc7720cf 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.08 (2020/11/12), +%% This is file `DEMO-TUDaPhD.tex' version 3.09 (2021/01/12), %% 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 ebf45122cb..07ba6f38e1 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.08 (2020/11/12), +%% This is file `DEMO-TUDaPoster.tex' version 3.09 (2021/01/12), %% 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 2a9db8f195..2f5df4da44 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.08 (2020/11/12), +%% This is file `DEMO-TUDaPub.tex' version 3.09 (2021/01/12), %% 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 e735b79a42..7e07e2574a 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.08 (2020/11/12), +%% This is file `DEMO-TUDaReport.tex' version 3.09 (2021/01/12), %% 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 64a6c6ad43..235b6b5a0c 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.08 (2020/11/12), +%% This is file `DEMO-TUDaSciPoster.tex' version 3.09 (2021/01/12), %% 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 287f4e213c..f4f3d087d1 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.08 (2020/11/12), +%% This is file `DEMO-TUDaThesis.tex' version 3.09 (2021/01/12), %% 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 2b63d2ec40..8d208e60d5 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.08 (2020/11/12), +%% This is file `beamercolorthemeTUDa.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamercolorthemeTUDa} [\filedate\space\fileversion] diff --git a/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerfontthemeTUDa.sty index ed3b3fbdf8..d14bb87e0c 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.08 (2020/11/12), +%% This is file `beamerfontthemeTUDa.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 6df42d1ae5..981e8d5ba9 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.08 (2020/11/12), +%% This is file `beamerinnerthemeTUDa.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 2113efa4b7..3e50759302 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.08 (2020/11/12), +%% This is file `beamerouterthemeTUDa.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 73df495d97..fad8a59b72 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.08 (2020/11/12), +%% This is file `beamerthemeTUDa-mecheng.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \RequirePackage{expl3} \ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering} diff --git a/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerthemeTUDa.sty index 6321f9c2e0..298ec134eb 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.08 (2020/11/12), +%% This is file `beamerthemeTUDa.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 886b818898..5a14a4ef3e 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.08 (2020/11/12), +%% This is file `tuda-a0paper.clo' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 8393d189f7..bb908952a4 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.08 (2020/11/12), +%% This is file `tuda-a1paper.clo' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 cbcc0a17b4..0ea9d0d0f4 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.08 (2020/11/12), +%% This is file `tuda-a2paper.clo' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 2ba2a6b131..7772fe8b8f 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.08 (2020/11/12), +%% This is file `tuda-a3paper.clo' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 d109fb3b7a..2756305686 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.08 (2020/11/12), +%% This is file `tuda-a4paper.clo' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 235aae7749..5ecb345480 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.08 (2020/11/12), +%% This is file `tuda-a5paper.clo' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 e6134138e7..b6e16e6df5 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.08 (2020/11/12), +%% This is file `tuda-pgfplots.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} % 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 95179807d4..79d08e9757 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.08 (2020/11/12), +%% This is file `tudabeamer.cls' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 f7289b76ad..17699574ca 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.08 (2020/11/12), +%% This is file `tudacolors.def' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 93800c1827..ad0c8aafef 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.08 (2020/11/12), +%% This is file `tudacolors.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 9a2c110d87..0845489e97 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.08 (2020/11/12), +%% This is file `tudaexercise.cls' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaexercise} diff --git a/macros/latex/contrib/tuda-ci/tex/tudafonts.sty b/macros/latex/contrib/tuda-ci/tex/tudafonts.sty index e479e7549b..c70586aedc 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.08 (2020/11/12), +%% This is file `tudafonts.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 dc03a83687..317c49c013 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.08 (2020/11/12), +%% This is file `tudaleaflet.cls' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 f68884c8a1..b99f5820f0 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.08 (2020/11/12), +%% This is file `tudaletter.cls' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 661a851b97..87a02bbd6b 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.08 (2020/11/12), +%% This is file `tudalettersize10pt.clo' version 3.09 (2021/01/12), %% 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 7063cdb5aa..f628dfef22 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.08 (2020/11/12), +%% This is file `tudamecheng.cfg' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \RequirePackage{expl3} \ProvidesExplFile{tudamecheng.cfg} {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)} @@ -47,8 +47,8 @@ \pgfpathlineto{\pgfpointpolar{186}{.05#1}} \pgfpathclose \pgfusepath{fill} - \pgfpathmoveto{\pgfpoint{-.04#1}{0}} - \pgfpathlineto{\pgfpoint{-#1}{0}} + \pgfpathmoveto{\pgfpoint{-#1+.5\pgflinewidth}{0}} + \pgfpathlineto{\pgfpoint{-.04#1-.5\pgflinewidth}{0}} \pgfusepath{stroke} \end{pgfpicture} } @@ -144,16 +144,23 @@ \dim_compare:nF {\box_wd:N \g_ptxcd_footline_box=\layerwidth} { \hbox_gset:Nn \g_ptxcd_footline_box {\MechEngArrow{\layerwidth}} } - \smash{\box_use:N \g_ptxcd_footline_box} + \smash{\box_use:N \g_ptxcd_footline_box}% } ]{plain.TUDa.mecheng.foot.above.line} \clearpairofpagestyles \cfoot[\pagemark]{\pagemark} - \tl_if_empty:NF \g_ptxcd_departmentlogo_tl { - \lefoot[{\raisebox{-\height}[0pt][0pt]{\includegraphics[width=\c_ptxcd_logoheight_dim]{\g_ptxcd_departmentlogo_tl}}}]{\raisebox{-\height}[0pt][0pt]{\includegraphics[width=\c_ptxcd_logoheight_dim]{\g_ptxcd_departmentlogo_tl}}} - \lofoot[{\raisebox{-\height}[0pt][0pt]{\includegraphics[width=\c_ptxcd_logoheight_dim]{\g_ptxcd_departmentlogo_tl}}}]{\raisebox{-\height}[0pt][0pt]{\includegraphics[width=\c_ptxcd_logoheight_dim]{\g_ptxcd_departmentlogo_tl}}} + \box_new:N \g_ptxcd_departmentlogo_box + \hbox_gset:Nn \g_ptxcd_departmentlogo_box { + \raisebox{-\height}{ + \tl_if_empty:NTF \g_ptxcd_departmentlogo_tl + {\strut} {\includegraphics[width=\c_ptxcd_logoheight_dim]{\g_ptxcd_departmentlogo_tl}} + } } + \setlength{\footheight}{\dim_eval:n {\box_ht:N \g_ptxcd_departmentlogo_box+\box_dp:N \g_ptxcd_departmentlogo_box+\ht\strutbox}} + + \lefoot[\box_use:N \g_ptxcd_departmentlogo_box]{\box_use:N \g_ptxcd_departmentlogo_box} + \lofoot[\box_use:N \g_ptxcd_departmentlogo_box]{\box_use:N \g_ptxcd_departmentlogo_box} } \DeclarePageStyleAlias{TUDa}{TUDa.mecheng} \DeclarePageStyleAlias{plain.TUDa}{plain.TUDa.mecheng} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls index 1a1152b805..a612ad9478 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.08 (2020/11/12), +%% This is file `tudaposter.cls' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 dec9d0b163..5be60f893d 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.08 (2020/11/12), +%% This is file `tudapub.cls' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty index a433cc8b16..c0a58d0e12 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.08 (2020/11/12), +%% This is file `tudarules.sty' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle} diff --git a/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls b/macros/latex/contrib/tuda-ci/tex/tudasciposter.cls index f4e0aa1a6c..bc8657201a 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.08 (2020/11/12), +%% This is file `tudasciposter.cls' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \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 4003665ff9..13ad60986d 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.08 (2020/11/12), +%% This is file `tudasize9pt.clo' version 3.09 (2021/01/12), %% 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 23958c3bab..23e41029fe 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.08 (2020/11/12), +%% This is file `tudathesis.cfg' version 3.09 (2021/01/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.08} -\def\filedate{2020/11/12} +\def\fileversion{3.09} +\def\filedate{2021/01/12} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)} |