From 9f05a0d67a7230bdf69ce19a2502761abb185b96 Mon Sep 17 00:00:00 2001
From: Jan Benda <jan.benda@uni-tuebingen.de>
Date: Sat, 27 Mar 2021 22:48:38 +0100
Subject: [PATCH] logo position in footer and frametitle

---
 beamerthemelines.sty | 44 ++++++++++++++++++--------------------------
 beamerthemeut.sty    | 10 ++++++----
 lines-example.tex    |  6 ++++--
 ut-example.tex       |  5 +++--
 4 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/beamerthemelines.sty b/beamerthemelines.sty
index ec03d19..18a80a0 100644
--- a/beamerthemelines.sty
+++ b/beamerthemelines.sty
@@ -17,6 +17,8 @@
 \newif\if@beamer@footline@page
 \newif\if@beamer@footline@logoleft
 \newif\if@beamer@footline@logoright
+\newif\if@beamer@frametitle@logoleft
+\newif\if@beamer@frametitle@logoright
 
 \DeclareOptionBeamer{author}{\@beamer@footline@authortrue}
 \DeclareOptionBeamer{hideauthor}{\@beamer@footline@authorfalse}
@@ -28,9 +30,11 @@
 \DeclareOptionBeamer{hidetitle}{\@beamer@footline@titlefalse}
 \DeclareOptionBeamer{page}{\@beamer@footline@pagetrue}
 \DeclareOptionBeamer{hidepage}{\@beamer@footline@pagefalse}
-\DeclareOptionBeamer{logoleft}{\@beamer@footline@logolefttrue\@beamer@footline@logorightfalse}
-\DeclareOptionBeamer{logoright}{\@beamer@footline@logorighttrue\@beamer@footline@logoleftfalse}
-\DeclareOptionBeamer{hidelogo}{\@beamer@footline@logoleftfalse\@beamer@footline@logorightfalse}
+\DeclareOptionBeamer{logofootleft}{\@beamer@footline@logolefttrue\@beamer@footline@logorightfalse}
+\DeclareOptionBeamer{logofootright}{\@beamer@footline@logorighttrue\@beamer@footline@logoleftfalse}
+\DeclareOptionBeamer{logotitleleft}{\@beamer@frametitle@logolefttrue\@beamer@frametitle@logorightfalse}
+\DeclareOptionBeamer{logotitleright}{\@beamer@frametitle@logorighttrue\@beamer@frametitle@logoleftfalse}
+\DeclareOptionBeamer{hidelogo}{\@beamer@footline@logoleftfalse\@beamer@footline@logorightfalse\@beamer@frametitle@logoleftfalse\@beamer@frametitle@logorightfalse}
 
 \ExecuteOptionsBeamer{author}
 \ExecuteOptionsBeamer{hideinstitute}
@@ -292,31 +296,19 @@
   \usebeamerfont{frametitle}%
   \begin{beamercolorbox}[wd=1\paperwidth,dp=1.2ex,ht=3.2ex,sep=0pt,%
     leftskip=1\beamer@leftmargin,rightskip=1\beamer@rightmargin]{frametitle}
