From 641952c28af814cb2ba30f4f57dc83222e8ba80f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 12 Jun 2010 23:26:55 +0000 Subject: beamer 3.09 (12jun10) git-svn-id: svn://tug.org/texlive/trunk@18919 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/beamer/beamerbasesection.sty | 7 +++++-- .../texmf-dist/tex/latex/beamer/beamerbasetitle.sty | 8 +++++--- .../texmf-dist/tex/latex/beamer/beamerbasetoc.sty | 16 ++++++++-------- .../tex/latex/beamer/beamerbasetranslator.sty | 20 +++++++++----------- .../beamer/themes/color/beamercolorthemedefault.sty | 8 +++++++- .../beamer/themes/font/beamerfontthemedefault.sty | 12 +++++++++--- .../beamer/themes/inner/beamerinnerthemedefault.sty | 21 +++++++++++++++++---- 7 files changed, 60 insertions(+), 32 deletions(-) (limited to 'Master/texmf-dist/tex/latex/beamer') diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasesection.sty index 510fbd85b85..d46c503218b 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: /home/vedran/bitbucket/beamer/base/beamerbasesection.sty,v 6feac3ddebc1 2010/05/06 17:54:55 joseph $ +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/base/beamerbasesection.sty,v 717e481ca47a 2010/06/12 11:33:01 rivanvx $ \mode @@ -229,6 +229,7 @@ % % Subsection Definitions % +\def\subsectionname{\translate{Subsection}} \newcounter{subsection}[section] \renewcommand\thesubsection{\@arabic\c@subsection} @@ -270,6 +271,8 @@ \beamer@resumemode} \def\insertsubsection{} +\def\insertsubsectionnumber{\@arabic\c@subsection} + \def\beamer@untitledsubsection{% \refstepcounter{subsection}% \def\insertsubsection{}% @@ -316,7 +319,7 @@ {% \long\def\subsubsecname{#2}% \addtocontents{toc}{\protect\beamer@subsubsectionintoc% - {\the\c@part}{\the\c@section}{\the\c@subsection}{\the\c@subsubsection}{\the\c@page}{\the\beamer@tocsectionnumber}{#2}}% + {\the\c@section}{\the\c@subsection}{\the\c@subsubsection}{#2}{\the\c@page}{\the\c@part}{\the\beamer@tocsectionnumber}}% }% \addtocontents{nav}{\protect\headcommand{\protect\beamer@subsubsectionentry% {\the\c@part}{\the\c@section}{\the\c@subsection}{\the\c@subsubsection}{\the\c@page}{\subsubsecname}}}% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty index 511c420f615..5a04c3a8e4d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetitle.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbasetitle.sty,v efa082c6111d 2010/05/01 13:27:03 rivanvx $ +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/base/beamerbasetitle.sty,v 717e481ca47a 2010/06/12 11:33:01 rivanvx $ \mode @@ -29,12 +29,14 @@ \def\titlepage{\usebeamertemplate*{title page}\@thanks} \def\partpage{\usebeamertemplate*{part page}} \def\sectionpage{\usebeamertemplate*{section page}} -%\def\subsectionpage{\usebeamertemplate*{subsection page}} % TODO +\def\subsectionpage{\usebeamertemplate*{subsection page}} \mode
{\renewcommand\titlepage{} -\providecommand\partpage{}} +\providecommand\partpage{} +\providecommand\sectionpage{} +\providecommand\subsectionpage{}} % diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty index ff24d87cdb0..41951b16ae9 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetoc.sty @@ -8,7 +8,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbasetoc.sty,v 8ad93b65b084 2010/06/06 13:05:23 rivanvx $ +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/base/beamerbasetoc.sty,v 242ecaa6783b 2010/06/11 15:21:47 rivanvx $ \mode @@ -170,23 +170,23 @@ \def\subsubsectionintoc{} \long\def\beamer@subsubsectionintoc#1#2#3#4#5#6#7{% \ifnum\c@tocdepth>2% - \ifnum#1=\beamer@showpartnumber% + \ifnum#6=\beamer@showpartnumber% { \beamer@saveanother% \gdef\beamer@todo{}% \beamer@slideinframe=#2\relax% \expandafter\only\beamer@tocsections{\gdef\beamer@todo{% \ifbeamer@pausesubsections\pause\fi% - \beamer@tempcount=#6% + \beamer@tempcount=#7% \advance\beamer@tempcount by\beamer@sectionadjust% \edef\inserttocsectionnumber{\the\beamer@tempcount}% - \def\inserttocsubsectionnumber{#3}% - \def\inserttocsubsubsectionnumber{#4}% - \def\inserttocsubsubsection{\hyperlink{Navigation#5}{#7}}% - \beamer@tocifnothide{\ifnum\c@section=#2\beamer@toc@oss\else\beamer@toc@ooss\fi}% + \def\inserttocsubsectionnumber{#2}% + \def\inserttocsubsubsectionnumber{#3}% + \def\inserttocsubsubsection{\hyperlink{Navigation#5}{#4}}% + \beamer@tocifnothide{\ifnum\c@section=#1\beamer@toc@oss\else\beamer@toc@ooss\fi}% {% \def\beamer@breakhere{\\}% - \beamer@tocact{\ifnum\c@section=#2\ifnum\c@subsection=#3\beamer@toc@css\else\beamer@toc@oss\fi\else\beamer@toc@ooss\fi\else\beamer@toc@oosss\fi\else\beamer@toc@ooosss\fi} + \beamer@tocact{\ifnum\c@section=#1\ifnum\c@subsection=#2\ifnum\c@subsubsection=#3\beamer@toc@csss\else\beamer@toc@osss\fi\else\beamer@toc@oosss\fi\else\beamer@toc@ooosss\fi} {subsubsection in toc}% }% }}% diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasetranslator.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasetranslator.sty index 3459b3dff53..06b035fe383 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasetranslator.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasetranslator.sty @@ -8,20 +8,18 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/base/beamerbasetranslator.sty,v efa082c6111d 2010/05/01 13:27:03 rivanvx $ +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/base/beamerbasetranslator.sty,v 85fd1cc7fc42 2010/06/11 14:40:11 rivanvx $ % -% Check for translator and load all dictionaries +% Load translator and it's dictionaries % -\IfFileExists{translator.sty}{ - \RequirePackage{translator} - \usedictionary{translator-basic-dictionary} - \usedictionary{translator-bibliography-dictionary} - \usedictionary{translator-environment-dictionary} - \usedictionary{translator-months-dictionary} - \usedictionary{translator-numbers-dictionary} - \usedictionary{translator-theorem-dictionary} -}{\providecommand\translate[2][]{#2}} +\RequirePackage{translator} +\usedictionary{translator-basic-dictionary} +\usedictionary{translator-bibliography-dictionary} +\usedictionary{translator-environment-dictionary} +\usedictionary{translator-months-dictionary} +\usedictionary{translator-numbers-dictionary} +\usedictionary{translator-theorem-dictionary} \mode diff --git a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty index d3c48a2d3be..d9edaf1e2cc 100644 --- a/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/themes/color/beamercolorthemedefault.sty @@ -7,7 +7,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/themes/color/beamercolorthemedefault.sty,v 25f85d59db1e 2010/04/23 17:12:41 rivanvx $ +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/themes/color/beamercolorthemedefault.sty,v 717e481ca47a 2010/06/12 11:33:01 rivanvx $ \mode @@ -66,6 +66,9 @@ \setbeamercolor{part name}{} \setbeamercolor{part title}{parent=titlelike} +\setbeamercolor{section name}{} +\setbeamercolor{section title}{parent=titlelike} + \setbeamercolor{section in toc}{parent=structure} \setbeamercolor{section in toc shaded}{parent=section in toc} \setbeamercolor{section in head/foot}{parent=palette tertiary} @@ -73,6 +76,9 @@ \setbeamercolor{section in sidebar shaded}{use=section in sidebar,fg=section in sidebar.fg!40!bg} \setbeamercolor{section number projected}{parent=item projected} +\setbeamercolor{subsection name}{} +\setbeamercolor{subsection title}{parent=titlelike} + \setbeamercolor{subsection in toc}{} \setbeamercolor{subsection in toc shaded}{parent=subsection in toc} \setbeamercolor{subsection in head/foot}{parent=palette secondary} diff --git a/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty index 4e3eaf3e985..7fcfa85bd91 100644 --- a/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/themes/font/beamerfontthemedefault.sty @@ -7,7 +7,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/themes/font/beamerfontthemedefault.sty,v efa082c6111d 2010/05/01 13:27:03 rivanvx $ +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/themes/font/beamerfontthemedefault.sty,v 717e481ca47a 2010/06/12 11:33:01 rivanvx $ \mode @@ -37,8 +37,11 @@ \setbeamerfont{date in head/foot}{} \setbeamerfont{date in sidebar}{} -\setbeamerfont{part name}{size=\Large} -\setbeamerfont{part title}{parent=title} +\setbeamerfont{part name}{size=\LARGE} +\setbeamerfont{part title}{size=\LARGE,parent=title} + +\setbeamerfont{section name}{size=\Large} +\setbeamerfont{section title}{size=\Large,parent=title} \setbeamerfont{section in toc}{parent=structure} \setbeamerfont{section in toc shaded}{parent=section in toc} @@ -46,6 +49,9 @@ \setbeamerfont{section in sidebar}{size=\tiny} \setbeamerfont{section number projected}{size=\small,parent={section in toc,projected text}} +\setbeamerfont{subsection name}{size=\large} +\setbeamerfont{subsection title}{size=\large,parent=title} + \setbeamerfont{subsection in toc}{} \setbeamerfont{subsection in toc shaded}{parent=subsection in toc} \setbeamerfont{subsection in head/foot}{} diff --git a/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty b/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty index 09723124095..1ac35e8a152 100644 --- a/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty +++ b/Master/texmf-dist/tex/latex/beamer/themes/inner/beamerinnerthemedefault.sty @@ -7,7 +7,7 @@ % % See the file doc/licenses/LICENSE for more details. -\ProvidesPackageRCS $Header: /home/vedran/bitbucket/beamer/themes/inner/beamerinnerthemedefault.sty,v 25f85d59db1e 2010/04/23 17:12:41 rivanvx $ +\ProvidesPackageRCS $Header: /home/vedranm/bitbucket/beamer/themes/inner/beamerinnerthemedefault.sty,v 717e481ca47a 2010/06/12 11:33:01 rivanvx $ \mode @@ -70,7 +70,7 @@ \begin{centering} {\usebeamerfont{part name}\usebeamercolor[fg]{part name}\partname~\insertromanpartnumber} \vskip1em\par - \begin{beamercolorbox}[sep=8pt,center,#1]{part title} + \begin{beamercolorbox}[sep=16pt,center,#1]{part title} \usebeamerfont{part title}\insertpart\par \end{beamercolorbox} \end{centering} @@ -82,10 +82,23 @@ \defbeamertemplate*{section page}{default}[1][] { \begin{centering} - {\usebeamerfont{part name}\usebeamercolor[fg]{part name}\sectionname~\insertsectionnumber} + {\usebeamerfont{section name}\usebeamercolor[fg]{section name}\sectionname~\insertsectionnumber} + \vskip1em\par + \begin{beamercolorbox}[sep=12pt,center,#1]{part title} + \usebeamerfont{section title}\insertsection\par + \end{beamercolorbox} + \end{centering} +} + +% Subection page: default + +\defbeamertemplate*{subsection page}{default}[1][] +{ + \begin{centering} + {\usebeamerfont{subsection name}\usebeamercolor[fg]{subsection name}\subsectionname~\insertsubsectionnumber} \vskip1em\par \begin{beamercolorbox}[sep=8pt,center,#1]{part title} - \usebeamerfont{part title}\insertsection\par + \usebeamerfont{subsection title}\insertsubsection\par \end{beamercolorbox} \end{centering} } -- cgit v1.2.3