summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/scrartcl.cls')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls292
1 files changed, 162 insertions, 130 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index a4af59af4c6..913d7315288 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% scrkernel-version.dtx (with options: `class,article')
-%% scrkernel-basics.dtx (with options: `load')
+%% scrkernel-basics.dtx (with options: `class,load')
%% scrkernel-listsof.dtx (with options: `class,book,prepare')
%% scrkernel-tocstyle.dtx (with options: `class,article,prepare')
%% scrkernel-sections.dtx (with options: `class,article,prepare')
@@ -84,7 +84,7 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3444 2019-12-23 08:06:56Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/12/23 v3.28 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -121,29 +121,29 @@
article%
}
\ProvidesClass{\KOMAClassName}[%
- 2019/10/12 v3.27 KOMA-Script
+ 2019/12/23 v3.28 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3409 2019-11-26 16:16:24Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2019/10/12 v3.27 KOMA-Script
+ 2019/12/23 v3.28 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
\addtotoclist[ToC]{toc}
-\ifstr{\ext@toc}{toc}{}{%
+\Ifstr{\ext@toc}{toc}{}{%
\expandafter\addtotoclist
\expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]%
\expandafter{\ext@toc}%
}
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: prepare)
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -195,7 +195,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -269,10 +269,12 @@
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
\@namedef{scr@v@3.27}{17}
+\@namedef{scr@v@3.27a}{17}
+\@namedef{scr@v@3.28}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
@@ -347,7 +349,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -403,9 +405,9 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\providecommand*\@ptsize{%
11%
@@ -415,17 +417,17 @@
}
\newcommand*{\@pt@@scan}{}
\def\@pt@@scan #1pt#2\@pt@@scan{%
- \ifstr{#2}{pt}{%
- \ifnumber{#1}{%
- \ifstr{#1}{10}{%
+ \Ifstr{#2}{pt}{%
+ \Ifnumber{#1}{%
+ \Ifstr{#1}{10}{%
\KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
{#1#2}{fontsize=#1#2}%
}{%
- \ifstr{#1}{11}{%
+ \Ifstr{#1}{11}{%
\KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
{#1#2}{fontsize=#1#2}%
}{%
- \ifstr{#1}{12}{%
+ \Ifstr{#1}{12}{%
\KOMA@UseStandardOption{\PackageInfoNoLine{\KOMAClassName}}%
{#1#2}{fontsize=#1#2}%
}{%
@@ -491,11 +493,11 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
- \ifstr{#1}{semi}{%
+ \Ifstr{#1}{semi}{%
\@twosidetrue
\FamilyKeyStateProcessed
}{%
@@ -552,8 +554,8 @@
\newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
\newcommand*{\@@BCOR}{}
\def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
- \ifstr{#1}{}{%
- \ifstr{#3}{BCOR}{%
+ \Ifstr{#1}{}{%
+ \Ifstr{#3}{BCOR}{%
\PassOptionsToPackage{BCOR#2}{typearea}%
}{\scr@pti@nerr@r}%
}{\scr@pti@nerr@r}%
@@ -581,18 +583,18 @@
}
\newcommand*{\x@@paper}{}
\def\x@@paper #1#2paper#3\x@@paper{%
- \ifstr{#3}{paper}{%
- \ifnumber{#2}{%
- \ifstr{#1}{a}{%
+ \Ifstr{#3}{paper}{%
+ \Ifnumber{#2}{%
+ \Ifstr{#1}{a}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{%
- \ifstr{#1}{b}{%
+ \Ifstr{#1}{b}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{%
- \ifstr{#1}{c}{%
+ \Ifstr{#1}{c}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{%
- \ifstr{#1}{d}{%
+ \Ifstr{#1}{d}{%
\PassOptionsToPackage{#3=#1#2}{typearea}%
}{\scr@pti@nerr@r}%
}%
@@ -774,13 +776,13 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\newif\if@titlepage
\@titlepagefalse
\newif\if@titlepageiscoverpage
\KOMA@key{titlepage}[true]{%
- \ifstr{#1}{firstiscover}{%
+ \Ifstr{#1}{firstiscover}{%
\@titlepagetrue
\@titlepageiscoverpagetrue
\FamilyKeyStateProcessed
@@ -809,9 +811,9 @@
\KOMA@ifkey{abstract}{@abstrt}
\KOMA@DeclareDeprecatedOption{abstracton}{abstract=true}
\KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: option)
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -854,16 +856,16 @@
Maybe `hyperref' not loaded or unknown version?%
}%
}{%
- \ifstr{\Hy@driver}{hdvips}{%
+ \Ifstr{\Hy@driver}{hdvips}{%
\providecommand*{\BookmarkDriverDefault}{dvips}%
}{%
- \ifstr{\Hy@driver}{hdvipdfm}{%
+ \Ifstr{\Hy@driver}{hdvipdfm}{%
\providecommand*{\BookmarkDriverDefault}{dvipdfm}%
}{%
- \ifstr{\Hy@driver}{hdvipson}{%
+ \Ifstr{\Hy@driver}{hdvipson}{%
\providecommand*{\BookmarkDriverDefault}{dvipsone}%
}{%
- \ifstr{\Hy@driver}{htexture}{%
+ \Ifstr{\Hy@driver}{htexture}{%
\providecommand*{\BookmarkDriverDefault}{textures}%
}{%
}%
@@ -1009,7 +1011,7 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
@@ -1024,7 +1026,7 @@
\KOMA@unknown@keyval{cleardoublepage}{#1}{%
'current' or any defined pagestyle e.g. 'empty','plain', 'headings'}%
}%
- \ifstr{#1}{current}{%
+ \Ifstr{#1}{current}{%
\def\@tempc{\endgroup%
\def\cleardoublepage{\cleardoublestandardpage}%
\def\cleardoubleoddpage{\cleardoubleoddstandardpage}%
@@ -1035,7 +1037,7 @@
}{cleardoublepage}{current}%
}%
}{%
- \ifnotundefined{ps@#1}{%
+ \Ifnotundefined{ps@#1}{%
\def\@tempc{\endgroup%
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
@@ -1048,7 +1050,7 @@
}{%
\ifx\@currname\KOMAClassName
\ifx\@currext\@clsextension
- \ifstr{#1}{headings}{%
+ \Ifstr{#1}{headings}{%
\def\@tempc{\endgroup%
\def\cleardoublepage{\cleardoublepageusingstyle{#1}}%
\def\cleardoubleoddpage{\cleardoubleoddpageusingstyle{#1}}%
@@ -1114,7 +1116,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1249,7 +1251,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -1264,7 +1266,7 @@
option `footnotes=#1'}%
\fi
\fi
- \ifstr{#1}{multiple}{%
+ \Ifstr{#1}{multiple}{%
\let\@footnotemark\scr@footnotemark
\def\FN@mf@prepare{\scr@mf@prepare}%
\def\scr@footmisc@options{multiple}%
@@ -1273,7 +1275,7 @@
\KOMAClassFileName
}{footnotes}{multiple}%
}{%
- \ifstr{#1}{nomultiple}{%
+ \Ifstr{#1}{nomultiple}{%
\let\@footnotemark\scr@saved@footnotemark
\let\FN@mf@prepare\relax
\let\scr@footmisc@options\@empty
@@ -1320,17 +1322,18 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
\KOMA@set@ncmdkey{toc}{@tempa}{%
{noindex}{0},{noidx}{0},%
{index}{1},{idx}{1},%
- {indexnumbered}{2},%
- {nolistof}{3},%
- {listof}{4},%
+ {indexnumbered}{2},{idxnumbered}{2},{numberedindex}{2},{numberedidx}{2},%
+ {nolistof}{3},{nolistsof}{3},%
+ {listof}{4},{listsof}{4},%
{listofnumbered}{5},{numberedlistof}{5},%
+ {listsofnumbered}{5},{numberedlistsof}{5},%
{nobibliography}{6},{nobib}{6},%
{bibliography}{7},{bib}{7},%
{bibliographynumbered}{8},{bibnumbered}{8},{numberedbibliography}{8},%
@@ -1549,7 +1552,7 @@
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
@@ -1570,7 +1573,7 @@
\let\bib@beginhook\@empty
\let\bib@endhook\@empty
\@ifundefined{scr@current@bibstyle}{}{%
- \ifstr{\scr@current@bibstyle}{}{}{%
+ \Ifstr{\scr@current@bibstyle}{}{}{%
\edef\reserved@a{%
\noexpand\KOMA@kav@remove{.\KOMAClassFileName}{bibliography}%
{\scr@current@bibstyle}%
@@ -1802,21 +1805,21 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3397 2019-11-20 10:26:14Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2291,13 +2294,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3265 2019-10-13 17:58:25Z 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 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2484,7 +2487,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -2901,10 +2904,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2918,19 +2921,18 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{%
\if@sectionentrywithdots
- \TOCLineLeaderFill\relax
+ {\usekomafont{sectionentrydots}{\TOCLineLeaderFill}}\relax
\else
\hfill
\fi
}%
- % F^^c3^^bcr die Eintr^^c3^^a4ge die Schrift von Element sectionentry verwenden.
\expandafter\providecommand%
\csname scr@tso@#1@entryformat\endcsname{\usekomafont{sectionentry}}%
\expandafter\providecommand%
@@ -2938,20 +2940,29 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z 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 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3392 2019-11-19 09:37:46Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{3}
-\newcommand*{\ifnumbered}[1]{%
+\providecommand*{\ifnumbered}{%
+ \ClassWarning{\KOMAClassName}{Usage of deprecated command
+ `\string\ifnumbered'.\MessageBreak
+ The command has been renamed because of a\MessageBreak
+ recommendation of The LaTeX Project Team.\MessageBreak
+ Please replace `\string\ifnumbered' by `\string\Ifnumbered'%
+ }%
+ \Ifnumbered
+}
+\newcommand*{\Ifnumbered}[1]{%
\if@currentusenumber
\scr@ifundefinedorrelax{#1numdepth}{%
\expandafter\@secondoftwo
@@ -2966,8 +2977,17 @@
\expandafter\@secondoftwo
\fi
}
-\newcommand*{\ifunnumbered}[1]{%
- \ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}%
+\providecommand*{\ifunnumbered}{%
+ \ClassWarning{\KOMAClassName}{Usage of deprecated command
+ `\string\ifunnumbered'.\MessageBreak
+ The command has been renamed because of a\MessageBreak
+ recommendation of The LaTeX Project Team.\MessageBreak
+ Please replace `\string\ifunnumbered' by `\string\Ifunnumbered'%
+ }%
+ \Ifunnumbered
+}
+\newcommand*{\Ifunnumbered}[1]{%
+ \Ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}%
}
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
@@ -3102,8 +3122,8 @@
\KOMAClassName\space needs it's own definition of
`\string\@startsection'\MessageBreak
to provide extended features for the optional argument\MessageBreak
- of `\string\section` etc.\MessageBreak
- Generally it defines `\string\@startsection` completely new\MessageBreak
+ of `\string\section' etc.\MessageBreak
+ Generally it defines `\string\@startsection' completely new\MessageBreak
to achieve this. Because of the unexpected definition\MessageBreak
an alternative approach will be used.\MessageBreak
If this fails and if there isn't a new release of\MessageBreak
@@ -3111,9 +3131,9 @@
send a report to the KOMA-Script author.\MessageBreak
Note, that this alternative approach does not\MessageBreak
execute the elements of do-hooks:\MessageBreak
- \space\space- `heading/postinit`,\MessageBreak
- \space\space- `heading/branch/star`,\MessageBreak
- \space\space- `heading/branch/nostar`,\MessageBreak
+ \space\space- `heading/postinit',\MessageBreak
+ \space\space- `heading/branch/star',\MessageBreak
+ \space\space- `heading/branch/nostar',\MessageBreak
and does always use `runin=bysign' and\MessageBreak
`afterindent=bysign'%
}%
@@ -3638,7 +3658,7 @@
####1####2####3{####2}%
\fi
\else
- \ifstr{##1}{#5}{%
+ \Ifstr{##1}{#5}{%
\expandafter\def\csname #3\scr@dsc@current#4\endcsname
####1####2####3{####3}%
\FamilyKeyStateProcessed
@@ -3733,7 +3753,7 @@
}
\newcommand*{\scr@dsc@style@part@neededoptionstest}{%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @beforeskip}{%
- \ifstr{\scr@dsc@current}{part}{%
+ \Ifstr{\scr@dsc@current}{part}{%
\scr@declaresectioncommanderror{\scr@dsc@current}%
{before part skip}{beforeskip}%
}{%
@@ -3744,7 +3764,7 @@
}%
}{}%
\scr@ifundefinedorrelax{scr@\scr@dsc@current @afterskip}{%
- \ifstr{\scr@dsc@current}{part}{%
+ \Ifstr{\scr@dsc@current}{part}{%
\scr@declaresectioncommanderror{\scr@dsc@current}%
{after part skip}{afterskip}%
}{%
@@ -3755,7 +3775,7 @@
}%
}{}%
\IfExistskomafont{\scr@dsc@current}{}{%
- \ifstr{\scr@dsc@current}{part}{%
+ \Ifstr{\scr@dsc@current}{part}{%
\scr@declaresectioncommanderror{\scr@dsc@current}{font}{font}%
}{%
\scr@declaresectioncommandwarning{\scr@dsc@current}{font}{font}%
@@ -3764,7 +3784,7 @@
}%
}{}%
\IfExistskomafont{\scr@dsc@current prefix}{}{%
- \ifstr{\scr@dsc@current}{part}{%
+ \Ifstr{\scr@dsc@current}{part}{%
\scr@declaresectioncommanderror{\scr@dsc@current}%
{number font}{prefixfont}%
}{%
@@ -4158,14 +4178,14 @@
\DeclareSectionCommand[{#1}]{#2}%
\else
\ClassError{\KOMAClassName}{%
- command `\reserved@b` already defined%
+ command `\reserved@b' already defined%
}{%
You've tried to define the section command `\expandafter\string\csname
- #2\endcsname` newly.\MessageBreak
+ #2\endcsname' newly.\MessageBreak
Such a section command needs an additional new command
- `\reserved@b`,\MessageBreak
+ `\reserved@b',\MessageBreak
but this already exists. So you cannot define
- `\expandafter\string\csname #2\endcsname` newly.\MessageBreak
+ `\expandafter\string\csname #2\endcsname' newly.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\RedeclareSectionCommand,\MessageBreak
or \string\ProvideSectionCommand.\MessageBreak
@@ -4174,10 +4194,10 @@
\fi
}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #2\endcsname` already defined%
+ command `\expandafter\string\csname #2\endcsname' already defined%
}{%
You've tried to define the section command `\expandafter\string\csname
- #2\endcsname` newly,\MessageBreak
+ #2\endcsname' newly,\MessageBreak
but a command or something else with this name already
exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
@@ -4190,10 +4210,10 @@
\newcommand*{\RedeclareSectionCommand}[2][]{%
\@ifundefined{#2}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname #2\endcsname` not defined%
+ command `\expandafter\string\csname #2\endcsname' not defined%
}{%
You've tried to re-define the section command `\expandafter\string\csname
- #2\endcsname`,\MessageBreak
+ #2\endcsname',\MessageBreak
but a command with this name does not exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\DeclareNewSectionCommand,\MessageBreak
@@ -4238,11 +4258,11 @@
\scr@trim@spaces\reserved@a
\@ifundefined{\reserved@a}{}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname\reserved@a\endcsname` already
+ command `\expandafter\string\csname\reserved@a\endcsname' already
defined%
}{%
You've tried to define the section command
- `\expandafter\string\csname\reserved@a\endcsname` newly,\MessageBreak
+ `\expandafter\string\csname\reserved@a\endcsname' newly,\MessageBreak
but a command, token, box or length with this name already
exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
@@ -4269,10 +4289,10 @@
\scr@trim@spaces\reserved@a
\@ifundefined{\reserved@a}{%
\ClassError{\KOMAClassName}{%
- command `\expandafter\string\csname\reserved@a\endcsname` not defined%
+ command `\expandafter\string\csname\reserved@a\endcsname' not defined%
}{%
You've tried to re-define the section command
- `\expandafter\string\csname\reserved@a\endcsname`,\MessageBreak
+ `\expandafter\string\csname\reserved@a\endcsname',\MessageBreak
but a command with this name does not exists.\MessageBreak
Maybe you should use one of \string\DeclareSectionCommand,
\string\DeclareNewSectionCommand,\MessageBreak
@@ -4350,7 +4370,7 @@
unknown section command style `#2'%
}{}%
}%
- \ifstr{\@nameuse{scr@#1@style}}{#2}%
+ \Ifstr{\@nameuse{scr@#1@style}}{#2}%
}
\newcommand*{\bprot@dottedtocline}[5]{%
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
@@ -4381,7 +4401,7 @@
\fi
}
\newcommand*\appendix{%
- \ifstr{\@currenvir}{appendix}{%
+ \Ifstr{\@currenvir}{appendix}{%
\ClassWarning{\KOMAClassName}{%
You are using
`\string\begin{appendix}...\string\end{appendix}'.\MessageBreak
@@ -4445,7 +4465,7 @@
\setkeys{KOMAarg.section}{tocentry={#2},head={#2},reference={#2}}%
\fi
\fi
- \ifnumbered{#1}{%
+ \Ifnumbered{#1}{%
\refstepcounter{#1}%
\@maybeautodot\thepart%
\expandafter\@maybeautodot\csname the#1\endcsname
@@ -4475,7 +4495,7 @@
\fi
}%
\begingroup
- \def\IfUseNumber{\ifnumbered{#1}}%
+ \def\IfUseNumber{\Ifnumbered{#1}}%
\ExecuteDoHook{heading/begingroup/#1}%
\setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
@@ -4689,7 +4709,7 @@
\newcommand*{\scr@fnt@subparagraph}{\size@subparagraph}
\newkomafont{sectionentry}{\usekomafont{disposition}}
\newkomafont{sectionentrypagenumber}{}
-\newkomafont{sectionentrydots}{\normalfont}
+\newkomafont{sectionentrydots}{}
\DeclareSectionCommand[%
style=section,%
level=1,%
@@ -4755,7 +4775,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3400 2019-11-21 10:36:26Z kohm $
%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -4829,7 +4849,16 @@
}
\newcommand*{\is@thispageodd@setlabel}{}
\newif\ifthispagewasodd
-\newcommand{\ifthispageodd}{%
+\providecommand*{\ifthispageodd}{%
+ \PackageWarning{scrbase}{Usage of deprecated command
+ `\string\ifthispageodd'.\MessageBreak
+ The command has been renamed because of a\MessageBreak
+ recommendation of The LaTeX Project Team.\MessageBreak
+ Please replace `\string\ifthispageodd' by `\string\Ifthispageodd'%
+ }%
+ \Ifthispageodd
+}
+\newcommand{\Ifthispageodd}{%
\is@thispageodd
\ifthispagewasodd
\expandafter\@firstoftwo
@@ -5077,7 +5106,7 @@
after loading `titlesec'%
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3393 2019-11-19 10:33:44Z kohm $
%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -5138,11 +5167,11 @@
\if@twoside\else\hfil\fi}}}}\hss}%
\renewcommand*{\sectionmark}[1]{%
\if@twoside\expandafter\markboth\else\expandafter\markright\fi
- {\MakeMarkcase{\ifnumbered{section}{\sectionmarkformat}{}##1}}{}}%
+ {\MakeMarkcase{\Ifnumbered{section}{\sectionmarkformat}{}##1}}{}}%
\renewcommand*{\subsectionmark}[1]{%
\if@twoside
\markright{%
- \MakeMarkcase{\ifnumbered{subsection}{\subsectionmarkformat}{}##1}%
+ \MakeMarkcase{\Ifnumbered{subsection}{\subsectionmarkformat}{}##1}%
}%
\fi
}%
@@ -5173,7 +5202,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
+%%% From File: $Id: scrlayer.dtx 3411 2019-11-28 09:11:27Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -5181,10 +5210,10 @@
\providecommand*{\@mkright}{%
\IfActiveMkBoth{\markright}{\@gobble}%
}%
-\providecommand*{\@mkdouble}[1]{%
+\providecommand{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -5274,7 +5303,7 @@
\if i\scap@pos\def\@tempa{l}\fi
\if o\scap@pos\def\@tempa{r}\fi
\if@twoside
- \ifthispageodd{}{%
+ \Ifthispageodd{}{%
\if o\scap@pos\def\@tempa{l}\fi
\if i\scap@pos\def\@tempa{r}\fi
\ifscap@alt
@@ -5401,7 +5430,7 @@
\let\cap@left=\relax
\let\cap@right=\hfill
\if@twoside
- \ifthispageodd{}{%
+ \Ifthispageodd{}{%
\let\cap@left=\hfill
\let\cap@right=\relax
}%
@@ -5414,7 +5443,7 @@
\let\cap@left=\hfill
\let\cap@right=\relax
\if@twoside
- \ifthispageodd{}{%
+ \Ifthispageodd{}{%
\let\cap@left=\relax
\let\cap@right=\hfill
}%
@@ -5500,7 +5529,7 @@
\let\cap@left=\relax
\let\cap@right=\hfill
\if@twoside
- \ifthispageodd{}{%
+ \Ifthispageodd{}{%
\let\cap@left=\hfill
\let\cap@right=\relax
}%
@@ -5520,7 +5549,7 @@
\let\cap@left=\hfill
\let\cap@right=\relax
\if@twoside
- \ifthispageodd{}{%
+ \Ifthispageodd{}{%
\let\cap@left=\relax
\let\cap@right=\hfill
}%
@@ -5556,7 +5585,7 @@
\edef\@tempa{\endgroup
\def\noexpand\cap@width{\the\@tempdima}%
\noexpand\if@twoside
- \noexpand\ifthispageodd{%
+ \noexpand\Ifthispageodd{%
\def\noexpand\cap@left{\noexpand\hspace*{\the\@tempdimc}}%
\def\noexpand\cap@right{\noexpand\hspace*{\the\@tempdimb}}%
}{%
@@ -5720,7 +5749,10 @@
{%
\hspace{-\cap@indent}%
\scr@smashdp{%
- #1{\usekomafont{captionlabel}{#2\captionformat}}%
+ #1{\usekomafont{caption}{%
+ \usekomafont{captionlabel}{#2\captionformat}%
+ }%
+ }%
}%
{\usekomafont{caption}{#3\scr@endstrut}\par}%
}%
@@ -5754,31 +5786,31 @@
\fi
}%
\def\reserved@a{#2}%
- \ifstr{\reserved@a}{j}{%
+ \Ifstr{\reserved@a}{j}{%
\expandafter\let\csname ragged#1caption\endcsname\@empty
}{%
- \ifstr{\reserved@a}{l}{%
+ \Ifstr{\reserved@a}{l}{%
\scr@ifundefinedorrelax{LaTeXraggedright}{%
\expandafter\let\csname ragged#1caption\endcsname\raggedright
}{%
\expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedright
}%
}{%
- \ifstr{\reserved@a}{r}{%
+ \Ifstr{\reserved@a}{r}{%
\scr@ifundefinedorrelax{LaTeXraggedleft}{%
\expandafter\let\csname ragged#1caption\endcsname\raggedleft
}{%
\expandafter\let\csname ragged#1caption\endcsname\LaTeXraggedleft
}%
}{%
- \ifstr{\reserved@a}{c}{%
+ \Ifstr{\reserved@a}{c}{%
\scr@ifundefinedorrelax{LaTeXcentering}{%
\expandafter\let\csname ragged#1caption\endcsname\centering
}{%
\expandafter\let\csname ragged#1caption\endcsname\LaTeXcentering
}%
}{%
- \ifstr{\reserved@a}{J}{%
+ \Ifstr{\reserved@a}{J}{%
\scr@ifundefinedorrelax{justifying}{%
\scr@caption@raggede@warning{J}{\justifying}%
\expandafter\let\csname ragged#1caption\endcsname\@empty
@@ -5786,7 +5818,7 @@
\expandafter\let\csname ragged#1caption\endcsname\justifying
}%
}{%
- \ifstr{\reserved@a}{L}{%
+ \Ifstr{\reserved@a}{L}{%
\scr@ifundefinedorrelax{RaggedRight}{%
\scr@caption@raggede@warning{L}{\RaggedRight}%
\expandafter\let\csname ragged#1caption\endcsname\raggedright
@@ -5794,7 +5826,7 @@
\expandafter\let\csname ragged#1caption\endcsname\RaggedRight
}%
}{%
- \ifstr{\reserved@a}{R}{%
+ \Ifstr{\reserved@a}{R}{%
\scr@ifundefinedorrelax{RaggedLeft}{%
\scr@caption@raggede@warning{R}{\RaggedLeft}%
\expandafter\let\csname ragged#1caption\endcsname\raggedleft
@@ -5802,7 +5834,7 @@
\expandafter\let\csname ragged#1caption\endcsname\RaggedLeft
}%
}{%
- \ifstr{\reserved@a}{C}{%
+ \Ifstr{\reserved@a}{C}{%
\scr@ifundefinedorrelax{Centering}{%
\scr@caption@raggede@warning{C}{\Centering}%
\expandafter\let\csname ragged#1caption\endcsname\centering
@@ -5810,7 +5842,7 @@
\expandafter\let\csname ragged#1caption\endcsname\Centering
}%
}{%
- \ifstr{\reserved@a}{}{%
+ \Ifstr{\reserved@a}{}{%
\expandafter\let\csname ragged#1caption\endcsname\relax
}{%
\ClassError{\KOMAClassName}{unknown alignment char `#2'}{%
@@ -5979,7 +6011,7 @@
\else\expandafter\captionbelow\fi
}
]{lot}
-%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
@@ -6024,10 +6056,10 @@
\newcommand*{\ftn@rule@width}{.4\columnwidth}
\newcommand*{\ftn@rule@height}{.4\p@}
\newcommand*{\setfootnoterule}[2][]{%
- \ifstr{#1}{}{}{%
+ \IfArgIsEmpty{#1}{}{%
\renewcommand*{\ftn@rule@height}{#1}%
}%
- \ifstr{#2}{}{}{%
+ \IfArgIsEmpty{#2}{}{%
\renewcommand*{\ftn@rule@width}{#2}%
}%
\ftn@rule@test@values
@@ -6137,7 +6169,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -6281,7 +6313,7 @@
UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables}
\renewcommand*\listoflotname{\listtablename}
\renewcommand*\listoflotentryname{\tablename}
-%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3390 2019-11-18 17:09:35Z kohm $
%%% (run: body)
\newcommand*\refname{References}
\newcommand*{\bibpreamble}{\relax}
@@ -6409,7 +6441,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3394 2019-11-19 11:56:28Z kohm $
%%% (run: body)
\if@twocolumn
\setlength{\leftmargini}{2em}
@@ -6519,7 +6551,7 @@
\@addmargin
}{%
\if@twoside
- \unskip\nobreak\ifthispageodd{}{}%
+ \unskip\nobreak\Ifthispageodd{}{}%
\expandafter\ifx\csname tpo@\scr@tpo\endcsname\scr@addmargin@startpage\else
\ClassWarning{\KOMAClassName}{%
page break inside `addmargin*' environment.\MessageBreak