-    \insertframetitle\strut
-  \end{beamercolorbox}%
-  \usebeamertemplate{frametitle line}%
-  \ifx\insertframesubtitle\@empty\else%
-    \vspace{-0.5ex}
-    \begin{beamercolorbox}[wd=1\paperwidth,sep=0pt,%
-      leftskip=1\beamer@leftmargin,rightskip=1\beamer@rightmargin]{framesubtitle}
-      \usebeamerfont{framesubtitle}\insertframesubtitle\strut
-    \end{beamercolorbox}%
-  \fi%
-  \vspace{-1ex}
-}
-\defbeamertemplate{frametitle}{boxlinelogo}%
-{
-  \ifbeamercolorempty[bg]{frametitle}{}{\nointerlineskip}%
-  \usebeamerfont{frametitle}%
-  \begin{beamercolorbox}[wd=1\paperwidth,dp=1.2ex,ht=3.2ex,sep=0pt,%
-    leftskip=1\beamer@leftmargin,rightskip=1\beamer@rightmargin]{frametitle}
+    % logo left:
+    \if@beamer@frametitle@logoleft%
+      \ifx\insertlogo\@empty\else\raisebox{-0.7ex}{\insertlogo}\quad\fi%
+    \fi
+    % title:
     \insertframetitle\strut%
-    \ifx\insertlogo\@empty%
-    \else%
-    \hfill \raisebox{-0.7ex}{\insertlogo}%
-    \fi%
+    % logo right:
+    \if@beamer@frametitle@logoright%
+      \ifx\insertlogo\@empty\else\hfill \raisebox{-0.7ex}{\insertlogo}\fi%
+    \fi
   \end{beamercolorbox}%
   \usebeamertemplate{frametitle line}%
+  % subtitle:
   \ifx\insertframesubtitle\@empty\else%
     \vspace{-0.5ex}
     \begin{beamercolorbox}[wd=1\paperwidth,sep=0pt,%
@@ -327,7 +319,7 @@
   \vspace{-1ex}
 }
 
-\setbeamertemplate{frametitle}[boxlinelogo]
+\setbeamertemplate{frametitle}[boxline]
 
 
 %%%%% itemize and enumerate %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/beamerthemeut.sty b/beamerthemeut.sty
index 460c87d..c915daa 100644
--- a/beamerthemeut.sty
+++ b/beamerthemeut.sty
@@ -21,13 +21,15 @@
 \DeclareOptionBeamer{hidetitle}{\PassOptionsToPackage{hidetitle}{beamerthemelines}}
 \DeclareOptionBeamer{page}{\PassOptionsToPackage{page}{beamerthemelines}}
 \DeclareOptionBeamer{hidepage}{\PassOptionsToPackage{hidepage}{beamerthemelines}}
-\DeclareOptionBeamer{logoleft}{\PassOptionsToPackage{logoleft}{beamerthemelines}}
-\DeclareOptionBeamer{logoright}{\PassOptionsToPackage{logoright}{beamerthemelines}}
+\DeclareOptionBeamer{logofootleft}{\PassOptionsToPackage{logofootleft}{beamerthemelines}}
+\DeclareOptionBeamer{logofootright}{\PassOptionsToPackage{logofootright}{beamerthemelines}}
+\DeclareOptionBeamer{logotitleleft}{\PassOptionsToPackage{logotitleleft}{beamerthemelines}}
+\DeclareOptionBeamer{logotitleright}{\PassOptionsToPackage{logotitleright}{beamerthemelines}}
 \DeclareOptionBeamer{hidelogo}{\PassOptionsToPackage{hidelogo}{beamerthemelines}}
 
 \ExecuteOptionsBeamer{author}
 \ExecuteOptionsBeamer{page}
-\ExecuteOptionsBeamer{logoleft}
+\ExecuteOptionsBeamer{logofootleft}
 
 \ProcessOptionsBeamer
 
@@ -38,7 +40,7 @@
 
 %%%%% templates:
 
-\setbeamertemplate{frametitle}[boxline]                  % boxline, boxlinelogo
+\setbeamertemplate{frametitle}[boxline]                  % boxline
 \setbeamertemplate{frametitle line}[text][0.75pt]        % text, page
 
 \setbeamertemplate{page number in head/foot}[frames]     % frames, framestotal, slides
diff --git a/lines-example.tex b/lines-example.tex
index 610a978..2f999a5 100644
--- a/lines-example.tex
+++ b/lines-example.tex
@@ -23,14 +23,16 @@
       \verb!\documentclass[aspectratio=169,t]{beamer}!\\
       \verb!\usetheme[author,date,title,page,hidelogo]{lines}!
   \end{block}
-  Options select content of footline (defaults to \texttt{[author,page,logo]}):
+  \vspace{2ex}
+  Options select content of footline and position of logo\\
+  (default is \texttt{[author,page]}):
   \begin{itemize}
   \item \texttt{author} / \texttt{hideauthor}
   \item \texttt{institute} / \texttt{hideinstitute}
   \item \texttt{date} / \texttt{hidedate}
   \item \texttt{title} / \texttt{hidetitle}
   \item \texttt{page} / \texttt{hidepage}
-  \item \texttt{logoleft} / \texttt{logoright} / \texttt{hidelogo}
+  \item \texttt{logofootleft} / \texttt{logofootright} / \texttt{logotitleleft} / \texttt{logotitleright} / \texttt{hidelogo}
   \end{itemize}
 \end{frame}
 
diff --git a/ut-example.tex b/ut-example.tex
index 15b90f2..837ebcd 100644
--- a/ut-example.tex
+++ b/ut-example.tex
@@ -25,14 +25,15 @@
       \verb!\usetheme[author,date,title,page]{ut}!
   \end{block}
   \vspace{2ex}
-  Options select content of footline (defaults to \texttt{[author,page,logoleft]}):
+  Options select content of footline and position of logo\\
+  (default is \texttt{[author,page,logofootleft]}):
   \begin{itemize}
   \item \texttt{author} / \texttt{hideauthor}
   \item \texttt{institute} / \texttt{hideinstitute}
   \item \texttt{date} / \texttt{hidedate}
   \item \texttt{title} / \texttt{hidetitle}
   \item \texttt{page} / \texttt{hidepage}
-  \item \texttt{logoleft} / \texttt{logoright} / \texttt{hidelogo}
+  \item \texttt{logofootleft} / \texttt{logofootright} / \texttt{logotitleleft} / \texttt{logotitleright} / \texttt{hidelogo}
   \end{itemize}
 \end{frame}