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 | 100 |
1 files changed, 53 insertions, 47 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 72d01ad5014..817f8d1f764 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -39,8 +39,10 @@ %% See `README'. %% %% The KOMA-Script bundle (but maybe not this file) was based upon the -%% LaTeX2.09 Script family created by Frank Neukam 1993 and the LaTeX2e -%% standard classes created by The LaTeX3 Project 1994-1996. +%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e +%% standard classes created by The LaTeX3 Project 1994-1996. You may +%% find a complete unmodified copy of LaTeX2e at +%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% %%% From File: scrkvers.dtx \begingroup @@ -64,7 +66,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2009/01/24 v3.02b KOMA-Script}% + \@CheckKOMAScriptVersion{2009/04/01 v3.03 KOMA-Script}% \endgroup %%% From File: scrkbase.dtx \ProvidesPackage{% @@ -72,30 +74,42 @@ }[% \KOMAScriptVersion\space package (KOMA-Script-independent basics and keyval usage)] -\RequirePackage{keyval} -\begingroup\expandafter\expandafter\expandafter\endgroup -\expandafter\ifx\csname ifcsname\endcsname\relax - \newcommand{\scr@ifundefinedorrelax}[1]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1\endcsname\relax - \expandafter\@firstoftwo +\begingroup + \def\@tempb{}% + \def\@tempa{% + \PackageError{scrbase}{seems you are not running e-TeX\@tempb}{% + Since 2004 the LaTeX team recommends to use e-TeX.\MessageBreak + KOMA-Script since version 2.95 uses several e-TeX features.\MessageBreak + At actual systems `latex' should already use e-TeX.\MessageBreak + At deprecated systems it may be called `elatex'.\MessageBreak + Use either unsupported KOMA-Script up to version 2.9u or\MessageBreak + ask you administrator for LaTeX using e-TeX\@tempb.\MessageBreak + Not using e-TeX\@tempb\space is a fatal error!\MessageBreak + Processing cannot be continued!}% + \endgroup + \batchmode \errmessage{}\csname @@end\endcsname\end\relax + \csname endinput\endcsname + }% + \expandafter\ifx\csname eTeXversion\endcsname\relax\else + \ifnum\eTeXversion <2 + \def\@tempb{ V 2}% \else - \expandafter\@secondoftwo + \let\@tempa\endgroup \fi - } -\else - \newcommand{\scr@ifundefinedorrelax}[1]{% - \ifcsname #1\endcsname - \expandafter\ifx\csname #1\endcsname\relax - \expandafter\expandafter\expandafter\@firstoftwo - \else - \expandafter\expandafter\expandafter\@secondoftwo - \fi + \fi +\@tempa +\RequirePackage{keyval} +\newcommand{\scr@ifundefinedorrelax}[1]{% + \ifcsname #1\endcsname + \expandafter\ifx\csname #1\endcsname\relax + \expandafter\expandafter\expandafter\@firstoftwo \else - \expandafter\@firstoftwo + \expandafter\expandafter\expandafter\@secondoftwo \fi - } -\fi + \else + \expandafter\@firstoftwo + \fi +} \newcommand*{\DefineFamily}[1]{% \scr@ifundefinedorrelax{#1@key@familylist}{% \@namedef{#1@key@familylist}{}% @@ -233,7 +247,7 @@ \FamilyProcessOptions{KOMA}\relax %%% From File: scrklang.dtx %%% From File: scrlfile.dtx -\def\scrlfileversion{2008/07/09 v3.00} +\def\scrlfileversion{2009/03/25 v3.03} \edef\@tempa{\noexpand\RequirePackage{scrlfile}[\scrlfileversion]} \@tempa %%% From File: scrkbase.dtx @@ -298,23 +312,12 @@ \fi } \let@as@internal@defined{ifundefinedorrelax} -\scr@ifundefinedorrelax{ifcsname}{% - \newcommand{\ifnotundefined}[1]{% - \begingroup\expandafter\expandafter\expandafter\endgroup - \expandafter\ifx\csname #1\endcsname\relax - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi - }% -}{% - \newcommand{\ifnotundefined}[1]{% - \ifcsname #1\endcsname - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi - }% +\newcommand{\ifnotundefined}[1]{% + \ifcsname #1\endcsname + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi } \newcommand\ifstr[2]{% \begingroup\edef\@tempa{#1}\edef\@tempb{#2}% @@ -708,9 +711,10 @@ }{% \begingroup \let\@tempa\endgroup - \let #2\undefined\relax + \def\@tempb{\relax\undefined\relax}% + \let #2\@tempb\relax \csname captions#1\endcsname - \ifx #2\undefined + \ifx #2\@tempb\relax \edef\@tempb{#1}% \@onelevel@sanitize\@tempb \@onelevel@sanitize\languagename @@ -744,9 +748,10 @@ \@namedef{captions#1}{}% }{}% \begingroup - \let #2\undefined\relax + \def\@tempb{\relax\undefined\relax}% + \let #2\@tempb\relax \csname captions#1\endcsname - \ifx #2\undefined\else + \ifx #2\@tempb\relax\else \PackageError{scrbase}{% `\string#2' at language `#1' already defined% }{% @@ -785,9 +790,10 @@ \@namedef{captions#1}{}% }{}% \begingroup - \let #2\undefined\relax + \def\@tempb{\relax\undefined\relax}% + \let #2\@tempb\relax \csname captions#1\endcsname - \ifx #2\undefined + \ifx #2\@tempb\relax \PackageError{scrbase}{% `\string#2' not defined at language `#1'% }{% |