diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty | 70 |
1 files changed, 37 insertions, 33 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty index 7f2b0fca27f..1d14df1698d 100644 --- a/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty +++ b/Master/texmf-dist/tex/latex/beamer/beamerbasemisc.sty @@ -1,6 +1,7 @@ % Copyright 2003--2007 by Till Tantau % Copyright 2010 by Vedran Mileti\'c % Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright +% Copyright 2017 by Joseph Wright % % This file may be distributed and/or modified % @@ -12,7 +13,6 @@ \mode <presentation> - % Maximum dead cycles \maxdeadcycles=1000 @@ -22,10 +22,10 @@ \beamer@sectionmax=0\relax \beamer@sectioncount=0\relax -\def\headcommand#1{\global\advance\beamer@totalheads by1\relax% +\newrobustcmd*\headcommand[1]{\global\advance\beamer@totalheads by1\relax \expandafter\gdef\csname @@head\the\beamer@totalheads\endcsname{#1}} -\def\dohead{\beamer@headcounter=0\relax\loop\ifnum\beamer@headcounter<\beamer@totalheads% - \advance\beamer@headcounter by1\relax% +\newrobustcmd*\dohead{\beamer@headcounter=0\relax\loop\ifnum\beamer@headcounter<\beamer@totalheads + \advance\beamer@headcounter by1\relax \csname @@head\the\beamer@headcounter\endcsname\repeat} \def\beamer@startpageofframe{1} @@ -40,8 +40,8 @@ \def\beamer@startpageofappendix{} \def\inserttotalframenumber{1} -\def\partentry#1#2{\beamer@sectioncount=0\relax} -\def\beamer@initsectionentry#1#2#3#4#5{\advance\beamer@sectioncount by1\relax% +\newrobustcmd*\partentry[2]{\beamer@sectioncount=0\relax} +\def\beamer@initsectionentry#1#2#3#4#5{\advance\beamer@sectioncount by1\relax \ifnum\beamer@sectionmax<\beamer@sectioncount\beamer@sectionmax=\beamer@sectioncount\fi} \def\beamer@initslideentry#1#2#3#4#5#6{\ifnum\beamer@subsectionmax<#2\relax\beamer@subsectionmax=#2\fi} \def\beamer@initsubsubsectionentry#1#2#3#4#5#6{\ifnum\beamer@subsubsectionmax<#4\relax\beamer@subsubsectionmax=#4\fi} @@ -74,7 +74,7 @@ \@endparpenalty -\@lowpenalty \@itempenalty -\@lowpenalty -\g@addto@macro\beamer@lastminutepatches{ +\g@addto@macro\beamer@lastminutepatches{% \beamer@activecjk \makeatletter \@input{\jobname.nav} @@ -90,27 +90,26 @@ \let\beamer@subsubsectionentry=\beamer@subsubsectionentryorig \beamer@calculateheadfoot \ifbeamer@draftmode - \setbeamertemplate{footline}{ + \setbeamertemplate{footline}{% \color{black!25}% \kern-\Gm@lmargin\vrule width\paperwidth - height\footheight\kern-\Gm@rmargin} - \setbeamertemplate{headline}{ + height\footheight\kern-\Gm@rmargin}% + \setbeamertemplate{headline}{% \color{black!25}% \kern-\Gm@lmargin\vrule width\paperwidth - height\headheight\kern-\Gm@rmargin} + height\headheight\kern-\Gm@rmargin}% \setbeamertemplate{sidebar left}{% \color{black!20}% - \vrule width \beamer@leftsidebar height\sidebarheight} + \vrule width \beamer@leftsidebar height\sidebarheight}% \setbeamertemplate{sidebar right}{% \color{black!20}% - \vrule width \beamer@rightsidebar height\sidebarheight} - \setbeamertemplate{sidebar canvas left}{} - \setbeamertemplate{sidebar canvas right}{} + \vrule width \beamer@rightsidebar height\sidebarheight}% + \setbeamertemplate{sidebar canvas left}{}% + \setbeamertemplate{sidebar canvas right}{}% \fi \makeatother } - \setcounter{tocdepth}{3} \setlength\arraycolsep{5\p@} @@ -122,7 +121,6 @@ \setlength\fboxsep{3\p@} \setlength\fboxrule{.4\p@} - \newcommand\contentsname{\translate{Contents}} \newcommand\listfigurename{\translate{List of Figures}} \newcommand\listtablename{\translate{List of Tables}} @@ -151,7 +149,7 @@ \AtEndDocument{% \clearpage - \beamer@tempcount=\c@page\advance\beamer@tempcount by -1% + \beamer@tempcount=\c@page\advance\beamer@tempcount by -1 % \if@filesw \immediate\write\@auxout{\string\@writefile{nav}% {\noexpand\headcommand{\noexpand\beamer@partpages{\the\beamer@partstartpage}{\the\beamer@tempcount}}}}% @@ -172,21 +170,18 @@ \fi } - - % % Managing short inserts % - \define@key{beamerst}{respectlinebreaks}[true]{% \def\beamer@stlinebreakrule{}} \define@key{beamerst}{width}{% \def\beamer@ststart{% \begin{minipage}[t]{#1}% - \raggedright% - \beamer@stalign% - \beamer@stlinebreakrule% + \raggedright + \beamer@stalign + \beamer@stlinebreakrule }% \def\beamer@stend{\end{minipage}}} \define@key{beamerst}{center}[true]{% @@ -200,7 +195,7 @@ \def\beamer@stend{\egroup}% \setkeys{beamerst}{#1}}% \newcommand{\beamer@insertshort}[1]{% - \beamer@ststart#1\beamer@stend% + \beamer@ststart#1\beamer@stend } \mode @@ -210,13 +205,24 @@ { \ifx\includegraphics\@undefined \else - \renewcommand<>\includegraphics[2][]{\only#3{\beameroriginal\includegraphics[{#1}]{#2}}\ignorespaces} - % Deal with star case (unique for overlay-aware commands) - \let\beamer@includegraphics@maybe@star\includegraphics - \DeclareRobustCommand\includegraphics{% + \renewcommand<>\includegraphics{% \@ifstar - {\Gin@cliptrue \beamer@includegraphics@maybe@star} - {\Gin@clipfalse \beamer@includegraphics@maybe@star}% + {\Gin@cliptrue} + {\Gin@clipfalse}% + \@ifnextchar[%] + {\beamer@includegraphics{#1}} + {\beamer@@@includegraphics{#1}{}}% + } + \long\def\beamer@includegraphics#1[#2]{% + \@ifnextchar[%] + {\beamer@@includegraphics{#1}{#2}} + {\beamer@@@includegraphics{#1}{#2}}% + } + \long\def\beamer@@includegraphics#1#2[#3]#4{% + \only#1{\beameroriginal\includegraphics[{#2}][{#3}]{#4}}% + } + \long\def\beamer@@@includegraphics#1#2#3{% + \only#1{\beameroriginal\includegraphics[{#2}]{#3}}% } \fi @@ -226,5 +232,3 @@ \renewcommand<>\pgfimage[2][]{\only#3{\beameroriginal\pgfimage[{#1}]{#2}}\ignorespaces} \fi } - - |