Commit 5c8b1099 authored by Ivo Kabadshow's avatar Ivo Kabadshow

Merge branch 'fix--logo-margin-NEW' into 'master'

Use CD-correct Canvas Margins

See merge request !13
parents 6a120e11 e2a55bbe
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
% this version does support pdflatex, xelatex and lualatex % this version does support pdflatex, xelatex and lualatex
% %
\setbeamersize{text margin left=0.5cm,text margin right=0.5cm} \setbeamersize{text margin left=0.05\paperheight,text margin right=0.05\paperheight}
% compute white border % compute white border
\newlength{\myborder} \newlength{\myborder}
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
\newlength{\myheadlineb} \newlength{\myheadlineb}
\setlength{\myheadlineb}{\dimexpr(0.55\paperheight-\headheight-6pt+\mylen)\relax} % alignmet at the left top corner of the headline \setlength{\myheadlineb}{\dimexpr(0.55\paperheight-\headheight-6pt+\mylen)\relax} % alignmet at the left top corner of the headline
\newlength{\titlebaseheight}
\settoheight{\titlebaseheight}{\usebeamerfont{frametitle}H}
\newlength{\hlvstart} \newlength{\hlvstart}
\setlength{\hlvstart}{\dimexpr(1cm-15pt)\relax} \setlength{\hlvstart}{\dimexpr(0.05\paperheight)\relax}
% alignment % alignment
\newcommand{\tlap}[1]{\vbox to 0pt{\vss\hbox{#1}}} \newcommand{\tlap}[1]{\vbox to 0pt{\vss\hbox{#1}}}
...@@ -101,7 +103,7 @@ ...@@ -101,7 +103,7 @@
\hfill\blap{#1}% \hfill\blap{#1}%
\end{beamercolorbox}% \end{beamercolorbox}%
} }
\defbeamertemplate{headline}{invible}{} \defbeamertemplate{headline}{invisble}{}
\defbeamertemplatealias{headline}{default}{visible} \defbeamertemplatealias{headline}{default}{visible}
...@@ -150,21 +152,21 @@ ...@@ -150,21 +152,21 @@
\defbeamertemplate{footer element1}{logo}[1] \defbeamertemplate{footer element1}{logo}[1]
{% {%
%\begin{beamercolorbox}[sep=0.0cm,left,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline} %\begin{beamercolorbox}[sep=0.0cm,left,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline}
\includegraphics[width=3.0cm]{#1}% \tlap{\vspace{0.02\paperheight}\includegraphics[width=3.0cm]{#1}}%
%\end{beamercolorbox}% %\end{beamercolorbox}%
} }
\defbeamertemplate{footer element2}{logo}[1] \defbeamertemplate{footer element2}{logo}[1]
{% {%
%\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline} %\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline}
\includegraphics[width=3.0cm]{#1}% \tlap{\vspace{0.02\paperheight}\includegraphics[width=3.0cm]{#1}}%
%\end{beamercolorbox}% %\end{beamercolorbox}%
} }
\defbeamertemplate{footer element3}{logo}[1] \defbeamertemplate{footer element3}{logo}[1]
{% {%
%\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline} %\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline}
\includegraphics[width=3.0cm]{#1}% \tlap{\vspace{0.02\paperheight}\includegraphics[width=3.0cm]{#1}}%
%\end{beamercolorbox}% %\end{beamercolorbox}%
} }
...@@ -174,9 +176,9 @@ ...@@ -174,9 +176,9 @@
\defbeamertemplate*{footer element1}{default}[1][\usebeamertemplate{helmholtz banner}] \defbeamertemplate*{footer element1}{default}[1][\usebeamertemplate{helmholtz banner}]
{% {%
\tlap{% \tlap{%
\vspace{\dimexpr(.5cm-3pt)}% \vspace{0.05\paperheight}%
%\begin{beamercolorbox}[sep=0.0cm,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline} %\begin{beamercolorbox}[sep=0.0cm,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline}
\hspace*{0.5cm}#1 % if no extra option is given, use \usebeamertemplate{helmholtz banner} \hspace*{0.05\paperheight}#1 % if no extra option is given, use \usebeamertemplate{helmholtz banner}
%\end{beamercolorbox}% %\end{beamercolorbox}%
}% }%
} }
...@@ -184,7 +186,7 @@ ...@@ -184,7 +186,7 @@
\defbeamertemplate*{footer element2}{default}[1][\usebeamertemplate{date}] \defbeamertemplate*{footer element2}{default}[1][\usebeamertemplate{date}]
{% {%
\tlap{% \tlap{%
\vspace{\dimexpr(.5cm-3pt)}% \vspace{\dimexpr(0.05\paperheight)}%
%\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline} %\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline}
#1 % if no extra option is given, use \usebeamertemplate*{date} #1 % if no extra option is given, use \usebeamertemplate*{date}
%\end{beamercolorbox}% %\end{beamercolorbox}%
...@@ -194,7 +196,7 @@ ...@@ -194,7 +196,7 @@
\defbeamertemplate*{footer element3}{default}[1][\usebeamertemplate*{frame number}] \defbeamertemplate*{footer element3}{default}[1][\usebeamertemplate*{frame number}]
{% {%
\tlap{% \tlap{%
\vspace{\dimexpr(.5cm-3pt)}% \vspace{\dimexpr(0.05\paperheight)}%
%\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline} %\begin{beamercolorbox}[sep=0.0cm,center,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline}
#1 % if no extra option is given, use \usebeamertemplate*{frame number} #1 % if no extra option is given, use \usebeamertemplate*{frame number}
%\end{beamercolorbox}% %\end{beamercolorbox}%
...@@ -204,7 +206,13 @@ ...@@ -204,7 +206,13 @@
\defbeamertemplate*{footer element4}{default} \defbeamertemplate*{footer element4}{default}
{% {%
%\begin{beamercolorbox}[sep=0.0cm,right,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline} %\begin{beamercolorbox}[sep=0.0cm,right,wd=.25\paperwidth,ht=1.25em,dp=0.0cm]{footline}
\includegraphics[scale=1.0416667]{fzj}% 75/36 scale from 0.5 initial size % \includegraphics[scale=1.0416667]{fzj}% 75/36 scale from 0.5 initial size
\raisebox{%
\dimexpr0.05\paperheight-0.0028\paperheight-0.0015\paperheight\relax% 0.0028 = 0.5*0.07*0.08
}{%
\includegraphics[height=0.08\paperheight]{fzj}%
}%
\hspace*{0.05\paperheight}%
%\end{beamercolorbox}% %\end{beamercolorbox}%
} }
...@@ -271,8 +279,8 @@ ...@@ -271,8 +279,8 @@
\defbeamertemplate*{title page}{image} \defbeamertemplate*{title page}{image}
{% {%
\vskip\myheadlineb% \vskip\myheadlineb%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont*{title}\strut{}\inserttitle\par% \usebeamercolor[fg]{title}\usebeamerfont*{title}\strut{}\inserttitle\par%
\ifx\insertsubtitle\@empty% \ifx\insertsubtitle\@empty%
\else% \else%
...@@ -286,8 +294,8 @@ ...@@ -286,8 +294,8 @@
\defbeamertemplate{title page}{text} \defbeamertemplate{title page}{text}
{% {%
\vskip\myheadlinea% \vskip\myheadlinea%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\inserttitle\par% \usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\inserttitle\par%
\ifx\insertsubtitle\@empty% \ifx\insertsubtitle\@empty%
\else% \else%
...@@ -313,8 +321,8 @@ ...@@ -313,8 +321,8 @@
\defbeamertemplate*{teaser page}{image} \defbeamertemplate*{teaser page}{image}
{% {%
\vskip\myheadlineb% \vskip\myheadlineb%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont*{title}\strut{}\inserttitle\par% \usebeamercolor[fg]{title}\usebeamerfont*{title}\strut{}\inserttitle\par%
\usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\medskip% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\medskip%
} }
...@@ -323,8 +331,8 @@ ...@@ -323,8 +331,8 @@
\defbeamertemplate{teaser page}{text} \defbeamertemplate{teaser page}{text}
{% {%
\vskip\myheadlinea% \vskip\myheadlinea%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\inserttitle\par\medskip% \usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\inserttitle\par\medskip%
\usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\bigskip\bigskip% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\bigskip\bigskip%
} }
...@@ -345,8 +353,8 @@ ...@@ -345,8 +353,8 @@
\defbeamertemplate*{lecture page}{image} \defbeamertemplate*{lecture page}{image}
{% {%
\vskip\myheadlineb% \vskip\myheadlineb%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\insertlecture\par% \usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\insertlecture\par%
% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\medskip% % \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\medskip%
\usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute% \usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute%
...@@ -356,8 +364,8 @@ ...@@ -356,8 +364,8 @@
\defbeamertemplate{lecture page}{text} \defbeamertemplate{lecture page}{text}
{% {%
\vskip\myheadlinea% \vskip\myheadlinea%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\insertlecture\par\medskip% \usebeamercolor[fg]{title}\usebeamerfont{title}\strut{}\insertlecture\par\medskip%
% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\bigskip\bigskip% % \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\bigskip\bigskip%
\usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute \usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute
...@@ -378,8 +386,8 @@ ...@@ -378,8 +386,8 @@
\defbeamertemplate*{part page}{image} \defbeamertemplate*{part page}{image}
{% {%
\vskip\myheadlineb% \vskip\myheadlineb%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\partname~\insertromanpartnumber:~\insertpart\par% \usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\partname~\insertromanpartnumber:~\insertpart\par%
% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\medskip% % \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\medskip%
% \usebeamercolor[fg]{title}\usebeamerfont{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute% % \usebeamercolor[fg]{title}\usebeamerfont{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute%
...@@ -389,8 +397,8 @@ ...@@ -389,8 +397,8 @@
\defbeamertemplate{part page}{text} \defbeamertemplate{part page}{text}
{% {%
\vskip\myheadlinea% \vskip\myheadlinea%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\partname~\insertromanpartnumber:~\insertpart\par\medskip% \usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\partname~\insertromanpartnumber:~\insertpart\par\medskip%
% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\bigskip\bigskip% % \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsubtitle\par\bigskip\bigskip%
% \usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute % \usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute
...@@ -411,8 +419,8 @@ ...@@ -411,8 +419,8 @@
\defbeamertemplate*{section page}{image} \defbeamertemplate*{section page}{image}
{% {%
\vskip\myheadlineb% \vskip\myheadlineb%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\insertpart\par% \usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\insertpart\par%
\usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsection\par\medskip% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsection\par\medskip%
% \usebeamercolor[fg]{title}\usebeamerfont{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute% % \usebeamercolor[fg]{title}\usebeamerfont{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute%
...@@ -422,8 +430,8 @@ ...@@ -422,8 +430,8 @@
\defbeamertemplate{section page}{text} \defbeamertemplate{section page}{text}
{% {%
\vskip\myheadlinea% \vskip\myheadlinea%
\leftskip 0.5cm% \leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\insertpart\par\medskip% \usebeamercolor[fg]{title}\usebeamerfont{part}\strut{}\insertpart\par\medskip%
\usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsection\par\bigskip\bigskip% \usebeamercolor[fg]{subtitle}\usebeamerfont{subtitle}\strut{}\insertsection\par\bigskip\bigskip%
% \usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute % \usebeamercolor[fg]{title}\usebeamerfont*{date}\insertdate\enspace\vrule width0.3pt\enspace\insertauthor\enspace\vrule width0.3pt\enspace\insertinstitute
...@@ -447,8 +455,8 @@ ...@@ -447,8 +455,8 @@
\nointerlineskip% \nointerlineskip%
\vskip\hlvstart% \vskip\hlvstart%
\begin{beamercolorbox}[sep=0.0cm,wd=\paperwidth]{frametitle} \begin{beamercolorbox}[sep=0.0cm,wd=\paperwidth]{frametitle}
{\leftskip 0.5cm% {\leftskip 0.05\paperheight%
\advance\rightskip 0.5cm% \advance\rightskip 0.05\paperheight%
\usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}\insertframetitle\strut\par% \usebeamerfont{frametitle}\usebeamercolor[fg]{frametitle}\insertframetitle\strut\par%
{% {%
\ifx\insertframesubtitle\@empty% \ifx\insertframesubtitle\@empty%
......
No preview for this file type
No preview for this file type
...@@ -105,6 +105,26 @@ english, ...@@ -105,6 +105,26 @@ english,
\end{itemize} \end{itemize}
\end{frame} \end{frame}
{\setbeamertemplate{background}{\begin{tikzpicture}[overlay, remember picture]
\draw ([yshift=-0.05\paperheight, xshift=0.05\paperheight]current page.north west) |- ([yshift=0.05\paperheight, xshift=-0.05\paperheight]current page.south east) |- cycle;
\end{tikzpicture}
}
\begin{frame}
\frametitle{Margins, Sizes}
This slide has an outline on the background canvas
\begin{itemize}
\item One can see the alignments in a normal list
\end{itemize}
\begin{block}{And also}
\begin{itemize}
\item for lists
\item in a block
\end{itemize}
\end{block}
\end{frame}
}
\fzjset{title=regular} \fzjset{title=regular}
\fzjset{title page=text} \fzjset{title page=text}
\subtitle{Now in text only mode and regular text} \subtitle{Now in text only mode and regular text}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment