Cleaned up some syntax and added nooffset option.

Could resolve #17.
This commit is contained in:
Johann Dahm 2015-01-29 17:18:55 -05:00
parent 1469af008c
commit 810b13b460
3 changed files with 27 additions and 22 deletions

View File

@ -69,5 +69,4 @@
\fi \fi
\mode \mode<all>
<all>

View File

@ -9,7 +9,7 @@
\ProvidesPackage{beamerfontthememetropolis} \ProvidesPackage{beamerfontthememetropolis}
\usepackage[no-math]{fontspec} \RequirePackage[no-math]{fontspec}
\defaultfontfeatures{Mapping=tex-text} \defaultfontfeatures{Mapping=tex-text}

View File

@ -12,14 +12,20 @@
%{{{ --- Options ---------------------- %{{{ --- Options ----------------------
\newif\if@useTitleProgressBar \newif\if@useTitleProgressBar
\@useTitleProgressBarfalse
\DeclareOptionBeamer{useTitleProgressBar}{\@useTitleProgressBartrue}
\newif\if@protectFrameTitle \newif\if@protectFrameTitle
\@protectFrameTitlefalse
\DeclareOptionBeamer{protectframetitle}{\@protectFrameTitletrue}
\DeclareOptionBeamer{blockbg}{\PassOptionsToPackage{blockbg}{beamercolorthememetropolis}} \@useTitleProgressBarfalse
\@protectFrameTitlefalse
\newlength{\@mtheme@voffset}
\setlength{\@mtheme@voffset}{2em}
\DeclareOptionBeamer{useTitleProgressBar}{\@useTitleProgressBartrue}
\DeclareOptionBeamer{protectframetitle}{\@protectFrameTitletrue}
\DeclareOptionBeamer{blockbg}{%
\PassOptionsToPackage{blockbg}{beamercolorthememetropolis}%
}
\DeclareOptionBeamer{nooffset}{\setlength{\@mtheme@voffset}{0em}}
\DeclareOptionBeamer*{% \DeclareOptionBeamer*{%
\PackageWarning{beamerthemem}{Unknown option `\CurrentOption'}% \PackageWarning{beamerthemem}{Unknown option `\CurrentOption'}%
@ -27,14 +33,16 @@
\ProcessOptionsBeamer \ProcessOptionsBeamer
%}}} %}}}
\mode<presentation>
%{{{ --- Packages --------------------- %{{{ --- Packages ---------------------
\usepackage[no-math]{fontspec} \RequirePackage[no-math]{fontspec}
\usepackage{etoolbox} \RequirePackage{etoolbox}
\usepackage{tikz} \RequirePackage{tikz}
\usepackage{pgfplots} \RequirePackage{pgfplots}
\usetikzlibrary{backgrounds} \usetikzlibrary{backgrounds}
\usetikzlibrary{calc} \usetikzlibrary{calc}
@ -42,7 +50,6 @@
\usecolortheme{metropolis} \usecolortheme{metropolis}
\usefonttheme{metropolis} \usefonttheme{metropolis}
%}}} %}}}
%{{{ --- Titlepage -------------------- %{{{ --- Titlepage --------------------
@ -145,7 +152,7 @@
}% }%
} }
\fi \fi
% }}} %}}}
%{{{ --- Commands --------------------- %{{{ --- Commands ---------------------
\newcommand{\insertsectionHEAD}{% \newcommand{\insertsectionHEAD}{%
@ -236,8 +243,9 @@
\progressbar@titleprogressbar \progressbar@titleprogressbar
\end{beamercolorbox} \end{beamercolorbox}
\fi \fi
\vspace{2em} \vspace{\@mtheme@voffset}
} }
%}}} %}}}
%{{{ --- pgfplots --------------------- %{{{ --- pgfplots ---------------------
@ -355,15 +363,13 @@
%}}} %}}}
%}}} \mode<all>
\mode %{{{ misc
<all>
% {{{ misc
\let\otp\titlepage \let\otp\titlepage
\renewcommand{\titlepage}{\otp\addtocounter{framenumber}{-1}} \renewcommand{\titlepage}{\otp\addtocounter{framenumber}{-1}}
\newcommand{\mreducelistspacing}{\vspace{-\topsep}} \newcommand{\mreducelistspacing}{\vspace{-\topsep}}
\linespread{1.15} \linespread{1.15}
%}}} %}}}