From 017854f072231110c1d0c10bccf103e003946d7b Mon Sep 17 00:00:00 2001 From: Benjamin Weiss Date: Sun, 14 Jun 2015 20:11:54 +0200 Subject: [PATCH] dtx-ifycation --- beamercolorthememetropolis.dtx | 187 +++++++++++------ beamerfontthememetropolis.dtx | 116 +++++++++-- beamerthemem.dtx | 360 ++++++++++++++++++++++++--------- 3 files changed, 488 insertions(+), 175 deletions(-) diff --git a/beamercolorthememetropolis.dtx b/beamercolorthememetropolis.dtx index 31d3df8..9d1fb52 100644 --- a/beamercolorthememetropolis.dtx +++ b/beamercolorthememetropolis.dtx @@ -1,112 +1,158 @@ -% Beamer mtheme +% \iffalse meta-comment % -% Copyright 2014 Matthias Vogelgesang +% Copyright (C) 2015 by Matthias Vogelgesang +% --------------------------------------------------------------------------- % Licensed under CC-BY-SA 4.0 International. % +% The initial template comes from the HSRM beamer theme by Benjamin Weiss, +% which you can find at https://github.com/benjamin-weiss/hsrmbeamertheme. +% --------------------------------------------------------------------------- +% +% The Current Maintainer of this work is Michael Vogelgesang. +% +% This work consists of the files beamercolorthememetropolis.dtx and +% beamercolorthememetropolis.ins and the derived filebase +% beamercolorthememetropolis.sty. +% +% \fi +% +% \iffalse +%<*driver> +\ProvidesFile{beamercolorthememetropolis.dtx} +% +%\NeedsTeXFormat{LaTeX2e} +%\ProvidesPackage{beamercolorthememetropolis} +%<*package> + [2015/06/12 1.0.0 A Modern Beamer Color Theme] +% +% +%<*driver> +\documentclass{ltxdoc} +\usepackage{beamercolorthememetropolis} +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\begin{document} + \DocInput{beamercolorthememetropolis.dtx} + \PrintChanges + \PrintIndex +\end{document} +% +% \fi +% +% \CheckSum{0} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% +% \changes{1.0.0}{2015/06/12}{Initial Stable Release.} +% +% \DoNotIndex{\newcommand,\newenvironment} +% -\ProvidesPackage{beamercolorthememetropolis} - - +% +% \StopEventually{} +% +% \subsection{Color Theme} +% +% \iffalse +%<*package> +% \fi +% % Options -% ======= - -% Option: blockbg -% applies a gray background to blocks +% +% \begin{macrocode} \newif\if@beamer@metropolis@blockbg \@beamer@metropolis@blockbgfalse \DeclareOptionBeamer{blockbg}{ \@beamer@metropolis@blockbgtrue } - -% Option: ... +% \end{macrocode} +% +% Unknown option error handling +% +% \begin{macrocode} \DeclareOptionBeamer*{% \PackageWarning{beamercolorthememetropolis}{Unknown option `\CurrentOption'}% } - \ProcessOptionsBeamer - - - -% Color definitions -% ================= +% \end{macrocode} % -% See http://paletton.com/#uid=7050t0kkJkJsntwoyp6gYgoddc4 +% Colors % +% \begin{macrocode} \definecolor{mDarkBrown}{HTML}{604c38} \definecolor{mDarkTeal}{HTML}{23373b} \definecolor{mLightBrown}{HTML}{EB811B} \definecolor{mLightGreen}{HTML}{14B03D} - - -% Base colors -% =========== +% \end{macrocode} % -% The metropolis color theme is defined in terms of three fundamental styles: -% -% - normal text (dark fg, light bg) -% - alerted text (colored fg, should be visible against dark or light) -% - example text (colored fg, should be visible against dark or light) -% -% An easy way to customize the theme is to redefine these colors using -% -% \setbeamercolor{ ... }{ fg= ... , bg= ... } -% -% in your preamble. +% Base Colors % +% \begin{macrocode} \setbeamercolor{normal text}{% fg=mDarkTeal, bg=black!2 } - \setbeamercolor{alerted text}{% fg=mLightBrown } - \setbeamercolor{example text}{% fg=mLightGreen } - - - -% Derived colors -% ============== +% \end{macrocode} % -% These colors are all defined in terms of the above and will update their -% appearance if `normal text`, `alerted text`, or `example text` is customized. +% Derived Colors % -% You may also redefine these in your preamble for greater control over the -% customization. Beamer colors not defined here are inherited from -% `beamercolorthemedefault.sty` -% - -% Reset titles and structure to normal text +% \begin{macrocode} \setbeamercolor{titlelike}{use=normal text, parent=normal text} \setbeamercolor{structure}{% - % This would be parent=normal text, but the inheritance is overriden by the - % explicity color definition for structure in `beamercolorthemedefault.sty` fg=normal text.fg } - - -% Frame titles and `\plain` slides +% \end{macrocode} +% +% Frame titles and plain slides +% +% \begin{macrocode} \setbeamercolor{frametitle}{use=palette primary, parent=palette primary} +% \end{macrocode} +% +% The “primary” palette should be used for the most important navigational +% elements, and possibly of other elements. +% The metropolis color theme uses it for frame titles and slides. +% +% \begin{macrocode} + \setbeamercolor{palette primary}{% - % The “primary” palette should be used for the most important navigational - % elements, and possibly of other elements. - % The metropolis color theme uses it for frame titles and `\plain` slides. use=normal text, fg=normal text.bg, bg=normal text.fg } - - +% \end{macrocode} +% % Progress bar and title separator +% +% \begin{macrocode} \setbeamercolor{title separator}{use=progress bar, parent=progress bar} \setbeamercolor{progress bar}{% @@ -114,9 +160,11 @@ fg=alerted text.fg, bg=normal text.bg!50!fg } - - +% \end{macrocode} +% % Blocks +% +% \begin{macrocode} \if@beamer@metropolis@blockbg \setbeamercolor{block title}{% @@ -127,7 +175,6 @@ \else \setbeamercolor{block title}{use=normal text, parent=normal text} \fi - \setbeamercolor{block title alerted}{% use={block title, alerted text}, bg=block title.bg, @@ -138,19 +185,27 @@ 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{block body}{ use={block title, normal text}, bg=block title.bg!50!normal text.bg } - - +% \end{macrocode} +% % Footnotes +% +% \begin{macrocode} \setbeamercolor{footnote}{fg=normal text.fg!90} \setbeamercolor{footnote mark}{fg=.} - - \mode +% \end{macrocode} + +% +% \iffalse +% +% \fi +% +% \Finale +\endinput diff --git a/beamerfontthememetropolis.dtx b/beamerfontthememetropolis.dtx index 60fa649..8d6fac4 100644 --- a/beamerfontthememetropolis.dtx +++ b/beamerfontthememetropolis.dtx @@ -1,49 +1,131 @@ -% Beamer mtheme +% \iffalse meta-comment % -% Copyright 2014 Matthias Vogelgesang +% Copyright (C) 2015 by Matthias Vogelgesang +% --------------------------------------------------------------------------- % Licensed under CC-BY-SA 4.0 International. % -% The initial template comes from the HSRM beamer theme by Benjamin Weiss, which -% you can find at https://github.com/hsrmbeamertheme/hsrmbeamertheme. +% The initial template comes from the HSRM beamer theme by Benjamin Weiss, +% which you can find at https://github.com/benjamin-weiss/hsrmbeamertheme. +% --------------------------------------------------------------------------- +% +% The Current Maintainer of this work is Michael Vogelgesang. +% +% This work consists of the files beamerfontthememetropolis.dtx and +% beamerfontthememetropolis.ins and the derived filebase +% beamerfontthememetropolis.sty. +% +% \fi +% +% \iffalse +%<*driver> +\ProvidesFile{beamerfontthememetropolis.dtx} +% +%\NeedsTeXFormat{LaTeX2e} +%\ProvidesPackage{beamerfontthememetropolis} +%<*package> + [2015/06/12 1.0.0 A Modern Beamer Font Theme] +% +% +%<*driver> +\documentclass{ltxdoc} +\usepackage{beamerfontthememetropolis} +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\begin{document} + \DocInput{beamerfontthememetropolis.dtx} + \PrintChanges + \PrintIndex +\end{document} +% +% \fi +% +% \CheckSum{0} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% +% \changes{1.0.0}{2015/06/12}{Initial Stable Release.} +% +% \DoNotIndex{\newcommand,\newenvironment} % -\ProvidesPackage{beamerfontthememetropolis} +% +% \StopEventually{} +% +% \subsection{Font Theme} +% +% \iffalse +%<*package> +% \fi +% +% Font Definitions +% +% \begin{macrocode} \RequirePackage[no-math]{fontspec} - - \defaultfontfeatures{Mapping=tex-text} -\setsansfont[BoldItalicFont={Fira Sans Italic}, ItalicFont={Fira Sans Light Italic}, BoldFont={Fira Sans}]{Fira Sans Light} +\setsansfont[BoldItalicFont={Fira Sans Italic},% + ItalicFont={Fira Sans Light Italic},% + BoldFont={Fira Sans}]{Fira Sans Light} \setmonofont{Fira Mono} \newfontfamily\ExtraLight{Fira Sans ExtraLight} \newfontfamily\Light{Fira Sans Light} \newfontfamily\Book{Fira Sans} \newfontfamily\Medium{Fira Sans Medium} - -\AtBeginEnvironment{tabular}{\setsansfont[BoldFont={Fira Sans}, Numbers={Monospaced}]{Fira Sans Light}} +\AtBeginEnvironment{tabular}{% + \setsansfont[BoldFont={Fira Sans},% + Numbers={Monospaced}]{Fira Sans Light}% + } +% \end{macrocode} +% +% Font Assignment +% +% \begin{macrocode} \setbeamerfont{title}{family=\Book, size=\Large} \setbeamerfont{author}{family=\ExtraLight, size=\small} \setbeamerfont{date}{family=\ExtraLight, size=\small} - \setbeamerfont{section title}{family=\Book, size=\Large} - \setbeamerfont{block title}{family=\Book, size=\normalsize} \setbeamerfont{block title alerted}{family=\Book,size=\normalsize} - \setbeamerfont{subtitle}{family=\Light, size=\fontsize{12}{14}} \setbeamerfont{frametitle}{family=\Book, size=\large} - \setbeamerfont{caption}{size=\small} \setbeamerfont{caption name}{family=\Book} - \setbeamerfont{description item}{family=\Book} - \setbeamerfont{page number in head/foot}{size=\scriptsize} +% \end{macrocode} +% +% Bibliograpy +% +% \begin{macrocode} \setbeamerfont{bibliography entry author}{family=\Light, size=\normalsize} \setbeamerfont{bibliography entry title}{family=\Book, size=\normalsize} \setbeamerfont{bibliography entry location}{family=\Light, size=\normalsize} \setbeamerfont{bibliography entry note}{family=\Light, size=\small} - \linespread{1.15} +% \end{macrocode} + +% +% \iffalse +% +% \fi +% +% \Finale +\endinput diff --git a/beamerthemem.dtx b/beamerthemem.dtx index e857ea1..84faecc 100644 --- a/beamerthemem.dtx +++ b/beamerthemem.dtx @@ -1,102 +1,180 @@ -% Beamer mtheme +% \iffalse meta-comment % -% Copyright 2014 Matthias Vogelgesang +% Copyright (C) 2015 by Matthias Vogelgesang +% --------------------------------------------------------------------------- % Licensed under CC-BY-SA 4.0 International. % -% The initial template comes from the HSRM beamer theme by Benjamin Weiss, which -% you can find at https://github.com/hsrmbeamertheme/hsrmbeamertheme. +% The initial template comes from the HSRM beamer theme by Benjamin Weiss, +% which you can find at https://github.com/benjamin-weiss/hsrmbeamertheme. +% --------------------------------------------------------------------------- +% +% The Current Maintainer of this work is Michael Vogelgesang. +% +% This work consists of the files beamerthemem.dtx and beamerthemem.ins +% and the derived filebase beamerthemem.sty. +% +% \fi +% +% \iffalse +%<*driver> +\ProvidesFile{beamerthemem.dtx} +% +%\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%\ProvidesPackage{beamerthemem} +%<*package> + [2015/06/12 1.0.0 A Modern Beamer Theme] +% +% +%<*driver> +\documentclass{ltxdoc} +\usepackage{beamerthemem} +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\begin{document} + \DocInput{beamerthemem.dtx} + \PrintChanges + \PrintIndex +\end{document} +% +% \fi +% +% \CheckSum{0} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% +% \changes{1.0.0}{2015/06/12}{Initial Stable Release.} +% +% \DoNotIndex{\newcommand,\newenvironment} % -\ProvidesPackage{beamerthemem} - - - -% Options & customization -% ======================= % -% To use any of options below, call them when invoking `mtheme` in the -% preamble of your slides: +% \StopEventually{} % -% \usetheme[]{m} +% \subsection{Main Theme} % - -% Option: usetitleprogressbar -% adds a thin progress bar underneath each frame title +% \iffalse +%<*package> +% \fi +% +% +% Options +% +% \begin{macrocode} \newif\if@useTitleProgressBar \@useTitleProgressBarfalse \DeclareOptionBeamer{usetitleprogressbar}{ \@useTitleProgressBartrue } - -% Option: usetotalslideindicator -% formats slide numbering as #current/#total +% \end{macrocode} +% +% usetotalslideindicator +% +% \begin{macrocode} \newif\if@useTotalSlideIndicator \@useTotalSlideIndicatorfalse \DeclareOptionBeamer{usetotalslideindicator}{ \@useTotalSlideIndicatortrue } - -% Option: noslidenumbers -% omits slide numbering entirely +% \end{macrocode} +% +% noslidenumbers +% +% \begin{macrocode} \newif\if@noSlideNumbers \@noSlideNumbersfalse \DeclareOptionBeamer{noslidenumbers}{ \@noSlideNumberstrue } - -% Option: nosectionslide -% omits the dedicated slide at the start of each new section +% \end{macrocode} +% +% nosectionslide +% +% \begin{macrocode} \newif\if@noSectionSlide \@noSectionSlidefalse \DeclareOptionBeamer{nosectionslide}{ \@noSectionSlidetrue } - -% Option: protectframetitle -% applies \protect to \insertframetitle to allow \cite, \ref, etc. +% \end{macrocode} +% +% protectframetitle +% +% \begin{macrocode} \newif\if@protectFrameTitle \@protectFrameTitlefalse \DeclareOptionBeamer{protectframetitle}{ \@protectFrameTitletrue } - -% Option: nooffset -% turns off extra space used to vertically center content on frames +% \end{macrocode} +% +% nooffset +% +% \begin{macrocode} \newlength{\@mtheme@voffset} \setlength{\@mtheme@voffset}{2em} \DeclareOptionBeamer{nooffset}{ \setlength{\@mtheme@voffset}{0em} } - -% Option: blockbg -% applies a gray background to blocks (via color theme `metropolis`) +% \end{macrocode} +% +% blockbg +% +% \begin{macrocode} \DeclareOptionBeamer{blockbg}{ \PassOptionsToPackage{blockbg}{beamercolorthememetropolis}% } - -% Option: ... +% \end{macrocode} +% +% Unknown option error handling +% +% \begin{macrocode} \DeclareOptionBeamer*{ \PackageWarning{beamerthemem}{Unknown option `\CurrentOption'}% } - \ProcessOptionsBeamer - -% Customize: \mthemetitleformat -% formats the main title, section titles, and frame titles +% \end{macrocode} +% +% mthemetitleformat +% +% \begin{macro}{\mthemetitleformat} +% \begin{macrocode} \def\mthemetitleformat#1{\scshape #1} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} \mode - -%{{{ --- Packages --------------------- +% \end{macrocode} +% +% Packages +% +% \begin{macrocode} \RequirePackage{etoolbox} \RequirePackage{tikz} @@ -112,23 +190,37 @@ \xetexorluatexfalse \fi \fi - \usetikzlibrary{backgrounds} \usetikzlibrary{calc} - \usecolortheme{metropolis} - \ifxetexorluatex \usefonttheme{metropolis} \else \PackageWarning{beamerthemem}{You need to compile with XeLaTeX or LuaLaTeX for the Fira fonts.} \fi - -%}}} -%{{{ --- Titlepage -------------------- +% \end{macrocode} +% +% Make Titlepage +% +% \begin{macro}{\maketitle} +% \begin{macrocode} \def\maketitle{\ifbeamer@inframe\titlepage\else\frame[plain]{\titlepage}\fi} +% \end{macrocode} +% \end{macro} +% +% Define Titlepage +% +% \begin{macro}{\titlepage} +% \begin{macrocode} + \def\titlepage{\usebeamertemplate{title page}} +% \end{macrocode} +% \end{macro} +% +% Set beamer title page template +% +% \begin{macrocode} \setbeamertemplate{title page} { @@ -210,13 +302,30 @@ \vspace*{\@mtheme@voffset} \end{minipage} } - -%}}} -%{{{ --- Progressbar ------------------ +% \end{macrocode} +% +% Progressbar +% +% \begin{macrocode} \RequirePackage{calc} +% \end{macrocode} +% +% \begin{macro}{\inserttotalframenumber} +% \begin{macrocode} + \def\inserttotalframenumber{100} % prevent \progressbar@percent from getting too big on first compile +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} + \newlength{\progressbar@percent} +% \end{macrocode} +% +% \begin{macro}{\progressbar} +% \begin{macrocode} + \newcommand{\progressbar}[1]{% \setlength{\progressbar@percent}{% #1 * \ratio{\insertframenumber pt}{\inserttotalframenumber pt}% @@ -227,15 +336,30 @@ \draw[fg, fill=fg] (0,0) rectangle (\progressbar@percent, 0.4pt); \end{tikzpicture}% } - - -%}}} -%{{{ --- Commands --------------------- +% \end{macrocode} +% \end{macro} +% +% Commands +% +% \begin{macro}{\insertsectionHEAD} +% \begin{macrocode} \newcommand{\insertsectionHEAD}{% \expandafter\insertsectionHEADaux\insertsectionhead} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\insertsectionHEADaux} +% \begin{macrocode} \newcommand{\insertsectionHEADaux}[3]{\mthemetitleformat{#3}}% +% \end{macrocode} +% \end{macro} +% +% Create a plain frame with dark background +% +% \begin{macro}{\plain} +% \begin{macrocode} \newcommand{\plain}[2][]{% \begingroup @@ -251,25 +375,36 @@ \end{frame} \endgroup } - -%}}} -%{{{ --- Itemize ---------------------- +% \end{macrocode} +% \end{macro} +% +% Itemize tweaks +% +% \begin{macrocode} \setlength{\leftmargini}{1em} - -% Actually one level should be enough but ... \setlength{\leftmarginii}{1em} \setlength{\leftmarginiii}{1em} +% \end{macrocode} +% +% \begin{macro}{\itemBullet} +% \begin{macrocode} \newcommand{\itemBullet}{∙} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} \setbeamertemplate{itemize item}{\itemBullet} \setbeamertemplate{itemize subitem}{\itemBullet} \setbeamertemplate{itemize subsubitem}{\itemBullet} \setlength{\parskip}{0.5em} - -%}}} -%{{{ --- Sections --------------------- +% \end{macrocode} +% +% Sections +% +% \begin{macrocode} \setbeamertemplate{section page} { @@ -283,9 +418,12 @@ \end{minipage} \par } - - +% \end{macrocode} +% % Insert frame with section title at every section start +% +% \begin{macrocode} + \if@noSectionSlide\else% \AtBeginSection[] { @@ -296,15 +434,19 @@ \fi } \fi - -%}}} -%{{{ --- Captions --------------------- +% \end{macrocode} +% +% Captions +% +% \begin{macrocode} \setbeamertemplate{caption label separator}{: } \setbeamertemplate{caption}[numbered] - -%}}} -%{{{ --- Footline/footnote ------------ +% \end{macrocode} +% +% Footline/footnote +% +% \begin{macrocode} \usenavigationsymbolstemplate{} \setbeamertemplate{footline} @@ -322,16 +464,17 @@ \fi% \end{beamercolorbox}% } - \setbeamertemplate{footnote} {% \parindent 0em\noindent% \raggedright \usebeamercolor{footnote}\hbox to 0.8em{\hfil\insertfootnotemark}\insertfootnotetext\par% } - -%}}} -%{{{ --- Frametitle ------------------- +% \end{macrocode} +% +% Frametitle +% +% \begin{macrocode} \setbeamertemplate{frametitle}{% \nointerlineskip @@ -351,13 +494,15 @@ \fi \vspace{\@mtheme@voffset} } - -%}}} -%{{{ --- pgfplots --------------------- - -%{{{ Colors - +% \end{macrocode} +% +% pgfplots +% +% Colors +% % TolColors from http://www.r-bloggers.com/the-paul-tol-21-color-salute/ +% \begin{macrocode} + \definecolor{TolColor1}{HTML}{332288} % dark purple \definecolor{TolColor2}{HTML}{6699CC} % dark blue \definecolor{TolColor3}{HTML}{88CCEE} % light blue @@ -370,9 +515,11 @@ \definecolor{TolColor10}{HTML}{AA4466} % light pink \definecolor{TolColor11}{HTML}{882255} % dark pink \definecolor{TolColor12}{HTML}{AA4499} % light purple - -%}}} -%{{{ Color cycles +% \end{macrocode} +% +% Color cycles +% +% \begin{macrocode} \pgfplotscreateplotcyclelist{mbarplot cycle}{% {draw=TolColor2, fill=TolColor2!70}, @@ -388,16 +535,17 @@ {draw=TolColor3, fill=TolColor3!70}, {draw=TolColor5, fill=TolColor5!70}, } - \pgfplotscreateplotcyclelist{mlineplot cycle}{% {TolColor2, mark=*, mark size=1.5pt}, {TolColor7, mark=square*, mark size=1.3pt}, {TolColor4, mark=triangle*, mark size=1.5pt}, {TolColor6, mark=diamond*, mark size=1.5pt}, } - -%}}} -%{{{ Styles +% \end{macrocode} +% +% Styles +% +% \begin{macrocode} \pgfplotsset{ compat=1.9, @@ -466,16 +614,44 @@ 1000 sep={} }, } - -%}}} +% \end{macrocode} +% +% +% \begin{macrocode} \mode +% \end{macrocode} +% +% misc +% +% \begin{macrocode} -%{{{ misc \let\otp\titlepage +% \end{macrocode} +% +% \begin{macro}{\titlepage} +% \begin{macrocode} + \renewcommand{\titlepage}{\otp\addtocounter{framenumber}{-1}} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\mreducelistspacing} +% \begin{macrocode} + \newcommand{\mreducelistspacing}{\vspace{-\topsep}} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} \linespread{1.15} +% \end{macrocode} -%}}} +% +% \iffalse +% +% \fi +% +% \Finale +\endinput