From dc7cba3d7b221b82725446f2bd826b6f7a2bebbe Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 10 Aug 2020 21:03:39 +0000 Subject: beamerauxtheme (10aug20) git-svn-id: svn://tug.org/texlive/trunk@56087 c570f23f-e606-0410-a88d-b1316a301751 --- .../beamerauxtheme/beamerinnerthemesimplelines.sty | 2 +- .../beamerouterthemesidebarwithminiframes.sty | 2 +- .../beamerouterthemesplitwithminiframes.sty | 2 +- .../beamerauxtheme/beamerouterthemetwolines.sty | 25 ++++++++++++++-------- 4 files changed, 19 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/beamerauxtheme') diff --git a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerinnerthemesimplelines.sty b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerinnerthemesimplelines.sty index 0a8bc6551bb..b88e86e89c5 100644 --- a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerinnerthemesimplelines.sty +++ b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerinnerthemesimplelines.sty @@ -13,7 +13,7 @@ % % The Current Maintainer of this work is Louis Stuart. -\ProvidesPackage{beamerinnerthemesimplelines}[2019-05-07 v1.01 Beamer supplementary inner themes] +\ProvidesPackage{beamerinnerthemesimplelines}[2020/08/10 v1.02a Beamer supplementary inner themes] \mode diff --git a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesidebarwithminiframes.sty b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesidebarwithminiframes.sty index 37c46a0c247..3d4ebd8830f 100644 --- a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesidebarwithminiframes.sty +++ b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesidebarwithminiframes.sty @@ -13,7 +13,7 @@ % % The Current Maintainer of this work is Louis Stuart. -\ProvidesPackage{beamerouterthemesidebarwithminiframes}[2019-05-07 v1.01 Beamer supplementary outer themes] +\ProvidesPackage{beamerouterthemesidebarwithminiframes}[2020/08/10 v1.02a Beamer supplementary outer themes] \DeclareOption{hideallsubsections}{% \PackageWarning{beamerouterthemesidebarwithminiframes}% diff --git a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesplitwithminiframes.sty b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesplitwithminiframes.sty index 79e73bee1ec..21b3bc21ced 100644 --- a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesplitwithminiframes.sty +++ b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemesplitwithminiframes.sty @@ -13,7 +13,7 @@ % % The Current Maintainer of this work is Louis Stuart. -\ProvidesPackage{beamerouterthemesplitwithminiframes}[2019-05-07 v1.01 Beamer supplementary outer themes] +\ProvidesPackage{beamerouterthemesplitwithminiframes}[2020/08/10 v1.02a Beamer supplementary outer themes] \mode diff --git a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemetwolines.sty b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemetwolines.sty index 7269bfa77e2..7dea557ac8f 100644 --- a/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemetwolines.sty +++ b/Master/texmf-dist/tex/latex/beamerauxtheme/beamerouterthemetwolines.sty @@ -13,7 +13,7 @@ % % The Current Maintainer of this work is Louis Stuart. -\ProvidesPackage{beamerouterthemetwolines}[2019-05-07 v1.01 Beamer supplementary outer themes] +\ProvidesPackage{beamerouterthemetwolines}[2020/08/10 v1.02a Beamer supplementary outer themes] \mode @@ -24,30 +24,37 @@ \setbeamercolor{section in head/foot shaded}{use=section in head/foot,fg=section in head/foot.fg!40!bg} \setbeamercolor{subsection in head/foot shaded}{use=subsection in head/foot,fg=subsection in head/foot.fg!40!bg} +\def\twolines@section@wd{} +\def\twolines@subsection@wd{} + \defbeamertemplate*{section in head/foot}{two lines}{% \leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsectionhead\hskip1ex}% - \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{section in head/foot} + \edef\twolines@section@wd{\the\wd\@tempboxa}% + \begin{beamercolorbox}[wd=\twolines@section@wd,ht=2.5ex,dp=1.125ex]{section in head/foot} \box\@tempboxa \end{beamercolorbox}% } \defbeamertemplate*{section in head/foot shaded}{two lines}{% \leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsectionhead\hskip1ex}% - \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{section in head/foot shaded} + \edef\twolines@section@wd{\the\wd\@tempboxa}% + \begin{beamercolorbox}[wd=\twolines@section@wd,ht=2.5ex,dp=1.125ex]{section in head/foot shaded} \box\@tempboxa \end{beamercolorbox}% } \defbeamertemplate*{subsection in head/foot}{two lines}{% \leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsubsectionhead\hskip1ex}% - \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{subsection in head/foot} + \edef\twolines@subsection@wd{\the\wd\@tempboxa}% + \begin{beamercolorbox}[wd=\twolines@subsection@wd,ht=2.5ex,dp=1.125ex]{subsection in head/foot} \box\@tempboxa \end{beamercolorbox}% } \defbeamertemplate*{subsection in head/foot shaded}{two lines}{% \leavevmode\setbox\@tempboxa\hbox{\strut\hskip1ex\insertsubsectionhead\hskip1ex}% - \begin{beamercolorbox}[wd=\wd\@tempboxa,ht=2.5ex,dp=1.125ex]{subsection in head/foot shaded} + \edef\twolines@subsection@wd{\the\wd\@tempboxa}% + \begin{beamercolorbox}[wd=\twolines@subsection@wd,ht=2.5ex,dp=1.125ex]{subsection in head/foot shaded} \box\@tempboxa \end{beamercolorbox}% } @@ -61,7 +68,7 @@ \hbox{% \usebeamerfont{section in head/foot}% \hyperlink{Navigation##3}{% - \ifnum\c@section=##1% + \ifnum\c@section=##1\relax% {\usebeamertemplate{section in head/foot}}% \else% {\usebeamertemplate{section in head/foot shaded}}% @@ -70,14 +77,14 @@ }% \fi% }% - \def\beamer@subsectionentry##1##2##3##4##5##6{}% + \def\beamer@subsectionentry##1##2##3##4##5{}% \def\slideentry##1##2##3##4##5##6{}% \dohead% } \long\def\insertsubsectionnavigationline{% \def\sectionentry##1##2##3##4##5{}% - \def\beamer@subsectionentry##1##2##3##4##5##6{% + \def\beamer@subsectionentry##1##2##3##4##5{% \ifnum##1=\c@part% \def\insertpartheadnumber{##1}% \def\insertsectionheadnumber{##2}% @@ -87,7 +94,7 @@ \usebeamerfont{subsection in head/foot}% \hyperlink{Navigation##4}{% \ifnum\c@section=##2% - \ifnum\c@subsection=##3% + \ifnum\c@subsection=##3\relax% {\usebeamertemplate{subsection in head/foot}}% \else% {\usebeamertemplate{subsection in head/foot shaded}}% -- cgit v1.2.3