diff options
Diffstat (limited to 'macros/latex/contrib/tuda-ci/tex/tudapub.cls')
-rw-r--r-- | macros/latex/contrib/tuda-ci/tex/tudapub.cls | 53 |
1 files changed, 35 insertions, 18 deletions
diff --git a/macros/latex/contrib/tuda-ci/tex/tudapub.cls b/macros/latex/contrib/tuda-ci/tex/tudapub.cls index 2cbc051fe5..6fe6093903 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 1.10 (2019/09/09), +%% This is file `tudapub.cls' version 1.11 (2019/09/25), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.10} -\def\filedate{2019/09/09} +\def\fileversion{1.11} +\def\filedate{2019/09/25} \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \ProvidesExplClass{tudapub} @@ -329,23 +329,26 @@ \usepackage[draft=false]{scrlayer-scrpage} \bool_if:NTF \g_TUDa_geometry_bool { - \RequirePackage[top=\g_TUDa_topMargin_dim, inner=\g_TUDa_innerMargin_dim, outer=\dim_eval:n {\g_TUDa_outerMargin_dim}, bottom=\g_TUDa_bottomMargin_dim, columnsep= \g_TUDa_columnSep_dim, includehead, includefoot,includemp, nomarginpar, headheight=\g_TUDa_headheight_dim - ]{geometry} - - + \RequirePackage{geometry} + \geometry{ + top=\g_TUDa_topMargin_dim, + inner=\g_TUDa_innerMargin_dim, + outer=\dim_eval:n {\g_TUDa_outerMargin_dim}, + bottom=\g_TUDa_bottomMargin_dim, + columnsep= \g_TUDa_columnSep_dim, + includehead, + includefoot, + includemp, + nomarginpar, + headheight=\g_TUDa_headheight_dim + } \savegeometry{TUDa@nomarginpar} \geometry{includemp, marginpar=\g_TUDa_marginpar_dim, marginparsep=\g_TUDa_columnSep_dim} \KOMAoptions{mpinclude} \savegeometry{TUDa@marginpar} - \bool_if:NTF \g_TUDa_marginpar_bool { - \loadgeometry{TUDa@marginpar} - } { - \loadgeometry{TUDa@nomarginpar} - } - \bool_if:NTF \g_TUDa_custommargins_bool { - \AtBeginDocument{\savegeometry{TUDa@default}} + \AtBeginDocument{\savegeometry{TUDa@default}} \tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@default} }{ \bool_if:NTF \g_TUDa_marginpar_bool { @@ -353,6 +356,7 @@ } { \tl_const:Nn \c_TUDa_default_geometry_tl {TUDa@nomarginpar} } + \AtBeginDocument{\loadgeometry{\c_TUDa_default_geometry_tl}} } \dim_gset:Nn \g_TUDa_headwidth_dim {\paperwidth-\g_TUDa_innerMargin_dim-\g_TUDa_outerMargin_dim-\Gm@bindingoffset} @@ -421,7 +425,21 @@ %Adjust headheight \AtBeginDocument{ \KOMAoptions{headlines=1.5} -\recalctypearea +\bool_if:NTF \g_TUDa_marginpar_bool + { + \KOMAoptions { + headwidth=textwithmarginpar, + footwidth=textwithmarginpar + } + }{ + \KOMAoptions { + headwidth=text, + footwidth=text + } + } +\box_if_exist:NF \TUDa@headline_box { + \TUDa@makeheadrule[color=identbarcolor, width=\sls@headwidth]{TUDa@headline} +} } \newpairofpagestyles[scrheadings]{TUDa.headings}{ @@ -448,9 +466,8 @@ } \setkomafont{pagehead}{\Large\bfseries} -\box_if_exist:NF \TUDa@headline_box { - \TUDa@makeheadrule[color=identbarcolor, width=\sls@headwidth]{TUDa@headline} -} + + \if@twocolumn \edef\sls@evenheadshift{\dim_eval:n {-\marginparwidth-\marginparsep\relax}} \let\sls@oddheadshift\sls@evenheadshift |