Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tudace/tuda_latex_templates
Browse files Browse the repository at this point in the history
  • Loading branch information
TeXhackse committed Nov 13, 2019
2 parents 977d408 + 9dc9586 commit 5616bfe
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 56 deletions.
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Copyright (C) Marei Peischl <[email protected]>, 2018–2019

tuda-ci 2019/11/07 v1.20
tuda-ci 2019/11/13 v2.01

***************************************************************************

Expand Down Expand Up @@ -154,4 +154,8 @@ exercise sheets/exams | DEMO-TUDaExercise.tex | tudaexercise.cls
- changed title fontsize adjustments to use clo-files
- additional options for tudaposter, to use it for job/thesis announcements
- improved implementation of tudaexercise
- Bugfixes concerning the PDF/A-Mode
- Bugfixes concerning the PDF/A-Mode
* v2.01 (2019-11-13) small bugfixes
- Fix expansion of metadata for PDF/A mode
- Adjustment of english translation for thesis mode of tudapub
- fix support for titlegraphic in announcement mode for tudaposter
2 changes: 1 addition & 1 deletion addlicense.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
cd tex
fileversion="2.0"
fileversion="2.01"
filedate=$(date '+%Y/%m/%d')
echo $filedate
for filename in *.sty *.cls *.def *.cfg *.clo
Expand Down
34 changes: 1 addition & 33 deletions example/DEMO-TUDaAnnouncement.tex
Original file line number Diff line number Diff line change
@@ -1,34 +1,3 @@
%% This is file `DEMO-TUDaAnnouncement.tex' version 1.20-beta (2019/10/26),
%% it is part of
%% TUDa-CI -- Corporate Design for TU Darmstadt
%% ----------------------------------------------------------------------------
%%
%% Copyright (C) 2018--2019 by Marei Peischl <[email protected]>
%%
%% ============================================================================
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
%% of this license or (at your option) any later version.
%% The latest version of this license is in
%% http://www.latex-project.org/lppl.txt
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2008/05/04 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
%%
%% The Current Maintainers of this work are
%% Marei Peischl <[email protected]>
%% Markus Lazanowski <[email protected]>
%%
%% The development respository can be found at
%% https://github.com/tudace/tuda_latex_templates
%% Please use the issue tracker for feedback!
%%
%% ============================================================================
%%
% !TeX program = lualatex
%%

\documentclass[
paper=a4,
ngerman,
Expand Down Expand Up @@ -66,8 +35,7 @@
\usepackage{url}
\begin{document}

\title{\LaTeX{} im Corporate Design der TU~Darmstadt
}
\title{\LaTeX{} im Corporate Design der TU~Darmstadt}
\subtitle{Aushänge mit tudaposter}
\titleinfo{Zusätzliche Informationen, die unterhalb des Untertitels eingefügt werden.}
%\addTitleBoxLogo*{\includegraphics[width=.5\linewidth]{example-image}}
Expand Down
7 changes: 5 additions & 2 deletions example/DEMO-TUDaPoster.tex
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
\subtitle{Die Dokumentenklasse tudaposter}
\author{Marei Peischl\thanks{pei\TeX{} \TeX{}nical Solutions}\and der \TeX-Löwe}

\titlegraphic{\color{red!20}\rule{\contentwidth}{.5\contentheight}}
\titlegraphic{\color{red!20}\rule{\contentwidth}{.3\contentheight}}

\addTitleBox{test}
\addTitleBox{jaodsijf}
Expand Down Expand Up @@ -61,7 +61,10 @@ \subsection*{Dokumentenklassenoptionen}
\item[color=<Farbkürzel>] Akzentfarbe nach den Corporate Design Richtlinien.
\item[colorsubtitle=true/false] Hintergrundfarbe beim Untertitel an-/ausschalten.
\item[footer=true/false] Aktivierung/Deaktivierung der Fußzeile. Voreinstellung ist false.
\item[marginpar=true/false] Ermöglicht die Nutzung einer Randnotizspalte . Diese hat die Breite des Logos. Sie wird entweder über das Makro \code{\tbs{}SetMarginpar} oder über das Standard-Makro \code{\tbs{}marginpar} befüllt. Eine Verwendung dieses Modus ist in der zusätzlichen Demo-Datei \file{DEMO-TUDaAnnouncement} gezeigt
\item[marginpar=true/false] Ermöglicht die Nutzung einer Randnotizspalte . Diese hat die Breite des Logos. Sie wird entweder über das Makro \code{\tbs{}SetMarginpar} oder über das Standard-Makro \code{\tbs{}marginpar} befüllt. Eine Verwendung dieses Modus ist in der zusätzlichen Demo-Datei \file{DEMO-TUDaAnnouncement} gezeigt.

Die Randnotizspalte überlappt die Abbildung, die zum Titel gehört. Kombinationen von \code{marginpar=true} und \code{\tbs{}titlegraphic} sollten daher nur mit Vorsicht genuzt werden.

\item[title=large/small/default] Ermöglicht es die Schriftgrößen um eine Stufe zu verkleinern. Die Option \code{large} entspricht hierbei der Option \code{default}. Im Fall des Wertes \code{small} werden die Titelschriftgrößen des nächsten kleineren Papierformates verwendet. Die Basischriftgröße und die Randeinstellungen bleiben davon unberührt.
\item[type=default/announcement] Diese Option liefert die Möglichkeit bestimmte Posterlayouts über einen Einzigen Wert zu laden.
Der Wert \code{announcement} setzt die folgenden Optionen: \code{marginpar=true, indenttext=false, logo=head, title=small,colorsubtitle=true} und aktiviert zusätzlich die Ausgabe ds Untertitels in fetter Schrift.
Expand Down
10 changes: 10 additions & 0 deletions example/DEMO-TUDaThesis.tex
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,16 @@ \section{Übergabe der Titelinformationen}
\item[reviewer] Gutachter. Mehrere Gutachter werden, wie Autoren durch \verb+\and+ getrennt. Die Nummerierung läuft von links nach rechts.
\item[institution] Einrichtung. Dieser Eintrag, wie auch die beiden Folgenden werden unterhalb des Logos auf der Titelseite platziert.
\item[department] Fach-/Studienbereich allerdings ist die oben genannte Option zu bevorzugen. Die Verarbeitung des Arguments erfolgt jedoch analog.

Dieses Makro verfügt jedoch zusätzlich über die Möglichkeit Abweichende Einträge gegenüber den Vorgaben anzugeben. Insbesondere wenn eine gesonderte Formulierung gegenüber der voreingestellten \enquote{im Fachbereich} und ihren Varianten notwendig ist. Hierfür liefert \code{\textbackslash{}department} ein optionales Argument:

\begin{verbatim}
\department[Ersatztext]{Kürzel/Bezeichnung}
\end{verbatim}
Zusätzlich gibt es ab Version 2.01 auch die Möglichkeit den gesamten Text \enquote{im Fachbereich <Bereichsbezeichnung>}, sowie die Angabe in der Infobox auf der Titelseite zu ersetzen. Dies geschieht über die gesternte Variante:
\begin{verbatim}
\department*[Text für die Box]{Text zwischen Typ und Autor}
\end{verbatim}
\item[group] Arbeitsgruppe.
\item[submissiondate] Datum der Einreichtung
\item[examdate] Datum der Disputation
Expand Down
18 changes: 11 additions & 7 deletions tex/tudaposter.cls
Original file line number Diff line number Diff line change
Expand Up @@ -314,18 +314,20 @@
\par\nointerlineskip
\exp_args:Nf \tl_if_empty:nF {\@subtitle\@titleinfo} {
\bool_if:NT \g_TUDa_indenttext_bool {\hspace*{-\g_TUDa_titleindent_dim}}\TUDa@smallrule\par
\vspace{\c_TUDa_rulesep_dim}
\nointerlineskip
\vspace{\c_TUDa_rulesep_dim}
\bool_if:NTF \g_TUDa_indenttext_bool {\begingroup}{\begin{addmargin}{\g_TUDa_titleindent_dim }}
\bool_if:NT \g_TUDa_colorsubtitle_bool {\color{textonaccentcolor}}
\tl_if_empty:NF \@subtitle {{\usekomafont{subtitle}\strut\@subtitle\strut\par}}
\tl_if_empty:NF \@titleinfo {{\usekomafont{titleinfo}\strut\@titleinfo\par}}
\tl_if_empty:NF \@titleinfo {{\usekomafont{titleinfo}\@titleinfo\par}}
\nointerlineskip
\bool_if:NTF \g_TUDa_indenttext_bool {\endgroup} {\end{addmargin}}
\vspace{\c_TUDa_rulesep_dim}
\bool_if:NTF \g_TUDa_indenttext_bool {\engroup} {\end{addmargin}}
\par\nointerlineskip
\bool_if:NT \g_TUDa_indenttext_bool {\hspace*{-\g_TUDa_titleindent_dim}
}
}
\nointerlineskip
\TUDa@smallrule
}
}
Expand Down Expand Up @@ -368,13 +370,15 @@
{\msg_warning:nn {TUDaPoster} {infobox-too-high}}
}
\leavevmode\box_use:N \g_TUDa_title_box\par
\dim_set:Nn \g_TUDa_titlegraphic_max_height_dim {\textheight-\pagetotal}
% \bool_if:NT \g_TUDa_marginpar_bool {\vspace{\c_TUDa_smallrule_dim}}
\dim_set:Nn \g_TUDa_titlegraphic_max_height_dim {\textheight-\pagetotal}%-\c_TUDa_smallrule_dim}
\global\def\contentheight{\g_TUDa_titlegraphic_max_height_dim}
\global\def\contentwidth{\linewidth}
\tl_if_empty:NF \@titlegraphic{
\par\nointerlineskip
\vbox{\parbox[t]{\linewidth}{\@titlegraphic}}
\par
\nointerlineskip
\vbox{\parbox[t]{\dim_eval:n {\paperwidth-2\g_TUDa_margin_dim}}{\@titlegraphic}}
}
\global\def\contentwidth{\linewidth}
\thispagestyle{TUDa.poster.title}
\endgroup\par
\let\@title\@empty
Expand Down
2 changes: 1 addition & 1 deletion tex/tudapub.cls
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ contents={\color{identbarcolor}\rule{\layerwidth}{\layerheight}}
\cs_set:Npn \sep {\exp_not:N \sep}
\cs_if_exist:cTF {\tl_mixed_case:n {#1}} {
\iow_now:Nx \TUDa@xmpdata_stream {
\c_backslash_str \tl_mixed_case:n {#1} {#2}
\c_backslash_str \tl_mixed_case:n {#1} {\exp_not:n {#2}}
}
}{
\msg_error:nnn {TUDaPub} {unknown-metadata} {#1}
Expand Down
32 changes: 22 additions & 10 deletions tex/tudathesis.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
}
{
\TUDa_declare_caption:Nnn \departmentname {Fachbereich} {department}
\TUDa_declare_caption:Nnn \TUDa_in_department {im~ \departmentname}{in}
\TUDa_declare_caption:Nnn \TUDa_in_department {im~ \departmentname}{in~the~\departmentname{}~ of}
\TUDa_declare_caption:Nnn \departmentfullname {\departmentname{}~ \TUDa@department} { \TUDa@department{}~ \tl_mixed_case:n{\departmentname}}
}
{\bool_if:NTF \g_TUDa_dr_bool
Expand All @@ -62,7 +62,9 @@
}
{
\TUDa_declare_caption:Nnn \departmentname {Studienbereich} {field~of~study}
\TUDa_declare_caption:Nnn \departmentfullname {\departmentname{}~ \TUDa@department} { \TUDa@department :~ \departmentname}
\TUDa_declare_caption:Nnn \departmentfullname {\departmentname{}~ \TUDa@department} {\departmentname{}:~\TUDa@department}
\TUDa_declare_caption:Nnn \TUDa_in_department {im~ \departmentname}{in~the~\departmentname}
\TUDa_declare_caption:Nnn \TUDa@in_department {\TUDa_in_department{}~\TUDa@department} {\TUDa_in_department{}~``\TUDa@department''}
}
{
\msg_warning:nnn {tudapub/tudathesis} {unrecognized-department} {#1}
Expand All @@ -72,12 +74,14 @@
}
\TUDa_declare_caption:Nnn \TUDa@byname {von} {by}
\TUDa_declare_caption:Nnn \TUDa_in_department {im~ \departmentname}{in}
\TUDa_declare_caption:Nnn \TUDa_in_department {im~ \departmentname}{in~the~\departmentname{}~ of}
\TUDa_declare_caption:Nnn \TUDa@reviewname {Gutachten}{review}
\TUDa_declare_caption:Nnnn \TUDa@examdatename {Tag~ der~ Prüfung}{Date~ of~ thesis~ defense}{Date~ of~ thesis~ defence}
\TUDa_declare_caption:Nnn \TUDa@submissiondatename {Tag~ der~ Einreichung}{Date~ of~ submission}
%Fallback content for box if not overwritten
\newcommand*\TUDa@box_department {\cs_if_exist_use:NF \departmentfullname {\TUDa@department}}
\newcommand*\TUDa@in_department {\TUDa_in_department{}~\TUDa@department}
\keys_define:nn {TUDa/thesis} {
Expand Down Expand Up @@ -154,8 +158,16 @@
\gdef\TUDa@institute{}
\gdef\TUDa@department{}
\newcommand*{\department}[1]{%
\tl_gset:Nn \g_TUDa_department_choice_tl {#1}
\NewDocumentCommand{\department}{som}{%
\IfBooleanTF{#1}{
\tl_gset:Nn \TUDa@department {#3}
\tl_gset:Nn \TUDa@in_department{#3}
\IfNoValueTF {\tl_gset:Nn \TUDa@box_department {#3}} {\tl_gset:Nn \TUDa@box_department{#2}}
\clist_remove_all:Nn \g_TUDa_Required_title_data_clist {department}
}{
\tl_gset:Nn \g_TUDa_department_choice_tl {#3}
\IfNoValueF {#2} {\tl_gset:Nn \TUDa_in_department {#1}}
}
}
\newcommand*{\institute}[1]{
Expand Down Expand Up @@ -259,14 +271,14 @@
\bool_if:NTF \g_TUDa_dr_bool {
\TUDa@thesisStatus{}~
\tl_mixed_case:n{\TUDa@thesisType}~
\tl_if_empty:NF \TUDa@department {\TUDa_in_department{}~\TUDa@department{}~}
\tl_if_empty:NF \TUDa@in_department {\TUDa@in_department{}~}
\seq_if_empty:NF \g_TUDa_author_seq {\TUDa@byname{}~\@author}
\tl_if_empty:NF \TUDa@birthplace {~aus~\TUDa@birthplace}
} {
\cs_if_exist:NT \TUDa@thesisStatus {\TUDa@thesisStatus{}~ }
\tl_mixed_case:n{\TUDa@thesisType}~
\tl_if_empty:NF \TUDa@department {\TUDa_in_department{}~\TUDa@department{}~}
\tl_if_empty:NF \@author {\TUDa@byname{}~\@author}
\tl_if_empty:NF \TUDa@in_department {\TUDa@in_department{}~}
\tl_if_empty:NF \@author {\TUDa@byname\nobreakspace\mbox{\@author}}
}
}
Expand Down Expand Up @@ -417,7 +429,7 @@
\exp_args:Nf \tl_if_empty:nF {\TUDa@institution\TUDa@department\TUDa@institute\TUDa@group} {
\addTitleBox{
\tl_if_empty:NF \TUDa@institution {\TUDa@institution\par}
\tl_if_empty:NF \TUDa@department {\cs_if_exist_use:NF \departmentfullname {\TUDa@department}\par}
\tl_if_empty:NF \TUDa@box_department {\TUDa@box_department\par}
\tl_if_empty:NF \TUDa@institute {\TUDa@institute\par}
\tl_if_empty:NF \TUDa@group {\TUDa@group}
}}
Expand Down

0 comments on commit 5616bfe

Please sign in to comment.