summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrbase.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty52
1 files changed, 36 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index 904c702015f..79fe9d1c2de 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-2011
+%% Copyright (c) 1994-2012
%% 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{2011/06/16 v3.09a KOMA-Script}%
+ \@CheckKOMAScriptVersion{2012/01/01 v3.10 KOMA-Script}%
\endgroup
%%% From File: scrkbase.dtx
\ProvidesPackage{%
@@ -169,6 +169,7 @@
\let\@globaloptionslist\XKV@classoptionslist
\fi
}
+\newcommand*{\scr@removeunused}{}
\newcommand*{\FamilyProcessOptions}[2][.\@currname.\@currext]{%
\let\ds@\@empty
\edef\@curroptions{\@ptionlist{\@currname.\@currext}}%
@@ -180,16 +181,20 @@
\@use@ption
\expandafter\let\csname ds@\CurrentOption\endcsname\@empty
\else
+ \expandafter\def\expandafter\scr@removeunused\expandafter{%
+ \expandafter\def\expandafter\CurrentOption\expandafter{%
+ \CurrentOption}\@use@ption}%
\scr@optiontest{#2}\CurrentOption{}{%
- \@use@ption
\@expandtwoargs\setkeys{#2}%
\CurrentOption
+ \scr@removeunused
}%
\scr@optiontest{#2#1}\CurrentOption{}{%
- \@use@ption
\@expandtwoargs\setkeys{#2#1}%
\CurrentOption
+ \scr@removeunused
}%
+ \let\scr@removeunused\@empty
\fi
\fi
}%
@@ -300,6 +305,7 @@
the manual of every package you are using\@gobble
}%
\fi
+ \ignorespaces
}%
\fi
}{%
@@ -641,18 +647,32 @@
}%
}
\newcommand*{\FamilyUnknownKeyValue}[4]{%
- \PackageError{%
- scrbase%
- }{%
- option `#2' of family `#1' has no value `#3'%
- }{%
- You've tried to set option `#2' of family '#1' to value `#3'.\MessageBreak
- But allowed values are only:\MessageBreak
- #4\FamilyElseValues.\MessageBreak
- See the manual of the class or package, that provides family
- `#1'\MessageBreak
- for more information about options and their values.%
- }%
+ \ifx\scr@removeunused\@empty
+ \PackageError{%
+ scrbase%
+ }{%
+ option `#2' of family `#1' has no value `#3'%
+ }{%
+ You've tried to set option `#2' of family '#1' to value `#3'.\MessageBreak
+ But allowed values are only:\MessageBreak
+ #4\FamilyElseValues.\MessageBreak
+ See the manual of the class or package, that provides family
+ `#1'\MessageBreak
+ for more information about options and their values.%
+ }%
+ \else
+ \let\scr@removeunused\@empty
+ \PackageInfo{%
+ scrbase%
+ }{%
+ option `#2' of family `#1' has no value `#3'.\MessageBreak
+ Allowed values for option `#2' of family `#1'\MessageBreak
+ would be:\MessageBreak
+ #4\FamilyElseValues.\MessageBreak
+ Maybe another class or package provides this option.\MessageBreak
+ Global option ignored
+ }%
+ \fi
}
\newcommand*{\FamilyElseValues}{}
\newcommand*{\FamilyBoolKey}[4][.\@currname.\@currext]{%