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 | 54 |
1 files changed, 36 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 6c348e721a4..64f173801d6 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -44,7 +44,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2089 2015-05-06 06:10:29Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2149 2015-07-02 08:07:30Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,18 +66,18 @@ \fi } \fi - \@CheckKOMAScriptVersion{2015/05/06 v3.17a KOMA-Script}% + \@CheckKOMAScriptVersion{2015/07/02 v3.18 KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -246,24 +246,34 @@ This error is fatal. You should not continue.% }% \fi + \scr@ifundefinedorrelax{scr@before@process@options@#2@hook}{}{% + \@nameuse{scr@before@process@options@#2@hook}% + }% + \scr@ifundefinedorrelax{scr@before@process@options@#2#1@hook}{}{% + \@nameuse{scr@before@process@options@#2#1@hook}% + \expandafter\let\csname scr@before@process@options@#2#1@hook\endcsname + \relax + }% \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions \@namedef{scr@after@options@#1@hook}{\@namedef{scr@after@options@#1@hook}{}}% \let\ds@\@empty \edef\@curroptions{\@ptionlist{\@currname.\@currext}}% \ifx\@currext\@clsextension\else - \@for\CurrentOption:=\@globaloptionslist\do{% - \ifx\CurrentOption\@empty\else - \@expandtwoargs\in@{,\CurrentOption,}{,\@declaredoptions,}% - \ifin@ - \@use@ption - \expandafter\let\csname ds@\CurrentOption\endcsname\@empty - \else - \scr@ifprocess@curroption{#1}{#2}{% - \@expandtwoargs\@removeelement\CurrentOption - \@unusedoptionlist\@unusedoptionlist - }{}% + \scr@ifundefinedorrelax{@globaloptionslist}{}{% + \@for\CurrentOption:=\@globaloptionslist\do{% + \ifx\CurrentOption\@empty\else + \@expandtwoargs\in@{,\CurrentOption,}{,\@declaredoptions,}% + \ifin@ + \@use@ption + \expandafter\let\csname ds@\CurrentOption\endcsname\@empty + \else + \scr@ifprocess@curroption{#1}{#2}{% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist + }{}% + \fi \fi - \fi + }% }% \fi \@for\CurrentOption:=\@curroptions\do{% @@ -281,6 +291,14 @@ \@nameuse{scr@after@options@#1@hook}% } \@onlypreamble\FamilyProcessOptions +\newcommand*{\BeforeFamilyProcessOptions}[3][.\@currname.\@currext]{% + \scr@ifundefinedorrelax{scr@before@process@options@#2#1@hook}{% + \@namedef{scr@before@process@options@#2#1@hook}{#3}% + }{% + \expandafter\g@addto@macro + \csname scr@before@process@options@#2#1@hook\endcsname{#3}% + }% +} \newcommand*{\scr@AtEndOfFamilyOptions}{% \expandafter \l@addto@macro\csname scr@after@options@\FamilyOfKey @hook\endcsname @@ -372,9 +390,9 @@ %%% From File: $Id: scrkernel-language.dtx 2011 2015-03-17 11:39:55Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2015/05/06 v3.17a KOMA-Script + 2015/07/02 v3.18 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2011 2015-03-17 11:39:55Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 2140 2015-06-17 10:15:52Z kohm $ \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } |