diff options
Diffstat (limited to 'macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty')
-rw-r--r-- | macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty | 108 |
1 files changed, 68 insertions, 40 deletions
diff --git a/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty b/macros/latex/contrib/tuda-ci/tex/beamerouterthemeTUDa.sty index 661c5c3ac5..ba85657b2c 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 1.11 (2019/09/25), +%% This is file `beamerouterthemeTUDa.sty' version 2.0 (2019/11/07), %% it is part of %% TUDa-CI -- Corporate Design for TU Darmstadt %% ---------------------------------------------------------------------------- @@ -7,12 +7,12 @@ %% %% ============================================================================ %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% 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.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% 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'. %% @@ -26,8 +26,8 @@ %% %% ============================================================================ %% -\def\fileversion{1.11} -\def\filedate{2019/09/25} +\def\fileversion{2.0} +\def\filedate{2019/11/07} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerouterthemeTUDa} [\filedate\space\fileversion] @@ -41,6 +41,12 @@ logo .initial:n =true, logofile .tl_gset:N = \g_TUDa_logofile_tl, logofile .initial:n = tuda_logo, + colorframetitle .bool_gset:N = \g_TUDa_colorframetitle_bool, + colorframetitle .initial:n = false, + colorframetitle .default:n = true, + centerframetitle .bool_gset:N = \g_TUDa_centerframetitle_bool, + centerframetitle .initial:n = false, + centerframetitle .default:n = true, } @@ -55,11 +61,19 @@ \newlength{\TUDa@beamer@sep} \setlength{\TUDa@beamer@sep}{1em} +\newlength{\TUDa@beamer@logosep} +\setlength{\TUDa@beamer@logosep}{2mm} +\newlength{\TUDa@beamer@extraindent} +\ExplSyntaxOn +\bool_if:NT \g_TUDa_colorframetitle_bool {\setlength{\TUDa@beamer@extraindent}{\TUDa@beamer@logosep}} -\setbeamersize{text~margin~left=\TUDa@beamer@sep,text~margin~right=\TUDa@beamer@sep} +\setbeamersize{ + text~margin~left= \dimexpr\TUDa@beamer@sep+\TUDa@beamer@extraindent\relax, + text~margin~right=\dimexpr\TUDa@beamer@sep+\TUDa@beamer@extraindent\relax, +} \newlength{\TUDa@beamer@linewidth} -\setlength{\TUDa@beamer@linewidth}{\dimexpr\paperwidth-2\TUDa@beamer@sep\relax} +\setlength{\TUDa@beamer@linewidth}{\dimexpr\paperwidth-2\TUDa@beamer@sep-2\TUDa@beamer@extraindent\relax} %Logo @@ -68,16 +82,8 @@ \makebox[2.2\c_TUDa_logoheight_dim][l]{\includegraphics[height=\c_TUDa_logoheight_dim]{\g_TUDa_logofile_tl}}% } -\newlength{\TUDa@beamer@logosep} -\setlength{\TUDa@beamer@logosep}{2mm} - -\ExplSyntaxOff - -%\RequirePackage[paper=slide]{tudarules} - -\ExplSyntaxOn -\TUDa@makeheadrule[color=identbarcolor,width=\TUDa@beamer@linewidth]{TUDa@beamer@headrule} -\TUDa@makefootrule[width=\TUDa@beamer@linewidth]{TUDa@beamer@rule} +\TUDa@makeheadrule[color=identbarcolor,width=\paperwidth-2\TUDa@beamer@sep]{TUDa@beamer@headrule} +\TUDa@makefootrule[width=\paperwidth-2\TUDa@beamer@sep]{TUDa@beamer@rule} \newlength{\TUDa@beamer@headheight} \setlength{\TUDa@beamer@headheight}{ @@ -142,25 +148,28 @@ } \defbeamertemplate{headline}{TUDa theme.logo} {% -% \vspace{.75\TUDa@beamer@sep} \begin{beamercolorbox}[ - leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep,%wd=\TUDa@beamer@linewidth, + leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep, ht=.75\TUDa@beamer@sep,dp=\box_dp:N \TUDa@beamer@headrule_box]{headline} \TUDa@beamer@headrule \end{beamercolorbox} } -\ExplSyntaxOff -\defbeamertemplate{frametitle}{TUDa theme.logo}{% +\box_new:N \l_TUDa_frametitle_box + +\defbeamertemplate{frametitle}{TUDa~theme.logo}{% \nointerlineskip% \begin{beamercolorbox}[ - sep=\TUDa@beamer@logosep,%wd=\dimexpr\TUDa@beamer@linewidth\relax, - rightskip=-\TUDa@beamer@logosep, -% leftskip=-\TUDa@beamer@logosep + sep=\TUDa@beamer@logosep, + wd=\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent\relax, + rightskip=-\TUDa@beamer@logosep, + leftskip=\dimexpr-\TUDa@beamer@logosep+\TUDa@beamer@extraindent\relax, ]{frametitle} - \parbox[t]{\dimexpr\linewidth- \wd\TUDa@logobox-1em\relax\relax}{% - \usebeamerfont{frametitle}\insertframetitle + \hbox_set:Nn \l_TUDa_frametitle_box { + \parbox[t] + {\dimexpr\linewidth- \wd\TUDa@logobox-1em\relax\relax}{% + \usebeamerfont{frametitle}\strut\insertframetitle \ifx\insertframesubtitle\@empty \else \par @@ -168,30 +177,42 @@ \usebeamerfont{framesubtitle} \insertframesubtitle \fi - } + }} + \leavevmode + \bool_if:NTF \g_TUDa_centerframetitle_bool + {\raisebox{\dimexpr-.5\height+.5\depth}} + {\use:n} + {\box_use:N \l_TUDa_frametitle_box} \hfill% - \raisebox{\dimexpr-\height+\ht\strutbox\relax}{\usebox\TUDa@logobox} + \bool_if:NTF \g_TUDa_centerframetitle_bool + {\raisebox{\dimexpr-.5\height+.5\depth}} + {\raisebox{\dimexpr-\height+\ht\strutbox}} + {\usebox\TUDa@logobox} \end{beamercolorbox} \nointerlineskip -\color{black}\TUDa@beamer@rule +\leavevmode\color{black}\hspace*{-\TUDa@beamer@extraindent}\TUDa@beamer@rule } -\defbeamertemplate*{headline}{TUDa theme.nologo} +\defbeamertemplate*{headline}{TUDa~theme.nologo} {% \vspace{.75\TUDa@beamer@sep} \begin{beamercolorbox}[ leftskip=\TUDa@beamer@sep,rightskip=\TUDa@beamer@sep]{headline} \TUDa@beamer@headrule \end{beamercolorbox} -} -\defbeamertemplate*{frametitle}{TUDa theme.nologo}{% + } + +\defbeamertemplate*{frametitle}{TUDa~theme.nologo}{% \nointerlineskip% \begin{beamercolorbox}[ - sep=\TUDa@beamer@logosep, + sep=\TUDa@beamer@logosep, + wd=\dimexpr\TUDa@beamer@linewidth+2\TUDa@beamer@extraindent\relax, + leftskip=\dimexpr-\TUDa@beamer@logosep+\TUDa@beamer@extraindent\relax, ]{frametitle} - \parbox[t]{\dimexpr\TUDa@beamer@linewidth-2\TUDa@beamer@logosep}{% - \usebeamerfont{frametitle} - \insertframetitle + \hbox_set:Nn \l_TUDa_frametitle_box { + \parbox[t] + {\dimexpr\linewidth- \wd\TUDa@logobox-1em\relax\relax}{% + \usebeamerfont{frametitle}\strut\insertframetitle \ifx\insertframesubtitle\@empty \else \par @@ -199,15 +220,22 @@ \usebeamerfont{framesubtitle} \insertframesubtitle \fi - }% +}} +\leavevmode +\bool_if:NTF \g_TUDa_centerframetitle_bool +{\raisebox{\dimexpr-.5\height+.5\depth}} +{\use:n} +{\box_use:N \l_TUDa_frametitle_box} % Rule for voffset similar to logo - \rule[\dimexpr-\ht\TUDa@logobox+\ht\strutbox\relax]{0pt}{\dimexpr\ht\TUDa@logobox+\dp\TUDa@logobox\relax} + \rule[\dim_eval:n { + \bool_if:NTF \g_TUDa_centerframetitle_bool + {-.5\ht\TUDa@logobox+.5\dp\TUDa@logobox} {-\ht\TUDa@logobox+\ht\strutbox} + }]{0pt}{\dimexpr\ht\TUDa@logobox+\dp\TUDa@logobox\relax} \end{beamercolorbox} \nointerlineskip \TUDa@beamer@rule } -\ExplSyntaxOn \cs_new:Nn \TUDa_setup_frame: { \bool_if:NTF \g_TUDa_headlinelogo_bool { \setbeamertemplate{frametitle}[TUDa~ theme.logo] |