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 | 101 |
1 files changed, 64 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty index 400505151ed..a424c7515e7 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty +++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty @@ -45,7 +45,7 @@ %% find a complete unmodified copy of LaTeX2e at %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>. %% -%%% From File: $Id: scrkernel-version.dtx 2674 2017-09-07 09:35:17Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 3050 2018-12-30 14:36:55Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -67,19 +67,19 @@ \fi } \fi - \@CheckKOMAScriptVersion{2018/03/30 v3.25 KOMA-Script}% + \@CheckKOMAScriptVersion{2018/12/30 v3.26a KOMA-Script}% \endgroup \providecommand*{\scr@pkgextension}{\@pkgextension} \AtBeginDocument{% \let\scr@pkgextension\@pkgextension } -%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3043 2018-11-06 07:50:06Z kohm $ %%% (run: prepare) \NeedsTeXFormat{LaTeX2e}[1995/06/01] \ProvidesPackage{% scrbase% }[% - 2018/03/30 v3.25 KOMA-Script + 2018/12/30 v3.26a KOMA-Script package (% KOMA-Script-independent @@ -303,8 +303,10 @@ }% \fi \@for\CurrentOption:=\@curroptions\do{% - \scr@ifundefinedorrelax{ds@\CurrentOption}{% - \@use@ption + \edef\reserved@a{\expandafter\detokenize\expandafter{\CurrentOption}}% + \scr@ifundefinedorrelax{ds@\reserved@a}{% + \@expandtwoargs\@removeelement\CurrentOption + \@unusedoptionlist\@unusedoptionlist \scr@ifprocess@curroption{#1}{#2}{}\default@ds }\@use@ption }% @@ -338,7 +340,7 @@ \newcommand*{\AtEndOfFamilyOptions}{} \let\AtEndOfFamilyOptions\scr@AtEndOfFamilyOptions@immediate \newcommand*\scr@ifprocess@curroption[2]{% - \def\reserved@a##1=##2\@nil{\def\reserved@a{##1}}% + \def\reserved@a##1=##2\@nil{\scr@sp@def\reserved@a{##1}}% \expandafter\reserved@a\CurrentOption=\@nil \scr@ifundefinedorrelax{KV@#2@\reserved@a}{% \scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{% @@ -374,7 +376,7 @@ }% \FamilyKeyStateProcessed \fi - \def\reserved@a##1=##2\@nil{\def\reserved@a{##1}}% + \def\reserved@a##1=##2\@nil{\scr@sp@def\reserved@a{##1}}% \expandafter\reserved@a\CurrentOption=\@nil \scr@ifundefinedorrelax{KV@#2#1@\reserved@a}{}{% \protected@edef\reserved@b{\noexpand\setkeys{#2#1}{{\CurrentOption}}% @@ -403,6 +405,19 @@ \expandafter\@secondoftwo \fi } +\def\@tempa#1{% + \def\scr@sp@def##1##2{% + \futurelet\scr@sp@tempa\scr@sp@d##2\@nil\@nil#1\@nil\relax##1}% + \def\scr@sp@d{% + \ifx\scr@sp@tempa\@sptoken + \expandafter\scr@sp@b + \else + \expandafter\scr@sp@b\expandafter#1% + \fi}% + \def\scr@sp@b#1##1 \@nil{\scr@sp@c##1}% +} +\@tempa{ } +\def\scr@sp@c#1\@nil#2\relax#3{\@temptokena{#1}\edef#3{\the\@temptokena}} \@ifundefined{l@addto@macro}{}{% \begingroup \long\def\reserved@a#1#2{% @@ -431,7 +446,7 @@ \long\def\l@addto@macro#1#2{% \edef#1{\unexpanded\expandafter{#1#2}}% }% -%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3043 2018-11-06 07:50:06Z kohm $ %%% (run: option) \newcommand*{\dont@let@as@internal@defined}{/} \newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse @@ -449,13 +464,13 @@ \fi } \FamilyProcessOptions{KOMA}\relax -%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $ %%% (run: option) -%%% From File: $Id: scrlfile.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% From File: $Id: scrlfile.dtx 3011 2018-08-29 07:35:17Z kohm $ \RequirePackage{scrlfile}[% - 2018/03/30 v3.25 KOMA-Script + 2018/12/30 v3.26a KOMA-Script ] -%%% From File: $Id: scrkernel-basics.dtx 2818 2017-12-08 08:31:53Z kohm $ +%%% From File: $Id: scrkernel-basics.dtx 3043 2018-11-06 07:50:06Z kohm $ %%% (run: body) \newcommand*{\XdivY}[2]{% \numexpr ( #1 + #2 / 2 ) / #2 - 1\relax @@ -463,6 +478,9 @@ \newcommand*{\XmodY}[2]{% \numexpr #1 - #2 * \XdivY{#1}{#2}\relax } +\newcommand\scr@trim@spaces[1]{% + \expandafter\scr@sp@def\expandafter#1\expandafter{#1}% +} \newif\if@atdocument \AtBeginDocument{\@atdocumenttrue} \@onlypreamble\@atdocumentrue @@ -1273,6 +1291,26 @@ \expandafter\xdef\csname cl@#2\endcsname{\csname cl@#2\endcsname}% }% } +\newif\ifscr@ActiveMkBoth +\def\scr@ActiveMkBothfalse{\global\let\ifscr@ActiveMkBoth\iffalse} +\def\scr@ActiveMkBothtrue {\global\let\ifscr@ActiveMkBoth\iftrue} +\newcommand*{\IfActiveMkBoth}{% + \begingroup + \def\markboth##1##2{\scr@ActiveMkBothtrue}% + \def\markright##1{\scr@ActiveMkBothtrue}% + \def\markleft##1{\scr@ActiveMkBothtrue}% + \def\markboth##1{\scr@ActiveMkBothtrue}% + \def\markdouble##1{\scr@ActiveMkBothtrue}% + \def\mark##1{\scr@ActiveMkBothtrue} + \scr@ActiveMkBothfalse + \setbox\@tempboxa\vbox{\@mkboth{}{}}% + \endgroup + \ifscr@ActiveMkBoth + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi +} \newcommand*{\FamilyExecuteOptions}[2][.\@currname.\@currext]{% \@FamilyExecuteOptions[{#1}]{#2}% } @@ -1569,12 +1607,12 @@ \newcommand*{\scr@key@value}{} \newcommand*{\scr@key@split@name@value}{} \long\def\scr@key@split@name@value#1=#2=#3\@nil{% - \KV@@sp@def\scr@key@name{#1}% - \KV@@sp@def\scr@key@value{#2}% + \scr@sp@def\scr@key@name{#1}% + \scr@sp@def\scr@key@value{#2}% } \newcommand*{\FamilyOption}[2]{\@FamilyOption{#1}{#2}} \newcommand{\@FamilyOption}[3]{% - \expandafter\KV@@sp@def\expandafter\scr@key@name\expandafter{#2}% + \expandafter\scr@sp@def\expandafter\scr@key@name\expandafter{#2}% \let\reserved@a\@empty \@for\reserved@b:=#3\do{% \ifx\reserved@b\@empty\else @@ -1947,13 +1985,13 @@ {\Family@@CS@@Key{#1}{#2}{#3}}{\Family@CS@Key{#1}{#2}{#3}}% } \newcommand*{\Family@@CS@@Key}{} -\long\def\Family@@String@@Key#1#2#3[#4]#5{% +\long\def\Family@@CS@@Key#1#2#3[#4]#5{% \DefineFamilyKey[{#1}]{#2}{#3}[{#4}]{\@namedef{#5}{##1}}% } \newcommand{\Family@CS@Key}[4]{% \DefineFamilyKey[{#1}]{#2}{#3}{\@namedef{#4}{##1}\FamilyKeyStateProcessed}% } -%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $ %%% (run: body) \newcommand*{\defcaptionname}{% \kernel@ifstar\scr@def@scaptionname\scr@def@captionname @@ -1967,8 +2005,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at \string\defcaptionname}% @@ -2021,9 +2058,6 @@ }% \fi } -\newcommand\scr@trim@spaces[1]{% - \expandafter\KV@@sp@def\expandafter#1\expandafter{#1}% -} \newcommand*{\scr@def@captionname}[3]{% \if@atdocument \expandafter\@firstofone \else \expandafter\AtBeginDocument @@ -2033,8 +2067,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at \string\defcaptionname}% @@ -2105,8 +2138,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at @@ -2146,8 +2178,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at @@ -2190,8 +2221,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at \string\newcaptionname}% @@ -2236,8 +2266,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at \string\newcaptionname}% @@ -2285,8 +2314,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at \string\renewcaptionname}% @@ -2330,8 +2358,7 @@ \let\reserved@b\endgroup \edef\scr@reserved@a{#1}% \@onelevel@sanitize\scr@reserved@a - \expandafter\@for \expandafter\scr@reserved@a \expandafter:\expandafter=% - \scr@reserved@a \do{% + \@for\scr@reserved@a:=\scr@reserved@a\do{% \scr@trim@spaces\scr@reserved@a \ifx\scr@reserved@a\@empty \PackageWarning{scrbase}{empty language at \string\renewcaptionname}% |