From d4d66453da7ea3fd6fc443a113b45031e79b0e30 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Sep 2017 22:06:52 +0000 Subject: koma-script (14sep17) git-svn-id: svn://tug.org/texlive/trunk@45292 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/koma-script/scrartcl.cls | 343 +++++++++++++-------- 1 file changed, 216 insertions(+), 127 deletions(-) (limited to 'Master/texmf-dist/tex/latex/koma-script/scrartcl.cls') diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls index 94eadae4f6b..b15559e50bb 100644 --- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls +++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls @@ -15,7 +15,7 @@ %% scrkernel-miscellaneous.dtx (with options: `class,article,option') %% scrkernel-language.dtx (with options: `class,article,option') %% scrkernel-fonts.dtx (with options: `class,article,option') -%% scrkernel-typearea.dtx (with options: `class,article,option') +%% scrkernel-typearea.dtx (with options: `class,article,options') %% scrkernel-paragraphs.dtx (with options: `class,article,option') %% scrkernel-title.dtx (with options: `class,article,option') %% scrkernel-tocstyle.dtx (with options: `class,article,option') @@ -51,7 +51,7 @@ %% scrkernel-listsandtabulars.dtx (with options: `class,article,body') %% scrlogo.dtx (with options: `logo') %% -%% Copyright (c) 1994-2016 Markus Kohm [komascript at gmx info] +%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info] %% %% This file was generated from file(s) of the KOMA-Script bundle. %% --------------------------------------------------------------- @@ -81,9 +81,9 @@ %% 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 -%% . +%% . %% -%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-version.dtx 2640 2017-05-08 09:36:55Z kohm $ \begingroup \catcode`\@11\relax \ifx\KOMAScriptVersion\undefined @@ -105,7 +105,7 @@ \fi } \fi - \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}% + \@CheckKOMAScriptVersion{2017/09/07 v3.24 KOMA-Script}% \endgroup \providecommand*{\scr@clsextension}{\@clsextension} \AtBeginDocument{% @@ -120,21 +120,23 @@ \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension} \edef\KOMAClassFileName{\KOMAClassFileName} \ProvidesClass{\KOMAClassName}[% - 2017/04/13 v3.23 KOMA-Script + 2017/09/07 v3.24 KOMA-Script document class (\ClassName)% ] +%%% From File: $Id: scrkernel-basics.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: load) \RequirePackage{scrkbase}[\KOMAScriptVersion] -%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $ +%%% From File: $Id: tocbasic.dtx 2640 2017-05-08 09:36:55Z kohm $ \RequirePackage{tocbasic}[% - 2017/04/13 v3.23 KOMA-Script + 2017/09/07 v3.24 KOMA-Script ] \addtotoclist{toc} \ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}} \addtotoclist[float]{lof} \addtotoclist[float]{lot} -%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: prepare) -%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $ %%% (run: prepare) \newcommand*{\scr@dotchangeatdocument}[1]{% \ClassError{\KOMAClassName}{% @@ -186,7 +188,8 @@ \newcommand*{\size@paragraph}{} \newcommand*{\size@subparagraph}{} \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries} -%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init) +%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: init) \newcommand* {\scr@compatibility}{\scr@v@last} \@namedef{scr@v@first}{0} @@ -253,9 +256,12 @@ \@namedef{scr@v@3.21}{15} \@namedef{scr@v@3.22}{16} \@namedef{scr@v@3.23}{16} +\@namedef{scr@v@3.24}{16} \@namedef{scr@v@last}{16} -%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init) -%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option) +%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +%%% (run: init) +%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newif\if@scr@emulatestandardclasses \let\scr@emulatestandardclassestrue\relax \let\scr@emulatestandardclassesfalse\relax @@ -329,7 +335,8 @@ \newcommand*{\scr@v@is@ge}[1]{% \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1} } -%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% (run: option) \KOMA@key{draft}[true]{% \KOMA@set@ifkey{draft}{@tempswa}{#1}% \ifx\FamilyKeyState\FamilyKeyStateProcessed @@ -355,8 +362,10 @@ \newcommand*{\@gr@gsffamily}{% \if@egregdoesnotlikesansseriftitles\else\sffamily\fi } -%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newcommand*\@ptsize{% 11% } @@ -441,7 +450,57 @@ \BeforePackage{tex4ht}{% \let\scr@defineobsoletefonts\thr@@ } -%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option) +%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +%%% (run: options) +\KOMA@key{twoside}[true]{% + \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% + \ifstr{#1}{semi}{% + \@twosidetrue + \FamilyKeyStateProcessed + }{% + \def\FamilyElseValue{, `semi'}% + \KOMA@set@ifkey{twoside}{% + @twoside% + }{#1}% + }% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \expandafter\ifnum\scr@v@is@ge{3.17}% + \if@twoside\flushbottom + \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi + \fi + \KOMA@kav@xreplacevalue{.% + \KOMAClassFileName + }{twoside}{#1}% + \fi +} +\KOMAExecuteOptions{twoside=false} +\KOMA@DeclareStandardOption% + {oneside}{twoside=false} +\KOMA@key{twocolumn}[true]{% + \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% + \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% + \ifx\FamilyKeyState\FamilyKeyStateProcessed + \KOMA@kav@replacebool{.% + \KOMAClassFileName + }{twocolumn}{@twocolumn}% + \if@atdocument\expandafter\@firstofone + \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} + {\expandafter\AtEndOfClass}\fi + {\expandafter\ifnum\scr@v@is@ge{3.17}% + \if@twocolumn\twocolumn\sloppy\flushbottom + \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi + \fi}% + \fi +} +\AtEndOfClass{% + \expandafter\ifnum\scr@v@is@lt{3.17}% + \if@twocolumn\twocolumn\sloppy\flushbottom + \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi + \fi +} +\KOMAExecuteOptions{twocolumn=false} +\KOMA@DeclareStandardOption% + {onecolumn}{twocolumn=false} \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR} \newcommand*{\@@BCOR}{} \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{% @@ -499,59 +558,10 @@ \newcommand*{\scr@pti@nerr@r}{ \OptionNotUsed } -\KOMA@key{twoside}[true]{% - \if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi% - \ifstr{#1}{semi}{% - \@twosidetrue - \FamilyKeyStateProcessed - }{% - \def\FamilyElseValue{, `semi'}% - \KOMA@set@ifkey{twoside}{% - @twoside% - }{#1}% - }% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \expandafter\ifnum\scr@v@is@ge{3.17}% - \if@twoside\flushbottom - \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi - \fi - \KOMA@kav@xreplacevalue{.% - \KOMAClassFileName - }{twoside}{#1}% - \fi -} -\KOMAExecuteOptions{twoside=false} -\KOMA@DeclareStandardOption% - {oneside}{twoside=false} -\KOMA@key{twocolumn}[true]{% - \if@atdocument\else\PassOptionsToPackage{twocolumn=#1}{typearea}\fi% - \KOMA@set@ifkey{twocolumn}{@twocolumn}{#1}% - \ifx\FamilyKeyState\FamilyKeyStateProcessed - \KOMA@kav@replacebool{.% - \KOMAClassFileName - }{twocolumn}{@twocolumn}% - \if@atdocument\expandafter\@firstofone - \else\@ifpackageloaded{typearea}{\expandafter\@firstofone} - {\expandafter\AtEndOfClass}\fi - {\expandafter\ifnum\scr@v@is@ge{3.17}% - \if@twocolumn\twocolumn\sloppy\flushbottom - \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi - \fi}% - \fi -} -\AtEndOfClass{% - \expandafter\ifnum\scr@v@is@lt{3.17}% - \if@twocolumn\twocolumn\sloppy\flushbottom - \else\onecolumn\if@twoside\flushbottom\else\raggedbottom\fi\fi - \fi -} -\KOMAExecuteOptions{twocolumn=false} -\KOMA@DeclareStandardOption% - {onecolumn}{twocolumn=false} \DeclareOption*{% \x@paper} -%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% run: option +%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newcommand*{\setparsizes}[3]{% \edef\f@parindent{\the\parindent}% \edef\f@parskip{\the\parskip}% @@ -716,7 +726,8 @@ \KOMA@DeclareDeprecatedOption{parindent}{parskip=false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false} \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute} -%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newif\if@titlepage \@titlepagefalse \newif\if@titlepageiscoverpage @@ -750,9 +761,9 @@ \KOMA@ifkey{abstract}{@abstrt} \KOMA@DeclareStandardOption{abstracton}{abstract=true} \KOMA@DeclareStandardOption{abstractoff}{abstract=false} -%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: option) -%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $ %%% (run: option) \KOMA@key{numbers}{% \KOMA@set@ncmdkey{numbers}{@tempa}{% @@ -878,7 +889,8 @@ \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big} \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal} \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small} -%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \KOMA@ifkey{headsepline}{@hsl}% \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false} \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false} @@ -982,7 +994,8 @@ \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty} \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain} \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current} -%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newif\if@captionabove\@captionabovefalse \newif\if@tablecaptionabove\@tablecaptionabovefalse \newif\if@figurecaptionabove\@figurecaptionabovefalse @@ -1116,7 +1129,8 @@ \DeclareOption{origlongtable}{\@komalongtablefalse} \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline} \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline} -%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \KOMA@key{footnotes}{% \ifx\@footnotemark\scr@saved@footnotemark \else @@ -1186,7 +1200,8 @@ \csname FN@mf@prepare\endcsname \ifhmode\spacefactor\@x@sf\fi \relax} -%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newif\if@tocleft \KOMA@key{toc}{% \KOMA@set@ncmdkey{toc}{@tempa}{% @@ -1403,7 +1418,8 @@ \KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered} \KOMA@DeclareDeprecatedOption{listsleft}{listof=flat} \KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated} -%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newcommand{\newbibstyle}[3][]{% \scr@ifundefinedorrelax{scr@bibstyle@#2}{% \scr@ifundefinedorrelax{scr@bibstyle@#1}{% @@ -1574,7 +1590,8 @@ \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle} \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc} \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered} -%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) \newcommand*{\idx@@heading}{% \ifidx@leveldown \expandafter\subsection @@ -1657,18 +1674,22 @@ \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc} \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel} \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: option) +%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $ %%% (run: execoption) \KOMAExecuteOptions{numbers=autoendperiod} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% (run: execoption) \KOMAExecuteOptions{% parskip=false,% headings=big% } \KOMAProcessOptions\relax -%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body) -%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-compatibility.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) +%%% From File: $Id: scrkernel-fonts.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*\scr@setlength[4]{% \expandafter\ifnum\scr@v@is@lt{3.12}\relax \setlength{#1}{#2 \@plus#3 \@minus#4}% @@ -2142,12 +2163,14 @@ \@nomath\sfb} \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} -%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-language.dtx 2649 2017-05-29 09:39:43Z kohm $ +%%% (run: body) \def\today{\ifcase\month\or January\or February\or March\or April\or May\or June\or July\or August\or September\or October\or November\or December\fi \space\number\day, \number\year}% -%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body) +%%% From File: $Id: scrkernel-typearea.dtx 2661 2017-07-24 19:45:16Z kohm $ +%%% (run: body) \let\@BCOR =\relax \let\@@BCOR =\relax \let\@DIV =\relax @@ -2191,8 +2214,8 @@ }\reserved@a \fi \fi -%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $ -%%% run: body +%%% From File: $Id: scrkernel-paragraphs.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \setlength{\lineskip}{\p@} \setlength{\normallineskip}{\p@} \setlength{\columnsep}{10\p@} @@ -2320,7 +2343,8 @@ \@lowpenalty = 51 \@medpenalty =151 \@highpenalty =301 -%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-title.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\@extratitle}{}% \newcommand{\extratitle}[1]{\gdef\@extratitle{% #1% @@ -2660,10 +2684,10 @@ \fi } \newcommand*\abstractname{Abstract} -%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: body) \let\numberline\scr@numberline -%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: class,style,part) \CloneTOCEntryStyle{tocline}{part} \TOCEntryStyleStartInitCode{part}{% @@ -2677,7 +2701,7 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: class,style,section) \CloneTOCEntryStyle{tocline}{section} \TOCEntryStyleStartInitCode{section}{% @@ -2697,17 +2721,17 @@ \expandafter\providecommand\expandafter*% \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: class,style,subsection) \CloneTOCEntryStyle{tocline}{subsection} \TOCEntryStyleStartInitCode{subsection}{% \expandafter\providecommand% \csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}% } -%%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $ +%%% From File: $Id: scrkernel-tocstyle.dtx 2640 2017-05-08 09:36:55Z kohm $ %%% (run: class,style,default) \CloneTOCEntryStyle{subsection}{default} -%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $ +%%% From File: $Id: scrkernel-sections.dtx 2655 2017-06-23 07:35:45Z kohm $ %%% (run: body) \setcounter{secnumdepth}{3} \newcommand*{\ifnumbered}[1]{% @@ -3219,35 +3243,66 @@ } \newcommand*{\scr@dsc@style@section@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @sectionindent}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{section indent}{indent}% + \scr@declaresectioncommandwarning{\scr@dsc@current}% + {section indent}{indent}{0pt}% + {\@namedef{scr@\scr@dsc@current @sectionindent}{0pt}}% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{before section skip} - {beforeskip}% + \scr@declaresectioncommanderror{\scr@dsc@current}% + {before section skip}{beforeskip}% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{after section skip} - {afterskip}% + \scr@declaresectioncommanderror{\scr@dsc@current}% + {after section skip}{afterskip}% }{}% \IfExistskomafont{\scr@dsc@current}{}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% - }{}% + \scr@declaresectioncommandwarning{\scr@dsc@current}% + {font}{font}{\normalsize}% + {\newkomafont{\scr@dsc@current}{\normalsize}}% + }% } \newcommand*{\scr@dsc@style@part@neededoptionstest}{% \scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{before part skip} - {beforeskip}% + \ifstr{\scr@dsc@current}{part}{% + \scr@declaresectioncommanderror{\scr@dsc@current}% + {before part skip}{beforeskip}% + }{% + \scr@declaresectioncommandwarning{\scr@dsc@current}% + {before part skip}{beforeskip}% + {\scr@part@beforeskip}% + {\@namedef{scr@\scr@dsc@current @beforeskip}{\scr@part@beforeskip}}% + }% }{}% \scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{after part skip} - {afterskip}% + \ifstr{\scr@dsc@current}{part}{% + \scr@declaresectioncommanderror{\scr@dsc@current}% + {after part skip}{afterskip}% + }{% + \scr@declaresectioncommandwarning{\scr@dsc@current}% + {after part skip}{afterskip}% + {\scr@part@afterskip}% + {\@namedef{scr@\scr@dsc@current @afterskip}{\scr@part@afterskip}}% + }% }{}% \IfExistskomafont{\scr@dsc@current}{}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% + \ifstr{\scr@dsc@current}{part}{% + \scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}% + }{% + \scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}% + {\usekomafont{part}}% + {\newkomafont{\scr@dsc@current}{\usekomafont{part}}}% + }% }{}% \IfExistskomafont{\scr@dsc@current prefix}{}{% - \scr@declaresectioncommanderror{\scr@dsc@current}{number font} - {prefixfont}% + \ifstr{\scr@dsc@current}{part}{% + \scr@declaresectioncommanderror{\scr@dsc@current}% + {number font}{prefixfont}% + }{% + \scr@declaresectioncommandwarning{\scr@dsc@current}% + {number font}{prefixfont}% + {\usekomafont{partprefix}}% + {\newkomafont{\scr@dsc@current prefix}{\usekomafont{partprefix}}}% + }% }{}% } \newif\ifscr@dsc@parametersonly @@ -3413,13 +3468,14 @@ \RelaxFamilyKey[.dsc]{KOMAarg}{level}% \RelaxFamilyKey[.dsc]{KOMAarg}{counterwithin}% \begingroup + \def\local@endgroup{\endgroup}% \scr@ifundefinedorrelax{\scr@dsc@current numdepth}{% \scr@declaresectioncommanderror{\scr@dsc@current}{section level}{level}% }{}% \@nameuse{scr@dsc@style@% \@nameuse{scr@\scr@dsc@current @style}% @neededoptionstest}% - \endgroup + \local@endgroup \@firstofone{% \@ifundefined{c@#2}{\newcounter{#2}}{}% \ifx\scr@local@counterwithout\relax @@ -3500,8 +3556,18 @@ Please use option `#3' to declare the #2.\MessageBreak If you'll continue, declaration will be ignored% }% + \let\local@endgroup\endgroup \aftergroup\@gobbletwo } +\newcommand*{\scr@declaresectioncommandwarning}[5]{% + \ClassInfo{\KOMAClassName}{% + #2 of \expandafter\string\csname #1\endcsname\space unknown.\MessageBreak + You should use option `#3' if you\MessageBreak + do not want to use the default value\MessageBreak + `\detokenize{#4}'% + }% + \l@addto@macro\local@endgroup{#5}% +} \newcommand*{\DeclareNewSectionCommand}[2][]{% \@ifundefined{#2}{% \DeclareSectionCommand[{#1}]{#2}% @@ -4010,7 +4076,8 @@ \fi \newcommand*{\scr@fnt@disposition}{\sectfont} \aliaskomafont{sectioning}{disposition} -%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $ +%%% From File: $Id: scrkernel-miscellaneous.dtx 2658 2017-06-25 14:32:43Z kohm $ +%%% (run: body) \newif\if@restonecol \newcommand{\dictum}[2][]{\par% \begingroup @@ -4098,15 +4165,24 @@ {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}% } \newcommand*{\scr@package@not@recommended}[2]{% - \BeforePackage{#1}{% - \ClassWarning{\KOMAClassName}{% - Usage of package `#1' together\MessageBreak - with a KOMA-Script class is not recommended.\MessageBreak - \if\relax\detokenize{#2}\relax\else - I'd suggest to use #2.\MessageBreak - \fi - Nevertheless, using requested\MessageBreak - package `#1'% + \scr@ifundefinedorrelax{class@shoulddisablepackagewarning@list}{% + \@firstofone + }{% + \edef\reserved@a{% + \noexpand\in@{#1}{\class@shoulddisablepackagewarning@list}}% + \reserved@a + \ifin@\expandafter\@gobble\else\expandafter\@firstofone\fi + }{% + \BeforePackage{#1}{% + \ClassWarning{\KOMAClassName}{% + Usage of package `#1' together\MessageBreak + with a KOMA-Script class is not recommended.\MessageBreak + \if\relax\detokenize{#2}\relax\else + I'd suggest to use #2.\MessageBreak + \fi + Nevertheless, using requested\MessageBreak + package `#1'% + }% }% }% }% @@ -4119,7 +4195,13 @@ `parskip' with one of it's several values} \scr@package@not@recommended{fancyhdr}{% \MessageBreak - package `scrlayer-scrpage'} + package `scrlayer' or `scrlayer-scrpage', because\MessageBreak + they support KOMA-Script classes.\MessageBreak + With `fancyhdr' several features of class `\KOMAClassName'\MessageBreak + like options `headsepline', `footsepline' or command\MessageBreak + `\string\MakeMarkcase' and the commands `\string\setkomafont' and\MessageBreak + `\string\addtokomafont' for the page style elements need\MessageBreak + explicite user intervention to work} \scr@package@not@recommended{titlesec}{% the package only\MessageBreak if you really need it, because it breaks several\MessageBreak @@ -4284,7 +4366,8 @@ \let\scr@ttl@@extract\relax }% } -%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\set@tempdima@hw}{% \setlength{\@tempdima}{\textwidth}% \if@mincl @@ -4379,7 +4462,8 @@ \newcommand*{\indexpagestyle}{plain} \pagestyle{plain} \pagenumbering{arabic} -%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-floats.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand\marginline[1]{% \marginpar[\raggedleft{#1}]{\raggedright #1}% } @@ -5069,7 +5153,8 @@ }{% \end@dblfloat } -%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $ +%%% From File: $Id: scrkernel-footnotes.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \renewcommand*\footnoterule{% \normalsize\ftn@rule@test@values \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax @@ -5226,7 +5311,8 @@ \endgroup \@footnotemark } -%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $ +%%% From File: $Id: scrkernel-listsof.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \g@addto@macro{\numberline@numberpostfix}{\autodot} \usetocbasicnumberline[% \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}% @@ -5372,7 +5458,8 @@ \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}} \newcommand*\listoftables{\listoftoc{\ext@table}} \let\l@table\l@figure -%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $ +%%% From File: $Id: scrkernel-bibliography.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*\refname{References} \newcommand*{\bibpreamble}{\relax} \let\bibpreamble\relax @@ -5457,7 +5544,8 @@ } \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook} \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook} -%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-index.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \newcommand*{\index@preamble}{} \let\index@preamble=\relax \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}} @@ -5503,7 +5591,8 @@ \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax } \newcommand*\indexname{Index} -%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $ +%%% (run: body) \if@twocolumn \setlength{\leftmargini}{2em} \else @@ -5662,7 +5751,7 @@ \newcommand*{\scr@fnt@descriptionlabel}{\descfont} \newkomafont{labelinglabel}{} \newkomafont{labelingseparator}{} -%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $ +%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $ \@ifundefined{KOMAScript}{% \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em% M\kern.05em A\kern.1em-\kern.1em Script}}}{} -- cgit v1.2.3