first stab at new template based on metropolis
authorBenjamin Mako Hill <mako@atdot.cc>
Wed, 21 Mar 2018 18:20:50 +0000 (11:20 -0700)
committerBenjamin Mako Hill <mako@atdot.cc>
Wed, 21 Mar 2018 18:20:50 +0000 (11:20 -0700)
- moved from pdflatex to xelatex
- changed all the .sty files to those build from th latest version of
  mtheme
- reworked the default template in a series of ways
- removed a bunch of cruft
- changed the logo to the new centered logo

14 files changed:
template/Makefile
template/beamercolorthememako.sty [deleted file]
template/beamercolorthememetropolis-highcontrast.sty [new file with mode: 0644]
template/beamercolorthememetropolis.sty [new file with mode: 0644]
template/beamerfontthememetropolis.sty [new file with mode: 0644]
template/beamerinnerthemefancy.sty [deleted file]
template/beamerinnerthememetropolis.sty [new file with mode: 0644]
template/beamerouterthemedecolines.sty [deleted file]
template/beamerouterthememetropolis.sty [new file with mode: 0644]
template/beamerthemeTorino.sty [deleted file]
template/beamerthememetropolis.sty [new file with mode: 0644]
template/example.tex
template/figures/logo.pdf
template/pgfplotsthemetol.sty [new file with mode: 0644]

index a3c7b193868c46bd0eef7ff88dc8b5ebe4aaf50b..a2a786670355b76adab66ba77ecc7472707b193f 100644 (file)
@@ -3,11 +3,12 @@
 all: notes.config vc $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
 pdf: all
 
-%.pdf: %.tex 
-       latexmk -f -pdf $<
-       qpdf --qdf --object-streams=disable $@ - | sponge $@
-       sed -e 's|/PageLabels|/BageLapels|g' < $@ |sponge $@
-       qpdf $@ - | sponge $@
+%.pdf: %.tex
+       latexmk -f -xelatex $<
+       # latexmk -f -pdf -pdflatex="xelatex -synctex=1 %S %O" -verbose -file-line-error -interaction=nonstopmode $<
+       # qpdf --qdf --object-streams=disable $@ - | sponge $@
+       # sed -e 's|/PageLabels|/BageLapels|g' < $@ |sponge $@
+       # qpdf $@ - | sponge $@
 
 # by default, we produce combined notes/slides output
 notes.config:
@@ -26,9 +27,6 @@ slides: slides-config pdf
 viewpdf: all
        evince *.pdf
 
-pdfpc: notes.config pdf
-       pdfpc -n right *pdf
-
 spell:
        aspell -c -t --tex-check-comments -b text.tex
 
