From 71ab038a518296cfe66d1b59e4456b2f1092259e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 12 Jun 2016 16:09:40 +0000 Subject: beamertheme-epyt (25may16) git-svn-id: svn://tug.org/texlive/trunk@41404 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/doc/latex/beamertheme-epyt/README | 9 +- .../doc/latex/beamertheme-epyt/epyt-demo-cn.pdf | Bin 142696 -> 177987 bytes .../doc/latex/beamertheme-epyt/epyt-demo-cn.tex | 163 +++++---- .../doc/latex/beamertheme-epyt/epyt-demo.pdf | Bin 67462 -> 144996 bytes .../doc/latex/beamertheme-epyt/epyt-demo.tex | 135 ++++---- .../tex/latex/beamertheme-epyt/beamerthemeepyt.sty | 380 +++++++++++---------- 6 files changed, 341 insertions(+), 346 deletions(-) diff --git a/Master/texmf-dist/doc/latex/beamertheme-epyt/README b/Master/texmf-dist/doc/latex/beamertheme-epyt/README index 0fd5d41565d..2f55fea6108 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-epyt/README +++ b/Master/texmf-dist/doc/latex/beamertheme-epyt/README @@ -1,11 +1,8 @@ -Package epyt: a simple and clean theme for LaTeX beamer class -Copyright (C) 2013-2015 Zou Hu - +Package epyt: a simple and clean theme for LaTeX beamer class. Please report bugs, problems, and suggestions via + https://github.com/zohooo/epyt The package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this -license or (at your option) any later version. The latest version -of this license is in - http://www.latex-project.org/lppl.txt +license or (at your option) any later version. diff --git a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.pdf b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.pdf index 153c744fc21..ebb62c9cb5d 100644 Binary files a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.pdf and b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.tex b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.tex index 92368078aa4..2319c4ca133 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo-cn.tex @@ -1,26 +1,22 @@ % -*- coding: utf-8 -*- % !TEX program = xelatex -\documentclass[14pt,notheorems,xcolor={rgb}]{beamer} +\documentclass[14pt,notheorems]{beamer} \usetheme[style=beta]{epyt} % alpha, beta, delta, gamma, zeta -\usepackage{arev} % use arev sans font - \usepackage[UTF8,noindent]{ctex} -\setlength{\parskip}{5pt plus 1pt minus 1pt} - \usepackage{listings} \lstset{ basicstyle=\ttfamily,xleftmargin=0em, - commentstyle=\color{teal},keywordstyle=\color{accent4}, + commentstyle=\color{teal},keywordstyle=\color{acolor4}, language=[LaTeX]{TeX},morekeywords={usetheme,epytsetup} } -\newcommand{\mylead}[1]{\textcolor{accent1}{#1}} -\newcommand{\mybold}[1]{\textcolor{accent2}{#1}} -\newcommand{\mywarn}[1]{\textcolor{accent3}{#1}} +\newcommand{\mylead}[1]{\textcolor{acolor1}{#1}} +\newcommand{\mybold}[1]{\textcolor{acolor2}{#1}} +\newcommand{\mywarn}[1]{\textcolor{acolor3}{#1}} \newtheorem{theorem}{定理} \newtheorem{definition}[theorem]{定义} @@ -61,25 +57,22 @@ \begin{frame}{下载安装} \mylead{Epyt} 主题已经包含在主要的 TeX 发行版中。 \begin{itemize} - \item 在 MiKTeX 中作为 \mybold{beamer-theme-epyt} 宏包。 - \item 在 TeXLive 中作为 \mybold{epyt} 宏包。 + \item 在 MiKTeX 中作为 \mybold{beamertheme-epyt} 宏包。 + \item 在 TeXLive 中作为 \mybold{beamertheme-epyt} 宏包。 \end{itemize} 你可以在包管理器中安装它。当然也可以直接从 -\href{https://www.ctan.org/pkg/epyt}{CTAN} 中下载并安装。 +\href{https://www.ctan.org/pkg/beamertheme-epyt}{CTAN} 中下载并安装。 \end{frame} \begin{frame}[fragile]{开始使用} -下面的代码是使用 \mylead{epyt} 主题的最简单例子。 +要使用 \mylead{epyt} 主题,可以在导言区中加入下面一行。 \begin{lstlisting} -\documentclass[xcolor={rgb}]{beamer} \usetheme{epyt} \end{lstlisting}\pause 如果要使用中文,可以添加 \verb ctex 宏包,例如: \begin{lstlisting} -\usepacakge[UTF8,noindent]{ctex} -\end{lstlisting}\pause -注意你\mywarn{必须}给 xcolor 宏包传递 rgb 参数。 -这是因为 epyt 主题总是使用 HSB 颜色模型。 +\usepackage[UTF8,noindent]{ctex} +\end{lstlisting} \end{frame} \begin{frame}[fragile]{样式选用} @@ -109,50 +102,23 @@ \begin{frame}{预定义的颜色} 每种样式都预先定义了五种强调颜色。当前样式的强调颜色如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} \pause 每种样式也预先定义了五种填充颜色,如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \pause 用 tikz 绘图时可以使用这些预先定义的颜色。 \end{frame} -\epytsetup{style=zeta} - -\begin{frame}[plain]\transboxout -\titlepage -\end{frame} - -\section{白色文字红色背景} - -\begin{frame}{预定义的颜色} -当前样式预先定义了五种强调颜色,如下所示。 -\begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} -\end{flushleft} -当前样式预先定义了五种填充颜色,如下所示。 -\begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} -\end{flushleft} -\end{frame} - \epytsetup{style=gamma} \begin{frame}[plain]\transboxout @@ -164,19 +130,19 @@ \begin{frame}{预定义的颜色} 当前样式预先定义了五种强调颜色,如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} 当前样式预先定义了五种填充颜色,如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -201,19 +167,19 @@ \begin{frame}{预定义的颜色} 当前样式预先定义了五种强调颜色,如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} 当前样式预先定义了五种填充颜色,如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -228,19 +194,19 @@ \begin{frame}{预定义的颜色} 当前样式预先定义了五种强调颜色,如下所示。 \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} 当前样式预先定义了五种填充颜色,如下所示。 \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -255,4 +221,31 @@ $$f'(x)=\mathrm{e}^x-1>0.$$ \end{proof} \end{frame} +\epytsetup{style=zeta} + +\begin{frame}[plain]\transboxout +\titlepage +\end{frame} + +\section{白色文字红色背景} + +\begin{frame}{预定义的颜色} +当前样式预先定义了五种强调颜色,如下所示。 +\begin{flushleft} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} +\end{flushleft} +当前样式预先定义了五种填充颜色,如下所示。 +\begin{flushleft} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} +\end{flushleft} +\end{frame} + \end{document} diff --git a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.pdf b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.pdf index 674ee8a35e9..7ca399ac4b7 100644 Binary files a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.pdf and b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.tex b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.tex index dd5c8dd13b8..a285f508ea0 100644 --- a/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.tex +++ b/Master/texmf-dist/doc/latex/beamertheme-epyt/epyt-demo.tex @@ -1,23 +1,19 @@ % -*- coding: utf-8 -*- % !TEX program = xelatex -\documentclass[12pt,xcolor={rgb}]{beamer} +\documentclass[12pt]{beamer} \usetheme[style=beta]{epyt} % alpha, beta, delta, gamma, zeta -\usepackage{arev} % use arev sans font - -\setlength{\parskip}{5pt plus 1pt minus 1pt} - \usepackage{listings} \lstset{ basicstyle=\ttfamily,xleftmargin=2em, - commentstyle=\color{teal},keywordstyle=\color{accent4}, + commentstyle=\color{teal},keywordstyle=\color{acolor4}, language=[LaTeX]{TeX},morekeywords={usetheme,epytsetup} } -\newcommand{\mylead}[1]{\textcolor{accent1}{#1}} -\newcommand{\mybold}[1]{\textcolor{accent2}{#1}} -\newcommand{\mywarn}[1]{\textcolor{accent3}{#1}} +\newcommand{\mylead}[1]{\textcolor{acolor1}{#1}} +\newcommand{\mybold}[1]{\textcolor{acolor2}{#1}} +\newcommand{\mywarn}[1]{\textcolor{acolor3}{#1}} \begin{document} @@ -50,17 +46,17 @@ \begin{frame}{Getting the Theme} \mylead{Epyt} theme is contained in major TeX distributions. \begin{itemize} - \item In MiKTeX as \mybold{beamer-theme-epyt} package. - \item In TeXLive as \mybold{epyt} package. + \item In MiKTeX as \mybold{beamertheme-epyt} package. + \item In TeXLive as \mybold{beamertheme-epyt} package. \end{itemize} You could install \mylead{epyt} in the package manager.\par\pause -Also you could download \mylead{epyt} from \href{https://www.ctan.org/pkg/epyt}{CTAN}. +Also you could download \mylead{epyt} from \href{https://www.ctan.org/pkg/beamertheme-epyt}{CTAN}. \end{frame} \begin{frame}[fragile]{Getting Started} The following code is a minimal example using \mylead{epyt} theme. \begin{lstlisting} -\documentclass[xcolor={rgb}]{beamer} +\documentclass{beamer} \usetheme{epyt} \begin{document} \begin{frame}{Hello} @@ -68,9 +64,6 @@ The following code is a minimal example using \mylead{epyt} theme. \end{frame} \end{document} \end{lstlisting} -\pause -Note that you \mywarn{should} pass rgb option to xcolor package, -since epyt theme always uses HSB colors. \end{frame} \begin{frame}[fragile]{Customization} @@ -101,19 +94,19 @@ And the default style is \mybold{beta}, which is what you see up to now in this For each style, five accent colors are predefined. With current style, they are the followings. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} -\pause Also five filler colors are predefined for each style. +\pause Also five filling colors are predefined for each style. \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \pause These colors are useful when you are drawing a tikz picture. \end{frame} @@ -129,19 +122,19 @@ With current style, they are the followings. \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} -Also five filler colors are predefined for this style. +Also five filling colors are predefined for this style. \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -166,19 +159,19 @@ A Beamer theme consists of the following four parts: \pause \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} -Also five filler colors are predefined for this style. +Also five filling colors are predefined for this style. \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -205,19 +198,19 @@ and we are done. \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} -Also five filler colors are predefined for this style. +Also five filling colors are predefined for this style. \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} @@ -232,19 +225,19 @@ Also five filler colors are predefined for this style. \begin{frame}{Predefined Colors} Five accent colors are predefined for this style. \begin{flushleft} -\textcolor{accent1}{accent1} -\textcolor{accent2}{accent2} -\textcolor{accent3}{accent3} -\textcolor{accent4}{accent4} -\textcolor{accent5}{accent5} +\textcolor{acolor1}{acolor1} +\textcolor{acolor2}{acolor2} +\textcolor{acolor3}{acolor3} +\textcolor{acolor4}{acolor4} +\textcolor{acolor5}{acolor5} \end{flushleft} -Also five filler colors are predefined for this style. +Also five filling colors are predefined for this style. \begin{flushleft} -\colorbox{filler1}{filler1} -\colorbox{filler2}{filler2} -\colorbox{filler3}{filler3} -\colorbox{filler4}{filler4} -\colorbox{filler5}{filler5} +\colorbox{fcolor1}{fcolor1} +\colorbox{fcolor2}{fcolor2} +\colorbox{fcolor3}{fcolor3} +\colorbox{fcolor4}{fcolor4} +\colorbox{fcolor5}{fcolor5} \end{flushleft} \end{frame} diff --git a/Master/texmf-dist/tex/latex/beamertheme-epyt/beamerthemeepyt.sty b/Master/texmf-dist/tex/latex/beamertheme-epyt/beamerthemeepyt.sty index 89c5677360f..51504ffaa38 100644 --- a/Master/texmf-dist/tex/latex/beamertheme-epyt/beamerthemeepyt.sty +++ b/Master/texmf-dist/tex/latex/beamertheme-epyt/beamerthemeepyt.sty @@ -1,12 +1,9 @@ % -*- coding: utf-8 -*- -\ProvidesPackage{beamerthemeepyt}[2016/05/14 v0.8] +\ProvidesPackage{beamerthemeepyt}[2016/05/25 v1.0] \makeatletter -\RequirePackage{tikz} -\usetikzlibrary{patterns} - %%% presentation mode \mode @@ -17,6 +14,8 @@ %% basic settings +\setlength{\parskip}{5pt plus 1pt minus 1pt} + \setbeamersize{text margin left=8mm,text margin right=8mm} %\geometry{hmargin=1em,vmargin=0em} @@ -42,30 +41,16 @@ \pgfuseshading{epyt@backgroundshading}% } -\defbeamertemplate{background}{brick} -{% - \usebeamercolor{normal text}% - \begin{tikzpicture} - \draw[pattern=bricks, pattern color=normal text.bg!80!black] - (0,0) rectangle (\paperwidth-\pgflinewidth,\paperheight-\pgflinewidth); - \end{tikzpicture} -} -\defbeamertemplate{background}{line} -{% - \usebeamercolor{normal text}% - \begin{tikzpicture} - \draw[pattern=horizontal lines, pattern color=normal text.bg!90!normal text.fg] - (0,0) rectangle (\paperwidth,\paperheight); - \end{tikzpicture} -} - \defbeamertemplate{frametitle}{simple} {% - \noindent\usebeamerfont{frametitle}\insertframetitle\par + \begingroup\offinterlineskip + \begin{beamercolorbox}[wd=\paperwidth,leftskip=\beamer@leftmargin]{frametitle} + \vskip6pt + \noindent\usebeamerfont{frametitle}\strut\insertframetitle\strut\par + \vskip4pt + \end{beamercolorbox} + \endgroup } -\setbeamertemplate{frametitle}[simple] - -\setbeamertemplate{navigation symbols}{} \defbeamertemplate{footline}{simple} { @@ -84,53 +69,28 @@ \end{beamercolorbox}% }% } -\defbeamertemplate{footline}{sectioning} -{ - \hbox{% - \begin{beamercolorbox}[wd=.8\paperwidth,ht=2.25ex,dp=1ex,left]{footline}% - \usebeamerfont{footline}\hspace*{\beamer@leftmargin}\insertshorttitle - \ifx\insertsection\@empty\else\qquad$\vartriangleright$\qquad\insertsection\fi - \ifx\insertsubsection\@empty\else\qquad$\vartriangleright$\qquad\insertsubsection\fi - \end{beamercolorbox}% - \begin{beamercolorbox}[wd=.2\paperwidth,ht=2.25ex,dp=1ex,right]{footline}% - \usebeamerfont{footline}% - \hyperlinkframeendprev{$\vartriangle$} - \Acrobatmenu{GoToPage}{\insertframenumber{}/\inserttotalframenumber} - \hyperlinkframestartnext{$\triangledown$}\hspace*{\beamer@rightmargin} - \end{beamercolorbox}% - }% -} -\setbeamertemplate{footline}[simple] %% -------------------- inner template -------------------- -\defbeamertemplate{title page}{simple}[1][]{ - \begin{beamercolorbox}[#1]{title} - \usebeamerfont{title}\inserttitle - \end{beamercolorbox} - \ifx\insertsubtitle\@empty\else - \vskip0.7em - \begin{beamercolorbox}[#1]{subtitle} - \usebeamerfont{subtitle}\insertsubtitle - \end{beamercolorbox} - \fi% - \vskip2em{\color{text1!50!back1}\hrule}\vskip2em - \begin{beamercolorbox}[#1]{author} - \usebeamerfont{author}\insertauthor - \end{beamercolorbox} - \ifx\insertinstitute\@empty\else - \vskip0.7em - \begin{beamercolorbox}[#1]{institute} - \usebeamerfont{institute}\insertinstitute - \end{beamercolorbox} - \fi% - \vskip2em{\color{text1!50!back1}\hrule}\vskip2em - \begin{beamercolorbox}[#1]{date} - \usebeamerfont{date}\insertdate - \end{beamercolorbox} +\defbeamertemplate{title separator one}{simple}{% + \hbox to \hsize{\hrulefill}% +} +\defbeamertemplate{title separator one}{triangle}{ + \hbox to \hsize{% + \tiny\leaders\hbox to 1em{\hss$\triangleright$\hss}\hfill + }% +} + +\defbeamertemplate{title separator two}{simple}{ + \hbox to \hsize{\hrulefill}% +} +\defbeamertemplate{title separator two}{triangle}{ + \hbox to \hsize{% + \tiny\leaders\hbox to 1em{\hss$\triangleleft$\hss}\hfill + }% } -\defbeamertemplate{title page}{triangle}[1][]{ +\defbeamertemplate{title page}{simple}[1][]{ \begin{beamercolorbox}[#1]{title} \usebeamerfont{title}\inserttitle \end{beamercolorbox} @@ -141,8 +101,7 @@ \end{beamercolorbox} \fi% \vskip18pt{% - \color{text1!50!back1}\leavevmode\tiny - \leaders\hbox to 1em{\hss$\triangleright$\hss}\hfill + \usebeamercolor[fg]{title separator one}\usebeamertemplate{title separator one}% }\vskip18pt \begin{beamercolorbox}[#1]{author} \usebeamerfont{author}\insertauthor @@ -154,40 +113,56 @@ \end{beamercolorbox} \fi% \vskip18pt{% - \color{text1!50!back1}\leavevmode\tiny - \leaders\hbox to 1em{\hss$\triangleleft$\hss}\hfill + \usebeamercolor[fg]{title separator two}\usebeamertemplate{title separator two}% }\vskip18pt \begin{beamercolorbox}[#1]{date} \usebeamerfont{date}\insertdate \end{beamercolorbox} } -\setbeamertemplate{itemize items}[default] -\setbeamertemplate{enumerate items}[default] - -\setbeamertemplate{section in toc}[sections numbered] -\setbeamertemplate{subsection in toc}{} - % sections and subsections -\AtBeginSection[]{\frame{\sectionpage}} +% create new template for section +\defbeamertemplate{section}{simple}{% + \insertsectionnumber.\hspace*{1ex}\insertsection% +} + +\AtBeginSection[]{\frame[plain]{\sectionpage}} \defbeamertemplate{section page}{simple}{ - \begin{center} - \usebeamerfont{section in toc} - \tableofcontents[sectionstyle=show/hide,subsectionstyle=hide] - \end{center} + \begin{beamercolorbox}[wd=\textwidth,center]{section title}% + \usebeamerfont{section title} + \usebeamertemplate{section}% + \end{beamercolorbox} + {% + \usebeamercolor[fg]{title separator one}% + \usebeamertemplate{title separator one}% + }% +} + +% create new template for subsection +\defbeamertemplate{subsection}{simple}{% + \insertsectionnumber.\insertsubsectionnumber\hspace*{2ex}\insertsubsection% } -\setbeamertemplate{section page}[simple] -\AtBeginSubsection[]{\frame{\subsectionpage}} +\AtBeginSubsection[]{\frame[plain]{\subsectionpage}} \defbeamertemplate{subsection page}{simple}{ - \begin{beamercolorbox}[wd=\paperwidth,center]{subsection in toc}% - \usebeamerfont{subsection in toc}\insertsectionnumber.\insertsubsectionnumber\hspace*{2ex}\insertsubsection% + \begin{beamercolorbox}[wd=\textwidth,center]{subsection title}% + \usebeamerfont{subsection title}% + \usebeamertemplate{subsection}% \end{beamercolorbox}% + {% + \usebeamercolor[fg]{title separator one}% + \usebeamertemplate{title separator one}% + }% +} + +\defbeamertemplate{subsection in toc}{triangle}{% + \leavevmode\leftskip=2.5em\scriptsize\raise1.25pt% + \rlap{\hskip-1.5em\donotcoloroutermaths$\blacktriangleright$}% + \normalsize\inserttocsubsection\par } -\setbeamertemplate{subsection page}[simple] % disable block style for theorems @@ -218,91 +193,99 @@ \setbeamerfont{author}{size=\large} \setbeamerfont{institute}{size=\normalsize} \setbeamerfont{date}{size=\large} -\setbeamerfont{section in toc}{size=\Large} -\setbeamerfont{subsection in toc}{size=\large} +\setbeamerfont{section in toc}{size=\large} +\setbeamerfont{subsection in toc}{size=\normalsize} \setbeamerfont{frametitle}{size=\large} +\setbeamerfont{block title}{size=\normalsize} \usefonttheme{professionalfonts} % there is some problem with default math fonts -%\usepackage{arev} +\usepackage{arev} % use arev sans font %% -------------------- color theme -------------------- -% always use rgb colors in pdf files -\substitutecolormodel{hsb}{rgb} - \def\beamer@epyt@style@do@alpha{ \definecolor{gray1}{gray}{0.1} - \definecolor{red69}{Hsb}{0,0.6,0.9} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{yellow99}{Hsb}{60,0.9,0.9} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{azure39}{Hsb}{210,0.3,0.9} - \definecolor{magenta69}{Hsb}{300,0.6,0.9} - \colorlet{text1}{white} - \colorlet{back1}{black} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{red69} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{magenta69} + \definecolor{red69}{HTML}{E55C5C} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{yellow99}{HTML}{E6E617} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{azure39}{HTML}{A1C3E5} + \definecolor{magenta69}{HTML}{E55CE5} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{black} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{red69} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{magenta69} \setbeamercolor{normal text}{bg=black,fg=white} \setbeamercolor{structure}{fg=yellow99} \setbeamercolor{local structure}{fg=azure39} \setbeamercolor{footline}{bg=,fg=white} \setbeamertemplate{background canvas}[myshading][top=black,middle=gray1,bottom=darkgray] - \setbeamertemplate{background}[line] + \setbeamertemplate{background}[grid][step=1mm,color=fgcolor!10!bgcolor] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[triangle] + \setbeamertemplate{title separator two}[triangle] \setbeamertemplate{title page}[simple][left] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[default] \setbeamertemplate{theorem end}[default] \setbeamertemplate{proof begin}[default] \setbeamertemplate{proof end}[default] } \def\beamer@epyt@style@do@beta{ - \definecolor{red99}{Hsb}{0,0.9,0.9} - \definecolor{yellow86}{Hsb}{60,0.8,0.6} - \definecolor{cyan95}{Hsb}{180,0.9,0.5} - \definecolor{blue77}{Hsb}{240,0.7,0.7} - \definecolor{blue99}{Hsb}{240,0.9,0.9} - \definecolor{magenta88}{Hsb}{300,0.8,0.8} - \colorlet{text1}{black} - \colorlet{back1}{white} - \colorlet{accent1}{blue99} - \colorlet{accent2}{cyan95} - \colorlet{accent3}{red99} - \colorlet{accent4}{yellow86} - \colorlet{accent5}{magenta88} + \definecolor{red99}{HTML}{E61717} + \definecolor{yellow86}{HTML}{99991F} + \definecolor{cyan95}{HTML}{0D8080} + \definecolor{blue77}{HTML}{3636B2} + \definecolor{blue99}{HTML}{1717E6} + \definecolor{magenta88}{HTML}{CC29CC} + \colorlet{fgcolor}{black} + \colorlet{bgcolor}{white} + \colorlet{acolor1}{blue99} + \colorlet{acolor2}{cyan95} + \colorlet{acolor3}{red99} + \colorlet{acolor4}{yellow86} + \colorlet{acolor5}{magenta88} \setbeamercolor{normal text}{bg=white,fg=black} \setbeamercolor{structure}{fg=blue99} \setbeamercolor{local structure}{fg=cyan95} \setbeamercolor{footline}{bg=blue77,fg=white} \setbeamertemplate{background canvas}[default] - \setbeamertemplate{background}[line] - \setbeamertemplate{title page}[triangle][center] + \setbeamertemplate{background}[grid][step=1mm,color=fgcolor!10!bgcolor] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[triangle] + \setbeamertemplate{title separator two}[triangle] + \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[simple] \setbeamertemplate{theorem end}[simple] \setbeamertemplate{proof begin}[simple] \setbeamertemplate{proof end}[simple] } \def\beamer@epyt@style@do@delta{ - \definecolor{red69}{Hsb}{0,0.6,0.9} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{yellow99}{Hsb}{60,0.9,0.9} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{azure39}{Hsb}{210,0.3,0.9} - \definecolor{blue77}{Hsb}{240,0.7,0.7} - \definecolor{blue88}{Hsb}{240,0.8,0.8} - \definecolor{blue97}{Hsb}{240,0.9,0.7} - \definecolor{magenta69}{Hsb}{300,0.6,0.9} - \definecolor{purple94}{Hsb}{330,0.9,0.4} - \colorlet{text1}{white} - \colorlet{back1}{blue77} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{red69} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{magenta69} + \definecolor{red69}{HTML}{E55C5C} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{yellow99}{HTML}{E6E617} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{azure39}{HTML}{A1C3E5} + \definecolor{blue77}{HTML}{3636B2} + \definecolor{blue88}{HTML}{2929CC} + \definecolor{blue97}{HTML}{1212B3} + \definecolor{magenta69}{HTML}{E55CE5} + \definecolor{purple94}{HTML}{660A38} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{blue77} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{red69} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{magenta69} \setbeamercolor{normal text}{bg=blue77,fg=white} \setbeamercolor{structure}{fg=yellow99} \setbeamercolor{local structure}{fg=azure39} @@ -311,29 +294,34 @@ \setbeamercolor{navigation symbols dimmed}{fg=purple94} \setbeamertemplate{background canvas}[myshading][top=blue97,middle=blue77,bottom=blue97] \setbeamertemplate{background}[grid][step=1mm,color=blue88] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[simple] + \setbeamertemplate{title separator two}[simple] \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[simple] \setbeamertemplate{theorem end}[simple] \setbeamertemplate{proof begin}[simple] \setbeamertemplate{proof end}[simple] } \def\beamer@epyt@style@do@gamma{ - \definecolor{red69}{Hsb}{0,0.6,0.9} - \definecolor{brown96}{Hsb}{30,0.9,0.6} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{green33}{Hsb}{120,0.3,0.3} - \definecolor{green39}{Hsb}{120,0.3,0.9} - \definecolor{green53}{Hsb}{120,0.5,0.3} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{magenta69}{Hsb}{300,0.6,0.9} - \colorlet{text1}{white} - \colorlet{back1}{green33} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{red69} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{magenta69} + \definecolor{red69}{HTML}{E55C5C} + \definecolor{brown96}{HTML}{99540F} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{green33}{HTML}{364D36} + \definecolor{green39}{HTML}{A1E5A1} + \definecolor{green53}{HTML}{264D26} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{magenta69}{HTML}{E55CE5} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{green33} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{red69} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{magenta69} \setbeamercolor{normal text}{bg=green33,fg=white} \setbeamercolor{structure}{fg=yellow} \setbeamercolor{local structure}{fg=green39} @@ -342,28 +330,33 @@ \setbeamercolor{navigation symbols dimmed}{fg=brown96} \setbeamertemplate{background canvas}[default] \setbeamertemplate{background}[grid][step=1mm,color=green53] - \setbeamertemplate{title page}[triangle][left] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[triangle] + \setbeamertemplate{title separator two}[triangle] + \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[default] \setbeamertemplate{theorem end}[default] \setbeamertemplate{proof begin}[default] \setbeamertemplate{proof end}[default] } \def\beamer@epyt@style@do@zeta{ - \definecolor{red85}{Hsb}{0,0.8,0.5} - \definecolor{red87}{Hsb}{0,0.8,0.7} - \definecolor{yellow69}{Hsb}{60,0.6,0.9} - \definecolor{yellow99}{Hsb}{60,0.9,0.9} - \definecolor{green69}{Hsb}{120,0.6,0.9} - \definecolor{cyan69}{Hsb}{180,0.6,0.9} - \definecolor{blue5x}{Hsb}{240,0.5,1} - \definecolor{magenta6x}{Hsb}{300,0.6,1} - \colorlet{text1}{white} - \colorlet{back1}{red87} - \colorlet{accent1}{yellow69} - \colorlet{accent2}{green69} - \colorlet{accent3}{magenta6x} - \colorlet{accent4}{cyan69} - \colorlet{accent5}{blue5x} + \definecolor{red85}{HTML}{801919} + \definecolor{red87}{HTML}{B32424} + \definecolor{yellow69}{HTML}{E5E55C} + \definecolor{yellow99}{HTML}{E6E617} + \definecolor{green69}{HTML}{5CE55C} + \definecolor{cyan69}{HTML}{5CE6E5} + \definecolor{blue5x}{HTML}{8080FF} + \definecolor{magenta6x}{HTML}{FF66FF} + \colorlet{fgcolor}{white} + \colorlet{bgcolor}{red87} + \colorlet{acolor1}{yellow69} + \colorlet{acolor2}{green69} + \colorlet{acolor3}{magenta6x} + \colorlet{acolor4}{cyan69} + \colorlet{acolor5}{blue5x} \setbeamercolor{normal text}{bg=red87,fg=white} \setbeamercolor{structure}{fg=yellow99} \setbeamercolor{local structure}{fg=yellow99} @@ -371,8 +364,13 @@ \setbeamercolor{navigation symbols}{bg=black} \setbeamercolor{navigation symbols dimmed}{fg=black} \setbeamertemplate{background canvas}[myshading][top=red85,middle=red87,bottom=red85] - \setbeamertemplate{background}[brick] - \setbeamertemplate{title page}[simple][center] + \setbeamertemplate{background}[grid][step=1mm,color=fgcolor!10!bgcolor] + \setbeamertemplate{footline}[simple] + \setbeamertemplate{title separator one}[simple] + \setbeamertemplate{title separator two}[simple] + \setbeamertemplate{title page}[simple][left] + \setbeamertemplate{section page}[simple] + \setbeamertemplate{subsection page}[simple] \setbeamertemplate{theorem begin}[default] \setbeamertemplate{theorem end}[default] \setbeamertemplate{proof begin}[default] @@ -381,24 +379,38 @@ \let\beamer@epyt@style@do@default=\beamer@epyt@style@do@beta \def\beamer@epyt@style@do@common{ - \colorlet{filler1}{accent1!50!back1} - \colorlet{filler2}{accent2!50!back1} - \colorlet{filler3}{accent3!50!back1} - \colorlet{filler4}{accent4!50!back1} - \colorlet{filler5}{accent5!50!back1} + \colorlet{fcolor1}{acolor1!50!bgcolor} + \colorlet{fcolor2}{acolor2!50!bgcolor} + \colorlet{fcolor3}{acolor3!50!bgcolor} + \colorlet{fcolor4}{acolor4!50!bgcolor} + \colorlet{fcolor5}{acolor5!50!bgcolor} + \setbeamercolor{title separator one}{fg=fgcolor!50!bgcolor} + \setbeamercolor{title separator two}{fg=fgcolor!50!bgcolor} \setbeamercolor{title}{use=structure,fg=structure.fg} \setbeamercolor{subtitle}{use={structure,normal text},fg=structure.fg!90!normal text.bg} \setbeamercolor{section in toc}{parent=title} \setbeamercolor{subsection in toc}{parent=subtitle} + \setbeamercolor{section in toc shaded}{parent=normal text} + \setbeamercolor{subsection in toc shaded}{parent=normal text} \setbeamercolor{frametitle}{parent=title} \setbeamercolor{theoremname}{parent=subtitle} \setbeamercolor{proofname}{parent=subtitle} - \setbeamercolor{block title}{fg=accent1,bg=darkgray} + \setbeamercolor{block title}{fg=acolor1,bg=darkgray} \setbeamercolor{block body}{bg=gray} - \setbeamercolor{block title example}{fg=accent2,bg=darkgray} + \setbeamercolor{block title example}{fg=acolor2,bg=darkgray} \setbeamercolor{block body example}{bg=gray} - \setbeamercolor{block title alerted}{fg=accent3,bg=darkgray} + \setbeamercolor{block title alerted}{fg=acolor3,bg=darkgray} \setbeamercolor{block body alerted}{bg=gray} + \setbeamertemplate{frametitle}[simple] + \setbeamertemplate{navigation symbols}{} + \setbeamertemplate{section}[simple] + \setbeamertemplate{subsection}[simple] + \setbeamertemplate{section in toc}[sections numbered] + \setbeamertemplate{subsection in toc}[triangle] + \setbeamertemplate{section in toc shaded}[default][100] + \setbeamertemplate{subsection in toc shaded}[default][100] + \setbeamertemplate{itemize items}[default] + \setbeamertemplate{enumerate items}[default] } %% apply user selected theme at last @@ -433,7 +445,7 @@ \setbeamercolor{subtitle}{fg=blue!70!gray} \setbeamercolor{section in toc}{fg=blue!90!gray} \setbeamercolor{subsection in toc}{fg=blue!80!gray} - \setbeamercolor{frametitle}{fg=blue!70!gray} + \setbeamercolor{frametitle}{fg=blue!70!gray,bg=white} \setbeamercolor{theoremname}{fg=blue!60!gray} \setbeamercolor{proofname}{fg=blue!60!gray} \setbeamercolor{footline}{bg=white,fg=black} -- cgit v1.2.3