diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg')
| -rw-r--r-- | Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg b/Master/texmf-dist/tex/latex/tuda-ci/tudathesis.cfg index 97d864ac87a..9485b50682f 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 2.0 (2019/11/07), +%% This is file `tudathesis.cfg' version 2.01 (2019/11/13), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{2.0} -\def\filedate{2019/11/07} +\def\fileversion{2.01} +\def\filedate{2019/11/13} \RequirePackage{expl3} \ProvidesExplFile{tudathesis.cfg} {\filedate}{\fileversion}{Special Features for publication type 'thesis' using TU Darmstadt's Coporate Design (tuda-ci)} @@ -68,7 +68,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 @@ -92,7 +92,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} @@ -102,12 +104,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} { @@ -184,8 +188,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]{ @@ -289,14 +301,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}} } } @@ -447,7 +459,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} }} |