From f35dfb20df88fa099d64577cc73a63c4e252d4ea Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Jan 2017 22:18:55 +0000 Subject: beamertheme-metropolis (23jan17) git-svn-id: svn://tug.org/texlive/trunk@43031 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/beamertheme-metropolis/README.md | 3 ++ .../doc/latex/beamertheme-metropolis/demo.pdf | Bin 63067 -> 59864 bytes .../doc/latex/beamertheme-metropolis/demo.tex | 2 +- .../beamertheme-metropolis/metropolistheme.pdf | Bin 121802 -> 121746 bytes .../beamercolorthememetropolis-highcontrast.dtx | 48 +++++++++++++++++++++ .../beamercolorthememetropolis.dtx | 3 +- .../beamerfontthememetropolis.dtx | 48 +++++++++++++++++---- .../beamerinnerthememetropolis.dtx | 23 ++++++---- .../beamerouterthememetropolis.dtx | 17 ++++++-- .../beamerthememetropolis.dtx | 2 +- .../beamerthememetropolis.ins | 5 ++- .../beamertheme-metropolis/metropolistheme.dtx | 42 +++++++++++++++++- .../beamertheme-metropolis/pgfplotsthemetol.dtx | 2 +- .../beamercolorthememetropolis-highcontrast.sty | 39 +++++++++++++++++ .../beamercolorthememetropolis.sty | 3 +- .../beamerfontthememetropolis.sty | 48 +++++++++++++++++---- .../beamerinnerthememetropolis.sty | 21 +++++---- .../beamerouterthememetropolis.sty | 17 ++++++-- .../beamerthememetropolis.sty | 2 +- .../beamertheme-metropolis/pgfplotsthemetol.sty | 2 +- 20 files changed, 275 insertions(+), 52 deletions(-) create mode 100644 Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.dtx create mode 100644 Master/texmf-dist/tex/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.sty (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/beamertheme-metropolis/README.md b/Master/texmf-dist/doc/latex/beamertheme-metropolis/README.md index 934eb98cd66..4921a2af50c 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-metropolis/README.md +++ b/Master/texmf-dist/doc/latex/beamertheme-metropolis/README.md @@ -66,6 +66,9 @@ Metropolis. Detailed information on using Metropolis can be found in the [manual][]. +For an alternative dark color theme, please have a look at Ross Churchley's +excellent [owl](https://github.com/rchurchley/beamercolortheme-owl) theme. + ## License diff --git a/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.pdf b/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.pdf index 5d62fa8410a..60cdf783dac 100644 Binary files a/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.pdf and b/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.tex b/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.tex index e7cbcbce89b..ae602193225 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-metropolis/demo.tex @@ -185,7 +185,7 @@ or show \textbf{bold} results.\end{verbatim} \begin{frame}{Tables} \begin{table} \caption{Largest cities in the world (source: Wikipedia)} - \begin{tabular}{lr} + \begin{tabular}{@{} lr @{}} \toprule City & Population\\ \midrule diff --git a/Master/texmf-dist/doc/latex/beamertheme-metropolis/metropolistheme.pdf b/Master/texmf-dist/doc/latex/beamertheme-metropolis/metropolistheme.pdf index d1db44df8e4..ec3b43c7e17 100644 Binary files a/Master/texmf-dist/doc/latex/beamertheme-metropolis/metropolistheme.pdf and b/Master/texmf-dist/doc/latex/beamertheme-metropolis/metropolistheme.pdf differ diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.dtx new file mode 100644 index 00000000000..36137523149 --- /dev/null +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis-highcontrast.dtx @@ -0,0 +1,48 @@ +% \iffalse meta-comment ------------------------------------------------------- +% 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/). +% ------------------------------------------------------------------------- \fi +% \iffalse +%<*package> +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{beamercolorthememetropolis-highcontrast}[2017/01/23 Metropolis color theme] +% +% \fi +% \CheckSum{0} +% \StopEventually{} +% \iffalse +%<*package> +% ------------------------------------------------------------------------- \fi +% +\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, +} +% +% \begin{macrocode} +\mode +% \end{macrocode} +% +% \iffalse +% +% \fi +% \Finale +\endinput diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis.dtx index 90ba7ef0459..056f717e29e 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamercolorthememetropolis.dtx @@ -12,7 +12,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthememetropolis}[2016/03/14 Metropolis color theme] +\ProvidesPackage{beamercolorthememetropolis}[2017/01/23 Metropolis color theme] % % \fi % \CheckSum{0} @@ -96,6 +96,7 @@ fg=black!2, bg=mDarkTeal } + \usebeamercolor[fg]{normal text} } \newcommand{\metropolis@colors@light}{ \setbeamercolor{normal text}{% diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerfontthememetropolis.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerfontthememetropolis.dtx index 0d707d5053a..3e629526ff4 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerfontthememetropolis.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerfontthememetropolis.dtx @@ -12,7 +12,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthememetropolis}[2016/03/14 Metropolis font theme] +\ProvidesPackage{beamerfontthememetropolis}[2017/01/23 Metropolis font theme] % % \fi % \CheckSum{0} @@ -45,7 +45,11 @@ % % \begin{macrocode} \ifboolexpr{bool {xetex} or bool {luatex}}{ - \RequirePackage[no-math]{fontspec} + \@ifpackageloaded{fontspec}{ + \PassOptionsToPackage{no-math}{fontspec} + }{ + \RequirePackage[no-math]{fontspec} + } % \end{macrocode} % % \begin{macro}{\checkfont} @@ -352,23 +356,49 @@ {\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 % \end{macrocode} % % Similarly, to make the |\MakeLowercase| and |\MakeUppercase| macros work in @@ -376,13 +406,13 @@ % % \begin{macrocode} \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}}% @@ -390,7 +420,7 @@ \gdef\beamer@shortframetitle{#1}% }} {} - {\PackageError{beamerfontthememetropolis}{Patching frame title failed}} + {\PackageError{beamerfontthememetropolis}{Patching frame title failed}\@ehc} % \end{macrocode} % % diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerinnerthememetropolis.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerinnerthememetropolis.dtx index 89550ea3a07..24f5c5f90c9 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerinnerthememetropolis.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerinnerthememetropolis.dtx @@ -12,7 +12,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthememetropolis}[2016/03/14 Metropolis inner theme] +\ProvidesPackage{beamerinnerthememetropolis}[2017/01/23 Metropolis inner theme] % % \fi % \CheckSum{0} @@ -65,7 +65,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{sectionpage} +% \begin{macro}{subsectionpage} % Optionally add a slide marking the beginning of each subsection. % \begin{macrocode} \pgfkeys{ @@ -184,6 +184,7 @@ % Set the subtitle on the title page. % \begin{macrocode} \setbeamertemplate{subtitle}{ + \raggedright% \insertsubtitle% \par% \vspace*{0.5em} @@ -195,9 +196,11 @@ % Template to set the title graphic in a zero-height box. (It won't % change the position of other elements.) % \begin{macrocode} +\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% } @@ -251,10 +254,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} } @@ -267,10 +270,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 @@ -327,13 +330,15 @@ % % \begin{macrocode} \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}% } % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerouterthememetropolis.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerouterthememetropolis.dtx index 6a9044ff30c..5ce947b7c20 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerouterthememetropolis.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerouterthememetropolis.dtx @@ -12,7 +12,7 @@ % \iffalse %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthememetropolis}[2016/03/14 Metropolis outer theme] +\ProvidesPackage{beamerouterthememetropolis}[2017/01/23 Metropolis outer theme] % % \fi % \CheckSum{0} @@ -168,9 +168,16 @@ 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 +} % \end{macrocode} % \end{macro} % @@ -180,6 +187,8 @@ % template |progress bar in section page|. % \begin{macrocode} \newlength{\metropolis@progressinheadfoot} +\newlength{\metropolis@progressinheadfoot@linewidth} +\setlength{\metropolis@progressinheadfoot@linewidth}{0.4pt} \setbeamertemplate{progress bar in head/foot}{ \nointerlineskip \setlength{\metropolis@progressinheadfoot}{% @@ -187,8 +196,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/source/latex/beamertheme-metropolis/beamerthememetropolis.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerthememetropolis.dtx index 7bdbf84a9b6..6482f521179 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerthememetropolis.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerthememetropolis.dtx @@ -13,7 +13,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthememetropolis} - [2016/03/14 v1.1 Metropolis Beamer theme] + [2017/01/23 v1.2 Metropolis Beamer theme] % % \fi % \CheckSum{0} diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerthememetropolis.ins b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerthememetropolis.ins index 5a78e84ba72..c6e2dfec962 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerthememetropolis.ins +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/beamerthememetropolis.ins @@ -10,7 +10,7 @@ %% International License (https://creativecommons.org/licenses/by-sa/4.0/). %% --------------------------------------------------------------------------- -\input{docstrip.tex} +\input docstrip.tex % \keepsilent \askforoverwritefalse \usedir{tex/latex/mtheme} @@ -44,6 +44,9 @@ International License (https://creativecommons.org/licenses/by-sa/4.0/). \generate{\file{beamercolorthememetropolis.sty}{% \from{beamercolorthememetropolis.dtx}{package}} } +\generate{\file{beamercolorthememetropolis-highcontrast.sty}{% + \from{beamercolorthememetropolis-highcontrast.dtx}{package}} + } \generate{\file{pgfplotsthemetol.sty}{% \from{pgfplotsthemetol.dtx}{package}} } diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/metropolistheme.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/metropolistheme.dtx index 4baf2607018..cd3baaa70ca 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/metropolistheme.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/metropolistheme.dtx @@ -400,7 +400,7 @@ The list of options is structured as shown in the following example. \DescribeMacro{titleformat title} \DescribeMacro{titleformat subtitle} -\DescribeMacro{titeformat section} +\DescribeMacro{titleformat section} \DescribeOption{titleformat frame}% {regular, smallcaps, allsmallcaps, allcaps}% {regular}{ @@ -630,6 +630,46 @@ on each slide. \end{lstlisting} +\subsection{Standout frames with labels} + +Because the |standout| frame option creates a group to restrict the colour +change to a single slide, labels defined after calling |standout| will stay +local to the group. In other words, the following may result in a ``label undefined'' error. + +\begin{lstlisting} +\begin{frame}[standout, label=conclusion]{Conclusion} + Awesome slide +\end{frame} +\end{lstlisting} + +To fix this problem, change the order of the keys in the frame. + +\begin{lstlisting} +\begin{frame}[label=conclusion, standout]{Conclusion} + Awesome slide +\end{frame} +\end{lstlisting} + +This error can be unwittingly triggered if you export your slides from Emacs +Org mode, which automatically adds labels after frame options. Alex Branham +\href{https://github.com/matze/mtheme/issues/203}{offers} the following +solution for Org mode users, using |org-set-property|. + +\begin{lstlisting} +* Start of a frame + :PROPERTIES: + :BEAMER_opt: label=conclusion,standout + :END: +\end{lstlisting} + + +\subsection{Standout frames with Pandoc} + +With Pandoc versions prior 1.17.2 it was not possible to create standout frames +because Pandoc only supported a specific list of frame attributes thus ignoring +additional attributes such as |{.standout}|. + + \section{License} \themename is licensed under a diff --git a/Master/texmf-dist/source/latex/beamertheme-metropolis/pgfplotsthemetol.dtx b/Master/texmf-dist/source/latex/beamertheme-metropolis/pgfplotsthemetol.dtx index 68b45054354..a46dca0097c 100644 --- a/Master/texmf-dist/source/latex/beamertheme-metropolis/pgfplotsthemetol.dtx +++ b/Master/texmf-dist/source/latex/beamertheme-metropolis/pgfplotsthemetol.dtx @@ -16,7 +16,7 @@ %<*package> \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] % % \documentclass{ltxdoc} % \usepackage{pgfplotsthemetol} 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 +\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} -- cgit v1.2.3