summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty')
-rw-r--r--Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty35
1 files changed, 16 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty b/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
index df9cc7db94b..c69564b681e 100644
--- a/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
+++ b/Master/texmf-dist/tex/latex/beamer/beamerbaseoptions.sty
@@ -1,6 +1,7 @@
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
-% Copyright 2013,2015 by Vedran Mileti\'c,, Joseph Wright
+% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
+% Copyright 2017 by Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -11,9 +12,9 @@
\RequirePackage{keyval}[1997/11/10]
-\def\ProcessOptionsBeamer{%
+\newrobustcmd*\ProcessOptionsBeamer{%
\let\@tempa\@empty
- \ifx\@currext\@clsextension%
+ \ifx\@currext\@clsextension
\else
\@for\CurrentOption:=\@classoptionslist\do{%
\@ifundefined{KV@\@currname @\CurrentOption}%
@@ -21,40 +22,36 @@
\fi
\edef\@tempa{%
\noexpand\setkeys{\@currname}{\@tempa\@ptionlist{\@currname.\@currext}}}%
- \let\beamer@origkverr\KV@errx%
- \let\beamer@origxkverr\XKV@err%
+ \let\beamer@origkverr\KV@errx
+ \let\beamer@origxkverr\XKV@err
\let\KV@errx=\@gobble% never mind
\let\XKV@err=\@gobble% never mind
- \@tempa%
- \let\KV@errx\beamer@origkverr%
- \let\XKV@err\beamer@origxkverr%
+ \@tempa
+ \let\KV@errx\beamer@origkverr
+ \let\XKV@err\beamer@origxkverr
\AtEndOfPackage{\let\@unprocessedoptions\relax}}
-\def\ExecuteOptionsBeamer#1{%
+\newrobustcmd\ExecuteOptionsBeamer[1]{%
\setkeys{\@currname}{#1}}
-\def\DeclareOptionBeamer#1{\@ifnextchar[{\beamer@dokv{#1}}{\beamer@dokv{#1}[]}}
+\newrobustcmd\DeclareOptionBeamer[1]{\@ifnextchar[{\beamer@dokv{#1}}{\beamer@dokv{#1}[]}}
\long\def\beamer@dokv#1[#2]#3{\define@key{\@currname}{#1}[{#2}]{#3}}
-
-\def\beamer@filterclassoptions{
- \def\beamer@filteredclassoptionslist{}
+\def\beamer@filterclassoptions{%
+ \def\beamer@filteredclassoptionslist{}%
\@for\CurrentOption:=\@classoptionslist\do{%
\ifx\CurrentOption\@empty\else
\@expandtwoargs\in@{=}{\CurrentOption}%
\ifin@
\else
\edef\beamer@filteredclassoptionslist{%
- \beamer@filteredclassoptionslist,\CurrentOption}
+ \beamer@filteredclassoptionslist,\CurrentOption}%
\fi
\fi
}%
\let\@classoptionslist=\beamer@filteredclassoptionslist
}
-
-
-\newcommand\defbeameroption{\define@key{beamer@option}}
-\newcommand\setbeameroption{\setkeys{beamer@option}}
-
+\newrobustcmd*\defbeameroption{\define@key{beamer@option}}
+\newrobustcmd*\setbeameroption{\setkeys{beamer@option}}