diff options
Diffstat (limited to 'macros/latex/contrib')
79 files changed, 542 insertions, 184 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.pdf Binary files differindex 10ee1e105b..74a745f1e1 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.tex b/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.tex index 5971cd93a1..f5eae36bdb 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/biblatex-trad.tex @@ -1,28 +1,161 @@ -% TEX root = path/to/root_file.tex -% !TEX program = arara -% !TEX encoding = utf8 -% !TEX spellcheck = en_GB -% arara: pdflatex: {synctex: true} -%: Start Header -\documentclass{ltxdockit}[2011/03/25] -\usepackage{btxdockit} +\documentclass{article} \usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} \usepackage[british]{babel} \usepackage[strict]{csquotes} -\usepackage{libertine} -\usepackage[scaled=0.8]{beramono} +\usepackage[useregional]{datetime2} +\usepackage{libertinus} +\usepackage[scaled=0.78]{beramono} \usepackage{microtype} +\usepackage{multicol} +\usepackage{ragged2e} +\usepackage{btxdockit} + +\hypersetup{% + colorlinks=true, + allcolors=spot, + bookmarksopen=false, + bookmarksnumbered=false, + plainpages=false} + +\definecolor{spot}{rgb}{0,0.2,0.6} + \lstset{basicstyle=\ttfamily,keepspaces=true} -\KOMAoptions{numbers=noenddot} -\addtokomafont{paragraph}{\spotcolor} -\addtokomafont{section}{\spotcolor} -\addtokomafont{subsection}{\spotcolor} -\addtokomafont{subsubsection}{\spotcolor} -\addtokomafont{descriptionlabel}{\spotcolor} -\pretocmd{\cmd}{\sloppy}{}{} -\pretocmd{\bibfield}{\sloppy}{}{} -\pretocmd{\bibtype}{\sloppy}{}{} +\makeatletter +% this is taken from ltxdockit.cls, which is not loaded +\newrobustcmd*{\fnurl}[1][]{\hyper@normalise\ltd@fnurl{#1}} +\def\ltd@fnurl#1#2{\footnote{#1\hyper@linkurl{\Hurl{#2}}{#2}}} + +\newrobustcmd*{\email}{\hyper@normalise\ltd@email} +\def\ltd@email#1{\href{mailto:#1}{#1}} + +% title +\providecommand*{\titlepage}{} +\providecommand*{\titlefont}{} +\renewrobustcmd*{\titlepage}[1]{\setkeys{ltd@ttp}{#1}} +\renewcommand*{\titlefont}{\bfseries} +\define@key{ltd@ttp}{title}{\def\ltd@title@title{#1}} +\define@key{ltd@ttp}{subtitle}{\def\ltd@title@subtitle{#1}} +\define@key{ltd@ttp}{url}{\def\ltd@title@url{#1}} +\define@key{ltd@ttp}{author}{\def\ltd@title@author{#1}} +\define@key{ltd@ttp}{email}{\def\ltd@title@email{#1}} +\define@key{ltd@ttp}{revision}{\def\ltd@title@revision{#1}} +\define@key{ltd@ttp}{date}{\def\ltd@title@date{#1}} + +\providecommand*{\printtitlepage}{} +\renewrobustcmd*{\printtitlepage}{% + \begingroup + \centering\titlefont + \begingroup\LARGE + \ifundef\ltd@title@url + {\ltd@title@title} + {\href{\ltd@title@url}{\ltd@title@title}}% + \par + \endgroup + \vspace{0.25\baselineskip} + \begingroup\large + \ltd@title@subtitle\par + \endgroup + \expandafter\url\expandafter{\ltd@title@url}\par + \begin{multicols}{2} + \raggedleft + \ltd@title@author\par + \expandafter\email\expandafter{\ltd@title@email}\par + \raggedright + Version \ltd@title@revision\par\ltd@title@date + \end{multicols} + \endgroup} + + +\renewcommand\tableofcontents{% + \pdfbookmark[1]{\contentsname}{contents}% + \section*{\contentsname + \@mkboth{% + \MakeUppercase\contentsname}{\MakeUppercase\contentsname}}% + \@starttoc{toc}% + } +\def\@starttoc#1{% + \begingroup + \begin{multicols}{2} + \makeatletter + \RaggedRight + \@input{\jobname.#1}% + \if@filesw + \expandafter\newwrite\csname tf@#1\endcsname + \immediate\openout \csname tf@#1\endcsname \jobname.#1\relax + \fi + \end{multicols} + \@nobreakfalse + \endgroup} + +\let\accentcolour\spotcolor + +\newcommand*{\allsectionsfont}{\sffamily\accentcolour} + +\renewcommand\section{\@startsection {section}{1}{\z@}% + {-3.5ex \@plus -1ex \@minus -.2ex}% + {2.3ex \@plus.2ex}% + {\normalfont\Large\bfseries\allsectionsfont}} +\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% + {-3.25ex\@plus -1ex \@minus -.2ex}% + {1.5ex \@plus .2ex}% + {\normalfont\large\bfseries\allsectionsfont}} +\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% + {-3.25ex\@plus -1ex \@minus -.2ex}% + {1.5ex \@plus .2ex}% + {\normalfont\normalsize\bfseries\allsectionsfont}} +\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% + {3.25ex \@plus1ex \@minus.2ex}% + {-1em}% + {\normalfont\normalsize\bfseries\allsectionsfont}} +\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% + {3.25ex \@plus1ex \@minus .2ex}% + {-1em}% + {\normalfont\normalsize\bfseries\allsectionsfont}} + +% from KOMA-Script +\newcommand*{\@list@extra}{% + \ifdim\parskip>\z@ + \topsep\z@ + \parsep\parskip + \itemsep\z@ + \fi +} +\appto\@listi{\@list@extra} +\appto\@listii{\@list@extra} +\appto\@listiii{\@list@extra} +\appto\@listiv{\@list@extra} +\appto\@listv{\@list@extra} +\appto\@listvi{\@list@extra} +\makeatother + +\newrobustcmd*{\tex}{\TeX} +\newrobustcmd*{\etex}{\mbox{e-TeX}} +\newrobustcmd*{\pdftex}{pdf\-\tex} +\newrobustcmd*{\xetex}{Xe\-\tex} +\newrobustcmd*{\luatex}{Lua\-\tex} +\newrobustcmd*{\latex}{\LaTeX}%{La\kern-0.07em TeX} +\newrobustcmd*{\pdflatex}{pdf\-\latex} +\newrobustcmd*{\xelatex}{Xe\-\latex} +\newrobustcmd*{\lualatex}{Lua\-\latex} +\newrobustcmd*{\miktex}{Mik\-\tex} +\newrobustcmd*{\texlive}{\tex~live} +\newrobustcmd*{\bibtex}{Bib\kern-0.07em TeX} +\newrobustcmd*{\lppl}{\latex{} Project Public License} + +\renewcommand*{\verbatimfont}{\ttfamily} +\renewcommand*{\displayverbfont}{\ttfamily} +\renewcommand*{\marglistfont}{\accentcolour\sffamily\small} +\renewcommand*{\margnotefont}{\sffamily\small} +\renewcommand*{\optionlistfont}{\accentcolour\sffamily\displayverbfont} +\renewcommand*{\ltxsyntaxfont}{\ttfamily} +\renewcommand*{\ltxsyntaxlabelfont}{\accentcolour\displayverbfont} +\renewcommand*{\changelogfont}{\normalfont} +\renewcommand*{\changeloglabelfont}{\accentcolour\sffamily\bfseries} +\newcommand*{\stylelistlabelfont}{\accentcolour\sffamily\small} +\newcommand*{\bibfieldformatfont}{\sffamily} +\newcommand*{\bibfieldformatlabelfont}{\accentcolour\bibfieldformatfont\small} \MakeAutoQuote*{<}{>} @@ -30,11 +163,11 @@ \titlepage{% title={The \sty{biblatex-trad} Package}, subtitle={Traditional bibliography styles for \sty{biblatex}}, - url={}, + url={https://github.com/moewew/biblatex-trad/}, author={Marco Daniel\\Moritz Wemheuer}, - email={}, - revision={0.4a}, - date={17th February 2018}} + email={mwemheu@posteo.de}, + revision={0.5}, + date={\DTMDate{2021-03-06}}} \hypersetup{% pdftitle={The biblatex-trad Package}, @@ -77,7 +210,7 @@ The package is motivated by a question at \tex{} -- \latex Stack Exchange \subsection{Requirements} The use of the styles requires the \sty{biblatex} package. -It is tested with the current version of \sty{biblatex} (at the time of writing that is 3.10). +It is tested with the current version of \sty{biblatex} (at the time of writing that is v3.16). Care has been taken to retain backwards compatibility with older versions, but please do not expect the styles to work flawlessly with ancient versions of \sty{biblatex}. Note also that the style may fail silently with older versions, it need not necessarily emit noisy @@ -89,7 +222,7 @@ Some features of this style will only work properly if you use the default Biber \subsection{License} -Copyright \textcopyright\ 2012--2015 Marco Daniel, 2016--2018 Moritz Wemheuer. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.latex-project.org/lppl.txt} +Copyright \textcopyright\ 2012--2015 Marco Daniel, 2016--2021 Moritz Wemheuer. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c.\fnurl{http://www.latex-project.org/lppl.txt} \subsection{Feedback}\label{subsec:int:feb} @@ -133,6 +266,10 @@ files handle those fields. \section{Revision History}\label{apx:log} \begin{changelog} +\begin{release}{0.5}{2021-03-06} +\item Synced with \sty{biblatex} v3.16 (2020-12-31) +\end{release} + \begin{release}{0.4a}{2018-02-17} \item Fixed alphabetic labels for names with prefix (\enquote{von} part) (\gitissuelink{34}) \end{release} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.bbx index 6b7d144642..b453cbed6f 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.bbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-abbrv.bbx}[2018/02/17 v0.4a biblatex-trad abbrv bibliography style] +\ProvidesFile{trad-abbrv.bbx}[2021/03/06 v0.5 biblatex-trad abbrv bibliography style] \RequireBibliographyStyle{trad-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.cbx index 6a1fd33cea..3e8b6c65d4 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-abbrv.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-abbrv.cbx}[2018/02/17 v0.4a biblatex-trad abbrv citation style] +\ProvidesFile{trad-abbrv.cbx}[2021/03/06 v0.5 biblatex-trad abbrv citation style] \RequireCitationStyle{numeric} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.bbx index 3b00135b0c..7c89f6935a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.bbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-alpha.bbx}[2018/02/17 v0.4a biblatex-trad alpha bibliograhy style] +\ProvidesFile{trad-alpha.bbx}[2021/03/06 v0.5 biblatex-trad alpha bibliograhy style] \RequireBibliographyStyle{trad-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.cbx index 172c00c310..9940a8b2b2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-alpha.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-alpha.cbx}[2018/02/17 v0.4a biblatex-trad alpha citation style] +\ProvidesFile{trad-alpha.cbx}[2021/03/06 v0.5 biblatex-trad alpha citation style] \RequireCitationStyle{alphabetic} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.bbx index ae036f5586..cf76f4680b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.bbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-plain.bbx}[2018/02/17 v0.4a biblatex-trad plain bibliography style] +\ProvidesFile{trad-plain.bbx}[2021/03/06 v0.5 biblatex-trad plain bibliography style] \RequireBibliographyStyle{trad-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.cbx index a9cd2dfcd4..5f0ff0c9c7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-plain.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-plain.cbx}[2018/02/17 v0.4a biblatex-trad plain citation style] +\ProvidesFile{trad-plain.cbx}[2021/03/06 v0.5 biblatex-trad plain citation style] \RequireCitationStyle{numeric} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.bbx index 196e87ec79..d8a10e3867 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.bbx @@ -1,11 +1,11 @@ %% Copyright (c) 2012 -- 2015 Marco Daniel -%% 2016 -- 2018 Moritz Wemheuer +%% 2016 -- 2021 Moritz Wemheuer %% %% This package is released under the terms of the %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-standard.bbx}[2018/02/17 v0.4a biblatex-trad base bibliography style] +\ProvidesFile{trad-standard.bbx}[2021/03/06 v0.5 biblatex-trad base bibliography style] %==========================================% %==========================================% %==========================================% @@ -20,8 +20,10 @@ %==========================================% %==========================================% \providebool{bbx:subentry} -\DeclareBibliographyOption[boolean]{subentry}[true]{% - \setbool{bbx:subentry}{#1}} +\ifundef\DeclareBiblatexOption + {\DeclareBibliographyOption[boolean]{subentry}[true]} + {\DeclareBiblatexOption{global,type,entry}[boolean]{subentry}[true]} + {\setbool{bbx:subentry}{#1}} \newbool{bbxtrad:doisequal} \newbool{bbxtrad:eprintsequal} \newbool{bbxtrad:urlsequal} @@ -33,6 +35,12 @@ \DeclareNameAlias{author}{default} \DeclareNameAlias{editor}{default} \DeclareNameAlias{translator}{default} + +\ifundef\DeclareNameWrapperAlias + {} + {\DeclareNameWrapperAlias{author}{default} + \DeclareNameWrapperAlias{editor}{default} + \DeclareNameWrapperAlias{translator}{default}} %==========================================% %==========================================% %==========================================% @@ -81,12 +89,11 @@ \OR\ifentrytype{reference}\OR\ifentrytype{mvreference}% \OR\ifentrytype{report}\OR\ifentrytype{thesis}} {#1} - {\MakeSentenceCase{#1}}} + {\MakeSentenceCase*{#1}}} \renewbibmacro*{in:}{% - \printtext{% - \bibstring{in}% - \printunit{\intitlepunct}}} + \bibstring{in}% + \printunit{\intitlepunct}} %==========================================% %==========================================% @@ -274,11 +281,7 @@ \newunit\newblock \usebibmacro{date}% \newunit\newblock - \iftoggle{bbx:eprint} - {\usebibmacro{eprint}} - {}% - \newunit\newblock - \usebibmacro{url+urldate}% + \usebibmacro{doi+eprint+url}% \newunit\newblock \printfield{note}% \newunit\newblock @@ -486,9 +489,7 @@ \newcommaunit*% \usebibmacro{location+date}% \newunit\newblock - \iftoggle{bbx:url} - {\usebibmacro{url+urldate}} - {}% + \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock @@ -735,11 +736,12 @@ \usebibmacro{series+number:emphcond}% \newunit} +\providecommand*{\bibeidpunct}{\addcomma\space} \renewbibmacro*{volume+number+eid}{% \printfield{volume}% \setunit*{\volumenumberdelim}% \printfield{number}% - \setunit{\addcomma\space}% + \setunit{\bibeidpunct}% \printfield{eid}} \renewbibmacro*{publisher+location+date}{% diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.cbx index c9b45419f8..b34acc0296 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-standard.cbx @@ -5,6 +5,6 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-standard.cbx}[2018/02/17 v0.4a biblatex-trad base citation style] +\ProvidesFile{trad-standard.cbx}[2021/03/06 v0.5 biblatex-trad base citation style] \endinput diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.bbx index ee4f4bda0a..3b3af90f47 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.bbx @@ -4,7 +4,7 @@ %% This package is released under the terms of the %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt -\ProvidesFile{trad-unsrt.bbx}[2018/02/17 v0.4a biblatex-trad unsrt bibliography style] +\ProvidesFile{trad-unsrt.bbx}[2021/03/06 v0.5 biblatex-trad unsrt bibliography style] \RequireBibliographyStyle{trad-standard} diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.cbx index 83ae2cd2f9..8f4224b913 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-trad/trad-unsrt.cbx @@ -5,7 +5,7 @@ %% LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% -\ProvidesFile{trad-unsrt.bbx}[2018/02/17 v0.4a biblatex-trad unsrt citation style] +\ProvidesFile{trad-unsrt.bbx}[2021/03/06 v0.5 biblatex-trad unsrt citation style] \RequireCitationStyle{numeric} diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex de4a50f6f7..e844013e3c 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index d8e06d9ee1..f98cbd1907 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -95,7 +95,7 @@ \github~\url{https://github.com/texl3/easybook} \\ \edge~\url{https://latexstudio.net} } -\date{2021/02/28\hskip\ccwd\relax v1.23i} +\date{2021/03/06\hskip\ccwd\relax v1.23j} \frontmatter[roman] \maketitle diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex 81448f5cd0..7d3e9a99db 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook.tex b/macros/latex/contrib/easybook/doc/easybook.tex index 2816153ca0..caa87380f7 100644 --- a/macros/latex/contrib/easybook/doc/easybook.tex +++ b/macros/latex/contrib/easybook/doc/easybook.tex @@ -3,7 +3,7 @@ \title{\sffamily easybook书籍文档类} \author{瞿毅} -\date{2021/02/28\hskip\ccwd\relax v1.23i\thanks{\url{https://gitee.com/texl3/easybook}}} +\date{2021/03/06\hskip\ccwd\relax v1.23j\thanks{\url{https://gitee.com/texl3/easybook}}} \begin{document} \maketitle @@ -98,7 +98,7 @@ \tn{frontmatter}\oarg{编号格式|(Roman)} \tn{printindex}\oarg{索引名} \end{syntax} -\changes{v1.23i}{2021/02/20}{重新定义文档结构划分命令。} +\changes{v1.23j}{2021/02/20}{重新定义文档结构划分命令。} \tn{frontmatter} 为前言区命令,章标题不编号,页码可设置为例如 \opt{roman}、\opt{Alph} 等格式,带有星号的命令 \tn{frontmatter*} 不使用 \tn{cleardoublepage}。\tn{mainmatter} 为主文区命令,章标题正常编号且页码为从1开始计数的阿拉伯数字,\tn{mainmatter*} 命令不使用 \tn{cleardoublepage}。\tn{backmatter} 为后记区命令,页码格式与编号保持不变,章标题不编号。\tn{listoffigures} 命令输出图片目录,\tn{listoftables} 命令输出表格目录,\tn{listoflistings} 命令输出代码目录。 \end{function} @@ -132,8 +132,8 @@ uppercase = <(true)|false> \end{syntax} \changes{v1.10}{2021/01/08}{更改颜色实现方式与选项名。} -\changes{v1.23i}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。} -\changes{v1.23i}{2021/02/09}{增加控制页面横线粗细的选项。} +\changes{v1.23j}{2021/02/02}{noto风格的数学字体独立出来,可自定义设置。} +\changes{v1.23j}{2021/02/09}{增加控制页面横线粗细的选项。} \opt{style} 选项控制文章的风格。 \end{function} @@ -190,7 +190,7 @@ footnote = <(1)> \end{syntax} \changes{v1.21}{2021/01/12}{增加脚注线间的距离选项。} -\changes{v1.23i}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。} +\changes{v1.23j}{2021/02/09}{取消使用 \pkg{zhlineskip} 宏包设置数学间距。} 行距因子用于设置各种行距倍数,只能是浮点数,不能带有长度单位。\tn{ctexset} 原有的行距选项\opt{linespread}失效。各行距既可在导言区全局设置也可正文中设置对后面生效,行距的意义为 \end{function} @@ -212,7 +212,7 @@ marginpart = <\tn{rmfamily}\tn{footnotesize}> \end{syntax} \changes{v1.10}{2021/01/08}{加入自定义非正文字体选项。} -\changes{v1.23i}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} +\changes{v1.23j}{2021/02/08}{修复使用 \tn{zihao} 命令设置字体失效的问题。} \end{function} \begin{optdesc} @@ -233,7 +233,7 @@ \tn{printbibliography}\oarg{选项列表} \end{syntax} \changes{v1.21}{2021/01/11}{增加 \opt{bibset} 选项,可以使用 \hologo{BibTeX} 或 \hologo{biber} 编译参考文献。} -\changes{v1.23i}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} +\changes{v1.23j}{2021/02/23}{使用 \opt{bibset} 选项时可设置标注风格。} \end{function} \begin{optdesc} @@ -432,7 +432,7 @@ \tn{item} <习题内容> \tn{end}\marg{exercise} \end{syntax} -\changes{v1.23i}{2021/02/08}{增加准确的习题盒子标题目录锚点。} +\changes{v1.23j}{2021/02/08}{增加准确的习题盒子标题目录锚点。} 习题环境 \opt{exercise} 的标题紧接上一节编号并加入目录与页眉,当使用星号环境时不进行编号。三个可选参数中颜色为自定义或 \pkg{xcolor} 包含的颜色名称,正文编号格式与小节 \ref{sort list} 排序列表相同,标题名默认为摘要,参数只能\textbf{从右往左}省略。 \begin{ctexexam} \begin{exercise}[LightYellow][1.][习题] diff --git a/macros/latex/contrib/easybook/easybook.cls b/macros/latex/contrib/easybook/easybook.cls index ab8310e6a3..29fce05d8a 100644 --- a/macros/latex/contrib/easybook/easybook.cls +++ b/macros/latex/contrib/easybook/easybook.cls @@ -9,7 +9,7 @@ %% https://creativecommons.org/licenses/by/4.0/legalcode \NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/02/28}{1.23i}{} +\ProvidesExplClass{easybook}{2021/03/06}{1.23j}{} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} @@ -213,22 +213,22 @@ \cs_new_protected:Npn \__set_zhfont_fangsong:nn #1#2 {\__set_family:nnn {fangsong}{#2}{#1}} -\tl_const:Nn \__option_zhfont: +\tl_const:Nn \__option_zhfont_tl {UprightFont = *,AutoFakeBold = 1.5,ItalicFont = *} \cs_new_protected:Npx \__setCJKmainfont:n #1 - {\__setCJKmainfont:nn {#1}{\__option_zhfont:}} + {\__setCJKmainfont:nn {#1}{\__option_zhfont_tl}} \cs_new_protected:Npx \__setCJKsansfont:n #1 - {\__setCJKsansfont:nn {#1}{\__option_zhfont:}} + {\__setCJKsansfont:nn {#1}{\__option_zhfont_tl}} \cs_new_protected:Npx \__setCJKmonofont:n #1 - {\__setCJKmonofont:nn {#1}{\__option_zhfont:}} + {\__setCJKmonofont:nn {#1}{\__option_zhfont_tl}} \cs_new_protected:Npx \__set_zhfont_songti:n #1 - {\__set_zhfont_songti:nn {#1}{\__option_zhfont:}} + {\__set_zhfont_songti:nn {#1}{\__option_zhfont_tl}} \cs_new_protected:Npx \__set_zhfont_heiti:n #1 - {\__set_zhfont_heiti:nn {#1}{\__option_zhfont:}} + {\__set_zhfont_heiti:nn {#1}{\__option_zhfont_tl}} \cs_new_protected:Npx \__set_zhfont_kaishu:n #1 - {\__set_zhfont_kaishu:nn {#1}{\__option_zhfont:}} + {\__set_zhfont_kaishu:nn {#1}{\__option_zhfont_tl}} \cs_new_protected:Npx \__set_zhfont_fangsong:n #1 - {\__set_zhfont_fangsong:nn {#1}{\__option_zhfont:}} + {\__set_zhfont_fangsong:nn {#1}{\__option_zhfont_tl}} \bool_if:NT \l__font_noto_bool { diff --git a/macros/latex/contrib/tuda-ci/README.md b/macros/latex/contrib/tuda-ci/README.md index 31d5d32a43..ba472cd4f6 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/02/22 v3.11 + tuda-ci 2021/03/06 v3.12 *************************************************************************** @@ -36,7 +36,18 @@ Das Bundle verwendet Pakete der Standard-LaTeX-Distributionen. Bei der Verwendun In den häufigsten Fällen fehlt ein Teilpaket mit dem Namen URspecialopts.sty. Dieses Paket wird für die Optionsdurchreichung genutzt und ist Teil des urcls-Bundle: https://ctan.org/pkg/urcls ## Installation -Für die Verwendung der Klassen und Pakete muss entweder der gesamte Inhalt des tex-Verzeichnisses im Arbeitsverzeichnis liegen oder in der TeX-Distribution installiert werden. Dies ist entweder über die Paketverwaltung der Distribution möglich oder das Paket kann manuell mithilfe der Release Informationen im GitHub Repository installiert werden. +TUDa-CI ist Bestandteil der beiden populären TeX Distributionen ([MikTeX](https://miktex.org/download) & [TeX Live](https://tug.org/texlive/), und damit auch im MacTeX-Paket). +Es ist somit möglich die Templates über die TeX Distribution zu installieren und zu updaten. + +Bei TeX Live werden Updates und Paketinstalation durch das Programm „TeX Live Manager“ (tlmgr) ausgeführt. Das Analogon unter MikTeX heißt „MikTeX Console”. +Unter Mac und Windows existieren bei Standardeinstellungen auch grafische Nutzeroberflächen, die durch das Update/die Installation führen. + +Falls Sie noch keine Distribution installiert haben, finden Sie die notwendigen Informationen zur Installation von TeX Live unter: +- Windows/Linux https://tug.org/texlive/acquire-netinstall.html +- MacTeX http://tug.org/mactex/ + +#### 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. ### 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. @@ -49,6 +60,8 @@ ein Paket mit entsprechenden Hinweisen. Für Nicht-Mitglieder ist eine Möglichkeit zur Platzierung eines Ersatzlogos dokumentiert. + + ## Enthaltene Templatedateien Dokumententyp | Templatedatei(en) | Dokumentenklasse @@ -121,7 +134,24 @@ Therefore it contains documentclasses as well as some helper packages and config If you are not a German speaker and require some help using these files, please feel free to contact the maintainers. -## Includes templates and document types +## Installation +TUDa-CI is part of the popular TeX distributions ([MikTeX](https://miktex.org/download) & [TeX Live](https://tug.org/texlive/), which is included by [MacTeX](https://www.tug.org/mactex/)). +It's possible to install the templates using the TeX Live Manager or the MikTeX Console. + +In case you don't have any installed TeX system the following links might be useful: +- Windows/Linux https://tug.org/texlive/acquire-netinstall.html +- MacTeX http://tug.org/mactex/ + +#### 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). + +### Logos +The used Logos can not be published within this bundle. Members of TU Darmstadt can download these via intranet: +https://download.hrz.tu-darmstadt.de/protected/CE/TUDa_LaTeX/tuda_logo.pdf + +If you are not a member of TU Darmstadt the example files include information on how to use a replacement image instead of the logo. + +## Included templates and document types document type | name of template file | used documentclass and config --------------------------------------- | --------------------------------------------------------------------- | ------------------------------------------ @@ -228,5 +258,8 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls - extend support for all CreativeCommons 4.0 Licenses - improve documentation * v3.11 (2021-02-22) - - Support CMYK in PDF/A - - Add Info for DVI-Outputs
\ No newline at end of file + - Add Info for DVI-Outputs + * v3.12 (2021-03-06) + - Fix color conversion for PDF/A + - Fix margin restore after titlepage for custommargins=geometry + - Enhance information on installation
\ No newline at end of file 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 da8696355a..eceac574e3 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 a8e69acf8b..85f486e58f 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 bc28181a5a..96595ebf37 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 a8d45fdf6a..d249ccfcb9 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 a8ba6cf044..88f6db29ec 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 6423283633..52454981ec 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 5a7f54cf32..12cfbf1c76 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.default.pdf b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.default.pdf Binary files differnew file mode 100644 index 0000000000..12ac769837 --- /dev/null +++ b/macros/latex/contrib/tuda-ci/doc/DEMO-TUDaPub.default.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 9feffcb80b..8e263ca30d 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 a16b5d5d0d..7b8acba1a5 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 25c368f0a1..0abd35ba6a 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 86ba29c9c8..f492adacf1 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 2b964a5a43..9d0df4cb9c 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.11 (2021/02/22), +%% This is file `DEMO-TUDaAnnouncement.tex' version 3.12 (2021/03/06), %% 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 6195e2ebc1..670a677d96 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.11 (2021/02/22), +%% This is file `DEMO-TUDaBeamer.tex' version 3.12 (2021/03/06), %% 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 633ced3b24..cec07e51a2 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.11 (2021/02/22), +%% This is file `DEMO-TUDaBibliography.bib' version 3.12 (2021/03/06), %% 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 e283b74a65..dcfbecfaba 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.11 (2021/02/22), +%% This is file `DEMO-TUDaExercise.tex' version 3.12 (2021/03/06), %% 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 464d6c44b0..a5163d87c4 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.11 (2021/02/22), +%% This is file `DEMO-TUDaFromaddress.lco' version 3.12 (2021/03/06), %% 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 633aabc7e8..dc5097e04b 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.11 (2021/02/22), +%% This is file `DEMO-TUDaLeaflet.tex' version 3.12 (2021/03/06), %% 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 c41676bd00..e1781c555a 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.11 (2021/02/22), +%% This is file `DEMO-TUDaLetter.tex' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaPhD.tex index d00f0d1705..88dd7ae72f 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.11 (2021/02/22), +%% This is file `DEMO-TUDaPhD.tex' version 3.12 (2021/03/06), %% 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 f958e2eec5..8e1638f7a2 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.11 (2021/02/22), +%% This is file `DEMO-TUDaPoster.tex' version 3.12 (2021/03/06), %% 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 09697ccdae..60ad64053f 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.11 (2021/02/22), +%% This is file `DEMO-TUDaPub.tex' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -135,7 +135,7 @@ Im folgenden werden die möglichen Optionen beschrieben. } \item[twocolumn] Aktiviert den zweispaltigen Modus global. In diesem Fall werden jedoch aufgrund ihrer Natur zwei Randnotizspalten erzeugt. Eine Nutzung in Kombination mit \code{marginpar=auto} ist daher in den meisten Fällen fragwürdig. Falls der zweispaltige Modus lediglich lokal aktiviert wird, entfällt dieses Verhalten, allerdings werden dann Randnotizen deaktiviert. \item[ruledheaders] Wählt den Stil der Überschriften aus. \code{ruledheaders=all} wählt den mit Linien eingerahmten Stil für alle bis zur \verb+\subsubsection+. Bei \code{chapter} beziehungsweise \code{section} ist dieser Stil entsprechend beschränkt. False lädt den Standardstil aus \KOMAScript. - \item[type] Als Typ stehen im Moment \code{publication} und \code{thesis} zur Verfügung. Die besonderen Möglichkeiten im Typ thesis sind in der Datei DEMO-TUDaThesis.tex/.pdf geschildert. Voreingestellt ist \code{publication}. + \item[type] Als Typ stehen im Moment \code{publication} und \code{thesis} zur Verfügung. Die besonderen Möglichkeiten im Typ thesis sind in der Datei DEMO-TUDaThesis.tex/.pdf geschildert. Voreingestellt ist \code{publication}. Zusätzlich existiert ab Version 1.2 noch der Modus \code{intern}. Dieser wählt die Optionen \code{titlepage=false} für einen Titelkopf statt Titelseiten, sowie die TUDaPub-Optionen \code{pdfa=""false} und \code{IMRAD=false}. Dieser Modus ist für kurze, interne Berichte gedacht. \item[headline] Die Kopfzeile verfügt über die im Corporate Design beschriebenen Layoutmöglichkeiten über den Wert \code{automark}. Da diese Lösung typografisch nicht sonderlich sinnvoll ist, ist es auch möglich, diese abzuschalten. Voreingestellt ist ein Stil ohne Kolumnentitel. \item[logo] Option für die Titelseite, siehe \ref{sec:title} @@ -281,9 +281,22 @@ entsprechende Labels generiert werden. Sie haben den Namen \code{IMRAD:<Schlüss Der Prüfmechanismus ist auf Wunsch der Bibliothek standardmäßig aktiviert, kann jedoch durch die Option \code{IMRAD=false} deaktiviert werden. +\subsection{Farbdarstellung} +\label{sec:pdfa-color} +Der PDF/A-Modus konvertiert automatisch eingegebene CMYK-Farben in RGB. Da es keine eindeutige Umwandlung gibt, sollten daher im Modus \code{pdfa=true} keine CMYK-Elemente verwendet werden. + +Für die Druckausgabe ist dieser Modus ungeeignet. Ab Version 3.12 gibt \cls{tudapub} eine entsprechende Infomeldung aus, um über diese Umwandlung zu informieren. \section{Erweiterte Konfigurationsmöglichkeiten} +\subsection{Auswahl des Dokumentenfarbmodus} +Farben unterliegen je nachdem auf welchem Medium sie ausgegeben werden einer anderen Farbmischung. Für die Verwendung bei der Dokumentenerzeugung ist daher wichtig welches Ausgabemedium primär genutzt werden soll. + +Technisch zeigt sich dieser Unterschied in Farbmodellen. TUDa-CI unterstützt entsprechend der Richtlinien sowohl ein Farbmodell für die Druckausgabe (cmyk) und für die Bildschirmdarstellung (RGB). Die Umsetzung geschieht über das Paket \pck{xcolor} wobei die entsprechenden Farbwerte für beide Modelle über \pck{tudacolors} hinterlegt sind. + +Normalerweise wählt TUDa-CI automatisch ein passendes Modell. Allerdings sorgt die Voreinstellung von \code{pdfa-true} für eine Konvertierung zu RGB (vgl.~\ref{sec:pdfa-color}). + +Soll abseits dieser automatischen Abweichung ein bestimmter Farbmodus erzeugt werden, können die \pck{xcolor}-Optionen \code{cmyk} oder \code{RGB} direkt an \cls{tudapub} übergeben werden. Sie werden entsprechend an das Paket weitergereicht und entsprechend der \pck{xcolor}-Dokumentation verarbeitet. \subsection{Anpassungen, die von den Corporate Design Richtlinien abweichen} diff --git a/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex b/macros/latex/contrib/tuda-ci/example/DEMO-TUDaReport.tex index aa50ba7d9c..236b80f04c 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.11 (2021/02/22), +%% This is file `DEMO-TUDaReport.tex' version 3.12 (2021/03/06), %% 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 ae700c3957..10edb4e898 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.11 (2021/02/22), +%% This is file `DEMO-TUDaSciPoster.tex' version 3.12 (2021/03/06), %% 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 bfd519cabd..993bf15427 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.11 (2021/02/22), +%% This is file `DEMO-TUDaThesis.tex' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamercolorthemeTUDa.sty index 19cc8d4de9..6f0335630c 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.11 (2021/02/22), +%% This is file `beamercolorthemeTUDa.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 b92e330783..66692fe446 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.11 (2021/02/22), +%% This is file `beamerfontthemeTUDa.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 1b530ac662..04535b92d7 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.11 (2021/02/22), +%% This is file `beamerinnerthemeTUDa.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 28fef7810b..b87c5f9366 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.11 (2021/02/22), +%% This is file `beamerouterthemeTUDa.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 2e9f46a7ba..82c610757a 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.11 (2021/02/22), +%% This is file `beamerthemeTUDa-mecheng.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 b330a9fab0..cd1ac104bc 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.11 (2021/02/22), +%% This is file `beamerthemeTUDa.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 c49620928f..487d2fc243 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.11 (2021/02/22), +%% This is file `tuda-a0paper.clo' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 81dcccc684..c13f040efb 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.11 (2021/02/22), +%% This is file `tuda-a1paper.clo' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 914e856fd8..91eb35a46d 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.11 (2021/02/22), +%% This is file `tuda-a2paper.clo' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 337e6ddf8a..5a1a27659b 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.11 (2021/02/22), +%% This is file `tuda-a3paper.clo' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 ebd934e1af..7f76d15bd9 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.11 (2021/02/22), +%% This is file `tuda-a4paper.clo' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 59d522b883..465e4607c7 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.11 (2021/02/22), +%% This is file `tuda-a5paper.clo' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 9871b594e9..6194150564 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.11 (2021/02/22), +%% This is file `tuda-pgfplots.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} % 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 1d97c48c7c..3fc7b0617f 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.11 (2021/02/22), +%% This is file `tudabeamer.cls' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{tudabeamer} [\filedate\space\fileversion\space] diff --git a/macros/latex/contrib/tuda-ci/tex/tudacolors.def b/macros/latex/contrib/tuda-ci/tex/tudacolors.def index 398c203694..8ac99880fa 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.11 (2021/02/22), +%% This is file `tudacolors.def' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 10db98d9bc..2a795747cb 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.11 (2021/02/22), +%% This is file `tudacolors.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 a39fd6a782..659ccdb351 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.11 (2021/02/22), +%% This is file `tudaexercise.cls' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 e0136bf889..5218c2d8e8 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.11 (2021/02/22), +%% This is file `tudafonts.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 1f801d7a9e..ab677c877f 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.11 (2021/02/22), +%% This is file `tudaleaflet.cls' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 109b275ddc..390cd7b554 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.11 (2021/02/22), +%% This is file `tudaletter.cls' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaletter} diff --git a/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo b/macros/latex/contrib/tuda-ci/tex/tudalettersize10pt.clo index b8f6d04c01..e5b4e77338 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.11 (2021/02/22), +%% This is file `tudalettersize10pt.clo' version 3.12 (2021/03/06), %% 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 477a8144b4..d9406c4a81 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.11 (2021/02/22), +%% This is file `tudamecheng.cfg' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 29a73328c0..0c0e52d1be 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.11 (2021/02/22), +%% This is file `tudaposter.cls' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 a25e53aad1..51c51186d7 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.11 (2021/02/22), +%% This is file `tudapub.cls' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} @@ -195,6 +195,12 @@ \ProcessKeysOptions{ptxcd/pub} + +%Option adjustments required for valid PDF/A +\bool_if:NT \g_ptxcd_pdfa_bool { + \PassOptionsToPackage{RGB}{xcolor} +} + \exp_args:Nx \tl_if_eq:nnT {\prop_item:Nn \g_ptxcd_clsopts_prop {fontsize}} {9pt} { \prop_if_in:NnF \g_ptxcd_unknown_clsopts_prop {DIV} @@ -943,10 +949,12 @@ \def\titlepage@restore{% \endgroup \ptxcd_restore_typearea: - \dim_sub:Nn \evensidemargin {\marginparwidth+\marginparsep} - \dim_add:Nn \textwidth {\marginparwidth+\marginparsep} - \columnwidth=\textwidth - \hsize=\columnwidth + \bool_if:nT {! \g_ptxcd_geometry_bool && \g_ptxcd_marginpar_bool} { + \dim_sub:Nn \evensidemargin {\marginparwidth+\marginparsep} + \dim_add:Nn \textwidth {\marginparwidth+\marginparsep} + \columnwidth=\textwidth + \hsize=\columnwidth + } \global\@titlepageiscoverpagefalse \let\titlepage@restore\relax }% diff --git a/macros/latex/contrib/tuda-ci/tex/tudarules.sty b/macros/latex/contrib/tuda-ci/tex/tudarules.sty index cae04dfe93..abfeec0bed 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.11 (2021/02/22), +%% This is file `tudarules.sty' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \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 97a1243c4c..cfdd7a73cf 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.11 (2021/02/22), +%% This is file `tudasciposter.cls' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt} @@ -206,10 +206,32 @@ } \tl_new:N \g_ptxcd_poster_qrcode_tl -\newcommand*{\footerqrcode}[1]{ - \tl_gset:Nn \g_ptxcd_poster_qrcode_tl {#1} + +\msg_new:nnnn {tudapub} {biblatex-required}{ + You~tried~to~use~#1.\\ + This~feature~requires~the~biblatex~package. +} { + Try~to~remove~the~star~or~load~biblatex. +} + +\NewDocumentCommand{\footerqrcode}{sm}{ + \IfBooleanTF {#1} { + \cs_if_exist:NTF \blx@blxinit { + \begingroup + \blx@blxinit + \entrydata{#2}{ + \tl_gset:Nx \g_ptxcd_poster_qrcode_tl{\thefield{url}} + } + \endgroup + }{ + \msg_error:nnx {tudapub} {biblatex-required} {\use:c{footerqrcode*}} + } + }{ + \tl_gset:Nn \g_ptxcd_poster_qrcode_tl {#2} + } } + %%%%%%%%%%%%%%%%%%% % Begin of PDF/A mode %%%%%%%%%%%%%%%%%%% diff --git a/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo b/macros/latex/contrib/tuda-ci/tex/tudasize9pt.clo index 0648020077..74585f6a11 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.11 (2021/02/22), +%% This is file `tudasize9pt.clo' version 3.12 (2021/03/06), %% 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 2e4c1b7759..7dd33c6292 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.11 (2021/02/22), +%% This is file `tudathesis.cfg' version 3.12 (2021/03/06), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.11} -\def\filedate{2021/02/22} +\def\fileversion{3.12} +\def\filedate{2021/03/06} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)} @@ -445,10 +445,12 @@ \def\titlepage@restore{% \endgroup \ptxcd_restore_typearea: + \bool_if:nT {! \g_ptxcd_geometry_bool && \g_ptxcd_marginpar_bool} { \dim_sub:Nn \evensidemargin {\marginparwidth+\marginparsep} \dim_add:Nn \textwidth {\marginparwidth+\marginparsep} - \columnwidth=\textwidth - \hsize=\columnwidth + \columnwidth=\textwidth + \hsize=\columnwidth + } \global\@titlepageiscoverpagefalse \let\titlepage@restore\relax }% diff --git a/macros/latex/contrib/widows-and-orphans/MANIFEST.md b/macros/latex/contrib/widows-and-orphans/MANIFEST.md new file mode 100644 index 0000000000..1a28c2249e --- /dev/null +++ b/macros/latex/contrib/widows-and-orphans/MANIFEST.md @@ -0,0 +1,132 @@ +# Manifest for widows-and-orphans + +This file is a listing of all files considered to be part of this package. +It is automatically generated with `texlua build.lua manifest`. + + +## Repository manifest + +The following groups list the files included in the development repository of the package. +Files listed with a ‘†’ marker are included in the TDS but not CTAN files, and files listed +with ‘‡’ are included in both. + +### Source files + +These are source files for a number of purposes, including the `unpack` process which +generates the installation files of the package. Additional files included here will also +be installed for processing such as testing. + +* widows-and-orphans.dtx ‡ +* widows-and-orphans.ins ‡ + +### Typeset documentation source files + +These files are typeset using LaTeX to produce the PDF documentation for the package. + +* widows-and-orphans-code.tex ‡ +* widows-and-orphans-doc.tex ‡ +* l3doc-TUB.cls + +### Text files + +Plain text files included as documentation or metadata. + +* MANIFEST.md ‡ +* README.md ‡ +* changes.txt ‡ +* todo.txt ‡ + +### Derived files + +The files created by ‘unpacking’ the package sources. This typically includes +`.sty` and `.cls` files created from DocStrip `.dtx` files. + +* widows-and-orphans.sty † +* l3doc-TUB.cls + +### Typeset documents + +The output files (PDF, essentially) from typesetting the various source, demo, +etc., package files. + +* widows-and-orphans-code.pdf ‡ +* widows-and-orphans-doc.pdf ‡ +* l3doc-TUB.pdf + +### Test files + +These files form the test suite for the package. `.lvt` or `.lte` files are the individual +unit tests, and `.tlg` are the stored output for ensuring changes to the package produce +the same output. These output files are sometimes shared and sometime specific for +different engines (pdfTeX, XeTeX, LuaTeX, etc.). + +* wao001.lvt +* wao002.lvt +* wao003.lvt +* wao004.lvt +* wao005.lvt +* wao006.lvt +* wao007.lvt +* wao008.lvt +* wao009.lvt +* wao010.lvt +* wao001.tlg +* wao002.tlg +* wao003.tlg +* wao004.tlg +* wao005.tlg +* wao006.tlg +* wao007.tlg +* wao008.tlg +* wao009.tlg +* wao010.tlg + + +## TDS manifest + +The following groups list the files included in the TeX Directory Structure used to install +the package into a TeX distribution. + +### Source files (TDS) + +All files included in the `widows-and-orphans/source` directory. + +* widows-and-orphans.dtx +* widows-and-orphans.ins + +### TeX files (TDS) + +All files included in the `widows-and-orphans/tex` directory. + +* widows-and-orphans.sty + +### Doc files (TDS) + +All files included in the `widows-and-orphans/doc` directory. + +* MANIFEST.md +* README.md +* changes.txt +* todo.txt +* widows-and-orphans-code.pdf +* widows-and-orphans-code.tex +* widows-and-orphans-doc.pdf +* widows-and-orphans-doc.tex + + +## CTAN manifest + +The following group lists the files included in the CTAN package. + +### CTAN files + +* MANIFEST.md +* README.md +* changes.txt +* todo.txt +* widows-and-orphans-code.pdf +* widows-and-orphans-code.tex +* widows-and-orphans-doc.pdf +* widows-and-orphans-doc.tex +* widows-and-orphans.dtx +* widows-and-orphans.ins diff --git a/macros/latex/contrib/widows-and-orphans/README.md b/macros/latex/contrib/widows-and-orphans/README.md index 0275059b8e..0812db90f5 100644 --- a/macros/latex/contrib/widows-and-orphans/README.md +++ b/macros/latex/contrib/widows-and-orphans/README.md @@ -12,7 +12,7 @@ It will also identify and warn about words broken across columns or pages and di Package source can be found below: -https://github.com/FrankMittelbach/fmitex/ +https://github.com/FrankMittelbach/fmitex-widows-and-orphans/ The license is LPPL 1.3c. @@ -22,7 +22,7 @@ https://www.latex-project.org/publications/indexbytopic/2e-packages/ ----- -Copyright (C) 2018-2020 Frank Mittelbach<br /> +Copyright (C) 2018-2021 Frank Mittelbach<br /> <https://latex-project.org/> <br /> All rights reserved. diff --git a/macros/latex/contrib/widows-and-orphans/changes.txt b/macros/latex/contrib/widows-and-orphans/changes.txt index 018420535d..f4fe04798a 100644 --- a/macros/latex/contrib/widows-and-orphans/changes.txt +++ b/macros/latex/contrib/widows-and-orphans/changes.txt @@ -1,7 +1,11 @@ -2020-01-22 Frank Mittelbach <Frank.Mittelbach@latex-project.org> +2021-03-05 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * widows-and-orphans.dtx: + xparse now part of the kernel and doesn't need loading. + +2020-01-22 Frank Mittelbach <Frank.Mittelbach@latex-project.org> + * widows-and-orphans.dtx: Version 1.0c was a maintenance release without any code changes. 2018-11-18 <Frank.Mittelbach@latex-project.org> diff --git a/macros/latex/contrib/widows-and-orphans/todo.txt b/macros/latex/contrib/widows-and-orphans/todo.txt new file mode 100644 index 0000000000..966b57da99 --- /dev/null +++ b/macros/latex/contrib/widows-and-orphans/todo.txt @@ -0,0 +1,4 @@ + +- consider check=file or something where data is read from an external + file instead of sprinkling \WaOignorenext etc in the document + diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf Binary files differindex 4e555c1dc9..431ee98469 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-code.pdf diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf Binary files differindex 79cc9ef6fd..f78f2b1810 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans-doc.pdf diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx index ddf05363e1..dbb617265f 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment %% -%% File: widows-and-orphans.dtx (C) Copyright 2017-2020 Frank Mittelbach +%% File: widows-and-orphans.dtx (C) Copyright 2017-2021 Frank Mittelbach % % It may be distributed and/or modified under the conditions of the % LaTeX Project Public License (LPPL), either version 1.3c of this @@ -251,9 +251,10 @@ % two packages we want to use: \pkg{xparse} for the user interface and % \pkg{l3keys2e} for key/value option syntax. They load the needed % \pkg{expl3} code so we are ready to roll afterwards. +% Nowadays \pkg{xparse} is in the kernel so doesn't need loading any longer. % % \begin{macrocode} -\NeedsTeXFormat{LaTeX2e} \RequirePackage{xparse,l3keys2e} +\NeedsTeXFormat{LaTeX2e} \RequirePackage{l3keys2e} % \end{macrocode} % % Then we announce the package to the world at large. This declaration @@ -334,7 +335,7 @@ % \end{figure} % % \begin{macrocode} -\ProvidesExplPackage{widows-and-orphans}{2020/01/22}{v1.0c} +\ProvidesExplPackage{widows-and-orphans}{2021/03/06}{v1.0d} {Detecting widows and orphans (FMi)} % \end{macrocode} % diff --git a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins index 344a5148bd..753887020d 100644 --- a/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins +++ b/macros/latex/contrib/widows-and-orphans/widows-and-orphans.ins @@ -3,7 +3,7 @@ %% driver files from the dtx file(s) in this package when run through %% LaTeX or TeX. %% -%% Copyright 2017-2018 Frank Mittelbach +%% Copyright 2017-2021 Frank Mittelbach %% %% %% This file is part of the LaTeX windows-and-orphans Bundle. @@ -35,7 +35,7 @@ This is a generated file. -Copyright 2017-2020 Frank Mittelbach +Copyright 2017-2021 Frank Mittelbach This file was generated from file(s) of the LaTeX windows-and-orphans Bundle. |