From fb5686d866a149345c08808c5355bdd8bc7bcb92 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 12 Nov 2020 21:46:03 +0000 Subject: tuda-ci (12nov20) git-svn-id: svn://tug.org/texlive/trunk@56921 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf | Bin 574097 -> 574097 bytes .../doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf | Bin 622105 -> 622105 bytes .../doc/latex/tuda-ci/DEMO-TUDaBeamer.tex | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaBibliography.bib | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaExercise.pdf | Bin 578332 -> 578429 bytes .../doc/latex/tuda-ci/DEMO-TUDaExercise.tex | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf | Bin 583236 -> 583236 bytes .../doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaLetter.pdf | Bin 589226 -> 589032 bytes .../doc/latex/tuda-ci/DEMO-TUDaLetter.tex | 2 +- .../texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf | Bin 642236 -> 649755 bytes .../texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex | 21 +++- .../doc/latex/tuda-ci/DEMO-TUDaPoster.pdf | Bin 558962 -> 558962 bytes .../doc/latex/tuda-ci/DEMO-TUDaPoster.tex | 2 +- .../texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf | Bin 675683 -> 676251 bytes .../texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex | 22 ++-- .../doc/latex/tuda-ci/DEMO-TUDaReport.pdf | Bin 550585 -> 550345 bytes .../doc/latex/tuda-ci/DEMO-TUDaReport.tex | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf | Bin 586682 -> 586682 bytes .../doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex | 2 +- .../doc/latex/tuda-ci/DEMO-TUDaThesis.pdf | Bin 636860 -> 644340 bytes .../doc/latex/tuda-ci/DEMO-TUDaThesis.tex | 25 ++++- Master/texmf-dist/doc/latex/tuda-ci/README.md | 8 +- .../tex/latex/tuda-ci/beamercolorthemeTUDa.sty | 6 +- .../tex/latex/tuda-ci/beamerfontthemeTUDa.sty | 6 +- .../tex/latex/tuda-ci/beamerinnerthemeTUDa.sty | 6 +- .../tex/latex/tuda-ci/beamerouterthemeTUDa.sty | 6 +- .../tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty | 6 +- .../tex/latex/tuda-ci/beamerthemeTUDa.sty | 6 +- .../texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo | 6 +- .../texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo | 6 +- .../texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo | 6 +- .../texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo | 6 +- .../texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo | 6 +- .../texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo | 6 +- .../texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty | 6 +- Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls | 6 +- Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def | 6 +- Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty | 6 +- .../texmf-dist/tex/latex/tuda-ci/tudaexercise.cls | 6 +- Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty | 6 +- .../texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls | 6 +- Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls | 6 +- .../tex/latex/tuda-ci/tudalettersize10pt.clo | 2 +- .../texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg | 6 +- Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls | 6 +- Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls | 114 +++++++++++++-------- Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty | 6 +- .../texmf-dist/tex/latex/tuda-ci/tudasciposter.cls | 6 +- .../texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo | 2 +- Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg | 107 ++++++++++++++----- 53 files changed, 302 insertions(+), 163 deletions(-) diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf index 960a56c4fd6..b1a0b5180a9 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex index 0c5d9691eeb..5d360c69839 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaAnnouncement.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaAnnouncement.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf index 2ed00ff52cb..3017dd8756e 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex index d840e3f42e9..0840efd91e4 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBeamer.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBeamer.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaBeamer.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib index 5bf7d70d4bf..f25abfb1d65 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaBibliography.bib @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaBibliography.bib' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaBibliography.bib' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf index fef01bb7d3b..6a24af761d1 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex index 8aa8c9f7e47..898485ef09f 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaExercise.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaExercise.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaExercise.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco index 0af15e5d403..f08bac22d09 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaFromaddress.lco' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaFromaddress.lco' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf index 1242232a9de..afb90f4fd1e 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex index c3f3338a6ad..e74ecf46029 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLeaflet.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaLeaflet.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf index 46978142530..ccc622add22 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex index d13a0e81964..d7a47a9b371 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaLetter.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaLetter.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaLetter.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf index 4d9ae42b87e..b6b23c815a4 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex index c3b55918f83..e451ced49fd 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPhD.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPhD.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaPhD.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -133,7 +133,16 @@ \submissiondate{\today} \examdate{\today} -\tuprints{urn=1234,printid=12345,doi=10.25534/tuprints-1234} + +% Hinweis zur Lizenz: +% TUDa-CI verwendet momentan die Lizenz CC BY-NC-ND 2.0 DE als Voreinstellung. +% Die TU Darmstadt hat jedoch die Empfehlung von dieser auf die liberalere +% CC BY 4.0 geändert. Diese erlaubt eine Verwendung bearbeiteter Versionen und +% die kommerzielle Nutzung. +% TUDa-CI wird im nächsten größeren Release ebenfalls diese Anpassung vornehmen. +% Aus diesem Grund wird empfohlen die Lizenz manuell auszuwählen. +\tuprints{urn=1234,printid=12345,doi=10.25534/tuprints-1234,license=cc-by-4.0} +% To see furhter information on the license option in English, remove the license= key and pay attention to the warning & help message. \dedication{For \TeX{} \& Friends} @@ -288,6 +297,14 @@ Es ist zu beachten, dass für die Erzeugung der Titelseite nach Übergabe aller Ab Version 2.07 ist es zudem möglich einen eigenen Lizenztext über den Schlüssel \verb|license| zu übergeben. Dieser ersetzt dann die voreingestellte Lizenzangabe. + Ab Version 3.08 existieren vorgefertigte Werte für die Option \verb|license|, um eine einfachere Anpassung zu ermöglichen. + Dies ist Bestandteil der Vorbereitung zur Anpassung der Standardlizenz, die durch die Universitätsbibliothek angepasst wurde. + Die entsprechende Diskussion findet sich unter \url{https://github.com/tudace/tuda_latex_templates/issues/251} und eine Anpassung der Voreinstellung bei TUDa-CI ist für Version 4.0 vorgesehen. + + Die vorgefertigten Lizenzschlüssel lauten: \verb+cc-by-nc-nd-2.0-de+ (noch aktuelle Voreinstellung), \verb+cc-by-4.0+, \verb+cc-by-nc-nd-4.0+. + Unterstützung bei der Wahl einer passenden Creative Commons Lizenz bietet das Projekt über seinen Lizenzfinder unter \url{http://creativecommons.org/choose/} + + Falls ein davon abweichender Wert gewählt wird, wird dieser direkt an der Stelle des Lizenztextes verwendet. Falls der Text Gleichheitszeichen oder Kommata enthält ist eine Gruppierung notwendig. \item[titleimage] Hier kann Code übergeben werden, der den farbigen Block im unteren Teil der Titelseite ersetzt. Als Maße können hier die Längen \verb+\layerwidth+ und \verb+\layerheight+ verwendet werden. Sie passen sich dem Verfügbaren Platz an. Für ein Beispiel sei auf die TUDapub-Dokumentation verwiesen. \item[titleintro] Ab Version 2.03 kann zusätzlich über diesen Hook ein beliebiger Text direkt nach dem Untertitel und vor den automatischen Informationen ergänzt werden. \item[titleaddendum] Wie \code{\tbs{}titleintro} jedoch als letztes Element des Blocks. diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf index 333b580971c..0546fa5a5bb 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex index 4353b6b6e35..ebf45122cbe 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPoster.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaPoster.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf index feefb8a4f88..4513ac09c24 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex index 01d98859eea..2a9db8f195b 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaPub.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaPub.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaPub.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -134,9 +134,8 @@ Im folgenden werden die möglichen Optionen beschrieben. Flattersatz in der marginnline aus \KOMAScript } \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[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}. 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} @@ -207,7 +206,16 @@ Die Position des Logos ist umschaltbar. Dies geschieht über die Dokumentenklass \item[logo=body] Das Logo samt der Infoboxen wird im Körper der Titelseite platziert. \end{description} -Darüber hinaus lässt sich die Farbgebung umschalten. Die Option \code{colorback} schaltet zwischen dem farbigen Block auf der Titelseite und weißem Hintergrund um. Falls die Kombination \code{colorback=false} und \code{logo=head} geschaltet ist, bleibt der obere Teil der Titelseite jedoch farbig. +Darüber hinaus lässt sich die Farbgebung umschalten. +Die Option \code{colorback} schaltet zwischen dem farbigen Block auf der Titelseite und weißem Hintergrund um. Sie ist in der Voreinstellung aktiviert, sodass ein Farbiger Block erzeugt wird. + +Mit Version 3.08 werden zusätzlich zu den \code{true}/\code{false} Werten auch die Werte \code{title}, \code{head} und \code{body} für die Option colorback ergänzt. +Mit diesen ist es möglich nach der Auswahl der Logoposition eine Korrektur an der Farbgebung durchzuführen. Alle drei neuen Werte aktivieren die Hintergrundfarbe und schalten deren Position um: +\begin{description} + \item[colorback=title] Der Titel (ohne Untertitel) wird hinterlegt. + \item[colorback=head] Der komplette Titelblock, inklusive Titelblock wird hinterlegt. + \item[colorback=body] Es wird nur der Bildbereich eingefärbt. +\end{description} \subsection{Strukturierungselemente} \minisec{Die abstract-Umgebung} @@ -353,7 +361,7 @@ Einige Fachbereiche haben spezielle Anforderungen. Dieser Abschnitt betrachtet d \subsection{Fachbereich Maschinenbau} Der entsprechende Modus wird über die Option \code{department=mecheng} oder kurz \code{mecheng} aktiviert. Die Farbgebung passt sich dann automatisch an und die Trennlinie der Fußzeile erhält die geforderte Form des Zeitstrahles. -Darüber hinaus erfordern manche Stellen dieses Fachbereits die übergabe einer ID zu Kennzeichnung des Dokuments. Hierfür wurde der Mechanismus +Darüber hinaus erfordern manche Stellen dieses Fachbereichs die Übergabe einer ID zu Kennzeichnung des Dokuments. Hierfür wurde der Mechanismus \begin{verbatim} \SetPaperID{}{}} \end{verbatim} @@ -401,7 +409,7 @@ Beispiele für typische Modifikationen, die auch im Rahmen des Corporate Design \subsection{\texorpdfstring{\hologo{XeLaTeX}}{XeLaTeX} und PDF/A} Das Paket \pck{pdfx}, über welches die PDF/A Kompatibilität erzeugt wird, hat nur einen begrenzten Support für \hologo{XeLaTeX}. -Es wird eine entsprechende Warnung erzeugt, allerdings kann es bei älteren \hologo{XeLaTeX}-Versionen passieren, dass \pck{pdfx} bereits Fehlermeldungen erzeugt. Abhilfe wird in diesem Fall durch eine Compiler-Wechsel auf \hologo{LuaLaTeX} (welcher ohnehin empfohlen wird) oder durch Sbschalten des PDF/A-Modus (\code{pdfa=false}) geschaffen. +Es wird eine entsprechende Warnung erzeugt, allerdings kann es bei älteren \hologo{XeLaTeX}-Versionen passieren, dass \pck{pdfx} bereits Fehlermeldungen erzeugt. Abhilfe wird in diesem Fall durch eine Compiler-Wechsel auf \hologo{LuaLaTeX} (welcher ohnehin empfohlen wird) oder durch Abschalten des PDF/A-Modus (\code{pdfa=false}) geschaffen. \subsection{Geschachtelte Akzente (Inkompatibilität zwischen pdfx und amsmath)} diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf index 926d845888b..7d14e3ce213 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex index 6136969a42e..e735b79a423 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaReport.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaReport.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaReport.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf index 7265a97fc70..4bcf4e2f01f 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex index 9044e60ef1d..64a6c6ad43a 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaSciPoster.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaSciPoster.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaSciPoster.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf index 878e9790196..4d13dd084e5 100644 Binary files a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf and b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.pdf differ diff --git a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex index 2d03b84f70a..287f4e213c0 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex +++ b/Master/texmf-dist/doc/latex/tuda-ci/DEMO-TUDaThesis.tex @@ -1,4 +1,4 @@ -%% This is file `DEMO-TUDaThesis.tex' version 3.07 (2020/10/21), +%% This is file `DEMO-TUDaThesis.tex' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -119,8 +119,17 @@ \submissiondate{\today} \examdate{\today} -% \tuprints{urn=1234,printid=12345,doi=10.25534/tuprints-1234} -% \dedication{Für alle, die \TeX{} nutzen.} +% Hinweis zur Lizenz: +% TUDa-CI verwendet momentan die Lizenz CC BY-NC-ND 2.0 DE als Voreinstellung. +% Die TU Darmstadt hat jedoch die Empfehlung von dieser auf die liberalere +% CC BY 4.0 geändert. Diese erlaubt eine Verwendung bearbeiteter Versionen und +% die kommerzielle Nutzung. +% TUDa-CI wird im nächsten größeren Release ebenfalls diese Anpassung vornehmen. +% Aus diesem Grund wird empfohlen die Lizenz manuell auszuwählen. +% \tuprints{urn=1234,printid=12345,doi=10.25534/tuprints-1234,license=cc-by-4.0} +% To see furhter information on the license option in English, remove the license= key and pay attention to the warning & help message. + +% \dedication{Für alle, die \TeX{} nutzen.} \maketitle @@ -252,6 +261,16 @@ Es ist zu beachten, dass für die Erzeugung der Titelseite nach Übergabe aller \end{verbatim} Falls das Argument kein Gleichheitszeichen erkennt, wird der Wert als \code{printid} gesetzt und keine URN angegeben. + Ab Version 2.07 ist es zudem möglich einen eigenen Lizenztext über den Schlüssel \verb|license| zu übergeben. Dieser ersetzt dann die voreingestellte Lizenzangabe. + + Ab Version 3.08 existieren vorgefertigte Werte für die Option \verb|license|, um eine einfachere Anpassung zu ermöglichen. + Dies ist Bestandteil der Vorbereitung zur Anpassung der Standardlizenz, die durch die Universitätsbibliothek angepasst wurde. + Die entsprechende Diskussion findet sich unter \url{https://github.com/tudace/tuda_latex_templates/issues/251} und eine Anpassung der Voreinstellung bei TUDa-CI ist für Version 4.0 vorgesehen. + + Die vorgefertigten Lizenzschlüssel lauten: \verb+cc-by-nc-nd-2.0-de+ (noch aktuelle Voreinstellung), \verb+cc-by-4.0+, \verb+cc-by-nc-nd-4.0+. + Unterstützung bei der Wahl einer passenden Creative Commons Lizenz bietet das Projekt über seinen Lizenzfinder unter \url{http://creativecommons.org/choose/} + + Falls ein davon abweichender Wert gewählt wird, wird dieser direkt an der Stelle des Lizenztextes verwendet. Falls der Text Gleichheitszeichen oder Kommata enthält ist eine Gruppierung notwendig \item[titleimage] Hier kann Code übergeben werden, der den farbigen Block im unteren Teil der Titelseite ersetzt. Als Maße können hier die Längen \verb+\layerwidth+ und \verb+\layerheight+ verwendet werden. Sie passen sich dem Verfügbaren Platz an. Für ein Beispiel sei auf die TUDapub-Dokumentation verwiesen. \item[titleintro] Ab Version 2.03 kann zusätzlich über diesen Hook ein beliebiger Text direkt nach dem Untertitel und vor den automatischen Informationen ergänzt werden. \item[titleaddendum] Wie \code{\tbs{}titleintro} jedoch als letztes Element des Blocks. diff --git a/Master/texmf-dist/doc/latex/tuda-ci/README.md b/Master/texmf-dist/doc/latex/tuda-ci/README.md index fab65abeb1f..a10670e38d6 100644 --- a/Master/texmf-dist/doc/latex/tuda-ci/README.md +++ b/Master/texmf-dist/doc/latex/tuda-ci/README.md @@ -2,7 +2,7 @@ Copyright (C) Marei Peischl , 2018–2020 - tuda-ci 2020/10/21 v3.07 + tuda-ci 2020/11/12 v3.08 *************************************************************************** @@ -215,4 +215,8 @@ leaflets | DEMO-TUDaLeaflet.tex | tudaleaflet.cls - simplify change of reviewer description * v3.07 (2020-10-21) - improve language selection - - fix linebreak issues in affidavit \ No newline at end of file + - fix linebreak issues in affidavit + * v3.08 (2020-11-12) + - fix titleback margins + - add predefined values for some cc licenses in tudathesis + - additional options to adjust titlepage color scheme diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty index 8a3ef069f10..2b63d2ec40a 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamercolorthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamercolorthemeTUDa.sty' version 3.07 (2020/10/21), +%% This is file `beamercolorthemeTUDa.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamercolorthemeTUDa} [\filedate\space\fileversion] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty index b78357a3ea0..ed3b3fbdf87 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerfontthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerfontthemeTUDa.sty' version 3.07 (2020/10/21), +%% This is file `beamerfontthemeTUDa.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerfontthemeTUDa} [\filedate\space\fileversion] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty index 8b4bd85dd3a..6df42d1ae5b 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerinnerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerinnerthemeTUDa.sty' version 3.07 (2020/10/21), +%% This is file `beamerinnerthemeTUDa.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerinnerthemeTUDa}{\filedate}{\fileversion}{Inner~beamer~theme~of~tuda-ci} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty index 5ec43ca458f..2113efa4b73 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerouterthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerouterthemeTUDa.sty' version 3.07 (2020/10/21), +%% This is file `beamerouterthemeTUDa.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \ProvidesExplPackage{beamerouterthemeTUDa}{\filedate}{\fileversion}{Outer~beamer~theme~of~tuda-ci} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty index 1837c847d62..73df495d970 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa-mecheng.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa-mecheng.sty' version 3.07 (2020/10/21), +%% This is file `beamerthemeTUDa-mecheng.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \RequirePackage{expl3} \ProvidesExplPackage{beamerthemeTUDa-mecheng}{\filedate}{\fileversion}{specific tudabeamer configuration for the department of mechanical engineering} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty index f4e0ba9b69c..6321f9c2e0c 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/beamerthemeTUDa.sty @@ -1,4 +1,4 @@ -%% This is file `beamerthemeTUDa.sty' version 3.07 (2020/10/21), +%% This is file `beamerthemeTUDa.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthemeTUDa} [\filedate\space\fileversion\space beamer theme using the Corporate Design of TU Darmstadt] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo index 2aa681a9dc2..886b8188982 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a0paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a0paper.clo' version 3.07 (2020/10/21), +%% This is file `tuda-a0paper.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \ProvidesExplFile{tuda-a0paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{125pt}{165pt}} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo index 67e1934d155..8393d189f72 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a1paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a1paper.clo' version 3.07 (2020/10/21), +%% This is file `tuda-a1paper.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \ProvidesExplFile{tuda-a1paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{86pt}{120pt}} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo index 01135fa39bd..cbcc0a17b4b 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a2paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a2paper.clo' version 3.07 (2020/10/21), +%% This is file `tuda-a2paper.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \ProvidesExplFile{tuda-a2paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a0paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{65pt}{82pt}} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo index fcc6095c48e..2ba2a6b1311 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a3paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a3paper.clo' version 3.07 (2020/10/21), +%% This is file `tuda-a3paper.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \ProvidesExplFile{tuda-a3paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a3paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{47pt}{61pt}} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo index 5de6a3672a8..d109fb3b7a6 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a4paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a4paper.clo' version 3.07 (2020/10/21), +%% This is file `tuda-a4paper.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \ProvidesExplFile{tuda-a4paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a4paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{36pt}{47pt}} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo index eb36f6f7a0d..235aae77497 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-a5paper.clo @@ -1,4 +1,4 @@ -%% This is file `tuda-a5paper.clo' version 3.07 (2020/10/21), +%% This is file `tuda-a5paper.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \ProvidesExplFile{tuda-a5paper.clo}{\filedate}{\fileversion}{tuda-ci~size~adjustments~for~a5paper} \cs_set:Nn \ptxcd_setup_title_sizes: { \cs_set:Nn \ptxcd_title_fontsize: {{22pt}{28pt}} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty b/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty index d661aeead23..e6134138e7f 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/tuda-pgfplots.sty @@ -1,4 +1,4 @@ -%% This is file `tuda-pgfplots.sty' version 3.07 (2020/10/21), +%% This is file `tuda-pgfplots.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} % Special thanks to: Sebastian Schöps Institut Theorie Elektromagnetischer Felder (TEMF), TU Darmstadt % The original version of this file has been inspired by the colorscheme in the Metropolis beamer theme by Matthias Vogelgesang https://github.com/matze/mtheme \ProvidesPackage{tuda-pgfplots}[\filedate\space\fileversion\space tuda-ci pgfplots color schemes] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls index 7be89039654..95179807d41 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudabeamer.cls @@ -1,4 +1,4 @@ -%% This is file `tudabeamer.cls' version 3.07 (2020/10/21), +%% This is file `tudabeamer.cls' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{tudabeamer} [\filedate\space\fileversion\space] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def index b853b281438..f7289b76ad9 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.def @@ -1,4 +1,4 @@ -%% This is file `tudacolors.def' version 3.07 (2020/10/21), +%% This is file `tudacolors.def' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \ProvidesFile{tudacolors.def} [\filedate\space\fileversion\space Color definitions for tuda-ci] diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty index 77a0c00137b..93800c18277 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudacolors.sty @@ -1,4 +1,4 @@ -%% This is file `tudacolors.sty' version 3.07 (2020/10/21), +%% This is file `tudacolors.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudacolors}{\filedate}{\fileversion}{Color definition for TU Darmstadt's tuda-ci bundle} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls index 70847495d93..9a2c110d872 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaexercise.cls @@ -1,4 +1,4 @@ -%% This is file `tudaexercise.cls' version 3.07 (2020/10/21), +%% This is file `tudaexercise.cls' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaexercise} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty index 2eed7e4a80b..e479e7549b0 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudafonts.sty @@ -1,4 +1,4 @@ -%% This is file `tudafonts.sty' version 3.07 (2020/10/21), +%% This is file `tudafonts.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{tudafonts} [\filedate\space\fileversion\space diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls index a2cfdc2a87d..dc03a836873 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaleaflet.cls @@ -1,4 +1,4 @@ -%% This is file `tudaleaflet.cls' version 3.07 (2020/10/21), +%% This is file `tudaleaflet.cls' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaleaflet}{\filedate}{\fileversion}{Leaflets using the Corporate Design of TU Darmstadt} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls index 6a7612faf39..f68884c8a1d 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaletter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaletter.cls' version 3.07 (2020/10/21), +%% This is file `tudaletter.cls' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudaletter} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo b/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo index b5b8d0065da..661a851b97e 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudalettersize10pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudalettersize10pt.clo' version 3.07 (2020/10/21), +%% This is file `tudalettersize10pt.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg index 23f635e8cc0..7063cdb5aaf 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudamecheng.cfg @@ -1,4 +1,4 @@ -%% This is file `tudamecheng.cfg' version 3.07 (2020/10/21), +%% This is file `tudamecheng.cfg' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \RequirePackage{expl3} \ProvidesExplFile{tudamecheng.cfg} {\filedate}{\fileversion}{Special Features the department of mechanical engineering of Darmstadt's Corporate Design (tuda-ci)} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls index 34389a423d6..1a1152b8053 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudaposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudaposter.cls' version 3.07 (2020/10/21), +%% This is file `tudaposter.cls' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudaposter}{\filedate}{\fileversion}{Poster Layouts for the Corporate Design of TU Darmstadt} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls index 41a74ae64dc..dec9d0b1635 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudapub.cls @@ -1,4 +1,4 @@ -%% This is file `tudapub.cls' version 3.07 (2020/10/21), +%% This is file `tudapub.cls' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} @@ -50,15 +50,16 @@ \int_new:N \g_ptxcd_ruledheaders_int \int_new:N \g_ptxcd_paper_int -\msg_new:nnnn {tudapub} {compatibility-only} { +\msg_new:nnn {tudapub} {compatibility-only} { You~used~the~outdated~#1~option.\\ - This~only~exists~due~to~compatibility~reasons. -}{ - Please~look~at~tuda-ci~documentation~for~further~information~and~avoid~using~outdated~options. + This~option~has~been~removed~with~tuda-ci~version~3.08.\\ + See~documentation~for~the~updated~implementation. } \bool_new:N \g_ptxcd_geometry_bool \bool_new:N \g_ptxcd_custommargins_bool +\bool_new:N \g_ptxcd_colorbacktitle_bool +\bool_new:N \g_ptxcd_colorbacksubtitle_bool \keys_define:nn {ptxcd/pub} { %twoside -> geometry + class @@ -110,8 +111,19 @@ headline .initial:n =false, colorback .bool_gset:N = \g_ptxcd_colorback_bool, colorback .initial:n = true, - colortitleback .code:n = \msg_warning:nnx {tudapub} {compatibility-only} {\l_keys_key_tl} - \keys_set:nn {ptxcd/pub} {logo=head,colorback=false}, + colorback / title .code:n = + \bool_gset_true:N \g_ptxcd_colorbacktitle_bool + \bool_gset_true:N \g_ptxcd_colorback_bool + \bool_gset_false:N \g_ptxcd_colorbacksubtitle_bool, + colorback / body .code:n = + \bool_gset_false:N \g_ptxcd_colorbacktitle_bool + \bool_gset_false:N \g_ptxcd_colorbacksubtitle_bool + \bool_gset_true:N \g_ptxcd_colorback_bool, + colorback / head .code:n = + \bool_gset_true:N \g_ptxcd_colorbacktitle_bool + \bool_gset_true:N \g_ptxcd_colorback_bool + \bool_gset_true:N \g_ptxcd_colorbacksubtitle_bool, + colortitleback .code:n = \msg_error:nnx {tudapub} {compatibility-only} {\l_keys_key_tl}, pdfa .bool_gset:N = \g_ptxcd_pdfa_bool, pdfa .initial:n = true, twocolumn .bool_gset:N = \g_ptxcd_twocolumn_bool, @@ -125,10 +137,16 @@ abstract .code:n = \prop_gput:Nnn \g_ptxcd_unknown_clsopts_prop {abstract} {#1}, abstract .initial:n =true, logo .choice:, - logo / head .code:n = {\bool_gset_true:N \g_ptxcd_logo@inhead_bool}, - logo / body .code:n = {\bool_gset_false:N \g_ptxcd_logo@inhead_bool}, - logo / top .code:n = {\bool_gset_true:N \g_ptxcd_logo@inhead_bool}, - logo / bottom .code:n = {\bool_gset_false:N \g_ptxcd_logo@inhead_bool}, + logo / head .code:n = { + \bool_gset_true:N \g__ptxcd_LogoInHead_bool + \bool_gset_true:N \g_ptxcd_colorbacktitle_bool + }, + logo / body .code:n = { + \bool_gset_false:N \g__ptxcd_LogoInHead_bool + \bool_gset_false:N \g_ptxcd_colorbacktitle_bool + }, + logo / top .meta:n = {logo=head}, + logo / bottom .code:n = {\bool_gset_false:N \g__ptxcd_LogoInHead_bool}, logo .initial:n = {body}, paper .choices:nn = {a0,a1,a2,a3,a4,a5,a6}{ \int_gset_eq:NN \g_ptxcd_paper_int \l_keys_choice_int @@ -599,14 +617,14 @@ +\c_ptxcd_rulesep_dim ]{title.TUDa.image} - \bool_if:NT \g_ptxcd_logo@inhead_bool { + \bool_if:NT \g_ptxcd_colorbacktitle_bool { \ModifyLayer[ - addvoffset=\dim_eval:n {\box_ht:N \ptxcd_headrule_box+\box_dp:N \ptxcd_headrule_box-\g_ptxcd_titlerule_dim}, - height={\box_ht:N \g_ptxcd_title_box+ \g_ptxcd_title_fill_skip+.5\c_ptxcd_logoheight_dim - } - ]{title.TUDa.background} - - \AddLayersToPageStyle{title.TUDa}{title.TUDa.background} + textarea, + addvoffset=\dim_eval:n {\box_ht:N \ptxcd_headrule_box+\box_dp:N \ptxcd_headrule_box-\g_ptxcd_titlerule_dim}, + height={\box_ht:N \g_ptxcd_title_box+ \g_ptxcd_title_fill_skip+.5\c_ptxcd_logoheight_dim + \bool_if:NT \g_ptxcd_colorbacksubtitle_bool {+\box_dp:N \g_ptxcd_title_box} + } + ]{title.TUDa.background} } \vspace*{\dim_eval:n { -\topskip @@ -618,13 +636,12 @@ \nointerlineskip \ptxcd_setup_title_box: - \bool_if:NT \g_ptxcd_logo@inhead_bool { + \bool_if:NT \g__ptxcd_LogoInHead_bool { \dim_compare:nT {\box_ht:N \g_ptxcd_title_info_box+ \box_dp:N \g_ptxcd_title_info_box > \box_ht:N \g_ptxcd_title_box} {\msg_warning:nn{tudapub} {infobox-too-high}} \makebox[\linewidth][r]{\smash{ \raisebox{-\height}{ \makebox[2.2\c_ptxcd_logoheight_dim][l]{ - % } \box_use:N \g_ptxcd_title_info_box }} }} @@ -703,7 +720,12 @@ \DeclareNewLayer[textarea,background,mode=picture, contents={ \tl_if_empty:NTF \g_ptxcd_titleimage_code_tl - {\bool_if:NT \g_ptxcd_colorback_bool {\putLL{\color{identbarcolor}\rule{\layerwidth}{\layerheight}}}} + { + \bool_if:NF \g_ptxcd_colorbacktitle_bool + { + \bool_if:NT \g_ptxcd_colorback_bool {\putLL{\color{identbarcolor}\rule{\layerwidth}{\layerheight}}} + } + } {\putUL{\color{identbarcolor} \let\width\layerwidth \let\height\layerheight @@ -711,7 +733,7 @@ \leavevmode\ignorespaces \g_ptxcd_titleimage_code_tl }}}} - \bool_if:NF \g_ptxcd_logo@inhead_bool { + \bool_if:NF \g__ptxcd_LogoInHead_bool { \put(\dim_to_decimal_in_unit:nn {\layerwidth-2.2\c_ptxcd_logoheight_dim } {\unitlength}, \dim_to_decimal_in_unit:nn {\layerheight-\box_ht:N \g_ptxcd_title_info_box - .5\c_ptxcd_logoheight_dim} {\unitlength}){ @@ -721,8 +743,12 @@ } ]{title.TUDa.image} -\DeclareNewLayer[textarea,background,mode=picture, -contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} +\DeclareNewLayer[background,mode=picture, + contents={ + \bool_lazy_and:nnT {\g_ptxcd_colorback_bool} {\g_ptxcd_colorbacktitle_bool} { + {\color{identbarcolor}\rule{\layerwidth}{\layerheight}} + } + } ]{title.TUDa.background} \DeclareNewLayer[ @@ -765,7 +791,7 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} } } -\DeclareNewPageStyleByLayers{title.TUDa}{title.TUDa.rule,title.TUDa.image} +\DeclareNewPageStyleByLayers{title.TUDa}{title.TUDa.background,title.TUDa.rule,title.TUDa.image} %Logos \RequirePackage{graphicx} @@ -835,6 +861,7 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} \prop_map_function:NN \g_ptxcd_MetaData_prop \ptxcd_write_xmp_line:nn \endgroup \iow_close:N \ptxcd_xmpdata_stream + \let\ptxcd_pass_TitleData:\relax } \cs_new:Nn \ptxcd_write_xmp_line:nn { \begingroup @@ -890,6 +917,10 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} \def\sponsors#1{\def\@sponsors{#1}} \sponsors{} +\newcommand*{\ptxcd_title@footnote}[2][1]{ + \textsuperscript{\@fnsymbol{#1}}#2 +} + \str_if_eq:VnTF \g_ptxcd_pubType_tl {thesis} { \input{tudathesis.cfg} } { @@ -901,9 +932,6 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} \msg_error:nnn {tudapub} {only-thesis} {#1} } } -\newcommand*{\ptxcd_title@footnote}[2][1]{ -\textsuperscript{\@fnsymbol{#1}}#2 -} % The following macro is an adapted version of the corresponding KOMA-Script macro % Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info] @@ -918,13 +946,15 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} }% \def\thefootnote{\fnsymbol{footnote}} \if@titlepageiscoverpage - \edef\titlepage@restore{% - \noexpand\endgroup - \noexpand\global\noexpand\@colht\the\@colht - \noexpand\global\noexpand\@colroom\the\@colroom - \noexpand\global\vsize\the\vsize - \noexpand\global\noexpand\@titlepageiscoverpagefalse - \noexpand\let\noexpand\titlepage@restore\noexpand\relax + \def\titlepage@restore{% + \endgroup + \ptxcd_restore_typearea: + \dim_sub:Nn \evensidemargin {\marginparwidth+\marginparsep} + \dim_add:Nn \textwidth {\marginparwidth+\marginparsep} + \columnwidth=\textwidth + \hsize=\columnwidth + \global\@titlepageiscoverpagefalse + \let\titlepage@restore\relax }% \begingroup \topmargin=\dimexpr \coverpagetopmargin-1in\relax @@ -950,8 +980,8 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} \ptxcd_setup_sponsor_box: \hbox_gset:Nn \g_ptxcd_title_box { \parbox[t]{\linewidth}{ - \begin{minipage}[b]{\bool_if:NT \g_ptxcd_logo@inhead_bool {.75}\linewidth} - \bool_if:NT \g_ptxcd_logo@inhead_bool {\color{textonaccentcolor}} + \begin{minipage}[b]{\bool_if:NT \g__ptxcd_LogoInHead_bool {.75}\linewidth} + \bool_lazy_and:nnT {\g_ptxcd_colorback_bool} {\g_ptxcd_colorbacktitle_bool} {\color{textonaccentcolor}} \tl_if_empty:NF \@titlehead { \begin{addmargin}{3mm} {\usekomafont{titlehead}{\@titlehead\par}} @@ -970,6 +1000,7 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} {\rule{0pt}{.5\c_ptxcd_logoheight_dim}} \end{addmargin} \end{minipage}% + \bool_if:NT \g_ptxcd_colorbacksubtitle_bool {\color{textonaccentcolor}} \par\nointerlineskip \rule{\linewidth}{\g_ptxcd_titlerule_dim}\par\vspace{\c_ptxcd_rulesep_dim} \begin{addmargin}{3mm} @@ -995,17 +1026,18 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}} \@thanks \end{addmargin} \par\vspace{-\dp\strutbox} - \let\@thanks\@empty } + \normalcolor \rule{\linewidth}{\g_ptxcd_titlerule_dim}\par} } + \let\@thanks\@empty \ptxcd_adjust_titlepage_style: \thispagestyle{title.TUDa} \nointerlineskip\box_use:N \g_ptxcd_title_box \par \vfill \box_if_empty:NTF \g_ptxcd_sponsor_box { - \raisebox{-\c_ptxcd_rulesep_dim}[0pt][0pt]{\rule{\linewidth}{\g_ptxcd_titlerule_dim}} + \raisebox{-\c_ptxcd_rulesep_dim}[0pt][0pt]{\rule{\linewidth}{\g_ptxcd_titlerule_dim}} }{ \box_use:N \g_ptxcd_sponsor_box } diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty index 72c8a1cfeb9..a433cc8b168 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudarules.sty @@ -1,4 +1,4 @@ -%% This is file `tudarules.sty' version 3.07 (2020/10/21), +%% This is file `tudarules.sty' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudarules}{\filedate}{\fileversion}{Creation of colored bars for tuda-ci bundle} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls index ba60ec64f86..f4e0aa1a6c3 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasciposter.cls @@ -1,4 +1,4 @@ -%% This is file `tudasciposter.cls' version 3.07 (2020/10/21), +%% This is file `tudasciposter.cls' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplPackage{tudasciposter}{\filedate}{\fileversion}{Scientific Poster Layout for TU Darmstadt} diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo b/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo index 68208c3198a..4003665ff90 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudasize9pt.clo @@ -1,4 +1,4 @@ -%% This is file `tudasize9pt.clo' version 3.07 (2020/10/21), +%% This is file `tudasize9pt.clo' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg index 1342704480b..23958c3baba 100644 --- a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg +++ b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg @@ -1,4 +1,4 @@ -%% This is file `tudathesis.cfg' version 3.07 (2020/10/21), +%% This is file `tudathesis.cfg' version 3.08 (2020/11/12), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{3.07} -\def\filedate{2020/10/21} +\def\fileversion{3.08} +\def\filedate{2020/11/12} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Corporate Design (tuda-ci)} @@ -279,17 +279,61 @@ } } +\tl_new:N \g_ptxcd_license_info_tl + \keys_define:nn {ptxcd/thesis} { urn .tl_gset:N =\g_ptxcd_thesis_urn_tl, urn .initial:V = \c_empty_tl, printid .tl_gset:N = \g_ptxcd_thesis_tuprints_tl, printid .initial:V = \c_empty_tl, doi .tl_gset:N = \g_ptxcd_thesis_doi_tl, - license .tl_gset:N = \g_ptxcd_license_info_tl, - license .initial:n = {Die~Veröffentlichung~steht~unter~folgender~Creative~Commons~Lizenz:\\ - Namensnennung~--~Keine~kommerzielle~Nutzung~--~Keine~Bearbeitung~ 2.0~Deutschland\\ - \url{http://creativecommons.org/licenses/by-nc-nd/2.0/de/} - } + license .choices:nn = {cc-by-4.0,cc-by-nc-nd-4.0} { + \tl_gset:Nx \g_ptxcd_license_info_tl {\exp_not:N \use:c {g__ptxcd_\l_keys_choice_tl :}\exp_not:N \iflanguage{\exp_not:N \bbl@main@language}{}{\exp_not:n {\par\smallskip\otherlanguage{\bbl@main@language}}{\exp_not:N \use:c {g__ptxcd_\l_keys_choice_tl :}}}} + }, + license / cc-by-nc-nd-2.0-de .code:n = \tl_gset:Nn \g_ptxcd_license_info_tl {\use:c {g__ptxcd_cc-by-nc-nd-2.0-de:}}, + license / initial .code:n = { + \keys_set:nn {ptxcd/thesis} {license=cc-by-nc-nd-2-de} + \tl_put_right:Nn \g_ptxcd_license_info_tl {\msg_warning:nn {tudapub/thesis} {default-license-will-change}} + }, + license / unknown .code:n = \tl_gset:Nn \g_ptxcd_license_info_tl {#1}, + license .initial:n = initial, +} + +\msg_new:nnnn {tudapub/thesis} {default-license-will-change} { + TUprints~changed~their~default~license.\\ + tuda-ci~will~adapt~this~change~in~the~next~major~update.~\\ + Please~choose~your~license~manually~to~avoid~unintended~changes. +} {Use~either~the~old~default~value~license=cc-by-nc-nd-2.0-de or~license=cc-by-4.0~or~license={}~with~\string\tuprints.} + + +\cs_new:cn {g__ptxcd_cc-by-nc-nd-2.0-de:} { + Die~Veröffentlichung~steht~unter~folgender~Creative~Commons~Lizenz:\\ + Namensnennung~--~Keine~kommerzielle~Nutzung~--~Keine~Bearbeitung~ 2.0~Deutschland\\ + \url{http://creativecommons.org/licenses/by-nc-nd/2.0/de/} +} + +\exp_args:Nnc \defcaptionname{ngerman, german}{g__ptxcd_cc-by-nc-nd-4.0:}{ + Die~Veröffentlichung~steht~unter~folgender~Creative~Commons~Lizenz:\\ + Namensnennung~--~Nicht~kommerziell~--~Keine~Bearbeitungen~4.0~International\\ + \url{http://creativecommons.org/licenses/by-nc-nd/4.0/} +} + +\exp_args:Nnc \defcaptionname{english, USenglish, american, UKenglish, british}{g__ptxcd_cc-by-nc-nd-4.0:}{ + This~work~is~licensed~under~a~Creative~Commons~License:\\ + Attribution--NonCommercial--NoDerivatives~4.0~International\\ + \url{https://creativecommons.org/licenses/by-nc-nd/4.0/} +} + +\exp_args:Nnc \defcaptionname{ngerman, german}{g__ptxcd_cc-by-4.0:}{ + Die~Veröffentlichung~steht~unter~folgender~Creative~Commons~Lizenz:\\ + Namensnennung~4.0~International\\ + \url{http://creativecommons.org/licenses/by/4.0/} +} + +\exp_args:Nnc \defcaptionname{english, USenglish, american, UKenglish, british}{g__ptxcd_cc-by-4.0:}{ + This~work~is~licensed~under~a~Creative~Commons~License:\\ + Attribution~4.0~International\\ + \url{https://creativecommons.org/licenses/by/4.0/} } \newcommand{\tuprints}[1]{% @@ -298,6 +342,7 @@ {\keys_set:nn {ptxcd/thesis} {printid=#1}} \lowertitleback{ \urlstyle{same} + \selectlanguage{ngerman} Bitte~zitieren~Sie~dieses~Dokument~als: \tl_if_empty:NF \g_ptxcd_thesis_urn_tl {\\URN:~urn:nbn:de:tuda-tuprints-\g_ptxcd_thesis_urn_tl}\\ URL:~\url{http://tuprints.ulb.tu-darmstadt.de/\g_ptxcd_thesis_tuprints_tl}\\ @@ -389,13 +434,15 @@ }% \def\thefootnote{\fnsymbol{footnote}} \if@titlepageiscoverpage - \edef\titlepage@restore{% - \noexpand\endgroup - \noexpand\global\noexpand\@colht\the\@colht - \noexpand\global\noexpand\@colroom\the\@colroom - \noexpand\global\vsize\the\vsize - \noexpand\global\noexpand\@titlepageiscoverpagefalse - \noexpand\let\noexpand\titlepage@restore\noexpand\relax + \def\titlepage@restore{% + \endgroup + \ptxcd_restore_typearea: + \dim_sub:Nn \evensidemargin {\marginparwidth+\marginparsep} + \dim_add:Nn \textwidth {\marginparwidth+\marginparsep} + \columnwidth=\textwidth + \hsize=\columnwidth + \global\@titlepageiscoverpagefalse + \let\titlepage@restore\relax }% \begingroup \topmargin=\dimexpr \coverpagetopmargin-1in\relax @@ -421,8 +468,8 @@ \ptxcd_setup_sponsor_box: \hbox_gset:Nn \g_ptxcd_title_box { \parbox[t]{\linewidth}{ - \begin{minipage}[b]{\bool_if:NT \g_ptxcd_logo@inhead_bool {.75}\linewidth} - \bool_if:NT \g_ptxcd_logo@inhead_bool {\color{textonaccentcolor}} + \begin{minipage}[b]{\bool_if:NT \g__ptxcd_LogoInHead_bool {.75}\linewidth} + \bool_lazy_and:nnT {\g_ptxcd_colorback_bool} {\g_ptxcd_colorbacktitle_bool} {\color{textonaccentcolor}} \tl_if_empty:NF \@titlehead { \begin{addmargin}{3mm} {\usekomafont{titlehead}{\@titlehead\par}} @@ -441,6 +488,7 @@ {\rule{0pt}{.5\c_ptxcd_logoheight_dim}} \end{addmargin} \end{minipage}% + \bool_if:NT \g_ptxcd_colorbacksubtitle_bool {\color{textonaccentcolor}} \par\nointerlineskip \rule{\linewidth}{\g_ptxcd_titlerule_dim}\par\vspace{\c_ptxcd_rulesep_dim} \begin{addmargin}{3mm} @@ -464,7 +512,20 @@ {\usekomafont{publishers}{\@publishers \par}}% \tl_if_empty:NF \g_ptxcd_titleaddendum_tl {\g_ptxcd_titleaddendum_tl\par} \end{addmargin} - \rule{\linewidth}{\g_ptxcd_titlerule_dim}\par}} + \tl_if_empty:NF \@thanks { + \expandafter\fontsize\ptxcd_titlethanks_fontsize:\selectfont\par + \rule{\linewidth}{\g_ptxcd_titlerule_dim}\par + \begin{addmargin}{3mm} + \let\footnotetext\ptxcd_title@footnote + \@thanks + \end{addmargin} + \par\vspace{-\dp\strutbox} + } + \normalcolor + \rule{\linewidth}{\g_ptxcd_titlerule_dim}\par + } + } + \let\@thanks\@empty \bool_if:NF \g_ptxcd_manual_info_box_bool { \exp_args:Nf \tl_if_empty:nF {\ptxcd_institution\ptxcd_department\ptxcd_institute\ptxcd_group} { \addTitleBox{ @@ -480,7 +541,6 @@ \nointerlineskip\box_use:N \g_ptxcd_title_box \par \vfill - \@thanks\let\@thanks\@empty \box_if_empty:NTF \g_ptxcd_sponsor_box { \raisebox{-\c_ptxcd_rulesep_dim}[0pt][0pt]{\rule{\linewidth}{\g_ptxcd_titlerule_dim}} }{ @@ -489,13 +549,13 @@ \if@twoside \@tempswatrue \expandafter\ifnum \@nameuse{scr@v@3.12}>\scr@compatibility\relax - \else - \ifx\@uppertitleback\@empty + \else + \ifx\@uppertitleback\@empty \ifx\@lowertitleback\@empty - \@tempswafalse + \@tempswafalse + \fi \fi \fi - \fi \else \exp_args:Nf \tl_if_empty:nTF {\g_ptxcd_thesis_urn_tl\g_ptxcd_thesis_tuprints_tl} {\@tempswafalse} @@ -530,7 +590,6 @@ } \newcommand*{\@ThesisType}{\ptxcd_thesisType} -%\ExplSyntaxOff \bool_if:NTF \g_ptxcd_dr_bool { \keys_define:nn {ptxcd/thesis} { -- cgit v1.2.3