diff --git a/template/beamercolorthememako.sty b/template/beamercolorthememako.sty
deleted file mode 100644 (file)
index 6889dcc..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-% Copyright 2007 by Marco Barisione
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-
-\mode<presentation>
-
-% 57/39/91
-
-\definecolor{makopurple1}{RGB}{57,39,91}
-\definecolor{makopurple2}{RGB}{137,119,173}
-\definecolor{makopurple3}{RGB}{29,13,59}
-\definecolor{makopurple4}{RGB}{124,99,173}
-
-\definecolor{makopurple5}{RGB}{238,225,255}
-
-\setbeamercolor*{palette primary}{fg=white,bg=makopurple2}
-\setbeamercolor*{palette secondary}{fg=white,bg=makopurple3}
-\setbeamercolor*{palette tertiary}{fg=white,bg=makopurple1}
-\setbeamercolor*{palette quaternary}{fg=white,bg=makopurple1}
-
-\setbeamercolor*{titlelike}{bg=makopurple1}
-\setbeamercolor*{frametitle}{bg=white,fg=white}
-\setbeamercolor*{part title}{bg=black,fg=black}
-\setbeamercolor*{item}{fg=makopurple3}
-
-\setbeamercolor*{separation line}{}
-\setbeamercolor*{fine separation line}{}
-
-\mode
-<all>
diff --git a/template/beamercolorthememetropolis-highcontrast.sty b/template/beamercolorthememetropolis-highcontrast.sty
new file mode 100644 (file)
index 0000000..85665dc
--- /dev/null
@@ -0,0 +1,39 @@
+%%
+%% This is file `beamercolorthememetropolis-highcontrast.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% beamercolorthememetropolis-highcontrast.dtx  (with options: `package')
+%% ---------------------------------------------------------------------------
+%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of
+%% contributors can be found at
+%% 
+%%     https://github.com/matze/mtheme/graphs/contributors
+%% 
+%% and the original template was based on the HSRM theme by Benjamin Weiss.
+%% 
+%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
+%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
+%% ---------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamercolorthememetropolis-highcontrast}[2017/01/23 Metropolis color theme]
+\usecolortheme{metropolis}
+
+\definecolor{mAlert}{HTML}{AD003D}
+\definecolor{mExample}{HTML}{005580}
+
+\setbeamercolor{normal text}{%
+  fg=black,
+  bg=white
+}
+\setbeamercolor{alerted text}{%
+  fg=mAlert,
+}
+\setbeamercolor{example text}{%
+  fg=mExample,
+}
+\mode<all>
+\endinput
+%%
+%% End of file `beamercolorthememetropolis-highcontrast.sty'.
diff --git a/template/beamercolorthememetropolis.sty b/template/beamercolorthememetropolis.sty
new file mode 100644 (file)
index 0000000..cdc497a
--- /dev/null
@@ -0,0 +1,138 @@
+%%
+%% This is file `beamercolorthememetropolis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% beamercolorthememetropolis.dtx  (with options: `package')
+%% ---------------------------------------------------------------------------
+%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of
+%% contributors can be found at
+%% 
+%%     https://github.com/matze/mtheme/graphs/contributors
+%% 
+%% and the original template was based on the HSRM theme by Benjamin Weiss.
+%% 
+%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
+%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
+%% ---------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamercolorthememetropolis}[2017/01/23 Metropolis color theme]
+\RequirePackage{pgfopts}
+\pgfkeys{
+  /metropolis/color/block/.cd,
+    .is choice,
+    transparent/.code=\metropolis@block@transparent,
+    fill/.code=\metropolis@block@fill,
+}
+\pgfkeys{
+  /metropolis/color/background/.cd,
+    .is choice,
+    dark/.code=\metropolis@colors@dark,
+    light/.code=\metropolis@colors@light,
+}
+\newcommand{\metropolis@color@setdefaults}{
+  \pgfkeys{/metropolis/color/.cd,
+    background=light,
+    block=transparent,
+  }
+}
+\definecolor{mDarkBrown}{HTML}{604c38}
+\definecolor{mDarkTeal}{HTML}{23373b}
+\definecolor{mLightBrown}{HTML}{EB811B}
+\definecolor{mLightGreen}{HTML}{14B03D}
+\newcommand{\metropolis@colors@dark}{
+  \setbeamercolor{normal text}{%
+    fg=black!2,
+    bg=mDarkTeal
+  }
+  \usebeamercolor[fg]{normal text}
+}
+\newcommand{\metropolis@colors@light}{
+  \setbeamercolor{normal text}{%
+    fg=mDarkTeal,
+    bg=black!2
+  }
+}
+\setbeamercolor{alerted text}{%
+  fg=mLightBrown
+}
+\setbeamercolor{example text}{%
+  fg=mLightGreen
+}
+\setbeamercolor{titlelike}{use=normal text, parent=normal text}
+\setbeamercolor{author}{use=normal text, parent=normal text}
+\setbeamercolor{date}{use=normal text, parent=normal text}
+\setbeamercolor{institute}{use=normal text, parent=normal text}
+\setbeamercolor{structure}{use=normal text, fg=normal text.fg}
+\setbeamercolor{palette primary}{%
+  use=normal text,
+  fg=normal text.bg,
+  bg=normal text.fg
+}
+\setbeamercolor{frametitle}{%
+  use=palette primary,
+  parent=palette primary
+}
+\setbeamercolor{progress bar}{%
+  use=alerted text,
+  fg=alerted text.fg,
+  bg=alerted text.fg!50!black!30
+}
+\setbeamercolor{title separator}{
+  use=progress bar,
+  parent=progress bar
+}
+\setbeamercolor{progress bar in head/foot}{%
+  use=progress bar,
+  parent=progress bar
+}
+\setbeamercolor{progress bar in section page}{
+  use=progress bar,
+  parent=progress bar
+}
+\newcommand{\metropolis@block@transparent}{
+  \setbeamercolor{block title}{%
+    use=normal text,
+    fg=normal text.fg,
+    bg=
+  }
+  \setbeamercolor{block body}{
+    bg=
+  }
+}
+\newcommand{\metropolis@block@fill}{
+  \setbeamercolor{block title}{%
+    use=normal text,
+    fg=normal text.fg,
+    bg=normal text.bg!80!fg
+  }
+  \setbeamercolor{block body}{
+    use={block title, normal text},
+    bg=block title.bg!50!normal text.bg
+  }
+}
+\setbeamercolor{block title alerted}{%
+    use={block title, alerted text},
+    bg=block title.bg,
+    fg=alerted text.fg
+}
+\setbeamercolor{block title example}{%
+    use={block title, example text},
+    bg=block title.bg,
+    fg=example text.fg
+}
+\setbeamercolor{block body alerted}{use=block body, parent=block body}
+\setbeamercolor{block body example}{use=block body, parent=block body}
+\setbeamercolor{footnote}{fg=normal text.fg!90}
+\setbeamercolor{footnote mark}{fg=.}
+\setbeamercolor{bibliography entry author}{fg=, bg=}
+\setbeamercolor{bibliography entry title}{fg=, bg=}
+\setbeamercolor{bibliography entry location}{fg=, bg=}
+\setbeamercolor{bibliography entry note}{fg=, bg=}
+\metropolis@color@setdefaults
+\ProcessPgfPackageOptions{/metropolis/color}
+\mode<all>
+\endinput
+%%
+%% End of file `beamercolorthememetropolis.sty'.
diff --git a/template/beamerfontthememetropolis.sty b/template/beamerfontthememetropolis.sty
new file mode 100644 (file)
index 0000000..15cced3
--- /dev/null
@@ -0,0 +1,325 @@
+%%
+%% This is file `beamerfontthememetropolis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% beamerfontthememetropolis.dtx  (with options: `package')
+%% ---------------------------------------------------------------------------
+%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of
+%% contributors can be found at
+%% 
+%%     https://github.com/matze/mtheme/graphs/contributors
+%% 
+%% and the original template was based on the HSRM theme by Benjamin Weiss.
+%% 
+%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
+%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
+%% ---------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerfontthememetropolis}[2017/01/23 Metropolis font theme]
+\RequirePackage{etoolbox}
+\RequirePackage{ifxetex}
+\RequirePackage{ifluatex}
+\RequirePackage{pgfopts}
+\ifboolexpr{bool {xetex} or bool {luatex}}{
+  \@ifpackageloaded{fontspec}{
+    \PassOptionsToPackage{no-math}{fontspec}
+  }{
+    \RequirePackage[no-math]{fontspec}
+  }
+  \newcounter{fontsnotfound}
+  \newcommand{\checkfont}[1]{%
+    \suppressfontnotfounderror=1%
+    \font\x = "#1" at 10pt
+    \selectfont
+    \ifx\x\nullfont%
+      \stepcounter{fontsnotfound}%
+    \fi%
+    \suppressfontnotfounderror=0%
+  }
+
+  \newcommand{\iffontsavailable}[3]{%
+    \setcounter{fontsnotfound}{0}%
+    \expandafter\forcsvlist\expandafter%
+    \checkfont\expandafter{#1}%
+    \ifnum\value{fontsnotfound}=0%
+      #2%
+    \else%
+      #3%
+    \fi%
+  }
+  \iffontsavailable{Fira Sans Light,%
+                    Fira Sans Light Italic,%
+                    Fira Sans,%
+                    Fira Sans Italic}%
+  {%
+    \setsansfont[ItalicFont={Fira Sans Light Italic},%
+                 BoldFont={Fira Sans},%
+                 BoldItalicFont={Fira Sans Italic}]%
+                {Fira Sans Light}%
+  }{%
+    \iffontsavailable{Fira Sans Light OT,%
+                      Fira Sans Light Italic OT,%
+                      Fira Sans OT,%
+                      Fira Sans Italic OT}%
+    {%
+      \setsansfont[ItalicFont={Fira Sans Light Italic OT},%
+                   BoldFont={Fira Sans OT},%
+                   BoldItalicFont={Fira Sans Italic OT}]%
+                  {Fira Sans Light OT}%
+    }{%
+      \PackageWarning{beamerthememetropolis}{%
+        Could not find Fira Sans fonts%
+      }
+    }
+  }
+  \iffontsavailable{Fira Mono, Fira Mono Bold}{%
+    \setmonofont[BoldFont={Fira Mono Medium}]{Fira Mono}%
+  }{%
+    \iffontsavailable{Fira Mono OT, Fira Mono Bold OT}{%
+      \setmonofont[BoldFont={Fira Mono Medium OT}]{Fira Mono OT}%
+    }{%
+      \PackageWarning{beamerthememetropolis}{%
+        Could not find Fira Mono fonts%
+      }
+    }
+  }
+  \AtBeginEnvironment{tabular}{%
+    \addfontfeature{Numbers={Monospaced}}%
+  }
+}{%
+  \PackageWarning{beamerthememetropolis}{%
+    You need to compile with XeLaTeX or LuaLaTeX to use the Fira fonts%
+  }
+}
+\setbeamerfont{title}{size=\Large,%
+                      series=\bfseries}
+\setbeamerfont{author}{size=\small}
+\setbeamerfont{date}{size=\small}
+\setbeamerfont{section title}{size=\Large,%
+                              series=\bfseries}
+\setbeamerfont{block title}{size=\normalsize,%
+                            series=\bfseries}
+\setbeamerfont{block title alerted}{size=\normalsize,%
+                                    series=\bfseries}
+\setbeamerfont*{subtitle}{size=\large}
+\setbeamerfont{frametitle}{size=\large,%
+                           series=\bfseries}
+\setbeamerfont{caption}{size=\small}
+\setbeamerfont{caption name}{series=\bfseries}
+\setbeamerfont{description item}{series=\bfseries}
+\setbeamerfont{page number in head/foot}{size=\scriptsize}
+\setbeamerfont{bibliography entry author}{size=\normalsize,%
+                                          series=\normalfont}
+\setbeamerfont{bibliography entry title}{size=\normalsize,%
+                                         series=\bfseries}
+\setbeamerfont{bibliography entry location}{size=\normalsize,%
+                                            series=\normalfont}
+\setbeamerfont{bibliography entry note}{size=\small,%
+                                        series=\normalfont}
+\setbeamerfont{standout}{size=\Large,%
+                         series=\bfseries}
+\pgfkeys{
+  /metropolis/font/titleformat title/.cd,
+    .is choice,
+    regular/.code={%
+      \let\metropolis@titleformat\@empty%
+      \setbeamerfont{title}{shape=\normalfont}%
+    },
+    smallcaps/.code={%
+      \let\metropolis@titleformat\@empty%
+      \setbeamerfont{title}{shape=\scshape}%
+    },
+    allsmallcaps/.code={%
+      \let\metropolis@titleformat\lowercase%
+      \setbeamerfont{title}{shape=\scshape}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat title=allsmallcaps can lead to problems%
+      }
+    },
+    allcaps/.code={%
+      \let\metropolis@titleformat\uppercase%
+      \setbeamerfont{title}{shape=\normalfont}
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat title=allcaps can lead to problems%
+      }
+    },
+}
+\pgfkeys{
+  /metropolis/font/titleformat subtitle/.cd,
+    .is choice,
+    regular/.code={%
+      \let\metropolis@subtitleformat\@empty%
+      \setbeamerfont{subtitle}{shape=\normalfont}%
+    },
+    smallcaps/.code={%
+      \let\metropolis@subtitleformat\@empty%
+      \setbeamerfont{subtitle}{shape=\scshape}%
+    },
+    allsmallcaps/.code={%
+      \let\metropolis@subtitleformat\lowercase%
+      \setbeamerfont{subtitle}{shape=\scshape}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat subtitle=allsmallcaps can lead to problems%
+      }
+    },
+    allcaps/.code={%
+      \let\metropolis@subtitleformat\uppercase%
+      \setbeamerfont{subtitle}{shape=\normalfont}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat subtitle=allcaps can lead to problems%
+      }
+    },
+}
+\pgfkeys{
+  /metropolis/font/titleformat section/.cd,
+    .is choice,
+    regular/.code={%
+      \let\metropolis@sectiontitleformat\@empty%
+      \setbeamerfont{section title}{shape=\normalfont}%
+    },
+    smallcaps/.code={%
+      \let\metropolis@sectiontitleformat\@empty%
+      \setbeamerfont{section title}{shape=\scshape}%
+    },
+    allsmallcaps/.code={%
+      \let\metropolis@sectiontitleformat\MakeLowercase%
+      \setbeamerfont{section title}{shape=\scshape}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat section=allsmallcaps can lead to problems%
+      }
+    },
+    allcaps/.code={%
+      \let\metropolis@sectiontitleformat\MakeUppercase%
+      \setbeamerfont{section title}{shape=\normalfont}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat section=allcaps can lead to problems%
+      }
+    },
+}
+\pgfkeys{
+  /metropolis/font/titleformat frame/.cd,
+    .is choice,
+    regular/.code={%
+      \let\metropolis@frametitleformat\@empty%
+      \setbeamerfont{frametitle}{shape=\normalfont}%
+    },
+    smallcaps/.code={%
+      \let\metropolis@frametitleformat\@empty%
+      \setbeamerfont{frametitle}{shape=\scshape}%
+    },
+    allsmallcaps/.code={%
+      \let\metropolis@frametitleformat\MakeLowercase%
+      \setbeamerfont{frametitle}{shape=\scshape}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat frame=allsmallcaps can lead to problems%
+      }
+    },
+    allcaps/.code={%
+      \let\metropolis@frametitleformat\MakeUppercase%
+      \setbeamerfont{frametitle}{shape=\normalfont}
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat frame=allcaps can lead to problems%
+      }
+    },
+}
+\pgfkeys{
+  /metropolis/font/.cd,
+  titleformattitle/.code=\pgfkeysalso{titleformat title=#1},
+  titleformatsubtitle/.code=\pgfkeysalso{titleformat subtitle=#1},
+  titleformatsection/.code=\pgfkeysalso{titleformat section=#1},
+  titleformatframe/.code=\pgfkeysalso{titleformat frame=#1},
+}
+\newcommand{\metropolis@font@setdefaults}{
+  \pgfkeys{/metropolis/font/.cd,
+    titleformat title=regular,
+    titleformat subtitle=regular,
+    titleformat section=regular,
+    titleformat frame=regular,
+  }
+}
+\def\metropolis@titleformat#1{#1}
+\def\metropolis@subtitleformat#1{#1}
+\def\metropolis@sectiontitleformat#1{#1}
+\def\metropolis@frametitleformat#1{#1}
+\patchcmd{\beamer@title}%
+  {\def\inserttitle{#2}}%
+  {\def\inserttitle{\metropolis@titleformat{#2}}}%
+  {}%
+  {\PackageError{beamerfontthememetropolis}{Patching title failed}\@ehc}
+\patchcmd{\beamer@subtitle}%
+  {\def\insertsubtitle{#2}}%
+  {\def\insertsubtitle{\metropolis@subtitleformat{#2}}}%
+  {}%
+  {\PackageError{beamerfontthememetropolis}{Patching subtitle failed}\@ehc}
+\patchcmd{\sectionentry}
+  {\def\insertsectionhead{#2}}
+  {\def\insertsectionhead{\metropolis@sectiontitleformat{#2}}}
+  {}
+  {\PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc}
+\@tempswafalse
+\patchcmd{\beamer@section}
+  {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
+  {\edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+    \noexpand\metropolis@sectiontitleformat{\unexpanded{#1}}}}}
+  {\@tempswatrue}
+  {}
+\patchcmd{\beamer@section}
+  {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
+  {\def\insertsectionhead{\hyperlink{Navigation\the\c@page}{%
+    \metropolis@sectiontitleformat{#1}}}}
+  {\@tempswatrue}
+  {}
+\patchcmd{\beamer@section}
+  {\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
+  {\protected@edef\insertsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+    \noexpand\metropolis@sectiontitleformat{#1}}}}
+  {\@tempswatrue}
+  {}
+\if@tempswa\else
+  \PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc
+\fi
+\@tempswafalse
+\patchcmd{\beamer@subsection}
+  {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{\unexpanded{#1}}}}
+  {\edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+    \noexpand\metropolis@sectiontitleformat{\unexpanded{#1}}}}}
+  {\@tempswatrue}
+  {}
+\patchcmd{\beamer@subsection}
+  {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{#1}}}
+  {\def\insertsubsectionhead{\hyperlink{Navigation\the\c@page}{%
+    \metropolis@sectiontitleformat{#1}}}}
+  {\@tempswatrue}
+  {}
+\patchcmd{\beamer@subsection}
+  {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{#1}}}
+  {\protected@edef\insertsubsectionhead{\noexpand\hyperlink{Navigation\the\c@page}{%
+    \noexpand\metropolis@sectiontitleformat{#1}}}}
+  {\@tempswatrue}
+  {}
+\if@tempswa\else
+  \PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc
+\fi
+\patchcmd{\beamer@@frametitle}
+  {{%
+      \gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space%
+      \usebeamertemplate*{frametitle continuation}\fi}}%
+    \gdef\beamer@frametitle{#2}%
+    \gdef\beamer@shortframetitle{#1}%
+    }}
+  {{%
+      \gdef\insertframetitle{{\metropolis@frametitleformat{#2}\ifnum%
+      \beamer@autobreakcount>0\relax{}\space%
+      \usebeamertemplate*{frametitle continuation}\fi}}%
+    \gdef\beamer@frametitle{#2}%
+    \gdef\beamer@shortframetitle{#1}%
+    }}
+  {}
+  {\PackageError{beamerfontthememetropolis}{Patching frame title failed}\@ehc}
+\metropolis@font@setdefaults
+\ProcessPgfPackageOptions{/metropolis/font}
+\endinput
+%%
+%% End of file `beamerfontthememetropolis.sty'.
diff --git a/template/beamerinnerthemefancy.sty b/template/beamerinnerthemefancy.sty
deleted file mode 100644 (file)
index fe73012..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-% Copyright 2007 by Marco Barisione
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-
-\mode<presentation>
-
-% Use alternative title page style.
-\DeclareOptionBeamer{alternativetitlepage}[true]{\def\beamer@fancy@alternativetitlepage{#1}}
-
-% Logo to use in the alternative title page.
-\def\beamer@fancy@titlepagelogo{}
-\DeclareOptionBeamer{titlepagelogo}{\def\beamer@fancy@titlepagelogo{#1}}
-
-% Bullet shape.
-\DeclareOptionBeamer{bullet}{\def\beamer@fancy@bullet{#1}}
-
-\ExecuteOptionsBeamer{alternativetitlepage=false,bullet=square}
-\ProcessOptionsBeamer
-
-% Colors.
-\setbeamercolor*{lineup}{parent=palette primary}
-\setbeamercolor*{linemid}{parent=palette secondary}
-\setbeamercolor*{linebottom}{parent=palette tertiary}
-\setbeamercolor*{title page header}{parent=palette quaternary}
-
-% Lengths.
-\newlength{\beamer@fancy@lineup}
-\setlength{\beamer@fancy@lineup}{.025\paperheight}
-\newlength{\beamer@fancy@linemid}
-\setlength{\beamer@fancy@linemid}{.015\paperheight}
-\newlength{\beamer@fancy@linebottom}
-\setlength{\beamer@fancy@linebottom}{.01\paperheight}
-
-% Margins.
-\newlength{\beamer@fancy@normalmargin}
-\setlength{\beamer@fancy@normalmargin}{.06\paperwidth}
-\setbeamersize{text margin left=\beamer@fancy@normalmargin}
-\setbeamersize{text margin right=\beamer@fancy@normalmargin}
-\setlength\leftmargini{.6\beamer@fancy@normalmargin}
-\setlength\leftmarginii{.6\beamer@fancy@normalmargin}
-\setlength\leftmarginiii{.6\beamer@fancy@normalmargin}
-
-% Normal title page.
-\defbeamertemplate*{title page normal}{fancy theme}[1][]
-{
-  \vbox{}
-  \vfill
-  \begin{centering}
-    \begin{beamercolorbox}[wd=\paperwidth,sep=8pt,center,#1]{title page header}
-      \usebeamerfont{title}\inserttitle\par%
-      \ifx\insertsubtitle\@empty%
-      \else%
-        \vskip0.25em%
-        {\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par}%
-      \fi%     
-    \end{beamercolorbox}%
-    \vskip1em\par
-    \begin{beamercolorbox}[sep=8pt,center,#1]{author}
-      \usebeamerfont{author}\insertauthor
-    \end{beamercolorbox}
-    \begin{beamercolorbox}[sep=8pt,center,#1]{institute}
-      \usebeamerfont{institute}\insertinstitute
-    \end{beamercolorbox}
-    \begin{beamercolorbox}[sep=8pt,center,#1]{date}
-      \usebeamerfont{date}\insertdate
-    \end{beamercolorbox}\vskip0.5em
-    {\usebeamercolor[fg]{titlegraphic}\inserttitlegraphic\par}
-  \end{centering}
-  \vfill
-}
-
-% Alternative title page, you should use this in a frame with the [plain]
-% option.
-\defbeamertemplate*{title page alternative}{fancy theme}[1][]
-{
-  {\parskip0pt\offinterlineskip%
-  \hbox{\hskip-\Gm@lmargin\hbox{\vbox{%
-  \@tempdima=\textwidth\textwidth=\paperwidth\hsize=\textwidth\def\\{,}\vbox{}\vskip-1.5ex%
-    % Title.
-    \begin{beamercolorbox}[wd=\paperwidth,ht=.4\paperheight,center,#1]{title page header}
-      \usebeamerfont{title}\inserttitle\par%
-      \ifx\insertsubtitle\@empty%
-      \else%
-        \vskip0.25em%
-        {\usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}\insertsubtitle\par}%
-      \fi%     
-      \vspace{.125\paperheight}%
-    \end{beamercolorbox}%
-    \vbox{}\vskip-\beamer@fancy@lineup%
-    \vbox{}\vskip-\beamer@fancy@linemid%
-    % First line.
-    \hbox{%
-    \begin{beamercolorbox}[wd=.2\paperwidth,ht=\beamer@fancy@lineup,dp=0pt]{}%
-    \end{beamercolorbox}%
-    \begin{beamercolorbox}[wd=.8\paperwidth,ht=\beamer@fancy@lineup,dp=0pt]{lineup}%
-    \end{beamercolorbox}%
-    }%
-    \vbox{}\vskip0ex%
-    % Second line.
-    \hbox{%
-    \begin{beamercolorbox}[wd=.1\paperwidth,ht=\beamer@fancy@linemid,dp=0pt]{}%
-    \end{beamercolorbox}%
-    \begin{beamercolorbox}[wd=.9\paperwidth,ht=\beamer@fancy@linemid,dp=0pt]{linemid}%
-    \end{beamercolorbox}%
-    }%
-    % Third line.
-    \hbox{%
-    \begin{beamercolorbox}[wd=.5\paperwidth,ht=\beamer@fancy@linebottom,dp=0pt]{}%
-    \end{beamercolorbox}%
-    \begin{beamercolorbox}[wd=.5\paperwidth,ht=\beamer@fancy@linebottom,dp=0pt]{linebottom}%
-    \end{beamercolorbox}%
-    }%
-    \vskip0pt%
-  }}%
-  \hskip-\Gm@rmargin%
-  }}\hfil%
-  %
-  \begin{columns}
-      \ifx\beamer@fancy@titlepagelogo\@empty%
-          \column{\textwidth}
-      \else
-          \column{.5\textwidth}
-              % Logo.
-              \begin{centering}
-                  \vbox{}\vspace{-2em}\vfill
-                  \includegraphics[height=.4\paperheight]{\beamer@fancy@titlepagelogo}
-                  \vfill
-              \end{centering}
-          \column{.5\textwidth}
-       \fi
-          % Authors, institute and date
-          \vskip1em\par
-          \begin{beamercolorbox}[sep=8pt,center,#1]{author}
-            \usebeamerfont{author}\insertauthor
-          \end{beamercolorbox}
-          \begin{beamercolorbox}[sep=8pt,center,#1]{institute}
-            \usebeamerfont{institute}\insertinstitute
-          \end{beamercolorbox}
-          \begin{beamercolorbox}[sep=8pt,center,#1]{date}
-            \usebeamerfont{date}\insertdate
-          \end{beamercolorbox}\vskip0.5em
-          {\usebeamercolor[fg]{titlegraphic}\inserttitlegraphic\par}
-  \end{columns}
-}
-
-\defbeamertemplate*{title page}{fancy}[1][]
-{
-  \def\beamer@fancy@truetext{true}%
-  \ifx\beamer@fancy@alternativetitlepage\beamer@fancy@truetext%
-    \usebeamertemplate{title page alternative}%
-  \else%
-    \usebeamertemplate{title page normal}%
-  \fi%
-}
-
-% Items.
-\defbeamertemplate{itemize item}{squarealt}%
-{\tiny\raise.5ex\hbox{\donotcoloroutermaths$\blacksquare$}}
-\defbeamertemplate{itemize subitem}{squarealt}%
-{\tiny\raise.4ex\hbox{\donotcoloroutermaths$\square$}}
-\defbeamertemplate{itemize subsubitem}{squarealt}%
-{\tiny\raise.3ex\hbox{\donotcoloroutermaths$\blacksquare$}}
-
-\defbeamertemplate{itemize item}{circlealt}%
-{\small\raise.2ex\hbox{\donotcoloroutermaths$\bullet$}}
-\defbeamertemplate{itemize subitem}{circlealt}%
-{\small\raise.1ex\hbox{\donotcoloroutermaths$\circ$}}
-\defbeamertemplate{itemize subsubitem}{circlealt}%
-{\scriptsize\raise.1ex\hbox{\donotcoloroutermaths$\bullet$}}
-
-\def\circletext{circle}
-\ifx\beamer@fancy@bullet\circletext
-  \setbeamertemplate{items}[circlealt]
-\else
-  \setbeamertemplate{items}[squarealt]
-\fi
-
-\mode<all>
-
diff --git a/template/beamerinnerthememetropolis.sty b/template/beamerinnerthememetropolis.sty
new file mode 100644 (file)
index 0000000..ed1696c
--- /dev/null
@@ -0,0 +1,293 @@
+%%
+%% This is file `beamerinnerthememetropolis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% beamerinnerthememetropolis.dtx  (with options: `package')
+%% ---------------------------------------------------------------------------
+%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of
+%% contributors can be found at
+%% 
+%%     https://github.com/matze/mtheme/graphs/contributors
+%% 
+%% and the original template was based on the HSRM theme by Benjamin Weiss.
+%% 
+%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
+%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
+%% ---------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerinnerthememetropolis}[2017/01/23 Metropolis inner theme]
+\RequirePackage{etoolbox}
+\RequirePackage{keyval}
+\RequirePackage{calc}
+\RequirePackage{pgfopts}
+\RequirePackage{tikz}
+\pgfkeys{
+  /metropolis/inner/sectionpage/.cd,
+    .is choice,
+    none/.code=\metropolis@disablesectionpage,
+    simple/.code={\metropolis@enablesectionpage
+                  \setbeamertemplate{section page}[simple]},
+    progressbar/.code={\metropolis@enablesectionpage
+                       \setbeamertemplate{section page}[progressbar]},
+}
+\pgfkeys{
+  /metropolis/inner/subsectionpage/.cd,
+    .is choice,
+    none/.code=\metropolis@disablesubsectionpage,
+    simple/.code={\metropolis@enablesubsectionpage
+                  \setbeamertemplate{section page}[simple]},
+    progressbar/.code={\metropolis@enablesubsectionpage
+                       \setbeamertemplate{section page}[progressbar]},
+}
+\newcommand{\metropolis@inner@setdefaults}{
+  \pgfkeys{/metropolis/inner/.cd,
+    sectionpage=progressbar,
+    subsectionpage=none
+  }
+}
+\setbeamertemplate{title page}{
+  \begin{minipage}[b][\paperheight]{\textwidth}
+    \ifx\inserttitlegraphic\@empty\else\usebeamertemplate*{title graphic}\fi
+    \vfill%
+    \ifx\inserttitle\@empty\else\usebeamertemplate*{title}\fi
+    \ifx\insertsubtitle\@empty\else\usebeamertemplate*{subtitle}\fi
+    \usebeamertemplate*{title separator}
+    \ifx\beamer@shortauthor\@empty\else\usebeamertemplate*{author}\fi
+    \ifx\insertdate\@empty\else\usebeamertemplate*{date}\fi
+    \ifx\insertinstitute\@empty\else\usebeamertemplate*{institute}\fi
+    \vfill
+    \vspace*{1mm}
+  \end{minipage}
+}
+\def\maketitle{%
+  \ifbeamer@inframe
+    \titlepage
+  \else
+    \frame[plain,noframenumbering]{\titlepage}
+  \fi
+}
+\def\titlepage{%
+  \usebeamertemplate{title page}
+}
+\setbeamertemplate{title graphic}{
+  \vbox to 0pt {
+    \vspace*{2em}
+    \inserttitlegraphic%
+  }%
+  \nointerlineskip%
+}
+\setbeamertemplate{title}{
+  \raggedright%
+  \linespread{1.0}%
+  \inserttitle%
+  \par%
+  \vspace*{0.5em}
+}
+\setbeamertemplate{subtitle}{
+  \raggedright%
+  \insertsubtitle%
+  \par%
+  \vspace*{0.5em}
+}
+\newlength{\metropolis@titleseparator@linewidth}
+\setlength{\metropolis@titleseparator@linewidth}{0.4pt}
+\setbeamertemplate{title separator}{
+  \tikzexternaldisable%
+  \begin{tikzpicture}
+    \fill[fg] (0,0) rectangle (\textwidth, \metropolis@titleseparator@linewidth);
+  \end{tikzpicture}%
+  \tikzexternalenable%
+  \par%
+}
+\setbeamertemplate{author}{
+  \vspace*{2em}
+  \insertauthor%
+  \par%
+  \vspace*{0.25em}
+}
+\setbeamertemplate{date}{
+  \insertdate%
+  \par%
+}
+\setbeamertemplate{institute}{
+  \vspace*{3mm}
+  \insertinstitute%
+  \par%
+}
+\defbeamertemplate{section page}{simple}{
+  \begin{center}
+    \usebeamercolor[fg]{section title}
+    \usebeamerfont{section title}
+    \insertsectionhead\par
+    \ifx\insertsubsectionhead\@empty\else
+      \usebeamercolor[fg]{subsection title}
+      \usebeamerfont{subsection title}
+      \insertsubsectionhead
+    \fi
+  \end{center}
+}
+\defbeamertemplate{section page}{progressbar}{
+  \centering
+  \begin{minipage}{22em}
+    \raggedright
+    \usebeamercolor[fg]{section title}
+    \usebeamerfont{section title}
+    \insertsectionhead\\[-1ex]
+    \usebeamertemplate*{progress bar in section page}
+    \par
+    \ifx\insertsubsectionhead\@empty\else%
+      \usebeamercolor[fg]{subsection title}%
+      \usebeamerfont{subsection title}%
+      \insertsubsectionhead
+    \fi
+  \end{minipage}
+  \par
+  \vspace{\baselineskip}
+}
+\newcommand{\metropolis@disablesectionpage}{
+  \AtBeginSection{
+    % intentionally empty
+  }
+}
+\newcommand{\metropolis@enablesectionpage}{
+  \AtBeginSection{
+    \ifbeamer@inframe
+      \sectionpage
+    \else
+      \frame[plain,c,noframenumbering]{\sectionpage}
+    \fi
+  }
+}
+\setbeamertemplate{subsection page}{%
+  \usebeamertemplate*{section page}
+}
+\newcommand{\metropolis@disablesubsectionpage}{
+  \AtBeginSubsection{
+    % intentionally empty
+  }
+}
+\newcommand{\metropolis@enablesubsectionpage}{
+  \AtBeginSubsection{
+    \ifbeamer@inframe
+      \subsectionpage
+    \else
+      \frame[plain,c,noframenumbering]{\subsectionpage}
+    \fi
+  }
+}
+\newlength{\metropolis@progressonsectionpage}
+\newlength{\metropolis@progressonsectionpage@linewidth}
+\setlength{\metropolis@progressonsectionpage@linewidth}{0.4pt}
+\setbeamertemplate{progress bar in section page}{
+  \setlength{\metropolis@progressonsectionpage}{%
+    \textwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
+  }%
+  \tikzexternaldisable%
+  \begin{tikzpicture}
+    \fill[bg] (0,0) rectangle (\textwidth, \metropolis@progressonsectionpage@linewidth);
+    \fill[fg] (0,0) rectangle (\metropolis@progressonsectionpage, \metropolis@progressonsectionpage@linewidth);
+  \end{tikzpicture}%
+  \tikzexternalenable%
+}
+\def\inserttotalframenumber{100}
+\newlength{\metropolis@blocksep}
+\newlength{\metropolis@blockadjust}
+\setlength{\metropolis@blocksep}{0.75ex}
+\setlength{\metropolis@blockadjust}{0.25ex}
+\providecommand{\metropolis@strut}{%
+  \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz()}%
+}
+\newcommand{\metropolis@block}[1]{
+  \par\vskip\medskipamount%
+  \setlength{\parskip}{0pt}
+  \ifbeamercolorempty[bg]{block title#1}{%
+    \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}}{%
+  \ifbeamercolorempty[bg]{block title}{%
+    \begin{beamercolorbox}[rightskip=0pt plus 4em]{block title#1}%
+  }%
+  {%
+    \begin{beamercolorbox}[
+      sep=\dimexpr\metropolis@blocksep-\metropolis@blockadjust\relax,
+      leftskip=\metropolis@blockadjust,
+      rightskip=\dimexpr\metropolis@blockadjust plus 4em\relax
+    ]{block title#1}%
+  }}%
+      \usebeamerfont*{block title#1}%
+      \metropolis@strut%
+      \insertblocktitle%
+      \metropolis@strut%
+  \end{beamercolorbox}%
+  \nointerlineskip%
+  \ifbeamercolorempty[bg]{block body#1}{%
+    \begin{beamercolorbox}[vmode]{block body#1}}{
+  \ifbeamercolorempty[bg]{block body}{%
+    \begin{beamercolorbox}[vmode]{block body#1}%
+  }{%
+    \begin{beamercolorbox}[sep=\metropolis@blocksep, vmode]{block body#1}%
+    \vspace{-\metropolis@parskip}
+  }}%
+      \usebeamerfont{block body#1}%
+      \setlength{\parskip}{\metropolis@parskip}%
+}
+\setbeamertemplate{block begin}{\metropolis@block{}}
+\setbeamertemplate{block alerted begin}{\metropolis@block{ alerted}}
+\setbeamertemplate{block example begin}{\metropolis@block{ example}}
+\setbeamertemplate{block end}{\end{beamercolorbox}\vspace*{0.2ex}}
+\setbeamertemplate{block alerted end}{\end{beamercolorbox}\vspace*{0.2ex}}
+\setbeamertemplate{block example end}{\end{beamercolorbox}\vspace*{0.2ex}}
+\setbeamertemplate{itemize items}{\textbullet}
+\setbeamertemplate{caption label separator}{: }
+\setbeamertemplate{caption}[numbered]
+\setbeamertemplate{footnote}{%
+  \parindent 0em\noindent%
+  \raggedright
+  \usebeamercolor{footnote}\hbox to 0.8em{\hfil\insertfootnotemark}\insertfootnotetext\par%
+}
+\newlength{\metropolis@parskip}
+\setlength{\metropolis@parskip}{0.5em}
+\setlength{\parskip}{\metropolis@parskip}
+\linespread{1.15}
+\define@key{beamerframe}{c}[true]{% centered
+  \beamer@frametopskip=0pt plus 1fill\relax%
+  \beamer@framebottomskip=0pt plus 1fill\relax%
+  \beamer@frametopskipautobreak=0pt plus .4\paperheight\relax%
+  \beamer@framebottomskipautobreak=0pt plus .6\paperheight\relax%
+  \def\beamer@initfirstlineunskip{}%
+}
+\providebool{metropolis@standout}
+\define@key{beamerframe}{standout}[true]{%
+  \booltrue{metropolis@standout}
+  \begingroup
+    \setkeys{beamerframe}{c}
+    \setkeys{beamerframe}{noframenumbering}
+    \ifbeamercolorempty[bg]{palette primary}{
+      \setbeamercolor{background canvas}{
+        use=palette primary,
+        bg=-palette primary.fg
+      }
+    }{
+      \setbeamercolor{background canvas}{
+        use=palette primary,
+        bg=palette primary.bg
+      }
+    }
+    \setbeamercolor{local structure}{
+      fg=palette primary.fg
+    }
+    \centering
+    \usebeamercolor[fg]{palette primary}
+    \usebeamerfont{standout}
+}
+  \apptocmd{\beamer@reseteecodes}{%
+    \ifbool{metropolis@standout}{
+      \endgroup
+      \boolfalse{metropolis@standout}
+    }{}
+  }{}{}
+\metropolis@inner@setdefaults
+\ProcessPgfPackageOptions{/metropolis/inner}
+\endinput
+%%
+%% End of file `beamerinnerthememetropolis.sty'.
diff --git a/template/beamerouterthemedecolines.sty b/template/beamerouterthemedecolines.sty
deleted file mode 100644 (file)
index 6979f88..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-% Copyright 2007 by Marco Barisione
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-
-\mode<presentation>
-
-% String used between the current page and the total page count.
-\def\beamer@decolines@pageofpages{/}
-\DeclareOptionBeamer{pageofpages}{\def\beamer@decolines@pageofpages{#1}}
-
-% Show a line below the frame title.
-\DeclareOptionBeamer{titleline}[true]{\def\beamer@decolines@titleline{#1}}
-
-% Image used for the watermark.
-\def\beamer@decolines@watermarkorig{}
-\DeclareOptionBeamer{watermark}{\def\beamer@decolines@watermarkorig{#1}}
-
-% Height of the watermark.
-\def\beamer@decolines@watermarkheight{100px}
-\DeclareOptionBeamer{watermarkheight}{\def\beamer@decolines@watermarkheight{#1}}
-
-% The original image height is watermarkheightmult * watermarkheight.
-\def\beamer@decolines@watermarkheightmult{1}
-\DeclareOptionBeamer{watermarkheightmult}{\def\beamer@decolines@watermarkheightmult{#1}}
-
-\ExecuteOptionsBeamer{titleline=false}
-\ProcessOptionsBeamer
-
-% Enable/disable the watermark.
-\def\watermarkon{%
-  \def\beamer@decolines@watermark{\beamer@decolines@watermarkorig}%
-}
-\def\watermarkoff{\def\beamer@decolines@watermark{}}
-
-% Initially enable the watermark.
-\watermarkon
-
-% Colors.
-\setbeamercolor*{lineup}{parent=palette primary}
-\setbeamercolor*{linemid}{parent=palette secondary}
-\setbeamercolor*{linebottom}{parent=palette tertiary}
-\setbeamercolor*{page header}{parent=titlelike}
-
-% Lengths
-\newlength{\headerheight}
-\setlength{\headerheight}{.045\paperheight}
-\newlength{\beamer@decolines@lineup}
-\setlength{\beamer@decolines@lineup}{.018\paperheight}
-\newlength{\beamer@decolines@linemid}
-\setlength{\beamer@decolines@linemid}{.015\paperheight}
-\newlength{\beamer@decolines@linebottom}
-\setlength{\beamer@decolines@linebottom}{.01\paperheight}
-
-% The height of the watermark part below the 3 bottom lines.
-\newlength{\beamer@decolines@watermarkheightbottom}
-\addtolength{\beamer@decolines@watermarkheightbottom}{\beamer@decolines@lineup}
-\addtolength{\beamer@decolines@watermarkheightbottom}{\beamer@decolines@linemid}
-\addtolength{\beamer@decolines@watermarkheightbottom}{\beamer@decolines@linebottom}
-
-% The height of the watermark part over the 3 bottom lines before shrinking.
-\newlength{\beamer@decolines@watermarkheightupperorig}
-\setlength{\beamer@decolines@watermarkheightupperorig}{\beamer@decolines@watermarkheight}
-\addtolength{\beamer@decolines@watermarkheightupperorig}{-\beamer@decolines@watermarkheightbottom}
-\multiply\beamer@decolines@watermarkheightupperorig by \beamer@decolines@watermarkheightmult
-
-% Footer.
-\defbeamertemplate*{footline}{decolines theme}
-{
-  \leavevmode%
-  % First line.
-  \hbox{%
-  \begin{beamercolorbox}[wd=.2\paperwidth,ht=\beamer@decolines@lineup,dp=1.5pt]{}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=.8\paperwidth,ht=\beamer@decolines@lineup,dp=1.5pt,right]{lineup}%
-    \usebeamerfont{palette primary}\insertframenumber{} \beamer@decolines@pageofpages{} \inserttotalframenumber%
-  \end{beamercolorbox}%
-  } %
-  % Second line.
-  \hbox{%
-  \begin{beamercolorbox}[wd=\paperwidth,ht=\beamer@decolines@linemid,dp=0pt]{linemid}%
-  \end{beamercolorbox}%
-  } %
-  % Third line.
-  \hbox{%
-  \begin{beamercolorbox}[wd=.1\paperwidth,ht=\beamer@decolines@linebottom,dp=0pt]{}%
-  \end{beamercolorbox}%
-  \begin{beamercolorbox}[wd=.9\paperwidth,ht=\beamer@decolines@linebottom,dp=0pt]{linebottom}%
-  \end{beamercolorbox}%
-  }%
-  % This seems to fix some alignment problems with the watermark. It has to be
-  % always applied if you do not want to see the footer moving up and down when
-  % moving from a page with watermark to a page without or vice versa.
-  \vskip-.5px%
-  % Watermark.
-  \if\beamer@decolines@watermark\@empty\else%
-    \vskip-\beamer@decolines@watermarkheightbottom%
-    \llap{\includegraphics[height=\beamer@decolines@watermarkheightbottom,clip=true,%
-      trim=0pt 0pt 0pt \beamer@decolines@watermarkheightupperorig]{\beamer@decolines@watermark}\hskip-\paperwidth}%
-  \fi%
-}
-
-\defbeamertemplate*{headline}{decolines theme}{}
-%
-%{
-%  \leavevmode%
-%  \hbox{%
-%  \begin{beamercolorbox}[wd=\paperwidth,ht=\headerheight,dp=0pt]{page header}%
-%  \end{beamercolorbox}%
-%  } %
-%  \vskip0pt%
-%}
-
-\defbeamertemplate*{frametitle}{decolines theme}[1][left]
-{
-  \ifbeamercolorempty[bg]{frametitle}{}{\nointerlineskip}%
-  \@tempdima=\textwidth%
-  \advance\@tempdima by\beamer@leftmargin%
-  \advance\@tempdima by\beamer@rightmargin%
-  \vbox{}\vskip-.5\beamer@leftmargin%
-  \begin{beamercolorbox}[sep=.5\beamer@leftmargin,#1,wd=\the\@tempdima]{page header}
-    \usebeamerfont{frametitle}\usebeamercolor[bg]{framesubtitle}%
-    \vbox{}\vskip0ex%
-    \if@tempswa\else\csname beamer@fte#1\endcsname\fi%
-    \strut\insertframetitle\strut\par%
-    {%
-      \ifx\insertframesubtitle\@empty%
-      \else%
-      {\usebeamerfont{framesubtitle}\usebeamercolor[bg]{framesubtitle}\insertframesubtitle\strut\par}%
-      \fi
-    }%
-    \vskip-1ex%
-    \if@tempswa\else\vskip-\beamer@leftmargin\fi
-  \end{beamercolorbox}%
-  \def\beamer@decolines@truetext{true}%
-  \ifx\beamer@decolines@titleline\beamer@decolines@truetext%
-    \vskip-.5\beamer@leftmargin%
-    \begin{beamercolorbox}[wd=\textwidth,ht=.1ex,dp=0ex]{linemid}%
-    \end{beamercolorbox}%
-  \fi
-}
-
-% Frame title continuations, default
-\defbeamertemplate*{frametitle continuation}{decolines theme}{(\insertcontinuationcount)}
-
-\defbeamertemplate*{sidebar right}{decolines theme}
-{
-  \vskip.1\beamer@leftmargin%
-  \llap{\insertlogo\hskip.5\beamer@leftmargin}%
-  \vfill%
-  \if\beamer@decolines@watermark\@empty\else%
-  \llap{\includegraphics[height=\beamer@decolines@watermarkheight]{\beamer@decolines@watermark}}%
-  \vskip-\beamer@decolines@watermarkheightbottom%
-  \fi
-}
-
-\mode
-<all>
diff --git a/template/beamerouterthememetropolis.sty b/template/beamerouterthememetropolis.sty
new file mode 100644 (file)
index 0000000..928a122
--- /dev/null
@@ -0,0 +1,137 @@
+%%
+%% This is file `beamerouterthememetropolis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% beamerouterthememetropolis.dtx  (with options: `package')
+%% ---------------------------------------------------------------------------
+%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of
+%% contributors can be found at
+%% 
+%%     https://github.com/matze/mtheme/graphs/contributors
+%% 
+%% and the original template was based on the HSRM theme by Benjamin Weiss.
+%% 
+%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
+%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
+%% ---------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerouterthememetropolis}[2017/01/23 Metropolis outer theme]
+\RequirePackage{etoolbox}
+\RequirePackage{calc}
+\RequirePackage{pgfopts}
+\pgfkeys{
+  /metropolis/outer/numbering/.cd,
+    .is choice,
+    none/.code=\setbeamertemplate{frame numbering}[none],
+    counter/.code=\setbeamertemplate{frame numbering}[counter],
+    fraction/.code=\setbeamertemplate{frame numbering}[fraction],
+}
+\pgfkeys{
+  /metropolis/outer/progressbar/.cd,
+    .is choice,
+    none/.code={%
+      \setbeamertemplate{headline}[plain]
+      \setbeamertemplate{frametitle}[plain]
+      \setbeamertemplate{footline}[plain]
+    },
+    head/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{headline}{}{%
+        \usebeamertemplate*{progress bar in head/foot}
+      }
+    },
+    frametitle/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{frametitle}{}{%
+        \usebeamertemplate*{progress bar in head/foot}
+      }
+    },
+    foot/.code={\pgfkeys{/metropolis/outer/progressbar=none}
+      \addtobeamertemplate{footline}{}{%
+        \usebeamertemplate*{progress bar in head/foot}%
+      }
+    },
+}
+\newcommand{\metropolis@outer@setdefaults}{
+  \pgfkeys{/metropolis/outer/.cd,
+    numbering=counter,
+    progressbar=none,
+  }
+}
+\setbeamertemplate{navigation symbols}{}
+\defbeamertemplate{frame footer}{none}{}
+\defbeamertemplate{frame footer}{custom}[1]{ #1 }
+\defbeamertemplate{frame numbering}{none}{}
+\defbeamertemplate{frame numbering}{counter}{\insertframenumber}
+\defbeamertemplate{frame numbering}{fraction}{
+  \insertframenumber/\inserttotalframenumber
+}
+\defbeamertemplate{headline}{plain}{}
+\defbeamertemplate{footline}{plain}{%
+  \begin{beamercolorbox}[wd=\textwidth, sep=3ex]{footline}%
+    \usebeamerfont{page number in head/foot}%
+    \usebeamertemplate*{frame footer}
+    \hfill%
+    \usebeamertemplate*{frame numbering}
+  \end{beamercolorbox}%
+}
+\newlength{\metropolis@frametitle@padding}
+\setlength{\metropolis@frametitle@padding}{2.2ex}
+\newcommand{\metropolis@frametitlestrut@start}{
+  \rule{0pt}{\metropolis@frametitle@padding +%
+    \totalheightof{%
+      \ifcsdef{metropolis@frametitleformat}{\metropolis@frametitleformat X}{X}%
+    }%
+  }%
+}
+\newcommand{\metropolis@frametitlestrut@end}{
+  \rule[-\metropolis@frametitle@padding]{0pt}{\metropolis@frametitle@padding}
+}
+\defbeamertemplate{frametitle}{plain}{%
+  \nointerlineskip%
+  \begin{beamercolorbox}[%
+      wd=\paperwidth,%
+      sep=0pt,%
+      leftskip=\metropolis@frametitle@padding,%
+      rightskip=\metropolis@frametitle@padding,%
+    ]{frametitle}%
+  \metropolis@frametitlestrut@start%
+  \insertframetitle%
+  \nolinebreak%
+  \metropolis@frametitlestrut@end%
+  \end{beamercolorbox}%
+}
+\setbeamertemplate{frametitle continuation}{%
+  \usebeamerfont{frametitle}
+  \romannumeral \insertcontinuationcount
+}
+\newlength{\metropolis@progressinheadfoot}
+\newlength{\metropolis@progressinheadfoot@linewidth}
+\setlength{\metropolis@progressinheadfoot@linewidth}{0.4pt}
+\setbeamertemplate{progress bar in head/foot}{
+  \nointerlineskip
+  \setlength{\metropolis@progressinheadfoot}{%
+    \paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}%
+  }%
+  \begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot}
+    \tikzexternaldisable%
+    \begin{tikzpicture}
+      \fill[bg] (0,0) rectangle (\paperwidth, \metropolis@progressinheadfoot@linewidth);
+      \fill[fg] (0,0) rectangle (\metropolis@progressinheadfoot, \metropolis@progressinheadfoot@linewidth);
+    \end{tikzpicture}%
+    \tikzexternalenable%
+  \end{beamercolorbox}
+}
+\AtBeginDocument{%
+  \apptocmd{\appendix}{%
+    \pgfkeys{%
+      /metropolis/outer/.cd,
+      numbering=none,
+      progressbar=none}
+    }{}{}
+}
+\metropolis@outer@setdefaults
+\ProcessPgfPackageOptions{/metropolis/outer}
+\endinput
+%%
+%% End of file `beamerouterthememetropolis.sty'.
diff --git a/template/beamerthemeTorino.sty b/template/beamerthemeTorino.sty
deleted file mode 100644 (file)
index 5756c97..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-% Copyright 2007 by Marco Barisione
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-
-\mode<presentation>
-
-\DeclareOptionBeamer{alternativetitlepage}[true]{\PassOptionsToPackage{alternativetitlepage=#1}{beamerinnerthemefancy}}
-\DeclareOptionBeamer{titlepagelogo}{\PassOptionsToPackage{titlepagelogo=#1}{beamerinnerthemefancy}}
-\DeclareOptionBeamer{bullet}{\PassOptionsToPackage{bullet=#1}{beamerinnerthemefancy}}
-\DeclareOptionBeamer{pageofpages}{\PassOptionsToPackage{pageofpages=#1}{beamerouterthemedecolines}}
-\DeclareOptionBeamer{titleline}[true]{\PassOptionsToPackage{titleline=#1}{beamerouterthemedecolines}}
-\DeclareOptionBeamer{watermark}{\PassOptionsToPackage{watermark=#1}{beamerouterthemedecolines}}
-\DeclareOptionBeamer{watermarkheight}{\PassOptionsToPackage{watermarkheight=#1}{beamerouterthemedecolines}}
-\DeclareOptionBeamer{watermarkheightmult}{\PassOptionsToPackage{watermarkheightmult=#1}{beamerouterthemedecolines}}
-
-\ProcessOptionsBeamer
-
-\useinnertheme{fancy}
-\useoutertheme{decolines}
-\usecolortheme{mako}
-
-\mode
-<all>
diff --git a/template/beamerthememetropolis.sty b/template/beamerthememetropolis.sty
new file mode 100644 (file)
index 0000000..9fbe86e
--- /dev/null
@@ -0,0 +1,107 @@
+%%
+%% This is file `beamerthememetropolis.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% beamerthememetropolis.dtx  (with options: `package')
+%% ---------------------------------------------------------------------------
+%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of
+%% contributors can be found at
+%% 
+%%     https://github.com/matze/mtheme/graphs/contributors
+%% 
+%% and the original template was based on the HSRM theme by Benjamin Weiss.
+%% 
+%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
+%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
+%% ---------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerthememetropolis}
+  [2017/01/23 v1.2 Metropolis Beamer theme]
+\RequirePackage{etoolbox}
+\RequirePackage{pgfopts}
+\pgfkeys{/metropolis/.cd,
+  .search also={
+    /metropolis/inner,
+    /metropolis/outer,
+    /metropolis/color,
+    /metropolis/font,
+  }
+}
+\pgfkeys{
+  /metropolis/titleformat plain/.cd,
+    .is choice,
+    regular/.code={%
+      \let\metropolis@plaintitleformat\@empty%
+      \setbeamerfont{standout}{shape=\normalfont}%
+    },
+    smallcaps/.code={%
+      \let\metropolis@plaintitleformat\@empty%
+      \setbeamerfont{standout}{shape=\scshape}%
+    },
+    allsmallcaps/.code={%
+      \let\metropolis@plaintitleformat\MakeLowercase%
+      \setbeamerfont{standout}{shape=\scshape}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat plain=allsmallcaps can lead to problems%
+      }
+    },
+    allcaps/.code={%
+      \let\metropolis@plaintitleformat\MakeUppercase%
+      \setbeamerfont{standout}{shape=\normalfont}%
+      \PackageWarning{beamerthememetropolis}{%
+        Be aware that titleformat plain=allcaps can lead to problems%
+      }
+    },
+}
+\pgfkeys{
+  /metropolis/titleformat/.code=\pgfkeysalso{
+      font/titleformat title=#1,
+      font/titleformat subtitle=#1,
+      font/titleformat section=#1,
+      font/titleformat frame=#1,
+      titleformat plain=#1,
+    }
+}
+\pgfkeys{/metropolis/.cd,
+  usetitleprogressbar/.code=\pgfkeysalso{outer/progressbar=frametitle},
+  noslidenumbers/.code=\pgfkeysalso{outer/numbering=none},
+  usetotalslideindicator/.code=\pgfkeysalso{outer/numbering=fraction},
+  nosectionslide/.code=\pgfkeysalso{inner/sectionpage=none},
+  darkcolors/.code=\pgfkeysalso{color/background=dark},
+  blockbg/.code=\pgfkeysalso{color/block=fill, inner/block=fill},
+}
+\newcommand{\metropolis@setdefaults}{
+  \pgfkeys{/metropolis/.cd,
+    titleformat plain=regular,
+  }
+}
+\providecommand{\tikzexternalenable}{}
+\providecommand{\tikzexternaldisable}{}
+\useinnertheme{metropolis}
+\useoutertheme{metropolis}
+\usecolortheme{metropolis}
+\usefonttheme{metropolis}
+\AtEndPreamble{%
+  \@ifpackageloaded{pgfplots}{%
+    \RequirePackage{pgfplotsthemetol}
+  }{}
+}
+\newcommand{\metroset}[1]{\pgfkeys{/metropolis/.cd,#1}}
+\def\metropolis@plaintitleformat#1{#1}
+\newcommand{\plain}[2][]{%
+  \PackageWarning{beamerthememetropolis}{%
+    The syntax `\plain' may be deprecated in a future version of Metropolis.
+    Please use a frame with [standout] instead.
+  }
+  \begin{frame}[standout]{#1}
+    \metropolis@plaintitleformat{#2}
+  \end{frame}
+}
+\newcommand{\mreducelistspacing}{\vspace{-\topsep}}
+\metropolis@setdefaults
+\ProcessPgfOptions{/metropolis}
+\endinput
+%%
+%% End of file `beamerthememetropolis.sty'.
index 2677fbdbbd6c25c422be186cc9828962c123616e..274d5036b739251f579507cb7f3c836ae11a7dfd 100644 (file)
@@ -1,16 +1,69 @@
-\documentclass[xcolor=dvipsnames]{beamer}
+\documentclass[10pt,xcolor=dvipsnames]{beamer}
+
+\usetheme{metropolis}
+\usepackage{appendixnumberbeamer}
 
-% set up the file to create notes in the output PDFs
 \usepackage{pgfpages}
 \input{notes.config}
 
-\renewcommand{\sfdefault}{phv}
-\usepackage{relsize}
+\usepackage{pgfplots}
+\usepgfplotslibrary{dateplot}
+
+\usepackage{booktabs}
+\usepackage[scale=2]{ccicons}
+
+% optional metro things
+\metroset{numbering=fraction} % page numbering format
+\metroset{progressbar=foot} % progress bar in footer
+\metroset{sectionpage=none, subsectionpage=none}
+\metroset{block=fill}
+% \metroset{background=light}
+
+\setsansfont{OpenSans}
+\setmonofont{Roboto}
+
+\definecolor{makopurple1}{RGB}{57,39,91}
+\definecolor{makopurple2}{RGB}{137,119,173}
+\definecolor{makopurple3}{RGB}{29,13,59}
+\definecolor{makopurple4}{RGB}{124,99,173}
+
+% \definecolor{makopurple1}{HTML}{3b255b}
+\definecolor{makogreen1}{HTML}{0b7a75}
+\definecolor{makovanilla1}{HTML}{d7c9aa}
+\definecolor{makoumber1}{HTML}{7b2d26}
+\definecolor{makowhite1}{HTML}{f0f3f5}
+
+\setbeamercolor{normal text}{fg=black, bg=white}
+\setbeamercolor{alerted text}{fg=makopurple1}
+\setbeamercolor{example text}{fg=makoumber1}
+
+\setbeamercolor{palette primary}{bg=makopurple1, fg=normal text.bg}
+\setbeamercolor{palette secondary}{bg=makogreen1,fg=normal text.bg}
+\setbeamercolor{palette tertiary}{bg=makovanilla1,fg=normal text.bg}
+\setbeamercolor{palette quaternary}{bg=makoumber1,fg=normal text.bg}
+\setbeamercolor{structure}{fg=makopurple1, bg=normal text.bg} % itemize, enumerate, etc
+\setbeamercolor{section in toc}{fg=makopurple1, bg=normal text.bg} % TOC sections
+
+\setbeamercolor{progress bar}{fg=makopurple1}
+\setbeamercolor{title separator}{fg=makopurple1}
+\setbeamercolor{progress bar in head/foot}{fg=makopurple1}
+\setbeamercolor{progress bar in section page}{fg=makopurple1}
+
+% this is a fix for a bug with XeTeX and notes pages
+% see: https://tex.stackexchange.com/questions/232168/normal-text-is-invisible-when-using-beamer-with-notes-and-xelatex
+\usepackage{ifthen}
+\makeatletter
+\def\beamer@framenotesbegin{% at beginning of slide
+  \ifthenelse{\not \boolean{metropolis@standout}}{%
+     \usebeamercolor[fg]{normal text}
+      \gdef\beamer@noteitems{}% 
+      \gdef\beamer@notes{}%
+    }{}
+}
+\makeatother
 
-\usepackage{ucs}
-\usepackage[utf8x]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{textcomp}
+\usepackage{xspace}
+\usepackage{relsize}
 
 % add tikz and a bunch of tikz foo
 \usepackage{tikz}
   \tikz{\node (marker-#1-b) at (0,0) {};}
   \tikz[dashed,inner sep=3pt]{\node[violet!75,ultra thick,draw,rounded rectangle,fit=(marker-#1-a.center) (marker-#1-b.center)] {};}}
 
-% DEPRECATED function to build a huge centered dropshadow
-\newcommand\dropshadow[3]{%
-  \node[black!30!white] at (#1+0.1,#2-0.1) {
-    \scalebox{2}{\Huge \textbf{#3}}
-  };
-  \node at (#1,#2) {
-    \scalebox{2}{\Huge \e{#3}}
-  };
-}
-
 % create an empty quotetxt so we can reuse it
 \newcommand{\quotetxt}{}
 
   }
 }
 
-
-% add function to stop numbering appendix slides
-\newcommand{\backupbegin}{
-   \newcounter{framenumberappendix}
-   \setcounter{framenumberappendix}{\value{framenumber}}
-}
-\newcommand{\backupend}{
-   \addtocounter{framenumberappendix}{-\value{framenumber}}
-   \addtocounter{framenumber}{\value{framenumberappendix}} 
-}
-
 % packages i use in essentially every document
 \usepackage{graphicx}
 \usepackage{url}
 \usepackage{perpage}
 \MakePerPage{footnote}
 
-%% BEAMER THEME STUFF
-\usetheme[pageofpages=/,% String used between the current page and the
-                         % total page count.
-          bullet=default,% Use circles instead of squares for bullets.
-          titleline=false,% Show a line below the frame title.
-          alternativetitlepage=true,% Use the fancy title page.
-          titlepagelogo=figures/logo.pdf,% Logo for the first page.
-          %watermark=watermark-polito,% Watermark used in every page.
-          watermarkheight=100px,% Height of the watermark.
-          watermarkheightmult=4,% The watermark image is 4 times bigger
-                                % than watermarkheight.
-          ]{Torino}
-
-\usecolortheme{mako}
-\useinnertheme{rectangles}
-%\setbeamertemplate{blocks}[rounded][]
-\setbeamercolor{block title}{bg=makopurple3, fg=White}
-
-\setbeamertemplate{items}[default] 
-\setbeamertemplate{blocks}[shadow=true] 
-
-\usepackage{tcolorbox}
-% These options will be applied to all `tcolorboxes`
-\tcbset{%
-    noparskip,
-    colback=makopurple5, %background color of the box
-    colframe=makopurple1, %color of frame and title background
-    coltext=black, %color of body text
-    coltitle=white, %color of title text 
-    arc=0em,
-    left=0.1em,
-    right=0.1em,
-    fonttitle=\bfseries,
-    alerted/.style={coltitle=red, 
-                     colframe=gray!40},
-    example/.style={coltitle=black, 
-                     colframe=green!20,             
-                     colback=green!5},
-    }
-
-
-%\useoutertheme{infolines}
-%\usepackage[breaklinks]{hyperref}
-
-\hypersetup{colorlinks=true, linkcolor=Black, citecolor=Black, filecolor=makopurple1,
-    urlcolor=Plum, unicode=true}
-
-% create a boldface version of the header
-\setbeamerfont{frametitle}{series=\bfseries}
-\setbeamerfont{title}{series=\bfseries}
-
-% tweak the beamer font to make it a bit lists a bit smaller
-\setbeamerfont*{itemize/enumerate body}{size=\small}
-\setbeamerfont*{itemize/enumerate subbody}{size=\footnotesize}
-\setbeamerfont*{itemize/enumerate subsubbody}{size=\footnotesize}
-
-% indent the margins of the itemize lists a little bit
-\setlength{\leftmargin}{0pt}
-\setlength{\leftmargini}{0.7cm}
-\setlength{\leftmarginii}{0.7cm}
+% \hypersetup{colorlinks=true, linkcolor=Black, citecolor=Black, filecolor=makopurple1,
+%     urlcolor=Plum, unicode=true}
 
 % create a new \e{} command to make things purple and bold
-\newcommand{\e}[1]{\textcolor{makopurple1}{\textbf{#1}}}
+\newcommand{\e}[1]{\alert{#1}}
 
 % remove the nagivation symbols
 \setbeamertemplate{navigation symbols}{}
 
 \newcommand{\credit}[1]{%
-  \tikz[overlay]{\node at (current page.south east)
-    [anchor=south east,yshift=11pt,xshift=3pt]
+  \tikz[overlay]{\node at (current page.south west)
+    [anchor=south west, yshift=3pt, xshift=2pt]
     {\smaller \smaller {[}#1{]}};}}
 
-\title{Presentation Title}
-% \subtitle{Presentation Subtitle}
-\author[Benj. Mako Hill]{\textbf{Benjamin Mako Hill}\\ makohill@uw.edu}
+\setlength{\parsep}{1em}
 
+\title{Presentation Title}
+\subtitle{Presentation Subtitle}
+\author[Benj. Mako Hill]{\textbf{Benjamin Mako Hill}\\
+  makohill@uw.edu}
 \institute[UW/Harvard]{\textbf{University of Washington}\\
   Department of Communication\\
   \emph{Assistant Professor}\\
 \begin{document}
 
 % remove some of the space in the itemize to make it quite compact
-\let\olditemize\itemize
-\renewcommand\itemize{\olditemize\itemsep-1pt}
+\let\olditemize\itemize
+\renewcommand\itemize{\olditemize\itemsep-1pt}
 
 %% SLIDE: Title Slide
-\begin{frame}[plain]
+\begin{frame}
   \titlepage
 
-% include version control stuff
-\input{vc}
-\tikz[overlay]{\node at (current page.south west) [anchor=south west, xshift=-4pt, yshift=-4pt]{\colorbox{makopurple1}{\color{white} \tt \smaller \smaller \smaller revision:\ \VCRevision\  (\VCDateTEX)}};} 
+  \tikz{\node at (current page.center) [anchor=center, yshift=-0.5in, xshift=1in]
+    {\includegraphics[width=0.35\textwidth]{figures/logo.pdf}};
+  }
+
+  % include version control stuff
+  \input{vc}
+  \credit{Revision:\ \VCRevision\  (\VCDateTEX)}
 \end{frame}
 
+\section{Introduction}
+
 %% SLIDE: Slide 2
 \begin{frame}{A sample slide, A sample slide, A sample slide, A sample
     slide, A sample slide, A sample slide}
@@ -191,29 +173,35 @@ An itemized list:
 \end{itemize}
 
 \visible<2->{
-\begin{tcolorbox}[title={Foo, Bar, Baz}]
+  \begin{example}
   \emph{In a right triangle, the square of hypotenuse equals
   the sum of squares of two other sides.}
-\end{tcolorbox}
+  \end{example}
 }
 
-\credit{Image credit: Shaw and Hill, 2099.}
-\note{These are the slide 2 notes.}
+  \credit{Image credit: Shaw and Hill, 2099.}
+  \note{These are the slide 2 notes.}
+\end{frame}
+
+\begin{frame}
+  \frametitle{Short frame title}
+
+  \e{A first} paragraph.
+  
+  And then \e{a second} paragraph.
 \end{frame}
 
 \appendix
-\backupbegin
 
-\begin{frame}[plain]
-\centertext{7em}{Example and Data Appendix}
+\begin{frame}[standout]
+  Example and Data Appendix
 \end{frame}
 
 \begin{frame}{A sample slide}
-
-Final Sample Slide
-\note{These are the slide 4 notes.}
+  Final Sample Slide
+  \note{These are the slide 4 notes.}
 \end{frame}
-\backupend
+
 
 \end{document}
 
index be284ab1f90343552ddaecfe43a870c447f54265..9d27d8168c9cbb1d5aaa1134b5e73badad907029 100644 (file)
Binary files a/template/figures/logo.pdf and b/template/figures/logo.pdf differ
diff --git a/template/pgfplotsthemetol.sty b/template/pgfplotsthemetol.sty
new file mode 100644 (file)
index 0000000..7f07743
--- /dev/null
@@ -0,0 +1,123 @@
+%%
+%% This is file `pgfplotsthemetol.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% pgfplotsthemetol.dtx  (with options: `package')
+%% ---------------------------------------------------------------------------
+%% Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of
+%% contributors can be found at
+%% 
+%%     https://github.com/matze/mtheme/graphs/contributors
+%% 
+%% and the original template was based on the HSRM theme by Benjamin Weiss.
+%% 
+%% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0
+%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
+%% ---------------------------------------------------------------------------
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{pgfplotsthemetol}
+    [2017/01/23 PGFplots colors based on Paul Tol's SRON technical note]
+\definecolor{TolDarkPurple}{HTML}{332288}
+\definecolor{TolDarkBlue}{HTML}{6699CC}
+\definecolor{TolLightBlue}{HTML}{88CCEE}
+\definecolor{TolLightGreen}{HTML}{44AA99}
+\definecolor{TolDarkGreen}{HTML}{117733}
+\definecolor{TolDarkBrown}{HTML}{999933}
+\definecolor{TolLightBrown}{HTML}{DDCC77}
+\definecolor{TolDarkRed}{HTML}{661100}
+\definecolor{TolLightRed}{HTML}{CC6677}
+\definecolor{TolLightPink}{HTML}{AA4466}
+\definecolor{TolDarkPink}{HTML}{882255}
+\definecolor{TolLightPurple}{HTML}{AA4499}
+\pgfplotscreateplotcyclelist{mbarplot cycle}{%
+  {draw=TolDarkBlue,    fill=TolDarkBlue!70},
+  {draw=TolLightBrown,  fill=TolLightBrown!70},
+  {draw=TolLightGreen,  fill=TolLightGreen!70},
+  {draw=TolDarkPink,    fill=TolDarkPink!70},
+  {draw=TolDarkPurple,  fill=TolDarkPurple!70},
+  {draw=TolDarkRed,     fill=TolDarkRed!70},
+  {draw=TolDarkBrown,   fill=TolDarkBrown!70},
+  {draw=TolLightRed,    fill=TolLightRed!70},
+  {draw=TolLightPink,   fill=TolLightPink!70},
+  {draw=TolLightPurple, fill=TolLightPurple!70},
+  {draw=TolLightBlue,   fill=TolLightBlue!70},
+  {draw=TolDarkGreen,   fill=TolDarkGreen!70},
+}
+\pgfplotscreateplotcyclelist{mlineplot cycle}{%
+  {TolDarkBlue, mark=*, mark size=1.5pt},
+  {TolLightBrown, mark=square*, mark size=1.3pt},
+  {TolLightGreen, mark=triangle*, mark size=1.5pt},
+  {TolDarkBrown, mark=diamond*, mark size=1.5pt},
+}
+\pgfplotsset{
+  compat=1.9,
+  mlineplot/.style={
+    mbaseplot,
+    xmajorgrids=true,
+    ymajorgrids=true,
+    major grid style={dotted},
+    axis x line=bottom,
+    axis y line=left,
+    legend style={
+      cells={anchor=west},
+      draw=none
+    },
+    cycle list name=mlineplot cycle,
+  },
+  mbarplot base/.style={
+    mbaseplot,
+    bar width=6pt,
+    axis y line*=none,
+  },
+  mbarplot/.style={
+    mbarplot base,
+    ybar,
+    xmajorgrids=false,
+    ymajorgrids=true,
+    area legend,
+    legend image code/.code={%
+      \draw[#1] (0cm,-0.1cm) rectangle (0.15cm,0.1cm);
+    },
+    cycle list name=mbarplot cycle,
+  },
+  horizontal mbarplot/.style={
+    mbarplot base,
+    xmajorgrids=true,
+    ymajorgrids=false,
+    xbar stacked,
+    area legend,
+    legend image code/.code={%
+      \draw[#1] (0cm,-0.1cm) rectangle (0.15cm,0.1cm);
+    },
+    cycle list name=mbarplot cycle,
+  },
+  mbaseplot/.style={
+    legend style={
+      draw=none,
+      fill=none,
+      cells={anchor=west},
+    },
+    x tick label style={
+      font=\footnotesize
+    },
+    y tick label style={
+      font=\footnotesize
+    },
+    legend style={
+      font=\footnotesize
+    },
+    major grid style={
+      dotted,
+    },
+    axis x line*=bottom,
+  },
+  disable thousands separator/.style={
+    /pgf/number format/.cd,
+      1000 sep={}
+  },
+}
+\endinput
+%%
+%% End of file `pgfplotsthemetol.sty'.

Benjamin Mako Hill || Want to submit a patch?