diff options
| author | Norbert Preining <norbert@preining.info> | 2021-07-28 03:00:58 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2021-07-28 03:00:58 +0000 |
| commit | f083b031d6785bf31f4b35408aca161e81b935f6 (patch) | |
| tree | 71d21510e1f9fc17dd58aae5c45fab30c65c4ea0 /macros/latex | |
| parent | cef58753eba8ad7e2071195dbd92454febe82d32 (diff) | |
CTAN sync 202107280300
Diffstat (limited to 'macros/latex')
75 files changed, 654 insertions, 508 deletions
diff --git a/macros/latex/contrib/colorist/colorart.cls b/macros/latex/contrib/colorist/colorart.cls index 8db263ddca..64c68139bd 100644 --- a/macros/latex/contrib/colorist/colorart.cls +++ b/macros/latex/contrib/colorist/colorart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorart} - [2021/07/15 A colorful article style] + [2021/07/27 A colorful article style] \def\colorclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/colorist/colorbook.cls b/macros/latex/contrib/colorist/colorbook.cls index 632f996820..45efb1360c 100644 --- a/macros/latex/contrib/colorist/colorbook.cls +++ b/macros/latex/contrib/colorist/colorbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{colorbook} - [2021/07/15 A colorful book style] + [2021/07/27 A colorful book style] \def\colorclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/colorist/colorist-doc.pdf b/macros/latex/contrib/colorist/colorist-doc.pdf Binary files differindex 2a7069b9ac..0a038390b7 100644 --- a/macros/latex/contrib/colorist/colorist-doc.pdf +++ b/macros/latex/contrib/colorist/colorist-doc.pdf diff --git a/macros/latex/contrib/colorist/colorist-doc.tex b/macros/latex/contrib/colorist/colorist-doc.tex index 303196f7d5..f8bea775a1 100644 --- a/macros/latex/contrib/colorist/colorist-doc.tex +++ b/macros/latex/contrib/colorist/colorist-doc.tex @@ -105,7 +105,7 @@ \title{\colorist{}, write your articles or books in a colorful way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\colorist{} 2021/07/15}} +\thanks{Corresponding to: \texttt{\colorist{} 2021/07/27}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{July 2021, Beijing} diff --git a/macros/latex/contrib/colorist/colorist.sty b/macros/latex/contrib/colorist/colorist.sty index 3a610e4943..ddc6055a05 100644 --- a/macros/latex/contrib/colorist/colorist.sty +++ b/macros/latex/contrib/colorist/colorist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{colorist} - [2021/07/15 A colorful style for articles and books] + [2021/07/27 A colorful style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -1459,7 +1459,8 @@ %%================================ %% Simulate features of amsart %%================================ -\RequirePackage{PJLamssim} +\PassOptionsToPackage{amsfashion}{PJLauthor} +\RequirePackage{PJLauthor} } diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 82c1980c7b..d044cbf4b0 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -29,7 +29,7 @@ % % \title{\sffamily easybook 文档类手册} % \author{瞿毅} -% \date{2021/07/25\hskip 1em\relax v1.27q\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/07/26\hskip 1em\relax v1.27R\thanks{\url{https://gitee.com/texl3/easybook}}} % % \maketitle % \begin{abstract} @@ -149,7 +149,7 @@ % cjkfont = <adobe|fandol|founder|mac|macnew|macold|ubuntu|windows|none> % \end{syntax} % 中文字体采用 \CTeX 宏集包含的字库并与其一致，具体配置方案可以查看 \CTeX 使用手册。它与 \opt{fontset} 选项是等效的，如果没有指定 \opt{cjkfont} 的值，将会自动检测用户的操作系统并选择相应的字体。 -% \changes{v1.27q}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体，原 \opt{font} 选项设置英文字体，中文字体使用 \CTeX 的字库。} +% \changes{v1.27R}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体，原 \opt{font} 选项设置英文字体，中文字体使用 \CTeX 的字库。} % \end{function} % % 如果需要使用其它中文字体，可以在启用选项 \opt{cjkfont = none} 后，再使用 \pkg{xeCJK} 宏包的相关命令设置字体以及声明字体族： @@ -614,7 +614,7 @@ % \tcolorboxenvironment{定理环境名}{tc-theorem} % \end{ctexexam} % -% 使用 \tn{tcbappstyle} 命令调整开启定理盒子时默认的样式，第一个参数为 \opt{theorem}，关于命令的介绍在小节 \ref{subsec:exercise}。 +% 使用 \tn{tcbappstyle} 命令调整开启定理盒子时默认的样式，第一个参数为 \opt{theorem}，关于命令的介绍在小节 \ref{subsec:box}。 % \begin{ctexexam} % \tcbappstyle{theorem}{colback = GreenYellow} % \end{ctexexam} @@ -731,7 +731,7 @@ % \end{syntax} % \ding{229} 以上选项路径为 \opt{hdrset/...} \\ % \changes{v1.25}{2021/05/12}{增加脚注样式设置选项。} -% \changes{v1.27q}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。} +% \changes{v1.27R}{2021/07/14}{增加脚注内容格式选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。} % \end{function} % % \begin{optdesc} @@ -919,7 +919,7 @@ % \tn{end}\{hangparas\} % \end{syntax} % \tn{hangpara} 命令使其后的一个段落保持悬挂缩进，\env{hangparas} 环境使其中的段落均保持悬挂缩进。缩进将以 \meta{缩进长度} 从每个段落的 \meta{缩进开始行数} 开始。 -% \changes{v1.27q}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。} +% \changes{v1.27R}{2021/07/11}{增加悬挂缩进段落命令 \tn{hangpara} 和环境 \env{hangparas}。} % \end{function} % % \subsection{代码} @@ -941,7 +941,7 @@ % \ \tn{item} <习题内容> % \tn{end}\{exercise\} % \end{syntax} -% 习题环境的标题使用 \env{tcbox} 行内盒子包装样式，内容则使用 \env{enumerate} 列表环境。它有 5 个可选参数，应当注意用法。当使用星号参数时标题不进行编号，使用 + 号参数时不使用预置标题，此时 \meta{键值列表1} 除了 \opt{label} 选项失效。 +% 习题环境的标题使用 \tn{tcbox} 行内盒子包装样式，内容则使用 \env{enumerate} 列表环境。它有 5 个可选参数，应当注意用法。当使用星号参数时标题不进行编号，使用 + 号参数时不使用预置标题，此时 \meta{键值列表1} 除了 \opt{label} 选项失效。 % \changes{v1.23}{2021/02/08}{增加准确的习题盒子标题目录锚点。} % \end{function} % @@ -959,24 +959,17 @@ % \opt{number} 为短编号形式，应当包含 A、a、I、i、或 1 其中一个符号。\opt{label} 选项用于设置习题环境的引用标签，它与标签格式命令 \tn{labelformat} 对应的计数器是 eb@exercise。 % \end{function} % -% \begin{function}{\setexercise,\tcbappstyle,\setexerlist,\exerprologue,\tcphantomifname} +% \begin{function}{\setexercise,\setexerlist,\exerprologue,\tcphantomifname} % \begin{syntax} % \tn{setexercise}\marg{键值列表1} -% \tn{tcbappstyle*}\marg{风格名称}\marg{键值列表2} % \tn{setexerlist}\marg{键值列表3} % \tn{exerprologue}\marg{序言内容} % \tn{tcphantomifname}\marg{编号代码}\marg{不编号代码} % \end{syntax} +% \tn{setexercise} 命令可以全局设置上述习题综合选项 \meta{键值列表1} 的默认值。\tn{setexerlist} 命令用于设置习题条目选项 \meta{键值列表3} 的值。\tn{exerprologue} 在习题环境开始前插入一段内容，可以是文本或者代码，需要在每一个习题环境前使用。 % \end{function} % -% \begin{optdesc} -% \item[\tn{setexercise}] 这个命令可以全局设置上述习题综合选项 \meta{键值列表1} 的默认值。 -% \item[\tn{tcbappstyle*}] 这是 \pkg{tcolorbox} 宏包盒子风格定义命令，带有星号的命令可以\textbf{新建或重置}一个名为 \opt{tc-}\meta{风格名称} 的盒子风格，否则是修改\textbf{已存在}的风格。在这里可以设置标题选项 \meta{键值列表2} 的值，第一个参数为 \opt{exercise}，也可以修改小节 \ref{subsec:box} 本文档类支持的其它盒子环境风格。 -% \item[\tn{setexerlist}] 这个命令用于设置习题条目选项 \meta{键值列表3} 的值。 -% \item[\tn{exerprologue}] 在习题环境开始前插入一段内容，可以是文本或者代码，需要在每一个习题环境前使用。 -% \item[\tn{tcphantomifname}] 根据使用 \pkg{tcolorbox} 生成的习题标题是否编号，在超链接锚点的位置加入代码，比如使用 \tn{addcontentsline} 命令将习题标题加入目录。 -% \end{optdesc} -% +% 在这里可以使用 \tn{tcbappstyle} 命令设置标题选项 \meta{键值列表2} 的值，第一个参数为 \opt{exercise}。\tn{tcphantomifname} 根据使用 \pkg{tcolorbox} 生成的习题标题是否编号，在超链接锚点的位置加入代码，比如使用 \tn{addcontentsline} 命令将习题标题加入目录。 % \begin{ctexexam} % \tcphantomifname{\markright{\UseCounter{tcbcounter}{\quad 习题}}}{} % \tcbappstyle{exercise}{boxsep = 5pt} @@ -991,6 +984,30 @@ % \label{subsec:box} % 使用盒子以及小节 \ref{subsec:exercise} 中的 \env{exercise} 环境需要在导言区\textbf{手动载入} \pkg{tcolorbox} 宏包，它们 \meta{配置选项} 的键值列表同样由 \pkg{tcolorbox} 提供支持，具体选项可见宏包文档的 Option Keys 一节，可以进行边距、字体及背景颜色等各种个性化设置，一些配置会覆盖预设。 % +% \begin{function}[added = 2021-07-25]{\tcbappstyle} +% \begin{syntax} +% \tn{tcbappstyle*}\marg{风格名称}\marg{键值列表} +% \end{syntax} +% 这是一个 \pkg{tcolorbox} 宏包盒子风格定义命令，带有星号的命令可以\textbf{新建或重置}一个名为 \opt{tc-}\meta{风格名称} 的盒子风格，否则是修改\textbf{已存在}的风格。这个命令可以调整以下即将介绍的预置盒子风格，对于预置盒子来说参数 \meta{风格名称} 即为它们对应的环境或命令名。 +% \end{function} +% +% \begin{ctexexam} +% \tcbappstyle*{mytcb} % 新建一个盒子风格tc-mytcb +% { +% colback = Snow,colframe = LimeGreen,coltext = Coral, +% fontupper = \bfseries,arc = 6pt, +% boxrule = 5pt,boxsep = 5pt, +% borderline = {2pt}{2pt}{white} +% } +% \newtcolorbox{mytcbox}[1][]{enhanced,tc-mytcb,title = #1} +% \begin{tcolorbox}[tc-mytcb,enhanced] +% 盒子内容1 +% \end{tcolorbox} +% \begin{mytcbox}[盒子标题] +% 盒子内容2 +% \end{mytcbox} +% \end{ctexexam} +% % \subsubsection{摘要盒子} % \begin{function}[added = 2021-01-05,updated = 2021-05-02]{\setoutlinelist,outline} % \begin{syntax} @@ -1004,9 +1021,9 @@ % % \begin{ctexexam} % \tcbappstyle{outline}{arc = 6pt} -% \begin{outline}[leftmargin = *](标题名称) -% \item 摘要内容 -% \item 摘要内容 +% \begin{outline}[leftmargin = *](摘要标题) +% \item 摘要内容1 +% \item 摘要内容2 % \end{outline} % \end{ctexexam} % @@ -1111,7 +1128,7 @@ % \subsection{公式符号对照} % \begin{function}[added = 2021-07-22]{\seteqcomp,\seteqcomplist,\symb,eqcomp} % \begin{syntax} -% \tn{seteqcomp}\marg{键值列表} +% \tn{seteqcomp}\marg{键值列表1} % \tn{seteqcomplist}\marg{键值列表2} % \tn{symb*}\marg{符号}\oarg{引导符} % \tn{begin}\{eqcomp\}\oarg{键值列表1}\parg{键值列表2} @@ -1119,7 +1136,7 @@ % \tn{end}\{eqcomp\} % \end{syntax} % 一些公式之后可以使用基于列表环境的 \env{eqcomp} 进行符号对照。\tn{symb} 需要在环境内使用，带有星号的命令可单独在文本段落使用。对照列表的 \meta{键值列表2} 与 \pkg{enumitem} 的选项相同，一般较少用到，可以用于设置垂直间距等。\meta{键值列表1} 也可以使用 \tn{seteqcomp} 全局设置，它的选项如下： -% \changes{v1.27q}{2021/07/22}{增加公式符号对照环境 \env{eqcomp} 和命令 \tn{symb}。} +% \changes{v1.27R}{2021/07/22}{增加公式符号对照环境 \env{eqcomp} 和命令 \tn{symb}。} % \end{function} % % \begin{function}{width,delim,space,item-align,delim-align,enumitem,intro,font,mode} @@ -1253,7 +1270,7 @@ % \textsc{The \LaTeX~Project Team}. % \newblock \textit{The \hologo{LaTeX2e} Sources} [CP/OL]. % \newblock (2020-10-01) -% \urlprefix\url{https://www.ctan.org/pkg/source2e} +% \urlprefix\url{https://ctan.org/pkg/source2e} % % \bibitem{胡伟2017latex2e} % 胡伟. @@ -1270,56 +1287,63 @@ % \newblock \textit{The \pkg{footmisc} package} [EB/OL]. % \newblock version 5.5b, % \newblock (2011-06-06) -% \urlprefix\url{https://www.ctan.org/pkg/footmisc} +% \urlprefix\url{https://ctan.org/pkg/footmisc} % % \bibitem{thmtools} % Dr. Ulrich M. Schwarz, Yukai Chou. % \newblock \textit{The \pkg{thmtools} package} [EB/OL]. % \newblock version 0.72, % \newblock (2020-08-01) -% \urlprefix\url{https://www.ctan.org/pkg/thmtools} +% \urlprefix\url{https://ctan.org/pkg/thmtools} % % \bibitem{fancyhdr} % Pieter van Oostrum. % \newblock \textit{The \pkg{fancyhdr} package} [EB/OL]. % \newblock version 4.0.1, % \newblock (2020-01-28) -% \urlprefix\url{https://www.ctan.org/pkg/fancyhdr} +% \urlprefix\url{https://ctan.org/pkg/fancyhdr} % % \bibitem{caption} % Axel Sommerfeldt. % \newblock \textit{The \pkg{caption} package} [EB/OL]. % \newblock version 3.5, % \newblock (2020-08-30) -% \urlprefix\url{https://www.ctan.org/pkg/caption} +% \urlprefix\url{https://ctan.org/pkg/caption} % % \bibitem{titletoc} % Javier Bezos. % \newblock \textit{The \pkg{titletoc} package} [EB/OL]. % \newblock version 2.13, % \newblock (2019-10-16) -% \urlprefix\url{https://www.ctan.org/pkg/titletoc} +% \urlprefix\url{https://ctan.org/pkg/titletoc} % % \bibitem{tcolorbox} % Thomas F. Sturm. % \newblock \textit{The \pkg{tcolorbox} package} [EB/OL]. % \newblock version 4.51, % \newblock (2021-06-14) -% \urlprefix\url{https://www.ctan.org/pkg/tcolorbox} +% \urlprefix\url{https://ctan.org/pkg/tcolorbox} +% +% \bibitem{enumitem} +% Javier Bezos. +% \newblock \textit{The \pkg{enumitem} package} [EB/OL]. +% \newblock version 3.9, +% \newblock (2019-06-20) +% \urlprefix\url{https://ctan.org/pkg/enumitem} % % \bibitem{biblatex} % Philipp Lehman, Philip Kime. % \newblock \textit{The \pkg{biblatex} package} [EB/OL]. % \newblock version 3.16, % \newblock (2020-12-31) -% \urlprefix\url{https://www.ctan.org/pkg/biblatex} +% \urlprefix\url{https://ctan.org/pkg/biblatex} % % \bibitem{eqexpl} % Konstantin Morenko. % \newblock \textit{The \pkg{eqexpl} package} [EB/OL]. % \newblock version 1.1, % \newblock (2019-07-01) -% \urlprefix\url{https://www.ctan.org/pkg/eqexpl} +% \urlprefix\url{https://ctan.org/pkg/eqexpl} % % \bibitem{xmuthesis} % Camuse Cao. @@ -1340,7 +1364,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/07/25}{1.27q} +\ProvidesExplClass{easybook}{2021/07/26}{1.27R} {Typeset Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -1624,7 +1648,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2021/07/25}{1.27q} +\ProvidesExplPackage{easybase}{2021/07/26}{1.27R} {Typeset Chinese theses or books} \cs_generate_variant:Nn \int_to_arabic:n { v } @@ -3588,7 +3612,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/25}{1.27q} +\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/26}{1.27R} {Customization of tcolorbox for easybook} \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip } @@ -3623,8 +3647,44 @@ fontupper = \Large\sffamily, beforeafter~skip = 3.75ex plus .2ex minus .1ex } -\tcbappstyle*{easybox}{} -\tcbappstyle*{ebparbox}{} +\tcbappstyle*{easybox} + { + enhanced~jigsaw,pad~at~break* = 3pt, + center~title, + sharpish~corners, + left = 8pt,right = 8pt, + opacityback = 0.2,opacitybacktitle = 0.2, + coltitle = black,colframe = black, + top = \eb@tc@line@skip,bottom = \eb@tc@line@skip, + middle = \eb@tc@line@skip, + toptitle = \eb@tc@line@skip, + titlerule = 0pt, + beforeafter~skip = 1.75ex plus .2ex minus .1ex + } +\tcbappstyle*{ebparbox} + { + frame~hidden, + enhanced~jigsaw,pad~at~break* = 3pt, + boxrule = 0pt, + sharpish~corners, + left = 8pt, + middle = \eb@tc@line@skip,bottomtitle = \eb@tc@line@skip, + beforeafter~skip = 1.75ex plus .2ex minus .1ex + } +\tcbappstyle*{ebemph}{on~line,blank} +\tcbappstyle*{eblink} + { + standard~jigsaw,on~line, + top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt, + boxrule = 0.75pt,arc = 1pt, + opacityback = 0.2 + } +\tcbappstyle*{ebfbox} + { + on~line,sharpish~corners, + top = 2pt,bottom = 2pt,left = 1pt,right = 1pt, + leftrule = 0pt,rightrule = 0pt + } \tcbset { breakable, @@ -3707,30 +3767,13 @@ }{} \DeclareTColorBox{easybox}{sO{Khaki}d()O{}} { - enhanced~jigsaw,pad~at~break* = 3pt, - IfBooleanTF = {#1} - {toptitle = \eb@tc@line@skip,top = \eb@tc@line@skip} - { - frame~hidden,boxrule = 0pt, - toptitle = \eb@tc@line@skip,top = 0pt - }, + IfBooleanF = {#1}{frame~hidden,boxrule = 0pt}, IfValueT = {#3}{title = #3}, colback = #2,colbacktitle = #2, - opacityback = 0.2,opacitybacktitle = 0.2, - coltitle = black,colframe = black, - sharpish~corners, - left = 8pt,right = 8pt, - bottom = \eb@tc@line@skip,middle = \eb@tc@line@skip, - bottomtitle = \eb@tc@line@skip, - beforeafter~skip = 1.75ex plus .2ex minus .1ex, - halign~upper = left,halign~lower = left, - center~title,tc-easybox,#4 + tc-easybox,#4 } \DeclareTColorBox{ebparbox}{sO{DarkSlateBlue}d()O{}} { - frame~hidden, - enhanced~jigsaw,pad~at~break* = 3pt, - boxrule = 0pt, borderline~west = {3pt}{0pt}{#2}, IfBooleanTF = {#1} { @@ -3744,27 +3787,13 @@ IfValueT = {#3}{title = #3}, top = 0pt,bottom = 0pt,right = 0pt,toptitle = 0pt }, - sharpish~corners, - left = 8pt, - middle = \eb@tc@line@skip,bottomtitle = \eb@tc@line@skip, - beforeafter~skip = 1.75ex plus .2ex minus .1ex, colframe = #2,coltitle = #2,tc-ebparbox,#4 } +\DeclareTotalTCBox{\ebfbox}{O{Lime}vO{}} + {colback = #1!10!white,colframe = #1!50!black,tc-ebfbox,#3}{#2} \DeclareTotalTCBox{\ebemph}{O{DarkSeaGreen}vO{}} - {on~line,blank,fuzzy~halo = 2pt~with~#1,#3}{#2} + {fuzzy~halo = 2pt~with~#1,tc-ebemph,#3}{#2} \DeclareTotalTCBox{\eblink}{O{Aqua}vO{}} - { - standard~jigsaw,on~line, - top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt, - boxrule = 0.75pt,arc = 1pt, - colback = #1,opacityback = 0.2,colframe = #1,#3 - }{#2} -\DeclareTotalTCBox{\ebfbox}{O{Lime}vO{}} - { - on~line,sharpish~corners, - top = 2pt,bottom = 2pt,left = 1pt,right = 1pt, - leftrule = 0pt,rightrule = 0pt, - colback = #1!10!white,colframe = #1!50!black,#3 - }{#2} + {colback = #1,colframe = #1,tc-eblink,#3}{#2} %</tcolorbox> \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 89cccdd884..378b887f07 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/minimalist/minimalist-doc.pdf b/macros/latex/contrib/minimalist/minimalist-doc.pdf Binary files differindex ad039de16c..c5aeb079d6 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.pdf +++ b/macros/latex/contrib/minimalist/minimalist-doc.pdf diff --git a/macros/latex/contrib/minimalist/minimalist-doc.tex b/macros/latex/contrib/minimalist/minimalist-doc.tex index 102ba87759..be388ef8c8 100644 --- a/macros/latex/contrib/minimalist/minimalist-doc.tex +++ b/macros/latex/contrib/minimalist/minimalist-doc.tex @@ -101,7 +101,7 @@ \title{\minimalist{}, write your articles or books in a simple and clear way} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\minimalist{} 2021/07/13}} +\thanks{Corresponding to: \texttt{\minimalist{} 2021/07/27}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{July 2021, Beijing} diff --git a/macros/latex/contrib/minimalist/minimalist.sty b/macros/latex/contrib/minimalist/minimalist.sty index a50f03497d..9ae2e948b5 100644 --- a/macros/latex/contrib/minimalist/minimalist.sty +++ b/macros/latex/contrib/minimalist/minimalist.sty @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesPackage{minimalist} - [2021/07/13 A simple and clear style for articles and books] + [2021/07/27 A simple and clear style for articles and books] \RequirePackage{kvoptions} \RequirePackage{etoolbox} \SetupKeyvalOptions{% @@ -905,7 +905,8 @@ %%================================ %% Simulate features of amsart %%================================ -\RequirePackage{PJLamssim} +\PassOptionsToPackage{amsfashion}{PJLauthor} +\RequirePackage{PJLauthor} } diff --git a/macros/latex/contrib/minimalist/minimart.cls b/macros/latex/contrib/minimalist/minimart.cls index 6adab5ca9a..8953e92b7c 100644 --- a/macros/latex/contrib/minimalist/minimart.cls +++ b/macros/latex/contrib/minimalist/minimart.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimart} - [2021/07/13 A simple and clear article style] + [2021/07/27 A simple and clear article style] \def\minimclass@baseclass{article} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/minimalist/minimbook.cls b/macros/latex/contrib/minimalist/minimbook.cls index e804b01376..83a16c03f4 100644 --- a/macros/latex/contrib/minimalist/minimbook.cls +++ b/macros/latex/contrib/minimalist/minimbook.cls @@ -17,7 +17,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesClass{minimbook} - [2021/07/13 A simple and clear book style] + [2021/07/27 A simple and clear book style] \def\minimclass@baseclass{book} \RequirePackage{kvoptions} \RequirePackage{etoolbox} diff --git a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf Binary files differindex ee69f8e313..fe8a0f459a 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-cn.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf Binary files differindex 595ebf9f25..b86cc30b19 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-en.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-en.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf Binary files differindex 40b469a972..ad837cfa82 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf +++ b/macros/latex/contrib/projlib/ProjLib-doc-fr.pdf diff --git a/macros/latex/contrib/projlib/ProjLib-doc.dtx b/macros/latex/contrib/projlib/ProjLib-doc.dtx index 6da315bd79..aafece21f6 100644 --- a/macros/latex/contrib/projlib/ProjLib-doc.dtx +++ b/macros/latex/contrib/projlib/ProjLib-doc.dtx @@ -91,7 +91,6 @@ %%================================ \providecommand{\ProjLibPackage}{\mbox{\textsf{ProjLib}}} \providecommand{\PJLtoolkit}{\mbox{\textsf{PJLtoolkit}}} -\providecommand{\PJLamssim}{\mbox{\textsf{PJLamssim}}} \providecommand{\PJLauthor}{\mbox{\textsf{PJLauthor}}} \providecommand{\PJLdatePackage}{\mbox{\textsf{PJLdate}}} \providecommand{\PJLdraft}{\mbox{\textsf{PJLdraft}}} @@ -109,7 +108,7 @@ %<*ProjLib-doc-cn> \title{\ProjLib{} 工具集\\[.3\baselineskip]\normalsize 使用指南} \author{许锦文} -\thanks{对应版本.~~\texttt{\ProjLib{}~2021/07/23}} +\thanks{对应版本.~~\texttt{\ProjLib{}~2021/07/27}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{2021年7月，北京} %</ProjLib-doc-cn> @@ -117,7 +116,7 @@ %<*ProjLib-doc-en> \title{\ProjLib{}~\,Toolkit\\[.3\baselineskip]\normalsize User Manual} \author{Jinwen XU} -\thanks{Corresponding to: \texttt{\ProjLib{}~2021/07/23}} +\thanks{Corresponding to: \texttt{\ProjLib{}~2021/07/27}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{July 2021, Beijing} %</ProjLib-doc-en> @@ -125,7 +124,7 @@ %<*ProjLib-doc-fr> \title{La boîte à outils~\,\ProjLib{}\\[.3\baselineskip]\normalsize Manuel d'utilisation} \author{Jinwen XU} -\thanks{Correspondant à : \texttt{\ProjLib{}~2021/07/23}} +\thanks{Correspondant à : \texttt{\ProjLib{}~2021/07/27}} \email{\href{mailto:ProjLib@outlook.com}{ProjLib@outlook.com}} \date{juillet 2021, à Pékin} %</ProjLib-doc-fr> @@ -429,7 +428,7 @@ Pour une description détaillée de cette commande et d'autres commandes associ ... \end{code} -另外，如果开启 \AmS{} 风格\footnote{这是由 \PJLamssim{} 模块实现的。由于这一模块修改了\LaTeX{} 的一些内部指令，有可能与一些宏包或文档类发生冲突，因此没有默认启用。}，那么文章中还可以采用 \AmS{} 文档类的写法 (此时原始的写法也是成立的)。为此，引入 \ProjLibPackage{} 时应该加入 \texttt{amsfashion} 选项： +另外，如果开启 \AmS{} 风格，那么文章中还可以采用 \AmS{} 文档类的写法 (此时原始的写法也是成立的)。为此，引入 \ProjLibPackage{} 时应该加入 \texttt{amsfashion} 选项\footnote{由于这一选项会修改\LaTeX{} 的一些内部指令，有可能与一些宏包或文档类发生冲突，因此没有默认启用。}： \begin{code} \usepackage[amsfashion,palatino]{ProjLib} \end{code} @@ -468,7 +467,7 @@ This part is the title and author information block. The example shows the most ... \end{code} -In addition, if the \AmS{} simulation is enabled\footnote{This is achieved by the module \PJLamssim{}. Since this module modifies some internal macros of \LaTeX{}, it may conflict with some packages or document classes, and thus it is not enabled by default.}, then you can also write in the \AmS{} fashion (the original way still works). In this case, the line that introduces \ProjLibPackage{} should be written as: +In addition, if the \AmS{} simulation is enabled, you can also write in the \AmS{} fashion (the original way still works). For this, you should add the package option \texttt{amsfashion}\footnote{Since this option modifies some internal macros of \LaTeX{}, it may conflict with some packages or document classes, and thus it is not enabled by default.}, \emph{i.e.}, the line that introduces \ProjLibPackage{} should be written as: \begin{code} \usepackage[amsfashion,palatino]{ProjLib} \end{code} @@ -507,7 +506,7 @@ Cette partie est le titre et le bloc d'informations de l'auteur. L'exemple montr ... \end{code} -De plus, si la simulation d'\AmS{} est activée\footnote{Ceci est réalisé par le module \PJLamssim{}. Étant donné que ce module modifie certaines macros internes de \LaTeX{}, il peut provoquer des conflits avec certains packages ou classes de documents, et donc il n'est pas activé par défaut.}, alors vous pouvez également écrire à la manière \AmS{} (la manière originale fonctionne encore). Dans ce cas, la ligne qui introduit \ProjLibPackage{} doit être écrite comme : +De plus, si la simulation d'\AmS{} est activée, alors vous pouvez également écrire à la manière \AmS{} (la manière originale fonctionne encore). Pour cela, vous devez ajouter l'option de package \texttt{amsfashion}\footnote{Étant donné que cette option modifie certaines macros internes de \LaTeX{}, elle peut entrer en conflit avec certains packages ou classes de documents, et n'est donc pas activée par défaut.}, c'est-à-dire que la ligne qui introduit \ProjLibPackage{} doit être écrite comme : \begin{code} \usepackage[amsfashion,palatino]{ProjLib} \end{code} @@ -602,15 +601,15 @@ Les environnements de type théorème couramment utilisés ont été prédéfini \end{itemize} \item \texttt{nothms}、\texttt{nothmnum}、\texttt{regionalref} \begin{itemize} - \item 来自 \PJLthm{} 的选项，详细信息请参阅有关这一宏包的小节。 + \item 来自用于设置定理类环境的组件 \PJLthm{} 的选项，详细信息请参阅有关这一宏包的小节。 \end{itemize} - \item \texttt{amsfashion} + \item \texttt{author} \begin{itemize} - \item 允许 \AmS{} 文档类的写法。与 \texttt{amssim} 选项相同。 + \item 加载用于增强作者信息块的组件 \PJLauthor{}。关于其详细功能，请参阅有关该宏包的小节。 \end{itemize} - \item \texttt{author}、\texttt{amssim} + \item \texttt{amsfashion} \begin{itemize} - \item 加载 \PJLauthor{} 或 \PJLamssim{}。关于其详细功能，请参阅有关相关宏包的小节。 + \item 允许 \AmS{} 文档类的写法。此时 \texttt{author} 选项会被自动开启。 \end{itemize} \end{itemize} 另外，还有一些组件的参数可以作为文档类的全局参数传递，例如 \texttt{EN} / \texttt{english} / \texttt{English}、\texttt{CN} / \texttt{chinese} / \texttt{Chinese} 等语言选项 (来自 \PJLlang{})，\texttt{paperstyle} 和 \texttt{preview} 等纸张选项 (来自 \PJLpaper{})。详细信息可以参阅对应的小节。 @@ -632,15 +631,15 @@ Les environnements de type théorème couramment utilisés ont été prédéfini \end{itemize} \item \texttt{nothms}, \texttt{nothmnum}, \texttt{regionalref} \begin{itemize} - \item Options from \PJLthm{}, please refer to the section on this package for details. + \item Options from the component \PJLthm{} used for setting theorem-like environments, please refer to the section on this package for details. \end{itemize} - \item \texttt{amsfashion} + \item \texttt{author} \begin{itemize} - \item Allow the user to write document in the \AmS{} fashion. Same as the option \texttt{amssim}. + \item Load the component \PJLauthor{} used to enhance the author information block. For more information about its functionality, see the section on this package. \end{itemize} - \item \texttt{author}, \texttt{amssim} + \item \texttt{amsfashion} \begin{itemize} - \item Load \PJLauthor{} or \PJLamssim{}. For more information about their functionality, see the section on the corresponding package. + \item Allow the user to write document in the \AmS{} fashion. In the mean time, the option \texttt{author} will be automatically turned on. \end{itemize} \end{itemize} In addition, there are also some options of the components that should be passed as global options of your document class, such as the language options \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French} etc.\,of \PJLlang{}, \\and \texttt{paperstyle}, \texttt{preview} of \PJLpaper{}. For more information, please refer to the corresponding sections. @@ -662,70 +661,32 @@ In addition, there are also some options of the components that should be passed \end{itemize} \item \texttt{nothms}, \texttt{nothmnum}, \texttt{regionalref} \begin{itemize} - \item Options de \PJLthm{}, veuillez vous référer à la section sur ce package pour plus de détails. + \item Options du composant \PJLthm{} utilisé pour définir des environnements de type théorème, veuillez vous référer à la section sur ce package pour plus de détails. \end{itemize} - \item \texttt{amsfashion} + \item \texttt{author} \begin{itemize} - \item Permet à l'utilisateur d'écrire à la manière \AmS{}. Identique à l'option \texttt{amssim}. + \item Utilisez le composant \PJLauthor{} pour enrichir le bloc d'informations sur l'auteur. Pour plus d'informations sur ses fonctionnalités, consultez la section sur ce package. \end{itemize} - \item \texttt{author}, \texttt{amssim} + \item \texttt{amsfashion} \begin{itemize} - \item Utilisez \PJLauthor{} ou \PJLamssim{}. Pour plus d'informations sur leurs fonctionnalités, consultez la section sur les packages correspondants. + \item Permet à l'utilisateur d'écrire à la manière \AmS{}. En attendant, l'option \texttt{author} sera automatiquement activée. \end{itemize} \end{itemize} De plus, il existe également certaines options des composants qui doivent être passées en tant qu'options globales de votre classe de document, telles que les options de langue de \PJLlang{} comme \texttt{EN} / \texttt{english} / \texttt{English}, \texttt{FR} / \texttt{french} / \texttt{French} etc., et les options de papier de \PJLpaper{} comme \texttt{paperstyle} et \texttt{preview}. Pour plus d'informations, veuillez vous référer aux sections correspondantes. %</ProjLib-doc-fr> \clearpage + %<*ProjLib-doc-cn> \section{具体组件} - -\subsection{PJLamssim：以 \texorpdfstring{\AmS}{AMS} 方式写作} - -\PJLamssim{} 用于模拟 \textsf{amsart} 文档类的部分功能，包括： -\begin{itemize} - \item \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email|、\lstinline|\dedicatory| 命令 (前三者由 \PJLauthor{} 提供) - \item \lstinline|\keywords| 命令 - \item \lstinline|\subjclass| 命令 - \item \lstinline|\thanks| 可以写在 \lstinline|\author| 之外 - \item \lstinline|abstract| 环境可以放在 \lstinline|\maketitle| 的前面 -\end{itemize} - -这些功能只在标准文档类中启用。在 \AmS{} 文档类中，\PJLamssim{} 不会起到任何效果。 %</ProjLib-doc-cn> % %<*ProjLib-doc-en> \section{The components} - -\subsection{PJLamssim: writing in \texorpdfstring{\AmS}{AMS} fashion} - -\PJLamssim{} is used to simulate some features of the \textsf{amsart} class in a standard class, including: -\begin{itemize} - \item the macros \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| and \lstinline|\dedicatory| (the first three are provided by \PJLauthor{}); - \item the macro \lstinline|\keywords|; - \item the macro \lstinline|\subjclass|; - \item \lstinline|\thanks| can be written outside \lstinline|\author|; - \item The \lstinline|abstract| environment can be placed before \lstinline|\maketitle|. -\end{itemize} - -These modifications would only take place in standard classes. In the \AmS{} classes, \PJLamssim{} does not have any effect. %</ProjLib-doc-en> % %<*ProjLib-doc-fr> \section{Les composants} - -\subsection{PJLamssim : écrire de la manière \texorpdfstring{\AmS}{AMS}} - -\PJLamssim{} est utilisé pour simuler certaines fonctionnalités de la classe \textsf{amsart} dans une classe standard, notamment : -\begin{itemize} - \item les macros \lstinline|\address|, \lstinline|\curraddr|, \lstinline|\email| et \lstinline|\dedicatory| (les trois premiers sont fournis par \PJLauthor{}); - \item la macro \lstinline|\keywords|; - \item la macro \lstinline|\subjclass|; - \item \lstinline|\thanks| peut être écrit en dehors de \lstinline|\author|; - \item La environnement \lstinline|abstract| peut être placé avant \lstinline|\maketitle|. -\end{itemize} - -Ces modifications n'auraient lieu que dans les classes standard. Dans les classes \AmS{}, \PJLamssim{} n'a aucun effet. %</ProjLib-doc-fr> %<*ProjLib-doc-cn> @@ -742,6 +703,18 @@ Ces modifications n'auraient lieu que dans les classes standard. Dans les classe ... \end{code} 其中 \lstinline|\address|、\lstinline|\curraddr|、\lstinline|\email| 的相互顺序是不重要的。 + +\medskip +另外，你可以通过选项 \texttt{amsfashion} 以使用 \AmS{} 方式写作。具体来说，效果为： +\begin{itemize} + \item 提供 \lstinline|\dedicatory|、\lstinline|\keywords| 及 \lstinline|\subjclass| 命令 + \item \lstinline|\thanks| 可以写在 \lstinline|\author| 之外 + \item \lstinline|abstract| 环境可以放在 \lstinline|\maketitle| 的前面 +\end{itemize} + +\begin{tip}[注意] + 这些功能只在标准文档类中启用。在 \AmS{} 文档类中，\PJLauthor{} 不会起到任何效果。 +\end{tip} %</ProjLib-doc-cn> % %<*ProjLib-doc-en> @@ -758,6 +731,18 @@ Ces modifications n'auraient lieu que dans les classes standard. Dans les classe ... \end{code} The mutual order of \lstinline|\address|, \lstinline|\curraddr| and \lstinline|\email| is not important. + +\medskip +In addition, you can use the option \texttt{amsfashion} to enable the \AmS{} fashion. More specifically, the effect is: +\begin{itemize} + \item Provides the macros \lstinline|\dedicatory|, \lstinline|\keywords| and \lstinline|\subjclass|; + \item \lstinline|\thanks| can be written outside \lstinline|\author|; + \item The \lstinline|abstract| environment can be placed before \lstinline|\maketitle|. +\end{itemize} + +\begin{tip}[Attention] + These modifications would only take place in standard classes. In the \AmS{} classes, \PJLauthor{} does not have any effect. +\end{tip} %</ProjLib-doc-en> % %<*ProjLib-doc-fr> @@ -774,6 +759,18 @@ The mutual order of \lstinline|\address|, \lstinline|\curraddr| and \lstinline|\ ... \end{code} L'ordre mutuel de \lstinline|\address|, \lstinline|\curraddr| et \lstinline|\email| n'est pas important. + +\medskip +De plus, vous pouvez utiliser l'option \texttt{amsfashion} pour écrire à la manière \AmS{}. Plus précisément, l'effet est : +\begin{itemize} + \item Fournit les macros \lstinline|\dedicatory|, \lstinline|\keywords| et \lstinline|\subjclass|; + \item \lstinline|\thanks| peut être écrit en dehors de la macro \lstinline|\author|; + \item La environnement \lstinline|abstract| peut être placé avant \lstinline|\maketitle|. +\end{itemize} + +\begin{tip}[Attention] + Ces modifications n'auraient lieu que dans les classes standard. Dans les classes \AmS{}, \PJLauthor{} n'a aucun effet. +\end{tip} %</ProjLib-doc-fr> %<*ProjLib-doc-cn> @@ -1079,7 +1076,7 @@ Par exemple, \lstinline|\AddLanguageSetting(German){\color{orange}}| peut rendre \PJLmath{} 提供下列捷径： \begin{enumerate}[label=\roman*)] - \item \lstinline|\mathfrak{|$\cdot$\lstinline|}| $\longrightarrow$ \lstinline|\mf|$\cdot$ 或 \lstinline|\frak|$\cdot$。例如，\lstinline|\mfA| (或 \lstinline|\mf{A}|) 与 \lstinline|\mathfrak{A}| 效果相同. 这对大写、小写字母都有效： + \item \lstinline|\mathfrak{|$\cdot$\lstinline|}| $\longrightarrow$ \lstinline|\mf|$\cdot$ 或 \lstinline|\frak|$\cdot$。例如，\lstinline|\mfA| (或 \lstinline|\mf{A}|) 与 \lstinline|\mathfrak{A}| 效果相同. 这对大写、小写字母都有效：\vspace{-\baselineskip} \begin{align*} \mfa\mfb\mfc\mfd\mfe\mff\mfg\mfh\mfi\mfj\mfk\mfl\mfm\mfn&\mfo\mfp\mfq\mfr\mfs\mft\mfu\mfv\mfw\mfx\mfy\mfz\\ \mfA\mfB\mfC\mfD\mfE\mfF\mfG\mfH\mfI\mfJ\mfK\mfL\mfM\mfN&\mfO\mfP\mfQ\mfR\mfS\mfT\mfU\mfV\mfW\mfX\mfY\mfZ @@ -1110,8 +1107,8 @@ Par exemple, \lstinline|\AddLanguageSetting(German){\color{orange}}| peut rendre \lstinline|\injection| & \lstinline|\injection| $\rightarrow ~\injection$ & 表示单射的箭头符号 \\ \lstinline|\surjection| & \lstinline|\surjection| $\rightarrow ~\surjection$ & 表示满射的箭头符号 \\ \lstinline|\bijection| & \lstinline|\bijection| $\rightarrow ~\bijection$ & 表示双射的箭头符号 \\ -\lstinline|\legendre| & \lstinline|\legendre{a}{p}| $\rightarrow \legendre{a}{p}$ & Legendre 符号 \\ -& \lstinline|\legendre[z]{a}{p}| $\rightarrow \legendre[z]{a}{p}$ & \\ +% \lstinline|\legendre| & \lstinline|\legendre{a}{p}| $\rightarrow \legendre{a}{p}$ & Legendre 符号 \\ +% & \lstinline|\legendre[z]{a}{p}| $\rightarrow \legendre[z]{a}{p}$ & \\ % \lstinline|\tlegendre| & \lstinline|\tlegendre{a}{p}| $\rightarrow \tlegendre{a}{p}$ & Legendre 符号 (text style) \\ % \lstinline|\dlegendre| & \lstinline|\dlegendre{a}{p}| $\rightarrow \dlegendre{a}{p}$ & Legendre 符号 (display style) \\ \end{longtable} @@ -1154,8 +1151,8 @@ In addition, \PJLmath{} also provides some math symbols that are not by default \lstinline|\injection| & \lstinline|\injection| $\rightarrow ~\injection$ & arrow symbol for injection \\ \lstinline|\surjection| & \lstinline|\surjection| $\rightarrow ~\surjection$ & arrow symbol for surjection \\ \lstinline|\bijection| & \lstinline|\bijection| $\rightarrow ~\bijection$ & arrow symbol for bijection \\ -\lstinline|\legendre| & \lstinline|\legendre{a}{p}| $\rightarrow \legendre{a}{p}$ & Legendre symbol \\ -& \lstinline|\legendre[z]{a}{p}| $\rightarrow \legendre[z]{a}{p}$ & \\ +% \lstinline|\legendre| & \lstinline|\legendre{a}{p}| $\rightarrow \legendre{a}{p}$ & Legendre symbol \\ +% & \lstinline|\legendre[z]{a}{p}| $\rightarrow \legendre[z]{a}{p}$ & \\ % \lstinline|\tlegendre| & \lstinline|\tlegendre{a}{p}| $\rightarrow \tlegendre{a}{p}$ & Legendre symbol (text style) \\ % \lstinline|\dlegendre| & \lstinline|\dlegendre{a}{p}| $\rightarrow \dlegendre{a}{p}$ & Legendre symbol (display style) \\ \end{longtable} @@ -1199,13 +1196,14 @@ De plus, \PJLmath{} fournit également des symboles mathématiques qui ne sont p \lstinline|\injection| & \lstinline|\injection| $\rightarrow ~\injection$ & symbole de flèche pour l'injection \\ \lstinline|\surjection| & \lstinline|\surjection| $\rightarrow ~\surjection$ & symbole de flèche pour la surjection \\ \lstinline|\bijection| & \lstinline|\bijection| $\rightarrow ~\bijection$ & symbole de flèche pour la bijection \\ -\lstinline|\legendre| & \lstinline|\legendre{a}{p}| $\rightarrow \legendre{a}{p}$ & Symbole Legendre \\ -& \lstinline|\legendre[z]{a}{p}| $\rightarrow \legendre[z]{a}{p}$ & \\ +% \lstinline|\legendre| & \lstinline|\legendre{a}{p}| $\rightarrow \legendre{a}{p}$ & Symbole Legendre \\ +% & \lstinline|\legendre[z]{a}{p}| $\rightarrow \legendre[z]{a}{p}$ & \\ % \lstinline|\tlegendre| & \lstinline|\tlegendre{a}{p}| $\rightarrow \tlegendre{a}{p}$ & Symbole Legendre (text-style) \\ % \lstinline|\dlegendre| & \lstinline|\dlegendre{a}{p}| $\rightarrow \dlegendre{a}{p}$ & Symbole Legendre (display-style) \\ \end{longtable} %</ProjLib-doc-fr> +\clearpage %<*ProjLib-doc-cn> \subsection{PJLpaper：纸张设置} diff --git a/macros/latex/contrib/projlib/ProjLib.dtx b/macros/latex/contrib/projlib/ProjLib.dtx index 634c196156..59be20a95b 100644 --- a/macros/latex/contrib/projlib/ProjLib.dtx +++ b/macros/latex/contrib/projlib/ProjLib.dtx @@ -18,72 +18,172 @@ % %<*ProjLib> \ProvidesPackage{ProjLib} - [2021/07/23 The collective interface of ProjLib toolkit] + [2021/07/27 The collective interface of ProjLib toolkit] %</ProjLib> % -%<*PJLamssim> -\ProvidesPackage{PJLamssim} - [2021/07/23 Simulate some features of amsart] -%</PJLamssim> -% %<*PJLauthor> \ProvidesPackage{PJLauthor} - [2021/07/23 Enhanced author information block] + [2021/07/27 Enhanced author information block] %</PJLauthor> % %<*PJLdate> \ProvidesPackage{PJLdate} - [2021/07/23 Convert yyyy-mm-dd to normal datetime format] + [2021/07/27 Convert yyyy-mm-dd to normal datetime format] %</PJLdate> % %<*PJLdraft> \ProvidesPackage{PJLdraft} - [2021/07/23 Some useful macros for the draft stage] + [2021/07/27 Some useful macros for the draft stage] %</PJLdraft> % %<*PJLlang> \ProvidesPackage{PJLlang} - [2021/07/23 Multi-language configuration] + [2021/07/27 Multi-language configuration] %</PJLlang> % %<*PJLlogo> \ProvidesPackage{PJLlogo} - [2021/07/23 The ProjLib logo] + [2021/07/27 The ProjLib logo] %</PJLlogo> % %<*PJLmath> \ProvidesPackage{PJLmath} - [2021/07/23 Useful math macros and shortcuts] + [2021/07/27 Useful math macros and shortcuts] %</PJLmath> % %<*PJLpaper> \ProvidesPackage{PJLpaper} - [2021/07/23 Paper style configuration] + [2021/07/27 Paper style configuration] %</PJLpaper> % %<*PJLthm> \ProvidesPackage{PJLthm} - [2021/07/23 Theorem setup and configuration] + [2021/07/27 Theorem setup and configuration] %</PJLthm> % -%<*PJLtoolkit> -\ProvidesPackage{PJLtoolkit} - [2021/07/23 Collective interface of ProjLib Toolkit] -%</PJLtoolkit> -% %# 下面两行引入宏包的代码是所有文件共用的。 %# The following two lines are common to all files. \RequirePackage{kvoptions} \RequirePackage{etoolbox} % -%<*PJLamssim> +%<*PJLauthor> %# 在 AMS 文档类中不执行任何操作 %# Do nothing if AMS class detected \ifdefined\subjclass\endinput\fi -%# 使用 PJLauthor 的作者块功能 -%# Use `PJLauthor`'s author block function -\RequirePackage{PJLauthor} +%# 这段代码定义了宏包中的选项。 +%# This code defines the options in the package. +\SetupKeyvalOptions{ + family = @PJLauthor, + prefix = @PJLauthor@, +} +%# 支持 AMS 风格 +%# Support AMS fashion +\DeclareBoolOption[false]{amsfashion} +%# 处理选项 +%# Process options +\ProcessKeyvalOptions*\relax + +%%================================ +%% Font and style +%%================================ +%# 各个作者信息元素的字体 +%# Font of the elements in the author block +\def\PJLauthor@font@author{\normalsize\normalfont\scshape} +\def\PJLauthor@font@address{\small\normalfont\itshape} +\def\PJLauthor@font@curraddr{\small\normalfont\itshape} +\def\PJLauthor@font@email{\small\normalfont\ttfamily} + +%%================================ +%% Lengths +%%================================ +%# author 和 address 之间的距离 +%# Space between author and address +\newlength{\PJLauthor@length@innersep} +\setlength{\PJLauthor@length@innersep}{.3\baselineskip} +%# 两个作者块之间的距离 +%# Space between different author blocks +\newlength{\PJLauthor@length@sep} +\setlength{\PJLauthor@length@sep}{.5\baselineskip} +%# 作者块和日期之间的距离 +%# Space between affiliation and date +\newlength{\PJLauthor@length@aftersep} +\setlength{\PJLauthor@length@aftersep}{.3\baselineskip} + +%%================================ +%% The macros +%%================================ +%# 用来记录当前是否有附加作者信息，以便调整距离 +%# To record whether there's affiliation so as to adjust the vertical space +\newif\if@PJLauthor@affilon +%# 作者 +%# author +\renewcommand*{\author}[1]{% + \gappto\@author{\phantom{A}\\[-\baselineskip]% + \vspace{\PJLauthor@length@sep}% + \PJLauthor@font@author{#1}\\\phantom{} + \@PJLauthor@affilonfalse}} +%# 地址 +%# address +\providecommand*{\address}[1]{% + \gappto\@author{\phantom{A}\\[-\baselineskip]% + \if@PJLauthor@affilon\else% + \vspace{\PJLauthor@length@innersep}% + \fi% + \@PJLauthor@affilontrue% + \PJLauthor@font@address{#1}\\\phantom{}}% +} +%# 当前地址 +%# curraddr +\providecommand*{\curraddr}[1]{% + \gappto\@author{\phantom{A}\\[-\baselineskip]% + \if@PJLauthor@affilon\else% + \vspace{\PJLauthor@length@innersep}% + \fi% + \@PJLauthor@affilontrue% + \PJLauthor@font@curraddr{#1}\\\phantom{}}% +} +%# 电子邮箱 +%# email +\providecommand*{\email}[1]{% + \gappto\@author{\phantom{A}\\[-\baselineskip]% + \if@PJLauthor@affilon\else% + \vspace{\PJLauthor@length@innersep}% + \fi% + \@PJLauthor@affilontrue% + \PJLauthor@font@email{#1}\\\phantom{}}% +} + +%%================================ +%% Adjustment +%%================================ +%# 去除 maketitle 中默认对 author 的处理 +%# Remove the tabular around \@author in maketitle +\patchcmd{\@maketitle}{\begin{tabular}[t]{c}}{}{}{} +\patchcmd{\@maketitle}{\end{tabular}}{}{}{} +%# 下面这一行是为了避免错误 "No \author given." +%# The follwing line is for avoiding the error "No \author given." +\def\@author{} +%# 修正作者块的前后等距离 +%# Adjust the spacing before and after the author block +\pretocmd{\@maketitle}{% + \pretocmd{\@author}{\vspace{-\PJLauthor@length@sep}}{}{\FAIL}% + \apptocmd{\@author}{% +% Fix the space caused by `\\\phantom{}` + \vspace{-\baselineskip}% + \if@PJLauthor@affilon% + \vspace{\PJLauthor@length@aftersep}% + \fi% + }{}{\FAIL}% +}{}{\FAIL} + +%# 若使用 AMS 风格 +%# If AMS fashion enabled +\if@PJLauthor@amsfashion + +%# 使用 PJLlang 以支持自动语言转换 +%# Use `PJLlang` to support automatic language conversion +\RequirePackage{PJLlang} \RequirePackage{calc} %# 设定带条件的加粗 @@ -257,105 +357,8 @@ \textup{2010} Mathematics Subject Classification} \@namedef{subjclassname@2020}{% \textup{2020} Mathematics Subject Classification} -%</PJLamssim> -% -%<*PJLauthor> -%# 在 AMS 文档类中不执行任何操作 -%# Do nothing if AMS class detected -\ifdefined\subjclass\endinput\fi - -%%================================ -%% Font and style -%%================================ -%# 各个作者信息元素的字体 -%# Font of the elements in the author block -\def\PJLauthor@font@author{\normalsize\normalfont\scshape} -\def\PJLauthor@font@address{\small\normalfont\itshape} -\def\PJLauthor@font@curraddr{\small\normalfont\itshape} -\def\PJLauthor@font@email{\small\normalfont\ttfamily} - -%%================================ -%% Lengths -%%================================ -%# author 和 address 之间的距离 -%# Space between author and address -\newlength{\PJLauthor@length@innersep} -\setlength{\PJLauthor@length@innersep}{.3\baselineskip} -%# 两个作者块之间的距离 -%# Space between different author blocks -\newlength{\PJLauthor@length@sep} -\setlength{\PJLauthor@length@sep}{.5\baselineskip} -%# 作者块和日期之间的距离 -%# Space between affiliation and date -\newlength{\PJLauthor@length@aftersep} -\setlength{\PJLauthor@length@aftersep}{.3\baselineskip} - -%%================================ -%% The macros -%%================================ -%# 用来记录当前是否有附加作者信息，以便调整距离 -%# To record whether there's affiliation so as to adjust the vertical space -\newif\if@PJLauthor@affilon -%# 作者 -%# author -\renewcommand*{\author}[1]{% - \gappto\@author{\phantom{A}\\[-\baselineskip]% - \vspace{\PJLauthor@length@sep}% - \PJLauthor@font@author{#1}\\\phantom{} - \@PJLauthor@affilonfalse}} -%# 地址 -%# address -\providecommand*{\address}[1]{% - \gappto\@author{\phantom{A}\\[-\baselineskip]% - \if@PJLauthor@affilon\else% - \vspace{\PJLauthor@length@innersep}% - \fi% - \@PJLauthor@affilontrue% - \PJLauthor@font@address{#1}\\\phantom{}}% -} -%# 当前地址 -%# curraddr -\providecommand*{\curraddr}[1]{% - \gappto\@author{\phantom{A}\\[-\baselineskip]% - \if@PJLauthor@affilon\else% - \vspace{\PJLauthor@length@innersep}% - \fi% - \@PJLauthor@affilontrue% - \PJLauthor@font@curraddr{#1}\\\phantom{}}% -} -%# 电子邮箱 -%# email -\providecommand*{\email}[1]{% - \gappto\@author{\phantom{A}\\[-\baselineskip]% - \if@PJLauthor@affilon\else% - \vspace{\PJLauthor@length@innersep}% - \fi% - \@PJLauthor@affilontrue% - \PJLauthor@font@email{#1}\\\phantom{}}% -} -%%================================ -%% Adjustment -%%================================ -%# 去除 maketitle 中默认对 author 的处理 -%# Remove the tabular around \@author in maketitle -\patchcmd{\@maketitle}{\begin{tabular}[t]{c}}{}{}{} -\patchcmd{\@maketitle}{\end{tabular}}{}{}{} -%# 下面这一行是为了避免错误 "No \author given." -%# The follwing line is for avoiding the error "No \author given." -\def\@author{} -%# 修正作者块的前后等距离 -%# Adjust the spacing before and after the author block -\pretocmd{\@maketitle}{% - \pretocmd{\@author}{\vspace{-\PJLauthor@length@sep}}{}{\FAIL}% - \apptocmd{\@author}{% -% Fix the space caused by `\\\phantom{}` - \vspace{-\baselineskip}% - \if@PJLauthor@affilon% - \vspace{\PJLauthor@length@aftersep}% - \fi% - }{}{\FAIL}% -}{}{\FAIL} +\fi %</PJLauthor> % %<*PJLdate> @@ -2121,18 +2124,17 @@ } %</PJLthm> % -%<*ProjLib,PJLtoolkit> +%<*ProjLib> %# 这段代码定义了宏包中的选项。 %# This code defines the options in the package. \SetupKeyvalOptions{ - family = @PJLtoolkit, - prefix = @PJLtoolkit@, + family = @ProjLib, + prefix = @ProjLib@, } \DeclareBoolOption[false]{draft} \DeclareBoolOption[false]{fast} \DeclareBoolOption[false]{author} \DeclareBoolOption[false]{amsfashion} -\DeclareBoolOption[false]{amssim} \DeclareBoolOption[false]{nothms} \DeclareBoolOption[false]{nothmnum} \DeclareBoolOption[false]{regionalref} @@ -2147,38 +2149,36 @@ %# 下面的代码设定了选项之间的关系 %# The following code sets the relationship between options -\if@PJLtoolkit@draft - \@PJLtoolkit@fasttrue -\fi -\if@PJLtoolkit@amsfashion - \@PJLtoolkit@amssimtrue +\if@ProjLib@draft + \@ProjLib@fasttrue \fi %# 向组件传递一些参数 %# Pass some options to the components -\if@PJLtoolkit@fast +\if@ProjLib@fast \PassOptionsToPackage{fast}{PJLdate} \PassOptionsToPackage{fast}{PJLdraft} \PassOptionsToPackage{fast}{PJLlogo} \PassOptionsToPackage{fast}{PJLthm} \fi -\if@PJLtoolkit@nothms +\if@ProjLib@nothms \PassOptionsToPackage{nothms}{PJLthm} \fi -\if@PJLtoolkit@nothmnum +\if@ProjLib@nothmnum \PassOptionsToPackage{nothmnum}{PJLthm} \fi -\if@PJLtoolkit@regionalref +\if@ProjLib@regionalref \PassOptionsToPackage{regionalref}{PJLthm} \fi %# 加载不默认载入的组件 %# Load those components not by default loaded -\if@PJLtoolkit@author +\if@ProjLib@amsfashion + \PassOptionsToPackage{amsfashion}{PJLauthor} \RequirePackage{PJLauthor} \fi -\if@PJLtoolkit@amssim - \RequirePackage{PJLamssim} +\if@ProjLib@author + \RequirePackage{PJLauthor} \fi %# 加载组件 %# Load the components @@ -2196,7 +2196,7 @@ % A message can then be shown as: Font "(font name)" has been set \ifdefined\PJL@font@alreadyset\else -\if@PJLtoolkit@palatino +\if@ProjLib@palatino % \RequirePackage{amssymb} \RequirePackage{mathpazo} \PassOptionsToPackage{defaultsups}{newpxtext} @@ -2204,22 +2204,22 @@ % \RequirePackage{newpxmath} \let\openbox\relax \PJLsetlinespacing{\setstretch{1.07}} - \if@PJLtoolkit@useosf\useosf\fi + \if@ProjLib@useosf\useosf\fi \fi -\if@PJLtoolkit@times +\if@ProjLib@times % \RequirePackage{amssymb} \PassOptionsToPackage{defaultsups}{newtxtext} \RequirePackage{newtxtext} \RequirePackage{newtxmath} \let\openbox\relax \PJLsetlinespacing{\setstretch{1.00}} - \if@PJLtoolkit@useosf\useosf\fi + \if@ProjLib@useosf\useosf\fi \fi -\if@PJLtoolkit@garamond +\if@ProjLib@garamond % \RequirePackage{amssymb} - \if@PJLtoolkit@useosf\else + \if@ProjLib@useosf\else \PassOptionsToPackage{lining}{ebgaramond} \fi \RequirePackage{ebgaramond-maths} @@ -2228,12 +2228,12 @@ \PJLsetlinespacing{\setstretch{1.00}} \fi -\if@PJLtoolkit@biolinum +\if@ProjLib@biolinum % \RequirePackage{amssymb} % \RequirePackage{mathpazo} % \RequirePackage[sansmath]{libertinust1math} \ifPDFTeX - \if@PJLtoolkit@useosf + \if@ProjLib@useosf \PassOptionsToPackage{osf}{biolinum} \fi \RequirePackage{biolinum} @@ -2245,7 +2245,7 @@ BoldFont = LinBiolinum_RB.otf , ItalicFont = LinBiolinum_RI.otf , BoldItalicFont = LinBiolinum_RBO.otf, - \if@PJLtoolkit@useosf Numbers = OldStyle\fi ] + \if@ProjLib@useosf Numbers = OldStyle\fi ] \fi \PJLsetlinespacing{\setstretch{1.05}} \RequirePackage[italic,defaultmathsizes]{mathastext} @@ -2258,6 +2258,6 @@ %# 使用 microtype 优化排版细节 %# Use `microtype` to get details better \RequirePackage{microtype} -%</ProjLib,PJLtoolkit> +%</ProjLib> \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/projlib/ProjLib.ins b/macros/latex/contrib/projlib/ProjLib.ins index 29806981d2..014bdd8680 100644 --- a/macros/latex/contrib/projlib/ProjLib.ins +++ b/macros/latex/contrib/projlib/ProjLib.ins @@ -40,7 +40,6 @@ and version 1.3c or later is part of all distributions of LaTeX version \usepreamble\mypreamble \generate{\file{ProjLib.sty}{\from{ProjLib.dtx}{ProjLib}}} -\generate{\file{PJLamssim.sty}{\from{ProjLib.dtx}{PJLamssim}}} \generate{\file{PJLauthor.sty}{\from{ProjLib.dtx}{PJLauthor}}} \generate{\file{PJLdate.sty}{\from{ProjLib.dtx}{PJLdate}}} \generate{\file{PJLdraft.sty}{\from{ProjLib.dtx}{PJLdraft}}} @@ -49,7 +48,6 @@ and version 1.3c or later is part of all distributions of LaTeX version \generate{\file{PJLmath.sty}{\from{ProjLib.dtx}{PJLmath}}} \generate{\file{PJLpaper.sty}{\from{ProjLib.dtx}{PJLpaper}}} \generate{\file{PJLthm.sty}{\from{ProjLib.dtx}{PJLthm}}} -\generate{\file{PJLtoolkit.sty}{\from{ProjLib.dtx}{PJLtoolkit}}} \obeyspaces \Msg{*************************************************************} @@ -58,7 +56,6 @@ and version 1.3c or later is part of all distributions of LaTeX version \Msg{* files into a directory searched by TeX: *} \Msg{* *} \Msg{* ProjLib.sty *} -\Msg{* PJLamssim.sty *} \Msg{* PJLauthor.sty *} \Msg{* PJLdate.sty *} \Msg{* PJLdraft.sty *} @@ -67,7 +64,6 @@ and version 1.3c or later is part of all distributions of LaTeX version \Msg{* PJLmath.sty *} \Msg{* PJLpaper.sty *} \Msg{* PJLthm.sty *} -\Msg{* PJLtoolkit.sty *} \Msg{* *} \Msg{* Happy TeXing! *} \Msg{* *} diff --git a/macros/latex/contrib/projlib/README.md b/macros/latex/contrib/projlib/README.md index 35fe121524..28d8e8de04 100644 --- a/macros/latex/contrib/projlib/README.md +++ b/macros/latex/contrib/projlib/README.md @@ -2,11 +2,12 @@ # ProjLib Toolkit -> **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or "***Proj**et **Lib**re*" (in French). Personally, I prefer the French interpretation. +> **ProjLib** can be interpreted as "***Proj**ect **Lib**rary*" (in English), or "***Proj**et **Lib**re*" (in French). +> Personally, I prefer later one. ## Introduction -`ProjLib` is a collection of tools that help you write LaTeX document. With package `ProjLib` loaded (note that it is case-sensitive), you no longer need to set up the theorem-like environments nor to manually configure the appropriate multilingual settings. In addition, a series of auxiliary functionalities are introduced. +`ProjLib` is a collection of tools that help you write LaTeX document. With the package `ProjLib` loaded (note that it is case-sensitive), you no longer need to set up the theorem-like environments nor to manually configure the appropriate multilingual settings. In addition, a series of auxiliary functionalities are introduced. To get started, simply put this line in your preamble: ```latex @@ -16,11 +17,13 @@ To get started, simply put this line in your preamble: ## The components The components include: -1. `PJLamssim.sty` - - Simulate some features of `amsart` in the standard classes 1. `PJLauthor.sty` - Enhanced author information block - Offers `\address`, `\curraddr` and `\email` + - Write in the AMS fashion (with option `amsfashion`): + - Support `\dedicatory`, `\keywords` and `\subjclass` + - `\thanks` can be written outside `\author`; + - The `abstract` environment can be placed before `\maketitle`. 1. `PJLdate.sty` - Offers a macro `\PLdate` (or `\PJLdate`) to convert `yyyy-mm-dd` to normal datetime format, with multi-language support 1. `PJLdraft.sty` @@ -39,11 +42,11 @@ The components include: - Theorem setup and configuration - Offers a macro `\CreateTheorem` for creating theorem-like environments with multi-language support - Preset environments include: `assumption`, `axiom`, `conjecture`, `convention`, `corollary`, `definition`, `definition-proposition`, `definition-theorem`, `example`, `exercise`, `fact`, `hypothesis`, `lemma`, `notation`, `observation`, `problem`, `property`, `proposition`, `question`, `remark`, `theorem`, and the corresponding unnumbered version with an asterisk `*` in the name. -1. `PJLtoolkit.sty` (this is the internal name of the `ProjLib` package) +<!-- 1. `PJLtoolkit.sty` (this is the internal name of the `ProjLib` package) - A collective interface of ProjLib Toolkit, loading all the packages above - - Provide some pre-defined font configuration + - Provide some pre-defined font configuration --> -> Since `PJLthm.sty` (and thus `PJLtoolkit.sty`) uses `cleveref`, it should be loaded after `varioref` and `hyperref`. +> Since `PJLthm.sty` (and thus `ProjLib.sty`) uses `cleveref`, it should be loaded after `varioref` and `hyperref`. ## How to get these files You can get the `.sty` files mentioned above simply by compiling `ProjLib.ins`: @@ -51,6 +54,12 @@ You can get the `.sty` files mentioned above simply by compiling `ProjLib.ins`: latex ProjLib.ins ``` +## How to get the source of the documentation +You can get the `.tex` source files of the documentation by compiling `ProjLib-doc.ins`: +``` +latex ProjLib-doc.ins +``` + ## An example ```latex \documentclass{amsart} @@ -60,7 +69,7 @@ latex ProjLib.ins %% You can also comment the above lines and try the following (require xelatex or lualatex): % \documentclass[a4paper,allowbf]{lebhart} -% \usepackage{ProjLib} +% \usepackage[amsfashion]{ProjLib} %% Using \UseLanguage to select language, by default "English" is selected \UseLanguage{French} % Use French from here diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf Binary files differindex d19d0c9fa9..b26a2bb325 100644 --- a/macros/latex/contrib/spbmark/spbmark.pdf +++ b/macros/latex/contrib/spbmark/spbmark.pdf diff --git a/macros/latex/contrib/spbmark/spbmark.sty b/macros/latex/contrib/spbmark/spbmark.sty index f5e40f2b7f..7df09aaeec 100644 --- a/macros/latex/contrib/spbmark/spbmark.sty +++ b/macros/latex/contrib/spbmark/spbmark.sty @@ -7,9 +7,9 @@ % conditions of the CC-BY 4.0 License. % The latest version of this license is in % https://creativecommons.org/licenses/by/4.0/legalcode -\NeedsTeXFormat{LaTeX2e}[2018/12/31] +\NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{xparse,l3keys2e} -\ProvidesExplPackage{spbmark}{2021/07/26}{1.05} +\ProvidesExplPackage{spbmark}{2021/07/26}{1.06} {Customize superscripts and subscripts} \cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } } @@ -53,24 +53,14 @@ \tl_set:Nn \l__spb_boxa_wd_tl { \box_wd:N \l_tmpa_box } \tl_set:Nn \l__spb_boxb_wd_tl { \box_wd:N \l_tmpb_box } -\cs_new:Npn \spb_tmp_boxa_use: { \box_use:N \l_tmpa_box } -\cs_new:Npn \spb_tmp_boxb_use: { \box_use:N \l_tmpb_box } -\cs_new:Npn \spb_box_max_dim_horizontal: +\tl_set:Nn \l__spb_box_max_wd_tl + { \dim_max:nn { \l__spb_boxa_wd_tl } { \l__spb_boxb_wd_tl } } +\cs_new:Npn \spb_tmp_boxa_use_vmove:n #1 + { \box_move_up:nn {#1} { \box_use:N \l_tmpa_box } } +\cs_new:Npn \spb_hbox_overlap_position:n #1 { - \skip_horizontal:n - { \dim_max:nn { \l__spb_boxa_wd_tl } { \l__spb_boxb_wd_tl } } - } -\cs_new:Npn \spb_boxwd_subtract:nnnn #1#2#3#4 - { - \skip_horizontal:n - { #1\tl_use:c { l__spb_#3_wd_tl } - #2\tl_use:c { l__spb_#4_wd_tl } } - } -\cs_new:Npn \spb_boxwd_script_align:nn #1#2 - { - \spb_boxwd_subtract:nnnn { 0.5 } { 0.5 } {#1} {#2} - \use:c { spb_tmp_#2_use: } - \spb_boxwd_subtract:nnnn { -0.5 } { 0.5 } {#1} {#2} - \use:c { spb_tmp_#1_use: } + \use:c { hbox_overlap_#1:n } { \box_use:N \l_tmpa_box } + \use:c { hbox_overlap_#1:n } { \box_use:N \l_tmpb_box } } \cs_new:Npn \spb_math_print_store:nnn #1#2#3 { @@ -138,10 +128,23 @@ { \spb_math_print_store:nnn {##4} {#1} {##5} } { \spb_text_print_store:nnn {##4} {#1} {##5} } } - \hbox_set_to_wd:Nnn \l_tmpb_box { \l__spb_boxa_wd_tl + ##6 } - { \hss\box_move_up:nn {##2} { \spb_tmp_boxa_use: } } + \hbox_set:Nn \l_tmpb_box + { + \dim_compare:nNnTF {##6} < { 0pt } + { + \hbox_overlap_left:n + { + \hbox_to_wd:nn { \l__spb_boxa_wd_tl - ##6 } + { \spb_tmp_boxa_use_vmove:n {##2}\hss } + } + } + { + \hbox_to_wd:nn { \l__spb_boxa_wd_tl + ##6 } + { \hss\spb_tmp_boxa_use_vmove:n {##2} } + } + } \spb_box_ht_dp_assign:nn ##3 - \spb_tmp_boxb_use: + \box_use:N \l_tmpb_box } } \NewDocumentCommand{\supersub} @@ -160,10 +163,10 @@ { \spb_math_print_store:nnnn {#4} {#5} {#8} {#6} } { \spb_text_print_store:nnnn {#4} {#5} {#8} {#6} } } - \hbox_set_to_wd:Nnn \l_tmpa_box { \l__spb_boxa_wd_tl + #7 } - { \hss\box_move_up:nn {#2} { \spb_tmp_boxa_use: } } - \hbox_set_to_wd:Nnn \l_tmpb_box { \l__spb_boxb_wd_tl + #7 } - { \hss\box_move_down:nn {#2} { \spb_tmp_boxb_use: } } + \hbox_set:Nn \l_tmpa_box + { \box_move_up:nn {#2} { \box_use:N \l_tmpa_box } } + \hbox_set:Nn \l_tmpb_box + { \box_move_down:nn {#2} { \box_use:N \l_tmpb_box } } \str_case:onF {#3} { { l } { \use_i:nnn } @@ -175,19 +178,48 @@ \use_i:nnn } { - \hbox_overlap_right:n { \spb_tmp_boxa_use: } - \hbox_overlap_right:n { \spb_tmp_boxb_use: } - \spb_box_max_dim_horizontal: + \dim_compare:nNnTF {#7} < { 0pt } + { + \hbox_overlap_left:n + { + \spb_hbox_overlap_position:n { right } + \skip_horizontal:n { -#7 } + } + } + { + \skip_horizontal:n {#7} + \spb_hbox_overlap_position:n { right } + \skip_horizontal:n { \l__spb_box_max_wd_tl } + } } { - \dim_compare:nNnTF { \l__spb_boxa_wd_tl } > { \l__spb_boxb_wd_tl } - { \spb_boxwd_script_align:nn { boxa } { boxb } } - { \spb_boxwd_script_align:nn { boxb } { boxa } } + \dim_compare:nNnTF {#7} < { 0pt } + { + \hbox_overlap_left:n + { + \spb_hbox_overlap_position:n { center } + \skip_horizontal:n { \l__spb_box_max_wd_tl/2 - #7 } + } + } + { + \skip_horizontal:n { \l__spb_box_max_wd_tl/2 + #7 } + \spb_hbox_overlap_position:n { center } + \skip_horizontal:n { \l__spb_box_max_wd_tl/2 } + } } { - \spb_box_max_dim_horizontal: - \hbox_overlap_left:n { \spb_tmp_boxa_use: } - \hbox_overlap_left:n { \spb_tmp_boxb_use: } + \dim_compare:nNnTF {#7} < { 0pt } + { + \hbox_overlap_left:n + { + \spb_hbox_overlap_position:n { left } + \skip_horizontal:n { -#7 } + } + } + { + \skip_horizontal:n { \l__spb_box_max_wd_tl + #7 } + \spb_hbox_overlap_position:n { left } + } } } \msg_new:nnn { spbmark } { unsupported-align } @@ -215,5 +247,5 @@ { \cs_new:Npn \fnmarkfont { \ftntm@font } } { \cs_new:Npn \fnmarkfont { \normalfont } } \endinput -%% -%% End of file `spbmark.sty'. +% +% End of file `spbmark.sty'.
\ No newline at end of file diff --git a/macros/latex/contrib/spbmark/spbmark.tex b/macros/latex/contrib/spbmark/spbmark.tex index 0391f84d74..1198c98708 100644 --- a/macros/latex/contrib/spbmark/spbmark.tex +++ b/macros/latex/contrib/spbmark/spbmark.tex @@ -1,4 +1,4 @@ -\documentclass[load-preamble]{cnltx-doc} +\documentclass[load-preamble+]{cnltx-doc} \usepackage{spbmark,siunitx} \usepackage[noto]{newtxmath} @@ -6,7 +6,7 @@ { package = spbmark, title = the spbmark package, - version = v1.05, + version = v1.06, date = 2021/07/26, authors = Qu Yi, info = Customize superscript and subscript, @@ -14,7 +14,7 @@ url = https://github.com/texl3/spbmark, abstract = { - \pkg{spbmark} provides three commands \cs{super}, \cs{sub} and \cs{supersub} to improve the layout of superscript and subscript which can be adjusted the relative position and format, and can be used in text and math mode. + \pkg*{spbmark} provides three commands \cs{super}, \cs{sub} and \cs{supersub} to improve the layout of superscript and subscript which can be adjusted the relative position and format, and can be used in text and math mode. }, color-scheme = blue, title-format = \huge\bfseries\scshape, @@ -29,7 +29,7 @@ \label{sec:macro package options} \begin{options} \opt{ctex}\Default! - This option works with the C\TeX{} document class used by simplified Chinese users, there's actually no functional change. Adding path \option{style} to \cs{ctexset} command, which is equivalent to using \cs{spbset}. + This option works with the C\TeX{} document class used by simplified Chinese users, there's actually no functional change. Adding path \option*{style} to \cs*{ctexset} command, which is equivalent to using \cs{spbset}. \keybool{newsupb}\Default{true} \option{newsupb} is a boolean option with a default value of true that redefines the \LaTeX{} kernel commands to cause \cs{sp} and \cs{textsuperscript} are equivalent to \cs{super} command, and \cs{sb} and \cs{textsubscript} are equivalent to \cs{sub} command. \end{options} @@ -37,9 +37,9 @@ \section{User commands} There are currently three commands to set superscript and subscript. Their format can be set temporarily using the optional parameters of the command, or set globally using a key-value list, see section \ref{sec:global control interface}. \begin{commands} - \command{super}[\sarg\oarg{option}\oarg{height,depth}\darg{code}\marg{content}\oarg{hshift}] + \command{super}[\sarg\oarg{vshift}\oarg{height,depth}\darg{code}\marg{content}\oarg{hshift}] This is a superscript output command. - \command{sub}[\sarg\oarg{option}\oarg{height,depth}\darg{code}\marg{content}\oarg{hshift}] + \command{sub}[\sarg\oarg{vshift}\oarg{height,depth}\darg{code}\marg{content}\oarg{hshift}] This is a subscript output command. \command{supersub}[\sarg\oarg{vsep}\oarg{align}\darg{sup code}\marg{sup cont}\marg{sub cont}\oarg{hshift}\darg{sub code}] This is a command that outputs both superscript and subscript at the same time. @@ -47,9 +47,9 @@ There are currently three commands to set superscript and subscript. Their forma These commands can match the corresponding pattern depending on whether they are currently in text mode or mathematical mode, or they can use an asterisk variant to force the mathematical pattern. -The \meta{vshift} and \meta{hshift} represent respectively vertical and horizontal offsets of superscript or subscript, their default value is \code{0pt}, and the parameters of \meta{script align} are the same as the \option{supersubalign}. +The \meta{vshift} and \meta{hshift} represent respectively vertical and horizontal offsets of superscript or subscript, their default value is \code{0pt}. If it is positive, move up or right, or if it is negative, move left or down. The parameters of \meta{script align} are the same as the \option{supersubalign}. -The second optional parameter generally does not need to be used. The \meta{height} and \meta{depth} are separated by commas. Only the front part indicates the height of the superscript or subscript, and only the back part indicates the depth. +The optional parameter \meta{height,depth} generally does not need to be used. The \meta{height} and \meta{depth} are separated by commas. Only the front part indicates the height of the superscript or subscript, and only the back part indicates the depth. The \meta{code} is used to format superscript and subscript, and can insert commands such as fonts or colors. The last command in the code can take an argument, which is either a superscript or a subscript. @@ -69,7 +69,7 @@ If you need to use the original definitions of \cs{textsuperscript}, \cs{textsub \label{sec:global control interface} \begin{commands} \command{spbset}[\marg{key-value list}] - \pkg{spbmark} uses the \cs{spbset} command to control the global default format of superscript and subscript. The values set by it will be overwritten by the optional parameters of the superscript and other commands. + \pkg*{spbmark} uses the \cs{spbset} command to control the global default format of superscript and subscript. The values set by it will be overwritten by the optional parameters of the superscript and other commands. \end{commands} The following list of keys control the format both of superscript or subscript. They are equivalent to the optional parameters of the \cs{super} or \cs{sub} commands. @@ -94,43 +94,34 @@ The following list of keys control the format of superscript and subscript. They Extra vertical shift of the superscript and the subscript. \keyval{supersub-format}{super code,sub code}\Default{0pt} Control the format of superscript or subscript. The first part is in superscript format, and the latter part is in subscript format. The two are separated by commas, or only the first part exists. - \keyval{supersubsep}{fixed length}\Default{0pt} + \keyval{supersubsep}{rubber length}\Default{0.3ex} The distance between superscript and subscript, its default value is \code{0.3ex}. \keychoice{supersubalign}{l,c,r}\Default{l} - The alignment of superscript and subscript, which contains \option{l}, \option{c}, and \option{r} parameters respectively for left, center, and right alignment. + The alignment of superscript and subscript, which contains \option*{l}, \option*{c}, and \option*{r} parameters respectively for left, center, and right alignment. \end{options} \section{Examples of use} -Here is a list of the three commands, please pay attention to the delimiter and usage of optional parameters: +Here is a list of the three commands, please pay attention to the delimiter and usage of optional parameters. Note when the horizontal offset is negative, the starting point is at the right end of the mark. \begin{example} \spbset{supersub-format = {\ttfamily,\color{blue}}} A\super[0.2ex](\textcolor{red}){exam}[0.2em]B \\ $A\sub(\mathsf){exam}B$ \\ -A\supersub[0.3ex][c]{examsuper}{sub}B +A\supersub[0.3ex][c]{examsuper}{sub}B \\ +A\super[5pt]{c}[-1.5pt]B\sub[-5pt]{d}[-1pt]AB \end{example} -It can also be used with the \pkg{siunitx} package to output superscript and subscript in the unit: +It can also be used with the \pkg*{siunitx} package to output superscript and subscript in the unit: \begin{example} \unit[mode = math]{kg.m/s\super*[-1pt]{2}} \\ \qty[mode = text]{30}{A\supersub(\color{red}){b}{c}[1pt]} \\ \spbset{sub-hshift = 2pt}\unit[mode = text]{A_b} \end{example} -\pkg{spbmark} also patches the footer markers for standard document class and \cls{KOMA-Script}. You can format the footer markers by redefining the \cs{fnmarkfont} command. Note that extra horizontal shift does not work with footnote markers. +\pkg*{spbmark} also patches the footer markers for standard document class and \cls*{KOMA-Script}. You can format the footer markers by redefining the \cs{fnmarkfont} command. Note that extra horizontal shift does not work with footnote markers. \section{Known issues} -At present, the vertical and horizontal offsets are effective for the unit commands in the \pkg{siunitx} macro package. However, due to the special mechanism that the decimal point is not recognized correctly because it is converted to a space in the \cs{unit} command, it is recommended to use \code{pt} as the unit of offset. - -\newcommand\urlprefix{\newline\hspace*{\fill}} -\let\OldUrl\url -\renewcommand\url[2][]{{\small\textit{#1}~\OldUrl{#2}}} -\begin{thebibliography}{99} -\bibitem{realscripts} -\textsc{Will Robertson}. -\newblock \textit{The \pkg{realscripts} package} [CP/OL]. -\newblock version 0.3d, -\newblock (2016-02-13) -\urlprefix\url{https://ctan.org/pkg/realscripts} -\end{thebibliography} - -\end{document}
\ No newline at end of file +At present, the vertical and horizontal offsets are effective for the unit commands in the \pkg*{siunitx} macro package. However, due to the special mechanism that the decimal point is not recognized correctly because it is converted to a space in the \cs*{unit} command, it is recommended to use \code{pt} as the unit of offset. + +\nocite{*} + +\end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md index 4f60b15476..631c7491b8 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/06/03 v3.16 + tuda-ci 2021/07/27 v3.17 *************************************************************************** @@ -49,6 +49,11 @@ Falls Sie noch keine Distribution installiert haben, finden Sie die notwendigen #### Sonderfall: Paketverwaltung des Betriebssystems (Linux/BSD) Für einige Linux/BSD-Varianten existieren texlive-Pakete die über die Paketverwaltung des Systems installierbar sind. Da TUDa-CI sehr speziell ist, ist es nur in der Paketen *texlive-full* enthalten. Falls Sie ein kleineres Setup wünschen, empfehlen wir die Installation über den TeX Live Manager https://tug.org/texlive/doc/texlive-en/texlive-en.html#installation. +### Nutzung von TUDa-CI über Overleaf + +Die TUDa verfügt über eine eigene Overleaf-Installation, auf die alle Mitglieder Zugriff haben. Die DEMO-Dateien werden dort in der jeweils aktuellen Version als Templates bereitgestellt: https://sharelatex01.ca.hrz.tu-darmstadt.de/templates/all +Somit ist eine Nutzung ohne lokale Installation möglich. + ### Logos & verwendete Bilddateien Die verwendeten Logos sind nicht Bestandteil dieses Bundles und können von Mitgliedern der TU Darmstadt über das interne Netzwerk heruntergeladen werden. @@ -144,6 +149,8 @@ In case you don't have any installed TeX system the following links might be use - Windows/Linux https://tug.org/texlive/acquire-netinstall.html - MacTeX http://tug.org/mactex/ +It's also possible to use the TUDa-CI-DEMO files as Overleaf-Templates on TUDa's own installation: https://sharelatex01.ca.hrz.tu-darmstadt.de/templates/all (requires TUDa Account) + #### Remark on texlive packages provided by Linux/BSD package managers: In case you already use a texlive package of your OS TUDa-CI might not be included. Since it's a personal corporate design package you might need to install *texlive-full* to use it without further adjustments. These packages also will miss the logo and – this depends on your OS – the provided package might be outdated. In this case we recomment the setup using tlmgr (as described in the upper links). @@ -280,3 +287,6 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls - improve documentation on document margins for tudapub and tudapub based examples * v3.16 (2021-06-03) - adjust option expansion due to changes in the LaTeX kernel + * v3.17 (2021-07-27) + - add a temporary workaround to avoid incompatibilities with pdfa=true + - fix footer positions 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 61f14277e9..5aada3df12 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 c4df254ab5..2efb1e9f1a 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 5e09114100..e5ce3ba59b 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 3d3234ba9c..e2c1d6a80e 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 8c430d1b8c..85107673fc 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 e4d778763c..eb3d355584 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 78f66cd986..9cd8db8400 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 4060cb823c..6a8c5d7888 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 7f832bb6ba..31ee12f74a 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 2d26814ba1..88985c9e93 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 9a0f4acd7e..647ccf29a8 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 a92c09c86a..66e5621b86 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.16 (2021/06/03), +%% This is file `DEMO-TUDaAnnouncement.tex' version 3.17 (2021/07/27), %% 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 d41ec09c21..fab5602804 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.16 (2021/06/03), +%% This is file `DEMO-TUDaBeamer.tex' version 3.17 (2021/07/27), %% 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 f60c07a49b..a51aafb903 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.16 (2021/06/03), +%% This is file `DEMO-TUDaBibliography.bib' version 3.17 (2021/07/27), %% 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 26cdeb5c56..691a39439b 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.16 (2021/06/03), +%% This is file `DEMO-TUDaExercise.tex' version 3.17 (2021/07/27), %% 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 171649509f..0782b80cdb 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.16 (2021/06/03), +%% This is file `DEMO-TUDaFromaddress.lco' version 3.17 (2021/07/27), %% 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 fb71971345..9e8431b8dc 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.16 (2021/06/03), +%% This is file `DEMO-TUDaLeaflet.tex' version 3.17 (2021/07/27), %% 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 eaa0b60f40..be0f909e10 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.16 (2021/06/03), +%% This is file `DEMO-TUDaLetter.tex' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -71,7 +71,7 @@ \opening{Sehr geehrte Damen und Herren,} Dieses Template dient der Verwendungsdokumentation der tudaletter-Klasse. -Die wichtigsten Optionen sind direkt im Quellcode zu dieser Datei hinterlegt und entsprechend kommentiert. Andere Optionen stellen nicht zwangsweise eine Konformität zu den Corporate Design Richtlinien dar. Layoutänderungen jeglicher Art solten daher vermieden werden. +Die wichtigsten Optionen sind direkt im Quellcode zu dieser Datei hinterlegt und entsprechend kommentiert. Andere Optionen stellen nicht zwangsweise eine Konformität zu den Corporate Design Richtlinien dar. Layoutänderungen jeglicher Art sollten daher vermieden werden. Zusätzliche Optionen sind im Folgenden aufgelistet:\\ \parbox{\linewidth}{ @@ -89,7 +89,7 @@ Für Wiederverwendung der Absenderadresse wurde die Datei \enquote{DEMO"=TUDaFro Die Adressdatei wird üblicherweise lokal im System installiert, um sie nicht immer mit allen anderen Dateien kopieren zu müssen. Falls Sie dies durchführen möchten, findet sich eine entsprechende Erklärung am Ende der DEMO"=TUDaFromaddress.lco"=Datei. -Eine Besonderheit der Klasse tudaletter stellt der Unterschied in der Zeilenlänge zwischen der ersten und den folgenden Seiten dar. Da \LaTeX{} grundsätzlich keine Änderung der Zeilenlänge innerhalb eines Absatzes unterstützt, ist hier eine komplexe Implementierung nötig. In einigen speziellen Fällen kann dieser Mechanismus fehlschlagen. Eine Sammlung an Soderfällen ist bereits implementiert. Sollten Sie jedoch auf weitere stoßen, werden wir uns um eine Erweiterung der Implementierung bemühen. +Eine Besonderheit der Klasse tudaletter stellt der Unterschied in der Zeilenlänge zwischen der ersten und den folgenden Seiten dar. Da \LaTeX{} grundsätzlich keine Änderung der Zeilenlänge innerhalb eines Absatzes unterstützt, ist hier eine komplexe Implementierung nötig. In einigen speziellen Fällen kann dieser Mechanismus fehlschlagen. Eine Sammlung an Sonderfällen ist bereits implementiert. Sollten Sie jedoch auf weitere stoßen, werden wir uns um eine Erweiterung der Implementierung bemühen. Der einfachste Fall, um solche Schwierigkeiten zu beheben, ist in diesem Beispiel mithilfe des Befehls parbox bei der Auflistung gezeigt. diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex index 22e5b70de8..3b183e6648 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.16 (2021/06/03), +%% This is file `DEMO-TUDaPhD.tex' version 3.17 (2021/07/27), %% 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 66ba28640a..15548379d0 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.16 (2021/06/03), +%% This is file `DEMO-TUDaPoster.tex' version 3.17 (2021/07/27), %% 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 fe6b6e3216..f033f1a299 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.16 (2021/06/03), +%% This is file `DEMO-TUDaPub.tex' version 3.17 (2021/07/27), %% 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 3836badbe9..6bedcd2d91 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.16 (2021/06/03), +%% This is file `DEMO-TUDaReport.tex' version 3.17 (2021/07/27), %% 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 2780fec0c8..31e943bdce 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.16 (2021/06/03), +%% This is file `DEMO-TUDaSciPoster.tex' version 3.17 (2021/07/27), %% 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 d6d903bd16..4ff6c0f488 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.16 (2021/06/03), +%% This is file `DEMO-TUDaThesis.tex' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -78,7 +78,7 @@ %\usepackage{array} % Basispaket für Tabellenkonfiguration, wird von den folgenden automatisch geladen \usepackage{tabularx} % Tabellen, die sich automatisch der Breite anpassen %\usepackage{longtable} % Mehrseitige Tabellen -%\usepackage{xltabular} % Mehrseitige Tabellen mit anpassarer Breite +%\usepackage{xltabular} % Mehrseitige Tabellen mit anpassbarer Breite \usepackage{booktabs} % Verbesserte Möglichkeiten für Tabellenlayout über horizontale Linien %%%%%%%%%%%%%%%%%%% @@ -112,7 +112,7 @@ \birthplace{Geburtsort}%Geburtsort, bei Dissertationen zwingend notwendig \reviewer{Gutachter 1 \and Gutachter 2 \and noch einer \and falls das immernoch nicht reicht}%Gutachter -%Diese Felder erden untereinander auf der Titelseite platziert. +%Diese Felder werden untereinander auf der Titelseite platziert. %\department ist eine notwendige Angabe, siehe auch dem Abschnitt `Abweichung von den Vorgaben für die Titelseite' \department{ce} % Das Kürzel wird automatisch ersetzt und als Studienfach gewählt, siehe Liste der Kürzel im Dokument. \institute{Institut} diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty index 2749f0bf1a..183432028c 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.16 (2021/06/03), +%% This is file `beamercolorthemeTUDa.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 a276fa4064..1a878be781 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.16 (2021/06/03), +%% This is file `beamerfontthemeTUDa.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 581bc18606..33fdafeb10 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.16 (2021/06/03), +%% This is file `beamerinnerthemeTUDa.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 b646a48bff..8a47784218 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.16 (2021/06/03), +%% This is file `beamerouterthemeTUDa.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 5eec56c863..df1213c129 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.16 (2021/06/03), +%% This is file `beamerthemeTUDa-mecheng.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 da07e3a984..05f9224247 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.16 (2021/06/03), +%% This is file `beamerthemeTUDa.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 3d69d9c001..ae48251500 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.16 (2021/06/03), +%% This is file `tuda-a0paper.clo' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 d376e2c66a..49b00b162d 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.16 (2021/06/03), +%% This is file `tuda-a1paper.clo' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 a3f57b3b0c..2b06d23e7c 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.16 (2021/06/03), +%% This is file `tuda-a2paper.clo' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 effd50311f..f86015b357 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.16 (2021/06/03), +%% This is file `tuda-a3paper.clo' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 f780875c72..ab8a1a0ba2 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.16 (2021/06/03), +%% This is file `tuda-a4paper.clo' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 322f6fbc6e..158f2d5f12 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.16 (2021/06/03), +%% This is file `tuda-a5paper.clo' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 57c59baa02..a6e355f82a 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.16 (2021/06/03), +%% This is file `tuda-pgfplots.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} % 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 96489f31ee..a6e20362da 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.16 (2021/06/03), +%% This is file `tudabeamer.cls' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{tudabeamer} [\filedate\space\fileversion\space] @@ -113,8 +113,33 @@ \ExplSyntaxOn \bool_if:NT \g_ptxcd_pdfa_bool { \UnPreventPackageFromLoading{hyperref} - \PassOptionsToPackage{a-2b}{pdfx} - \RequirePackage{pdfx} + %only apply the hack if pdfx is older than the working version + \@ifpackagelater{pdfx}{2021/07/06}{ + \PassOptionsToPackage{a-2b}{pdfx} + \RequirePackage{pdfx} + } { + \msg_new:nnnn{tudapub} {dirty-hack-pdfa} { + I~have~to~use~a~dirty~hack~to~workaround~some~incompatibilites~between~your~LaTeX~version~and~the~pdfa-mode.\\ + Please~use~pdfa=true~only~if~you~really~need~it.\\ + We~will~remove~this~hack~as~soon~as~all~incompatibilities~have~been~patched. + } { + See~the~corresponding~GitHub~Issue~for~more~information:~https://github.com/tudace/tuda_latex_templates/issues/321 + } + \msg_warning:nn {tudapub} {dirty-hack-pdfa} + %check if \par is expanable and add a dirty hack + %Thanks to Ross Moore for the support + \expandafter\ifx\csname tex_par:D\endcsname \relax + \let\pdfx@par\par + \else + \expandafter\let\expandafter\pdfx@par\csname tex_par:D\endcsname + \fi + \let\orig@par\par + \let\par\pdfx@par + \PassOptionsToPackage{a-2b}{pdfx} + \RequirePackage{pdfx} + %restore\par + \let\par\orig@par + } } \hypersetup{hidelinks, unicode} diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def index db447baad2..19524dc019 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.16 (2021/06/03), +%% This is file `tudacolors.def' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 92e8030ed5..5731daec2a 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.16 (2021/06/03), +%% This is file `tudacolors.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 2aeae4f839..55a7a333c1 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.16 (2021/06/03), +%% This is file `tudaexercise.cls' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 1ea353f04e..ebe208c13a 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.16 (2021/06/03), +%% This is file `tudafonts.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 ba91e39950..b08262a492 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.16 (2021/06/03), +%% This is file `tudaleaflet.cls' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 14b3dec695..00678b431d 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.16 (2021/06/03), +%% This is file `tudaletter.cls' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaletter} @@ -428,8 +428,33 @@ %pdfa \if_bool:N \g_ptxcd_pdfa_bool -\PassOptionsToPackage{a-2b}{pdfx} -\RequirePackage{pdfx} + %only apply the hack if pdfx is older than the working version +\@ifpackagelater{pdfx}{2021/07/06}{ + \PassOptionsToPackage{a-2b}{pdfx} + \RequirePackage{pdfx} +} { + \msg_new:nnnn{tudapub} {dirty-hack-pdfa} { + I~have~to~use~a~dirty~hack~to~workaround~some~incompatibilites~between~your~LaTeX~version~and~the~pdfa-mode.\\ + Please~use~pdfa=true~only~if~you~really~need~it.\\ + We~will~remove~this~hack~as~soon~as~all~incompatibilities~have~been~patched. + } { + See~the~corresponding~GitHub~Issue~for~more~information:~https://github.com/tudace/tuda_latex_templates/issues/321 + } + \msg_warning:nn {tudapub} {dirty-hack-pdfa} + %check if \par is expanable and add a dirty hack + %Thanks to Ross Moore for the support + \expandafter\ifx\csname tex_par:D\endcsname \relax + \let\pdfx@par\par + \else + \expandafter\let\expandafter\pdfx@par\csname tex_par:D\endcsname + \fi + \let\orig@par\par + \let\par\pdfx@par + \PassOptionsToPackage{a-2b}{pdfx} + \RequirePackage{pdfx} + %restore\par + \let\par\orig@par +} %%hyperref \hypersetup{hidelinks, unicode} \iow_new:N \ptxcd_xmpdata_stream diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo index be2276079e..185982a4e4 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.16 (2021/06/03), +%% This is file `tudalettersize10pt.clo' version 3.17 (2021/07/27), %% 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 7280a31a39..dc9ebde2b6 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.16 (2021/06/03), +%% This is file `tudamecheng.cfg' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \RequirePackage{expl3} \ProvidesExplFile{tudamecheng.cfg} {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)} diff --git a/macros/latex/contrib/tuda-ci/tex/tudaposter.cls b/macros/latex/contrib/tuda-ci/tex/tudaposter.cls index 4328cb9049..bba27ec195 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.16 (2021/06/03), +%% This is file `tudaposter.cls' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 5574218e28..f936cc0ba6 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.16 (2021/06/03), +%% This is file `tudapub.cls' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} @@ -481,32 +481,6 @@ footwidth=text } } - \RedeclareLayer[ - clone=scrheadings.head.above.line, - background, - contents={ - \dim_compare:nF {\box_wd:N \ptxcd_headrule_box=\layerwidth} { - \ptxcd_makeheadrule[color=identbarcolor, width=\layerwidth]{ptxcd_headrule} - } - \smash{\ptxcd_headrule} - } - ]{TUDa.pub.head.above.line} - \RedeclareLayer[ - clone=plain.scrheadings.head.above.line, - background, - contents={ - \dim_compare:nF {\box_wd:N \ptxcd_headrule_box=\layerwidth} { - \ptxcd_makeheadrule[color=identbarcolor, width=\layerwidth]{ptxcd_headrule} - } - \smash{\ptxcd_headrule} - } - ]{plain.TUDa.pub.head.above.line} - \ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.even} - \ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.odd} - \ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.oneside} - \ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.even} - \ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.odd} - \ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.oneside} \bool_if:NT \g_ptxcd_headline_bool { \setkomafont{pagehead}{\Large\bfseries} \KOMAoptions{headlines=2} @@ -519,6 +493,38 @@ \ofoot[\pagemark]{\pagemark} } +\RedeclareLayer[ + clone=scrheadings.head.above.line, + background, + contents={ + \dim_compare:nF {\box_wd:N \ptxcd_headrule_box=\layerwidth} { + \ptxcd_makeheadrule[color=identbarcolor, width=\layerwidth]{ptxcd_headrule} + } + \smash{\ptxcd_headrule} + } +]{TUDa.pub.head.above.line} + +\RedeclareLayer[ + clone=plain.scrheadings.head.above.line, + background, + contents={ + \dim_compare:nF {\box_wd:N \ptxcd_headrule_box=\layerwidth} { + \ptxcd_makeheadrule[color=identbarcolor, width=\layerwidth]{ptxcd_headrule} + } + \smash{\ptxcd_headrule} + } +]{plain.TUDa.pub.head.above.line} + +%\dim_set:Nn \l_tmpa_dim {\topmargin+1in+\headheight+\headsep+\textheight +% +\footskip+\dp\strutbox-\footheight +\c_ptxcd_rulesep_dim} +\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.even} +\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.odd} +\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{TUDa.pub.foot.oneside} +\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.even} +\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.odd} +\ModifyLayer[addvoffset=\c_ptxcd_rulesep_dim]{plain.TUDa.pub.foot.oneside} + + \DeclarePageStyleAlias{TUDa}{TUDa.pub} \DeclarePageStyleAlias{plain.TUDa}{plain.TUDa.pub} \pagestyle{TUDa} @@ -803,10 +809,33 @@ This~can~lead~to~incompatiblities~especially~with~older~compiler~versions.\\ You~should~prefer~using~lualatex. } - - - \PassOptionsToPackage{a-2b}{pdfx} - \RequirePackage{pdfx} + %only apply the hack if pdfx is older than the working version + \@ifpackagelater{pdfx}{2021/07/06}{ + \PassOptionsToPackage{a-2b}{pdfx} + \RequirePackage{pdfx} + } { + \msg_new:nnnn{tudapub} {dirty-hack-pdfa} { + I~have~to~use~a~dirty~hack~to~workaround~some~incompatibilites~between~your~LaTeX~version~and~the~pdfa-mode.\\ + Please~use~pdfa=true~only~if~you~really~need~it.\\ + We~will~remove~this~hack~as~soon~as~all~incompatibilities~have~been~patched. + } { + See~the~corresponding~GitHub~Issue~for~more~information:~https://github.com/tudace/tuda_latex_templates/issues/321 + } + \msg_warning:nn {tudapub} {dirty-hack-pdfa} + %check if \par is expanable and add a dirty hack + %Thanks to Ross Moore for the support + \expandafter\ifx\csname tex_par:D\endcsname \relax + \let\pdfx@par\par + \else + \expandafter\let\expandafter\pdfx@par\csname tex_par:D\endcsname + \fi + \let\orig@par\par + \let\par\pdfx@par + \PassOptionsToPackage{a-2b}{pdfx} + \RequirePackage{pdfx} + %restore\par + \let\par\orig@par + } \sys_if_engine_pdftex:T { \msg_warning:nnn{tudapub} {prefer-lualatex} {PDFTeX} diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty index ed549312d2..4b55bd7afd 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.16 (2021/06/03), +%% This is file `tudarules.sty' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 6a551813b6..589f3ead4a 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.16 (2021/06/03), +%% This is file `tudasciposter.cls' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \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 3f923ae763..61e6c1bb61 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.16 (2021/06/03), +%% This is file `tudasize9pt.clo' version 3.17 (2021/07/27), %% 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 5e0b5b4f9c..b0e7d344f4 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.16 (2021/06/03), +%% This is file `tudathesis.cfg' version 3.17 (2021/07/27), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.16} -\def\filedate{2021/06/03} +\def\fileversion{3.17} +\def\filedate{2021/07/27} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)} |