summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamertheme-metropolis
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-01-23 22:18:55 +0000
committerKarl Berry <karl@freefriends.org>2017-01-23 22:18:55 +0000
commitf35dfb20df88fa099d64577cc73a63c4e252d4ea (patch)
tree90c76836f9540afb9197b0650a95b382841e03d7 /Master/texmf-dist/tex/latex/beamertheme-metropolis
parent8f189a4893035ef699e505bba4872f4c6bfaf1fd (diff)
beamertheme-metropolis (23jan17)
git-svn-id: svn://tug.org/texlive/trunk@43031 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamertheme-metropolis')
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty39
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty3
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty48
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty21
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty17
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty2
-rw-r--r--Master/texmf-dist/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty2
7 files changed, 108 insertions, 24 deletions
diff --git a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty
new file mode 100644
index 00000000000..85665dc83d0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty
@@ -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/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty
index 6b23f8dec99..9699d24c0f5 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis.sty
@@ -17,7 +17,7 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthememetropolis}[2016/03/14 Metropolis color theme]
+\ProvidesPackage{beamercolorthememetropolis}[2017/01/23 Metropolis color theme]
\RequirePackage{pgfopts}
\pgfkeys{
/metropolis/color/block/.cd,
@@ -46,6 +46,7 @@
fg=black!2,
bg=mDarkTeal
}
+ \usebeamercolor[fg]{normal text}
}
\newcommand{\metropolis@colors@light}{
\setbeamercolor{normal text}{%
diff --git a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty
index 8ecd1677ce4..fa29036b269 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerfontthememetropolis.sty
@@ -17,13 +17,17 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthememetropolis}[2016/03/14 Metropolis font theme]
+\ProvidesPackage{beamerfontthememetropolis}[2017/01/23 Metropolis font theme]
\RequirePackage{etoolbox}
\RequirePackage{ifxetex}
\RequirePackage{ifluatex}
\RequirePackage{pgfopts}
\ifboolexpr{bool {xetex} or bool {luatex}}{
- \RequirePackage[no-math]{fontspec}
+ \@ifpackageloaded{fontspec}{
+ \PassOptionsToPackage{no-math}{fontspec}
+ }{
+ \RequirePackage[no-math]{fontspec}
+ }
\newcounter{fontsnotfound}
\newcommand{\checkfont}[1]{%
\suppressfontnotfounderror=1%
@@ -243,31 +247,57 @@
{\def\inserttitle{#2}}%
{\def\inserttitle{\metropolis@titleformat{#2}}}%
{}%
- {\PackageError{beamerfontthememetropolis}{Patching title failed}}
+ {\PackageError{beamerfontthememetropolis}{Patching title failed}\@ehc}
\patchcmd{\beamer@subtitle}%
{\def\insertsubtitle{#2}}%
{\def\insertsubtitle{\metropolis@subtitleformat{#2}}}%
{}%
- {\PackageError{beamerfontthememetropolis}{Patching subtitle failed}}
+ {\PackageError{beamerfontthememetropolis}{Patching subtitle failed}\@ehc}
\patchcmd{\sectionentry}
{\def\insertsectionhead{#2}}
{\def\insertsectionhead{\metropolis@sectiontitleformat{#2}}}
{}
- {\PackageError{beamerfontthememetropolis}{Patching section title failed}}
+ {\PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc}
+\@tempswafalse
\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}
+ {\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}
{}
- {\PackageError{beamerfontthememetropolis}{Patching section title failed}}
+\if@tempswa\else
+ \PackageError{beamerfontthememetropolis}{Patching section title failed}\@ehc
+\fi
\patchcmd{\beamer@@frametitle}
- {\beamer@ifempty{#2}{}{%
+ {{%
\gdef\insertframetitle{{#2\ifnum\beamer@autobreakcount>0\relax{}\space%
\usebeamertemplate*{frametitle continuation}\fi}}%
\gdef\beamer@frametitle{#2}%
\gdef\beamer@shortframetitle{#1}%
}}
- {\beamer@ifempty{#2}{}{%
+ {{%
\gdef\insertframetitle{{\metropolis@frametitleformat{#2}\ifnum%
\beamer@autobreakcount>0\relax{}\space%
\usebeamertemplate*{frametitle continuation}\fi}}%
@@ -275,7 +305,7 @@
\gdef\beamer@shortframetitle{#1}%
}}
{}
- {\PackageError{beamerfontthememetropolis}{Patching frame title failed}}
+ {\PackageError{beamerfontthememetropolis}{Patching frame title failed}\@ehc}
\metropolis@font@setdefaults
\ProcessPgfPackageOptions{/metropolis/font}
\endinput
diff --git a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty
index 84431f025ba..16d86144e18 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerinnerthememetropolis.sty
@@ -17,7 +17,7 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthememetropolis}[2016/03/14 Metropolis inner theme]
+\ProvidesPackage{beamerinnerthememetropolis}[2017/01/23 Metropolis inner theme]
\RequirePackage{etoolbox}
\RequirePackage{keyval}
\RequirePackage{calc}
@@ -86,13 +86,16 @@
\vspace*{0.5em}
}
\setbeamertemplate{subtitle}{
+ \raggedright%
\insertsubtitle%
\par%
\vspace*{0.5em}
}
+\newlength{\metropolis@titleseparator@linewidth}
+\setlength{\metropolis@titleseparator@linewidth}{0.4pt}
\setbeamertemplate{title separator}{
\begin{tikzpicture}
- \draw[fg, fill=fg] (0,0) rectangle (\textwidth, 0.4pt);
+ \fill[fg] (0,0) rectangle (\textwidth, \metropolis@titleseparator@linewidth);
\end{tikzpicture}%
\par%
}
@@ -116,10 +119,10 @@
\usebeamercolor[fg]{section title}
\usebeamerfont{section title}
\insertsectionhead\par
- \ifx\insertsubsection\@empty\else
+ \ifx\insertsubsectionhead\@empty\else
\usebeamercolor[fg]{subsection title}
\usebeamerfont{subsection title}
- \insertsubsection
+ \insertsubsectionhead
\fi
\end{center}
}
@@ -132,10 +135,10 @@
\insertsectionhead\\[-1ex]
\usebeamertemplate*{progress bar in section page}
\par
- \ifx\insertsubsection\@empty\else%
+ \ifx\insertsubsectionhead\@empty\else%
\usebeamercolor[fg]{subsection title}%
\usebeamerfont{subsection title}%
- \insertsubsection
+ \insertsubsectionhead
\fi
\end{minipage}
\par
@@ -173,13 +176,15 @@
}
}
\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}%
}%
\begin{tikzpicture}
- \draw[bg, fill=bg] (0,0) rectangle (\textwidth, 0.4pt);
- \draw[fg, fill=fg] (0,0) rectangle (\metropolis@progressonsectionpage, 0.4pt);
+ \fill[bg] (0,0) rectangle (\textwidth, \metropolis@progressonsectionpage@linewidth);
+ \fill[fg] (0,0) rectangle (\metropolis@progressonsectionpage, \metropolis@progressonsectionpage@linewidth);
\end{tikzpicture}%
}
\def\inserttotalframenumber{100}
diff --git a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty
index e4d359ae916..fe1e8e06746 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerouterthememetropolis.sty
@@ -17,7 +17,7 @@
%% International License (https://creativecommons.org/licenses/by-sa/4.0/).
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthememetropolis}[2016/03/14 Metropolis outer theme]
+\ProvidesPackage{beamerouterthememetropolis}[2017/01/23 Metropolis outer theme]
\RequirePackage{etoolbox}
\RequirePackage{calc}
\RequirePackage{pgfopts}
@@ -95,10 +95,19 @@
leftskip=\metropolis@frametitle@padding,%
rightskip=\metropolis@frametitle@padding,%
]{frametitle}%
- \metropolis@frametitlestrut@start\insertframetitle\metropolis@frametitlestrut@end%
+ \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}{%
@@ -106,8 +115,8 @@
}%
\begin{beamercolorbox}[wd=\paperwidth]{progress bar in head/foot}
\begin{tikzpicture}
- \draw[bg, fill=bg] (0,0) rectangle (\paperwidth, 0.4pt);
- \draw[fg, fill=fg] (0,0) rectangle (\metropolis@progressinheadfoot, 0.4pt);
+ \fill[bg] (0,0) rectangle (\paperwidth, \metropolis@progressinheadfoot@linewidth);
+ \fill[fg] (0,0) rectangle (\metropolis@progressinheadfoot, \metropolis@progressinheadfoot@linewidth);
\end{tikzpicture}%
\end{beamercolorbox}
}
diff --git a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty
index 740cb887cf5..2e54c3d8dfa 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-metropolis/beamerthememetropolis.sty
@@ -18,7 +18,7 @@
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{beamerthememetropolis}
- [2016/03/14 v1.1 Metropolis Beamer theme]
+ [2017/01/23 v1.2 Metropolis Beamer theme]
\RequirePackage{etoolbox}
\RequirePackage{pgfopts}
\pgfkeys{/metropolis/.cd,
diff --git a/Master/texmf-dist/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty b/Master/texmf-dist/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty
index 9405e103f46..7f07743772d 100644
--- a/Master/texmf-dist/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty
+++ b/Master/texmf-dist/tex/latex/beamertheme-metropolis/pgfplotsthemetol.sty
@@ -18,7 +18,7 @@
%% ---------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pgfplotsthemetol}
- [2016/03/14 PGFplots colors based on Paul Tol's SRON technical note]
+ [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}