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 | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index c9493cfb994..ff90d0d74ab 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -12,7 +12,7 @@ %% scrklang.dtx (with options: `package,body,base') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2009 +%% Copyright (c) 1994-2010 %% Markus Kohm and any individual authors listed elsewhere in this file. %% %% This file was generated from file(s) of the KOMA-Script bundle. @@ -67,7 +67,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/07/24 v3.04a KOMA-Script}% + \@CheckKOMAScriptVersion{2010/02/15 v3.05 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -321,7 +321,7 @@ \fi } \newcommand\ifstr[2]{% - \begingroup\edef\@tempa{#1}\edef\@tempb{#2}% + \begingroup\protected@edef\@tempa{#1}\protected@edef\@tempb{#2}% \ifx\@tempa\@tempb \endgroup\expandafter\@firstoftwo \else @@ -500,13 +500,17 @@ \@for\scr@key@atlist:=#3\do{% \expandafter\scr@key@split@name@value\scr@key@atlist==\@nil \scr@ifundefinedorrelax{KV@#2@\scr@key@name}{}{% - \edef\reserved@a{\noexpand\setkeys{#2}{\scr@key@atlist}% + \protected@edef\reserved@a{\noexpand\setkeys{#2}{\scr@key@atlist}% + \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}% + \noexpand\def\noexpand\scr@key@name{\scr@key@name}% }% \reserved@a }% \scr@ifundefinedorrelax{KV@#2#1@\scr@key@name}{}{% - \edef\reserved@a{% + \protected@edef\reserved@a{% \noexpand\setkeys{#2#1}{\scr@key@atlist}% + \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}% + \noexpand\def\noexpand\scr@key@name{\scr@key@name}% }% \reserved@a }% @@ -541,11 +545,11 @@ \@for\@tempa:=\@tempa\do{% \scr@ifundefinedorrelax{KV@\@tempa @\scr@key@name}{}{% \scr@key@found@true - \edef\reserved@a{\noexpand\setkeys{\@tempa}{\scr@key@atlist}% - \noexpand\edef\noexpand\@tempa{\@tempa}% - \noexpand\edef\noexpand\scr@key@atlist{\scr@key@atlist}% - \noexpand\edef\noexpand\scr@key@name{\scr@key@name}% - \noexpand\edef\noexpand\scr@key@value{\scr@key@value}% + \protected@edef\reserved@a{\noexpand\setkeys{\@tempa}{\scr@key@atlist}% + \noexpand\def\noexpand\@tempa{\@tempa}% + \noexpand\def\noexpand\scr@key@atlist{\scr@key@atlist}% + \noexpand\def\noexpand\scr@key@name{\scr@key@name}% + \noexpand\def\noexpand\scr@key@value{\scr@key@value}% }% \reserved@a }% @@ -591,12 +595,12 @@ \let\reserved@a\@empty \@for\@tempa:=#3\do{% \expandafter\KV@@sp@def\expandafter\@tempa\expandafter{\@tempa}% - \edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}% + \protected@edef\reserved@a{\reserved@a,\scr@key@name=\@tempa}% }% \ifx\reserved@a\@empty - \edef\reserved@a{\noexpand\setkeys{\@tempb}{\scr@key@name}}% + \protected@edef\reserved@a{\noexpand\setkeys{\@tempb}{\scr@key@name}}% \else - \edef\reserved@a{% + \protected@edef\reserved@a{% \noexpand\setkeys{\@tempb}{\expandafter\@gobble\reserved@a}}% \fi \reserved@a |