From eeeac82b75eb7a2001f3aae91ddc92adfcbf7217 Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Tue, 8 Mar 2016 22:44:31 -0800 Subject: [PATCH 1/8] Fix titleformat options in documentation --- doc/metropolistheme.dtx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/metropolistheme.dtx b/doc/metropolistheme.dtx index 2dbbb1d..086fb5f 100644 --- a/doc/metropolistheme.dtx +++ b/doc/metropolistheme.dtx @@ -335,16 +335,16 @@ The list of options is structured as shown in the following example. {regular, smallcaps, allsmallcaps, allcaps} {regular}{ Changes the format of titles, subtitles, section titles, frame titles, and - the text on standout ``plain'' frames. The available options produce + the text on ``standout'' frames. The available options produce Regular, \textsc{SmallCaps}, \textsc{\MakeLowercase{AllSmallCaps}}, or \MakeUppercase{AllCaps} titles. Please refer to Section~\ref{sec:titleformats} for known issues with these options. } -\DescribeOption{titleformat-plain}% +\DescribeOption{titleformat plain}% {regular, smallcaps, allsmallcaps, allcaps}% {regular}{ - Changes the format of standout ``plain'' frames (see |titleformat|, above). + Changes the format of ``standout'' frames (see |titleformat|, above). } @@ -391,10 +391,10 @@ The list of options is structured as shown in the following example. \subsubsection{Font theme} -\DescribeMacro{titleformat-title} -\DescribeMacro{titleformat-subtitle} -\DescribeMacro{titeformat-section} -\DescribeOption{titleformat-frame}% +\DescribeMacro{titleformat title} +\DescribeMacro{titleformat subtitle} +\DescribeMacro{titeformat section} +\DescribeOption{titleformat frame}% {regular, smallcaps, allsmallcaps, allcaps}% {regular}{ Individually controls the format of titles, subtitles, section titles, and From 48ee6d3336bac04b53b144ffc847290067efc505 Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Tue, 8 Mar 2016 22:45:22 -0800 Subject: [PATCH 2/8] Address notes font colour bug in documentation Fix #191 --- doc/metropolistheme.dtx | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/doc/metropolistheme.dtx b/doc/metropolistheme.dtx index 086fb5f..e703078 100644 --- a/doc/metropolistheme.dtx +++ b/doc/metropolistheme.dtx @@ -594,6 +594,27 @@ background color for the title; this will cause issues when using color themes like |whale| which set a white foreground for the title. +\subsection{Notes on second screen} + +If you use the |[show notes on second screen]| option built in to Beamer and +compile with \XeLaTeX, text on slides following the first section slide may +be rendered in white instead of the regular colour. This is due to +\href{http://tex.stackexchange.com/questions/288408/}{a bug} in Beamer +or \XeLaTeX\ itself. You can work around it either by compiling with \LuaTeX\ +or by adding the following code to your preamble to reset the text color +on each slide. + +\begin{lstlisting} +\makeatletter +\def\beamer@framenotesbegin{% at beginning of slide + \usebeamercolor[fg]{normal text} + \gdef\beamer@noteitems{}% + \gdef\beamer@notes{}% +} +\makeatother +\end{lstlisting} + + \section{License} \themename is licensed under a From 1d65da0777da0dd00ec072325a47b58d80a79d5c Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Tue, 8 Mar 2016 22:46:05 -0800 Subject: [PATCH 3/8] Suggest Fira Book customization in some cases Fix #75 --- doc/metropolistheme.dtx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/metropolistheme.dtx b/doc/metropolistheme.dtx index e703078..2d3a114 100644 --- a/doc/metropolistheme.dtx +++ b/doc/metropolistheme.dtx @@ -441,6 +441,14 @@ you prefer, for example, the \href{http://font.ubuntu.com}{|Ubuntu|} font family \setmonofont{Ubuntu Mono} \end{lstlisting} +If you are expecting to present in a large room or with an underpowered +projector, you may want to change the font to a heavier weight of Fira to +maximize readability. + +\begin{lstlisting} +\setsansfont[BoldFont={Fira Sans SemiBold}]{Fira Sans Book} +\end{lstlisting} + \subsubsection{Old style figures} From 4c12fb79eea5d121c3b5d9c69fc566e442a46ae7 Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Tue, 8 Mar 2016 22:46:41 -0800 Subject: [PATCH 4/8] Remove link to Debian package (gives 404) --- doc/metropolistheme.dtx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/metropolistheme.dtx b/doc/metropolistheme.dtx index 2d3a114..ddccb98 100644 --- a/doc/metropolistheme.dtx +++ b/doc/metropolistheme.dtx @@ -242,12 +242,6 @@ options for advanced users: \end{description} -\subsection{Installing the Debian Package} -As an alternative users of Debian or Ubuntu can also install this -\href{https://launchpad.net/\%7Eedd/+archive/ubuntu/misc/+files/latex-mtheme_0.1.0vidid1_all.deb}{.deb package} -containing the theme files as well as the Fira Sans font files. - - \subsection{A Minimal Example} The following code shows a minimal example of a Beamer presentation using From 19505fe82ab1b89486b790b7f7e873bdbe22d720 Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Tue, 8 Mar 2016 22:47:13 -0800 Subject: [PATCH 5/8] Various documentation improvements --- doc/metropolistheme.dtx | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/doc/metropolistheme.dtx b/doc/metropolistheme.dtx index ddccb98..785ecf2 100644 --- a/doc/metropolistheme.dtx +++ b/doc/metropolistheme.dtx @@ -125,6 +125,7 @@ plain,setbeamercolor,metroset,setsansfont,setmonofont}, } \lstMakeShortInline| +\usepackage{metalogo} \usepackage[colorlinks=true, linkcolor=mLightBrown, @@ -173,7 +174,7 @@ By default, \themename uses \href{https://www.mozilla.org/en-US/styleguide/products/firefox-os/typeface/} {Fira Sans}, a gorgeous typeface commissioned by Mozilla and designed by \href{http://www.carrois.com/fira-3-1/}{Carrois}. For best results, you will -need the Fira typeface installed and use Xe\LaTeX{} to typeset your slides. +need the Fira typeface installed and use \XeLaTeX\ to typeset your slides. However, \themename can also be used with other typefaces and \LaTeX{} build systems. @@ -188,26 +189,36 @@ the theme even better, please get in touch there. The \subsection{Installing from CTAN} -For the regular user it is recommended to install \themename from -\href{https://www.ctan.org}{CTAN}. In case you keep your \TeX\ distribution +For most users, we recommend installing \themename from +\href{https://www.ctan.org}{CTAN}. If you keep your \TeX\ distribution up-to-date, chances are good that \themename is already installed. If it is -not, you need to update your packages. For \TeX\ Live (or Mac\TeX\ on OS X) -the following command updates all packages. +not, you need to update your packages. If your distribution is \TeX\ Live +(or Mac\TeX\ on OS X), the following command updates all packages. + +\begin{lstlisting} +tlmgr update --all +\end{lstlisting} + +If this results in an error, you may need to run it with administrative privileges: \begin{lstlisting} sudo tlmgr update --all \end{lstlisting} +Mac\TeX\ on OS X also provides a graphical interface for |tlmgr| called +\TeX\ Live Utility. + For any other distribution please refer to its documentation on how to update your packages. To get the most out of the theme you should also install the |Fira| fonts. -Yet this is not mandatory. \themename also works with the standard fonts. +However, this is not mandatory; \themename also works with the standard fonts. \subsection{Installing from GitHub} -Installing \themename, like any Beamer theme, involves four easy steps: +If you want to use the cutting-edge development version of \themename, you can +install it manually. Like any \LaTeX\ package, this involves four easy steps: \begin{description} \item[Download the source] with a |git clone| of the \href{https://github.com/matze/mtheme}{\themename repository} or as a @@ -234,11 +245,10 @@ options for advanced users: \item[|make doc|] builds this documentation manual. \item[|make demo|] builds a demo presentation to test the features of \themename. - \item[|make all|] builds the theme, manual, and demo presentation. + \item[|make all|] builds the theme and manual. \item[|make clean|] removes the files generated by |make all|. \item[|make install|] installs the theme into your local texmf folder. \item[|make uninstall|] removes the theme from your local texmf folder. - \item[|make ctan|] creates a package for CTAN distribution. \end{description} @@ -280,9 +290,9 @@ The following code shows a minimal example of a Beamer presentation using For best results, we recommend installing the fonts \href{https://github.com/mozilla/Fira}{|Fira Sans|} and |Fira Mono| -and compiling with \themename using Xe\LaTeX{} or Lua\TeX{}. +and compiling with \themename using \XeLaTeX\ or \LuaTeX. These are optional dependencies; \themename is compatible with (e.g.) -pdf\LaTeX{} and will fall back to standard fonts if |Fira Sans| or |Fira Mono| +pdf\LaTeX\ and will fall back to standard fonts if |Fira Sans| or |Fira Mono| is not installed. The packaged name of |Fira Sans| is |Fira Sans OT| in some Linux From ffde17b63cacaa79f6072a66a15b7c77dba08203 Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Tue, 8 Mar 2016 22:47:44 -0800 Subject: [PATCH 6/8] Update date of packages modified for v1.1 --- source/beamercolorthememetropolis.dtx | 2 +- source/beamerfontthememetropolis.dtx | 2 +- source/beamerinnerthememetropolis.dtx | 5 +---- source/beamerouterthememetropolis.dtx | 2 +- source/beamerthememetropolis.dtx | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/source/beamercolorthememetropolis.dtx b/source/beamercolorthememetropolis.dtx index f020546..c5a16a8 100644 --- a/source/beamercolorthememetropolis.dtx +++ b/source/beamercolorthememetropolis.dtx @@ -13,7 +13,7 @@ % \ProvidesFile{beamercolorthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamercolorthememetropolis}[2016/02/21 Metropolis color theme] +\ProvidesPackage{beamercolorthememetropolis}[2016/03/08 Metropolis color theme] % % \documentclass{ltxdoc} % \usepackage{beamercolorthememetropolis} diff --git a/source/beamerfontthememetropolis.dtx b/source/beamerfontthememetropolis.dtx index e54a1e8..0c6e483 100644 --- a/source/beamerfontthememetropolis.dtx +++ b/source/beamerfontthememetropolis.dtx @@ -13,7 +13,7 @@ % \ProvidesFile{beamerfontthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerfontthememetropolis}[2016/02/21 Metropolis font theme] +\ProvidesPackage{beamerfontthememetropolis}[2016/03/08 Metropolis font theme] % % \documentclass{ltxdoc} % \usepackage{beamerfontthememetropolis} diff --git a/source/beamerinnerthememetropolis.dtx b/source/beamerinnerthememetropolis.dtx index 4511ecf..c29b677 100644 --- a/source/beamerinnerthememetropolis.dtx +++ b/source/beamerinnerthememetropolis.dtx @@ -13,7 +13,7 @@ % \ProvidesFile{beamerinnerthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerinnerthememetropolis}[2016/02/21 Metropolis inner theme] +\ProvidesPackage{beamerinnerthememetropolis}[2016/03/08 Metropolis inner theme] % % \documentclass{ltxdoc} % \usepackage{beamerinnerthememetropolis} @@ -397,9 +397,6 @@ % To achieve the correct spacing for |alertblock|s and |exampleblock|s % as well as for normal blocks, we have to begin the |beamercolorbox| % differently based on whether |block title| has an empty background. -% (We assume that either all or none of |block title|, -% |block title alerted|, and |block title example| have an empty -% background). % % If the |block title| background is empty, or the user has explicitly % removed the background from (e.g.) |block title alerted|, we just need to diff --git a/source/beamerouterthememetropolis.dtx b/source/beamerouterthememetropolis.dtx index 9024da7..e18a40c 100644 --- a/source/beamerouterthememetropolis.dtx +++ b/source/beamerouterthememetropolis.dtx @@ -13,7 +13,7 @@ % \ProvidesFile{beamerouterthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{beamerouterthememetropolis}[2016/02/21 Metropolis outer theme] +\ProvidesPackage{beamerouterthememetropolis}[2016/03/08 Metropolis outer theme] % % \documentclass{ltxdoc} % \usepackage{beamerouterthememetropolis} diff --git a/source/beamerthememetropolis.dtx b/source/beamerthememetropolis.dtx index a14e014..9519a45 100644 --- a/source/beamerthememetropolis.dtx +++ b/source/beamerthememetropolis.dtx @@ -14,7 +14,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthememetropolis} - [2016/02/21 v1.1 Metropolis Beamer theme] + [2016/03/08 v1.1 Metropolis Beamer theme] % % \documentclass{ltxdoc} % \usepackage{beamerthememetropolis} From 448f438c182fd8c5470c38e539b9807a0edd9d30 Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Thu, 10 Mar 2016 23:24:40 -0800 Subject: [PATCH 7/8] Note section, subsection slides can be consecutive Fix #197 --- doc/metropolistheme.dtx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/metropolistheme.dtx b/doc/metropolistheme.dtx index 785ecf2..9326d6d 100644 --- a/doc/metropolistheme.dtx +++ b/doc/metropolistheme.dtx @@ -363,7 +363,10 @@ The list of options is structured as shown in the following example. \DescribeOption{subsectionpage}{none, simple, progressbar}{none}{ Optionally adds a slide at the start of each subsection. If enabled with the |simple| or |progressbar| options, the style of the |section page| will - be updated to match the style of the |subsection page|. + be updated to match the style of the |subsection page|. Note that section + slides and subsection slides can appear consecutively if both are enabled; + you may want to use this option together with |sectionpage=none| depending + on the section structure of your presentation. } From 68249c974743eb6c72e6e91fec58a2b043c507fd Mon Sep 17 00:00:00 2001 From: Ross Churchley Date: Thu, 10 Mar 2016 23:35:51 -0800 Subject: [PATCH 8/8] Remove unused driver code from sub-packages As the theme's documentation is generated from `doc/metropolistheme.dtx` and not by running latex on the component sub-packages, this code is never actually executed. (Good thing, too, since it wouldn't compile; it is not possible to call `beamerthememetropolis` in a document with the `ltxdoc` class) --- source/beamercolorthememetropolis.dtx | 6 ------ source/beamerfontthememetropolis.dtx | 6 ------ source/beamerinnerthememetropolis.dtx | 6 ------ source/beamerouterthememetropolis.dtx | 6 ------ source/beamerthememetropolis.dtx | 6 ------ 5 files changed, 30 deletions(-) diff --git a/source/beamercolorthememetropolis.dtx b/source/beamercolorthememetropolis.dtx index c5a16a8..aaa3a41 100644 --- a/source/beamercolorthememetropolis.dtx +++ b/source/beamercolorthememetropolis.dtx @@ -10,16 +10,10 @@ % International License (https://creativecommons.org/licenses/by-sa/4.0/). % ------------------------------------------------------------------------- \fi % \iffalse -% \ProvidesFile{beamercolorthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamercolorthememetropolis}[2016/03/08 Metropolis color theme] % -% \documentclass{ltxdoc} -% \usepackage{beamercolorthememetropolis} -% \begin{document} -% \DocInput{beamercolorthememetropolis.dtx} -% \end{document} % \fi % \CheckSum{0} % \StopEventually{} diff --git a/source/beamerfontthememetropolis.dtx b/source/beamerfontthememetropolis.dtx index 0c6e483..3e7681f 100644 --- a/source/beamerfontthememetropolis.dtx +++ b/source/beamerfontthememetropolis.dtx @@ -10,16 +10,10 @@ % International License (https://creativecommons.org/licenses/by-sa/4.0/). % ------------------------------------------------------------------------- \fi % \iffalse -% \ProvidesFile{beamerfontthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerfontthememetropolis}[2016/03/08 Metropolis font theme] % -% \documentclass{ltxdoc} -% \usepackage{beamerfontthememetropolis} -% \begin{document} -% \DocInput{beamerfontthememetropolis.dtx} -% \end{document} % \fi % \CheckSum{0} % \StopEventually{} diff --git a/source/beamerinnerthememetropolis.dtx b/source/beamerinnerthememetropolis.dtx index c29b677..60c22fa 100644 --- a/source/beamerinnerthememetropolis.dtx +++ b/source/beamerinnerthememetropolis.dtx @@ -10,16 +10,10 @@ % International License (https://creativecommons.org/licenses/by-sa/4.0/). % ------------------------------------------------------------------------- \fi % \iffalse -% \ProvidesFile{beamerinnerthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerinnerthememetropolis}[2016/03/08 Metropolis inner theme] % -% \documentclass{ltxdoc} -% \usepackage{beamerinnerthememetropolis} -% \begin{document} -% \DocInput{beamerinnerthememetropolis.dtx} -% \end{document} % \fi % \CheckSum{0} % \StopEventually{} diff --git a/source/beamerouterthememetropolis.dtx b/source/beamerouterthememetropolis.dtx index e18a40c..5e30d1a 100644 --- a/source/beamerouterthememetropolis.dtx +++ b/source/beamerouterthememetropolis.dtx @@ -10,16 +10,10 @@ % International License (https://creativecommons.org/licenses/by-sa/4.0/). % ------------------------------------------------------------------------- \fi % \iffalse -% \ProvidesFile{beamerouterthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerouterthememetropolis}[2016/03/08 Metropolis outer theme] % -% \documentclass{ltxdoc} -% \usepackage{beamerouterthememetropolis} -% \begin{document} -% \DocInput{beamerouterthememetropolis.dtx} -% \end{document} % \fi % \CheckSum{0} % \StopEventually{} diff --git a/source/beamerthememetropolis.dtx b/source/beamerthememetropolis.dtx index 9519a45..062f231 100644 --- a/source/beamerthememetropolis.dtx +++ b/source/beamerthememetropolis.dtx @@ -10,17 +10,11 @@ % International License (https://creativecommons.org/licenses/by-sa/4.0/). % ------------------------------------------------------------------------- \fi % \iffalse -% \ProvidesFile{beamerthememetropolis.dtx} %<*package> \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthememetropolis} [2016/03/08 v1.1 Metropolis Beamer theme] % -% \documentclass{ltxdoc} -% \usepackage{beamerthememetropolis} -% \begin{document} -% \DocInput{beamerthememetropolis.dtx} -% \end{document} % \fi % \CheckSum{0} % \StopEventually{}