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 | 124 |
1 files changed, 97 insertions, 27 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index f5a22cd2751..365de75f479 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 1815 2014-10-28 10:15:59Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 1900 2015-01-14 07:16:26Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -66,14 +66,14 @@ \fi } \fi - \@CheckKOMAScriptVersion{2014/10/28 v3.14 KOMA-Script}% + \@CheckKOMAScriptVersion{2015/01/14 v3.15 KOMA-Script}% \endgroup -%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $ \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2014/10/28 v3.14 KOMA-Script + 2015/01/14 v3.15 KOMA-Script package (% KOMA-Script-independent basics and keyval usage)] @@ -199,6 +199,14 @@ }% }% } +\newcommand*{\RelaxFamilyKey}[3][.\@currname.\@currext]{% + \scr@ifundefinedorrelax{KV@#2#1@#3}{}{% + \expandafter\let\csname KV@#2#1@#3\endcsname\relax + }% + \scr@ifundefinedorrelax{KV@#2#1@#3@default}{}{% + \expandafter\let\csname KV@#2#1@#3@default\endcsname\relax + }% +} \newcommand*{\FamilyKeyState}{} \newcommand*{\FamilyKeyStateUnknown}{% \let\FamilyKeyState\FamilyKeyStateUnknown @@ -360,9 +368,9 @@ %%% From File: $Id: scrkernel-language.dtx 1767 2014-06-26 09:20:18Z kohm $ %%% From File: $Id: scrlfile.dtx 1525 2013-11-22 12:57:29Z mjk $ \RequirePackage{scrlfile}[% - 2014/10/28 v3.14 KOMA-Script + 2015/01/14 v3.15 KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 1809 2014-10-17 08:02:00Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 1897 2015-01-02 12:04:12Z kohm $ \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax } @@ -868,6 +876,16 @@ \providecommand*{\ClassInfoNoLine}[2]{% \ClassInfo{#1}{#2\@gobble}% } +\providecommand*\@removefromreset[2]{% + {% + \expandafter\let\csname c@#1\endcsname\@removefromreset + \def\@elt##1{% + \expandafter\ifx\csname c@##1\endcsname\@removefromreset + \else\noexpand\@elt{##1}\fi + }% + \expandafter\xdef\csname cl@#2\endcsname{\csname cl@#2\endcsname}% + }% +} \newcommand*{\FamilyExecuteOptions}[2][.\@currname.\@currext]{% \@FamilyExecuteOptions[{#1}]{#2}% } @@ -1163,7 +1181,17 @@ }% \let\FamilyElseValues\@empty } -\newcommand*{\FamilyCounterKey}[4][.\@currname.\@currext]{% +\newcommand*{\FamilyCounterKey}[3][.\@currname.\@currext]{% + \@ifnextchar [%] + {\Family@@Counter@@Key{#1}{#2}{#3}}% + {\Family@Counter@Key{#1}{#2}{#3}}% +} +\newcommand*{\Family@@Counter@@Key}{} +\def\Family@@Counter@@Key#1#2#3[#4]#5{% + \@ifundefined{c@#5}{\newcounter{#5}}{}% + \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetCounter{#2}{#3}{#5}{##1}}% +} +\newcommand*{\Family@Counter@Key}[4]{% \@ifundefined{c@#4}{\newcounter{#4}}{}% \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetCounter{#2}{#3}{#4}{##1}}% } @@ -1186,18 +1214,30 @@ }% }% } -\newcommand*{\FamilyCounterMacroKey}[4][.\@currname.\@currext]{% +\newcommand*{\FamilyCounterMacroKey}[3][.\@currname.\@currext]{% + \@ifnextchar [%] + {\Family@@Counter@@Macro@@Key{#1}{#2}{#3}}% + {\Family@Counter@Macro@Key{#1}{#2}{#3}}% +} +\newcommand*{\Family@@Counter@@Macro@@Key}{} +\def\Family@@Counter@@Macro@@Key#1#2#3[#4]#5{% + \ifdefined#4\else\let#4\z@\fi + \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetCounterMacro{#2}{#3}{#5}{##1}}% +} +\newcommand*{\Family@Counter@Macro@Key}[4]{% \ifdefined#4\else\let#4\z@\fi \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetCounterMacro{#2}{#3}{#4}{##1}}% } \newcommand*{\FamilySetCounterMacro}[4]{% \begingroup - \ifiscount{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{% - \ifisdimen{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempcnta=#4\FamilyKeyState\Processed}{% - \ifisnumexpr{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{% - \ifisdimexpr{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{% - \ifisinteger{#4}{\@tempcnta=#4\FamilyKeyStateProcessed}{% + \ifiscount{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% + \ifisdimen{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% + \ifisskip{#4}{\@tempcnta=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisnumexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% + \ifisdimexpr{#4}{\@tempcnta=#4\aftergroup\FamilyKeyStateProcessed}{% + \ifisinteger{#4}{% + \@tempcnta=#4\aftergroup\FamilyKeyStateProcessed + }{% \ifiscounter{#4}{% \@tempcnta=\value{#4}\FamilyKeyStateProcessed}{% \FamilyUnknownKeyValue{#1}{#2}{#4}{% @@ -1213,7 +1253,17 @@ \expandafter\expandafter\expandafter\endgroup \expandafter\def\expandafter#3\expandafter{\the\@tempcnta}% } -\newcommand*{\FamilyLengthKey}[4][.\@currname.\@currext]{% +\newcommand*{\FamilyLengthKey}[3][.\@currname.\@currext]{% + \@ifnextchar [%] + {\Family@@Length@@Key{#1}{#2}{#3}}% + {\Family@Length@Key{#1}{#2}{#3}}% +} +\newcommand*{\Family@@Length@@Key}{} +\def\Family@@Length@@Key#1#2#3[#4]#5{% + \ifdefined#5\else\newlength{#5}\fi + \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetLength{#2}{#3}{#5}{##1}}% +} +\newcommand*{\Family@Length@Key}[4]{% \ifdefined#4\else\newlength{#4}\fi \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetLength{#2}{#3}{#4}{##1}}% } @@ -1223,9 +1273,11 @@ \ifisskip{#4}{#3=#4\FamilyKeyState\Processed}{% \ifisnumexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% \ifisdimexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% - \ifisglue{#4}{#3=#4\FamilyKeyStateProcessed}{% - \FamilyUnknownKeyValue{#1}{#2}{#4}{% - length values, counters, lengths, skips, dimens + \ifisglueexpr{#4}{#3=#4\FamilyKeyStateProcessed}{% + \ifisglue{#4}{#3=#4\FamilyKeyStateProcessed}{% + \FamilyUnknownKeyValue{#1}{#2}{#4}{% + length values, counters, lengths, skips, dimens + }% }% }% }% @@ -1234,20 +1286,38 @@ }% }% } -\newcommand*{\FamilyLengthMacroKey}[4][.\@currname.\@currext]{% +\newcommand*{\FamilyLengthMacroKey}[3][.\@currname.\@currext]{% + \@ifnextchar [%] + {\Family@@Length@@Macro@@Key{#1}{#2}{#3}}% + {\Family@Length@Macro@Key{#1}{#2}{#3}}% +} +\newcommand*{\Family@@Length@@Macro@@Key}{} +\def\Family@@Length@@Macro@@Key#1#2#3[#4]#5{% + \ifdefined#5\else\let#5\z@\fi + \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\FamilySetLengthMacro{#2}{#3}{#5}{##1}}% +} +\newcommand*{\Family@Length@Macro@Key}[4]{% \ifdefined#4\else\let#4\z@\fi \DefineFamilyKey[{#1}]{#2}{#3}{\FamilySetLengthMacro{#2}{#3}{#4}{##1}}% } \newcommand*{\FamilySetLengthMacro}[4]{% \begingroup - \ifiscount{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{% - \ifisdimen{#4}{\@temskipa=#4\FamilyKeyStateProcessed}{% - \ifisskip{#4}{\@tempkipa=#4\FamilyKeyState\Processed}{% - \ifisnumexpr{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{% - \ifisdimexpr{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{% - \ifisglue{#4}{\@tempskipa=#4\FamilyKeyStateProcessed}{% - \FamilyUnknownKeyValue{#1}{#2}{#4}{% - length values, counters, lengths, skips, dimens + \ifiscount{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% + \ifisdimen{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% + \ifisskip{#4}{\@tempkipa=#4\aftergroup\FamilyKeyState\Processed}{% + \ifisnumexpr{#4}{\@tempskipa=#4\aftergroup\FamilyKeyStateProcessed}{% + \ifisdimexpr{#4}{% + \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed + }{% + \ifisglueexpr{#4}{% + \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed + }{% + \ifisglue{#4}{% + \@tempskipa=#4\aftergroup\FamilyKeyStateProcessed + }{% + \FamilyUnknownKeyValue{#1}{#2}{#4}{% + length values, counters, lengths, skips, dimens + }% }% }% }% |