diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/koma-script/scrbase.sty | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 0c97aa6d666..4aa04ac1b6a 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2012/05/15 v3.11 KOMA-Script}% + \@CheckKOMAScriptVersion{2012/07/05 v3.11a KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -206,17 +206,25 @@ \scr@optiontest{#2#1}\CurrentOption{% \default@ds }{% + \let\scr@removeunused\relax \edef\reserved@a{% \noexpand\setkeys{#2#1}{\CurrentOption}% \noexpand\def\noexpand\CurrentOption{\CurrentOption}% }\reserved@a + \ifx\scr@removeunused\relax\else\default@ds\fi }% }{% - \@expandtwoargs\setkeys{#2}% - \CurrentOption + \let\scr@removeunused\relax + \edef\reserved@a{% + \noexpand\setkeys{#2}{\CurrentOption}% + \noexpand\def\noexpand\CurrentOption{\CurrentOption}% + }\reserved@a + \if\scr@removeunused\relax\else\default@ds\fi \scr@optiontest{#2#1}\CurrentOption{}{% + \let\scr@removeunused\relax \@expandtwoargs\setkeys{#2#1}% \CurrentOption + \ifx\scr@removeunused\relax\else\default@ds\fi }% }% }{% @@ -253,7 +261,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: scrklang.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2011/03/09 v3.09} +\def\scrlfileversion{2012/06/15 v3.12} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -661,7 +669,7 @@ for more information about options and their values.% }% \else - \let\scr@removeunused\@empty + \global\let\scr@removeunused\@empty \PackageInfo{% scrbase% }{% @@ -688,7 +696,7 @@ \ifstr{#4}{false}{\@nameuse{#3false}}{% \ifstr{#4}{off}{\@nameuse{#3false}}{% \ifstr{#4}{no}{\@nameuse{#3false}}{% - \FamilyUnknownKeyValue{#1}{#2}{#3}{% + \FamilyUnknownKeyValue{#1}{#2}{#4}{% `true', `on', `yes', `false', `off', `no'% }% }% @@ -735,8 +743,9 @@ \noexpand\@namedef{#3}{\@tempa}% }% \else - \FamilyUnknownKeyValue{#1}{#2}{#5}{\@tempa}% - \let\@tempa=\endgroup + \edef\@tempa{\endgroup + \noexpand\FamilyUnknownKeyValue{#1}{#2}{#5}{\@tempa}% + }% \fi \@tempa \let\FamilyElseValues\@empty |