From 4bb9dfaf3d22589ae47db564ee588c1690de9cdd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 15 Nov 2012 00:19:15 +0000 Subject: beamer (14nov12) git-svn-id: svn://tug.org/texlive/trunk@28262 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/beamer/beamerbaselocalstructure.sty | 6 +- .../tex/latex/beamer/beamerbaseoverlay.sty | 10 +++- .../texmf-dist/tex/latex/beamer/beamerbasercs.sty | 4 +- .../tex/latex/beamer/beamerbasesection.sty | 22 ++++++-- .../themes/color/beamercolorthememonarca.sty | 66 ++++++++++++++++++++++ 5 files changed, 95 insertions(+), 13 deletions(-) create mode 100755 Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthememonarca.sty (limited to 'Master/texmf-dist/tex/latex/beamer') diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty index 8bb9c85f3be..1c4832ee331 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaselocalstructure.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaselocalstructure.sty,v 5ff5e8ed7c0e 2012/05/25 09:30:46 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaselocalstructure.sty,v ddfba79dac19 2012/11/13 20:36:32 joseph $ \mode @@ -75,8 +75,8 @@ {\usebeamertemplate{structure text begin}\usebeamercolor[fg]{structure}\usebeamerfont{structure}} {\usebeamertemplate{structure text end}}{\color{.}}{}}{\end{altenv}} - \newcommand<>{\alert}[1]{\begin{alertenv}#2#1\end{alertenv}} - \newcommand<>{\structure}[1]{\begin{structureenv}#2#1\end{structureenv}} + \newcommand<>{\alert}[1]{\begin{alertenv}#2\relax#1\end{alertenv}} + \newcommand<>{\structure}[1]{\begin{structureenv}#2\relax#1\end{structureenv}} } diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty index 140ce192dd3..5ef37d761b9 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoverlay.sty @@ -9,7 +9,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseoverlay.sty,v 45744d9ae88b 2012/04/03 05:30:29 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbaseoverlay.sty,v 6afbc49b1109 2012/11/11 20:09:38 joseph $ % % @@ -490,7 +490,13 @@ \long\def\beamer@itemreverse[#1]<#2>{\beamer@parseitem<#2>[{#1}]} \def\beamer@parseitem<#1>{% - \gdef\beamer@closeitem{\end{actionenv}}% + \gdef\beamer@closeitem{% + %% Handle empty item as LaTeX would do + \if@inlabel\indent\par\fi + \end{actionenv}% + %% Local change inside actionenv should survive, and should be + %% always false + \@noparitemfalse}% \begin{actionenv}<#1>\beamer@callorigitem} diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty index 4bf0de8401e..62ac5863c29 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasercs.sty @@ -10,7 +10,7 @@ % See the file doc/licenses/LICENSE for more details. % Define beamer version -\def\beamer@version{3.23} +\def\beamer@version{3.24} % Get date and version from RCS Ids @@ -37,4 +37,4 @@ \ProvidesClass{\beamer@rcsfile}[\beamer@rcsdate\space#2\space (rcs-revision \beamer@rcsrevision)] } -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v c011175e662f 2012/10/28 15:23:45 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasercs.sty,v cb16a617839f 2012/11/13 20:38:40 joseph $ diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty index 5c648a24c10..c7e00cdcb26 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasesection.sty,v 22ff49def670 2012/05/30 21:50:05 joseph $ +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/beamerbasesection.sty,v 0056eef6f17f 2012/11/11 21:00:02 joseph $ \mode @@ -31,6 +31,17 @@ \newif\ifbeamer@inlecture \beamer@inlecturetrue +\newcommand{\beamer@if@in@clist@TF}[2]{% + \def\beamer@if@in@clist@aux##1,#2,{}% + \expandafter\expandafter\expandafter\ifx + \expandafter\expandafter\expandafter\@nil + \expandafter\beamer@if@in@clist@aux\expandafter,#1,{}{},#2,\@nil + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi +} + \newcounter{lecture} \renewcommand\thelecture{\@arabic\c@lecture} \let\insertlecturenumber=\thelecture @@ -44,11 +55,10 @@ \def\beamer@shortlecturename{#1} \ifx\beamer@onlylecture\@empty \else - \ifx\beamer@currentlecturelabel\beamer@onlylecture - \beamer@inlecturetrue - \else - \beamer@inlecturefalse - \fi + \expandafter\beamer@if@in@clist@TF\expandafter\beamer@onlylecture + \beamer@currentlecturelabel + {\beamer@inlecturetrue} + {\beamer@inlecturefalse} \fi \beamer@atbeginlecture \beamer@resumemode diff --git a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthememonarca.sty b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthememonarca.sty new file mode 100755 index 00000000000..f6bad5add89 --- /dev/null +++ b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthememonarca.sty @@ -0,0 +1,66 @@ +% Copyright 2012 by Till Tantau and Max Dohse +% +% This file may be distributed and/or modified +% +% 1. under the LaTeX Project Public License and/or +% 2. under the GNU Public License. +% +% See the file doc/licenses/LICENSE for more details. +% +% This theme is based on the crane theme by Till Tantau. +% the OVERLYSTYLISH option is taken from the albatross theme +% +% The colors are those of the Monarca/Monarch butterfly. +% http://en.wikipedia.org/wiki/Monarch_butterfly +% The Monarch is famous for its southward migration +% and northward return in summer from Canada to Mexico, +% which spans the life of three to four generations of the butterfly. +% + +\ProvidesPackageRCS $Header: /Users/joseph/Documents/LaTeX/beamer/base/themes/color/beamercolorthememonarca.sty,v c1fc5075f54a 2012/11/11 20:21:39 joseph $ + +\definecolor{craneorange}{RGB}{252,187,6} +\definecolor{craneblue}{RGB}{4,6,76} + +\DeclareOption{overlystylish}{ + \def\beamer@cta@do{\setbeamertemplate{background canvas}[vertical shading]% + [bottom=craneorange,top=craneorange,middle=yellow] + } +} +\ProcessOptions + +\@ifundefined{beamer@cta@do}{}{\beamer@cta@do} + +\mode + +\setbeamercolor{normal text}{fg=black,bg=craneorange} + +\setbeamercolor{structure}{fg=black} + +\setbeamercolor{palette primary}{fg=craneorange!75,bg=black} +\setbeamercolor{palette secondary}{fg=black,bg=craneorange} +\setbeamercolor{palette tertiary}{fg=craneorange!75,bg=black} +\setbeamercolor{palette quaternary}{fg=black,bg=white} + +\setbeamercolor{titlelike}{parent=palette quaternary} + +\setbeamercolor{block title}{fg=black,bg=white} +\setbeamercolor{block title alerted}{use=alerted text,fg=black,bg=alerted text.fg!75!bg} +\setbeamercolor{block title example}{use=example text,fg=black,bg=example text.fg!75!bg} + +\setbeamercolor{block body}{parent=normal text,use=block title,bg=block title.bg!25!bg} +\setbeamercolor{block body alerted}{parent=normal text,use=block title alerted,bg=block title alerted.bg!25!bg} +\setbeamercolor{block body example}{parent=normal text,use=block title example,bg=block title example.bg!25!bg} + +\setbeamercolor{sidebar}{bg=craneorange!90}%70 + +\setbeamercolor{palette sidebar primary}{fg=black} +\setbeamercolor{palette sidebar secondary}{fg=black!75} +\setbeamercolor{palette sidebar tertiary}{fg=black!75} +\setbeamercolor{palette sidebar quaternary}{fg=black} + +\setbeamercolor*{separation line}{} +\setbeamercolor*{fine separation line}{} + +\mode + -- cgit v1.2.3