summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco175
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco173
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/DINmtext.lco13
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KOMAold.lco14
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/KakuLL.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NF.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEH.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponEL.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLH.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponLL.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/NipponRL.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SN.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/SNleft.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/float.hak16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/floatrow.hak16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/hyperref.hak18
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/komamarks.sty276
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/listings.hak16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/lscape.hak16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/nomencl.hak16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scraddr.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrartcl.cls597
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrarticle.cls88
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbase.sty455
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrbook.cls612
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrdate.sty18
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrextend.sty71
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrhack.sty28
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrjura.sty106
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrkbase.sty24
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty20
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty130
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty89
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlayer.sty18
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.cls90
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrletter.sty406
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlfile.sty62
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls356
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrpage2.sty8
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreport.cls88
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrreprt.cls606
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo12
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrtime.sty18
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/scrwfile.sty6
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/setspace.hak16
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/standardsections.hak616
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty555
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocstyle.sty53
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/typearea.sty29
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/visualize.lco14
56 files changed, 4650 insertions, 1480 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN.lco b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
index a799bf0749a..33211a3451b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DIN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,DIN,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
DIN%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco
new file mode 100644
index 00000000000..8350053230c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008A.lco
@@ -0,0 +1,175 @@
+%%
+%% This is file `DIN5008A.lco',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,5008,A,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,5008,A,body')
+%%
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
+%% 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 $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+\endgroup
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: head)
+\ProvidesFile{%
+ 5008%
+ A%
+ .lco}[\KOMAScriptVersion\space letter-class-option]
+\LoadLetterOption{%
+ DINmtext%
+}
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: body)
+\@setplength{toaddrindent}{%
+ 5mm}
+\@setplength{locvpos}{%
+ \dimexpr\useplength{toaddrvpos}+\useplength{backaddrheight}}
+\@setplength{specialmailindent}{\useplength{toaddrindent}}
+\@setplength{specialmailrightindent}{\z@}
+\@setplength{locwidth}{%
+ 75mm}
+\@setplength{lochpos}{10mm}
+\@setplength{firstheadhpos}{%
+ \dimexpr \useplength{toaddrhpos}+\useplength{toaddrindent}}
+\@setplength{firstheadwidth}{%
+ \dimexpr 125mm-\useplength{firstheadhpos}}
+\@setplength{firstfoothpos}{%
+ \dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}%
+\@setplength{firstfootwidth}{%
+ \dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}%
+\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax
+ \@setplength{firstfootvpos}{\paperheight}
+ \@addtoplength{firstfootvpos}{-16mm}
+\else
+ \@setplength{firstfootvpos}{1in}
+ \@addtoplength{firstfootvpos}{\topmargin}
+ \@addtoplength{firstfootvpos}{\headheight}
+ \@addtoplength{firstfootvpos}{\headsep}
+ \@addtoplength{firstfootvpos}{\textheight}
+ \@addtoplength{firstfootvpos}{\footskip}
+\fi
+\@setplength{refvpos}{%
+ 79.4mm}
+\@setplength{refaftervskip}{%
+ 8.46mm}
+\@newplength{specialmailheight}
+\@setplength{specialmailheight}{12.7mm}
+\areaset[5mm]{165mm}{233mm}
+\KOMAoptions{%
+ fromalign=locationleft,
+ addrfield=topaligned,
+ refline=narrow,
+ parskip=full
+}
+\l@addto@macro\@PapersizeWarning{%
+ \begingroup
+ \@tempswafalse
+ \ifdim\oddsidemargin<\dimexpr 25mm-1in-1pt\relax\@tempswatrue\else
+ \ifdim\oddsidemargin>\dimexpr 25mm-1in+1pt\relax\@tempswatrue\fi\fi
+ \ifdim\textwidth<\dimexpr \paperwidth-45mm-1pt\relax\@tempswatrue\else
+ \ifdim\textwidth>\dimexpr \paperwidth-45mm+1pt\relax\@tempswatrue\fi\fi
+ \if@tempswa
+ \LCOWarning{DIN5008%
+ A%
+ }{%
+ DIN5008 orders exact margins and text\MessageBreak
+ width. Without following these values,\MessageBreak
+ your document does not conform DIN5008.\MessageBreak
+ You should use, e.g.,\MessageBreak
+ \space\string\areaset[5mm]{%
+ \the\dimexpr \paperwidth-45mm\relax}{%
+ \the\dimexpr 1.414\dimexpr \paperwidth-45mm\relax\relax}\MessageBreak
+ to follow the norm
+ }%
+ \fi
+ \ifdim \dimexpr\parskip\relax=\dimexpr\baselineskip\relax\else
+ \LCOWarning{DIN5008%
+ A%
+ }{%
+ DIN5008 orders paragraph separation by\MessageBreak
+ exactly one line. Without this, your\MessageBreak
+ document does not conform DIN5008.\MessageBreak
+ You shoud use, e.g.,\MessageBreak
+ \space\string\KOMAoption{parskip}{full}\MessageBreak
+ to follow the norm
+ }%
+ \fi
+ \endgroup
+}
+\renewcommand{\backaddr@format}[1]{\hspace*{\useplength{toaddrindent}}%
+ \parbox[t][\useplength{backaddrheight}][t]%
+ {\dimexpr\useplength{toaddrwidth}-\useplength{toaddrindent}}%
+ {\strut\ignorespaces #1\ifhmode\scr@endstrut\fi}%
+}
+\renewcommand{\specialmail@format}[1]{%
+ \parbox[t][\useplength{specialmailheight}][t]%
+ {\dimexpr\useplength{toaddrwidth}
+ -\useplength{specialmailindent}
+ -\useplength{specialmailrightindent}}%
+ {\strut\ignorespaces #1\ifhmode\scr@endstrut\fi}%
+}
+\setkomafont{specialmail}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{backaddress}{\sffamily\fontsize{8pt}{10pt}\selectfont}
+\setkomafont{addressee}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{fromname}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{fromaddress}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{refvalue}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\let\raggedsignature\raggedright
+\endinput
+%%
+%% End of file `DIN5008A.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco
new file mode 100644
index 00000000000..9abd8cf9183
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/DIN5008B.lco
@@ -0,0 +1,173 @@
+%%
+%% This is file `DIN5008B.lco',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `trace')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,5008,B,head')
+%% scrkernel-letterclassoptions.dtx (with options: `lco,5008,B,body')
+%%
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
+%% 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 $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+\endgroup
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: head)
+\ProvidesFile{%
+ 5008%
+ B%
+ .lco}[\KOMAScriptVersion\space letter-class-option]
+\LoadLetterOption{%
+ DIN%
+}
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: body)
+\@setplength{toaddrindent}{%
+ 5mm}
+\@setplength{locvpos}{%
+ \dimexpr\useplength{toaddrvpos}+\useplength{backaddrheight}}
+\@setplength{specialmailindent}{\useplength{toaddrindent}}
+\@setplength{specialmailrightindent}{\z@}
+\@setplength{locwidth}{%
+ 75mm}
+\@setplength{lochpos}{10mm}
+\@setplength{firstheadhpos}{%
+ \dimexpr \useplength{toaddrhpos}+\useplength{toaddrindent}}
+\@setplength{firstheadwidth}{%
+ \dimexpr 125mm-\useplength{firstheadhpos}}
+\@setplength{firstfoothpos}{%
+ \dimexpr\useplength{toaddrhpos}+\useplength{toaddrindent}}%
+\@setplength{firstfootwidth}{%
+ \dimexpr \paperwidth-\useplength{toaddrhpos}-\useplength{firstfoothpos}}%
+\ifnum \scr@compatibility >\@nameuse{scr@v@2.9t}\relax
+ \@setplength{firstfootvpos}{\paperheight}
+ \@addtoplength{firstfootvpos}{-16mm}
+\else
+ \@setplength{firstfootvpos}{1in}
+ \@addtoplength{firstfootvpos}{\topmargin}
+ \@addtoplength{firstfootvpos}{\headheight}
+ \@addtoplength{firstfootvpos}{\headsep}
+ \@addtoplength{firstfootvpos}{\textheight}
+ \@addtoplength{firstfootvpos}{\footskip}
+\fi
+\@setplength{refaftervskip}{%
+ 8.46mm}
+\@newplength{specialmailheight}
+\@setplength{specialmailheight}{12.7mm}
+\areaset[5mm]{165mm}{233mm}
+\KOMAoptions{%
+ fromalign=locationleft,
+ addrfield=topaligned,
+ refline=narrow,
+ parskip=full
+}
+\l@addto@macro\@PapersizeWarning{%
+ \begingroup
+ \@tempswafalse
+ \ifdim\oddsidemargin<\dimexpr 25mm-1in-1pt\relax\@tempswatrue\else
+ \ifdim\oddsidemargin>\dimexpr 25mm-1in+1pt\relax\@tempswatrue\fi\fi
+ \ifdim\textwidth<\dimexpr \paperwidth-45mm-1pt\relax\@tempswatrue\else
+ \ifdim\textwidth>\dimexpr \paperwidth-45mm+1pt\relax\@tempswatrue\fi\fi
+ \if@tempswa
+ \LCOWarning{DIN5008%
+ B%
+ }{%
+ DIN5008 orders exact margins and text\MessageBreak
+ width. Without following these values,\MessageBreak
+ your document does not conform DIN5008.\MessageBreak
+ You should use, e.g.,\MessageBreak
+ \space\string\areaset[5mm]{%
+ \the\dimexpr \paperwidth-45mm\relax}{%
+ \the\dimexpr 1.414\dimexpr \paperwidth-45mm\relax\relax}\MessageBreak
+ to follow the norm
+ }%
+ \fi
+ \ifdim \dimexpr\parskip\relax=\dimexpr\baselineskip\relax\else
+ \LCOWarning{DIN5008%
+ B%
+ }{%
+ DIN5008 orders paragraph separation by\MessageBreak
+ exactly one line. Without this, your\MessageBreak
+ document does not conform DIN5008.\MessageBreak
+ You shoud use, e.g.,\MessageBreak
+ \space\string\KOMAoption{parskip}{full}\MessageBreak
+ to follow the norm
+ }%
+ \fi
+ \endgroup
+}
+\renewcommand{\backaddr@format}[1]{\hspace*{\useplength{toaddrindent}}%
+ \parbox[t][\useplength{backaddrheight}][t]%
+ {\dimexpr\useplength{toaddrwidth}-\useplength{toaddrindent}}%
+ {\strut\ignorespaces #1\ifhmode\scr@endstrut\fi}%
+}
+\renewcommand{\specialmail@format}[1]{%
+ \parbox[t][\useplength{specialmailheight}][t]%
+ {\dimexpr\useplength{toaddrwidth}
+ -\useplength{specialmailindent}
+ -\useplength{specialmailrightindent}}%
+ {\strut\ignorespaces #1\ifhmode\scr@endstrut\fi}%
+}
+\setkomafont{specialmail}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{backaddress}{\sffamily\fontsize{8pt}{10pt}\selectfont}
+\setkomafont{addressee}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{fromname}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{fromaddress}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\setkomafont{refvalue}{\sffamily\fontsize{10pt}{12pt}\selectfont}
+\let\raggedsignature\raggedright
+\endinput
+%%
+%% End of file `DIN5008B.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
index 06f09122b53..a7eeeefbf69 100644
--- a/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/DINmtext.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,DINmoretext,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
DINmtext%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
@@ -149,7 +149,6 @@
\@setplength{sigindent}{0mm}
\@setplength{sigbeforevskip}{2\baselineskip}
\let\raggedsignature=\centering
-\def\scr@default@firsthead@fromaddress@hook{\def\\{,\ \@gobble}}
\endinput
%%
%% End of file `DINmtext.lco'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
index 8b57b18843f..b49b0ff2096 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KOMAold.lco
@@ -9,7 +9,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,KOMAold,body')
%% scrkernel-notepaper.dtx (with options: `lco,KOMAold,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -37,11 +37,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
KOMAold%
@@ -80,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
@@ -207,7 +207,7 @@
\@ObsoleteCommand{\subjectafteron}{subject=afteropening}}
\def\subjectafteroff{%
\@ObsoleteCommand{\subjectafteroff}{subject=beforeopening}}
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\def\setpresigskip{\@setplength{sigbeforevskip}}
\endinput
diff --git a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
index 12216aa9d32..6f2c2360c19 100644
--- a/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/KakuLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Kaku,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Kaku,LATE,LOW,head)
\ProvidesFile{%
Kaku%
@@ -81,7 +81,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Kaku,LATE,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NF.lco b/Master/texmf-dist/tex/latex/koma-script/NF.lco
index 23c4100c8ce..c12b96e83ca 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NF.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NF.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,NF,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
NF%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
index 4e3fa83f1df..6e48688e699 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,HIGH,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,EARLY,HIGH,head)
\ProvidesFile{%
Nippon%
@@ -81,7 +81,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,EARLY,HIGH,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
index f2b86a9eb72..1a3fc77d432 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponEL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,EARLY,LOW,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,EARLY,LOW,head)
\ProvidesFile{%
Nippon%
@@ -81,7 +81,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,EARLY,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
index 6fae6f514d2..a0cbf699c1c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLH.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,HIGH,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,LATE,HIGH,head)
\ProvidesFile{%
Nippon%
@@ -81,7 +81,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,LATE,HIGH,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
index a98a40122c1..e15670798a0 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponLL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,LATE,LOW,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,LATE,LOW,head)
\ProvidesFile{%
Nippon%
@@ -81,7 +81,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,LATE,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
index fcbf7a11ebe..bccb24869f9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/NipponRL.lco
@@ -8,7 +8,7 @@
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,head')
%% japanlco.dtx (with options: `lco,Ni,RIGHT,LOW,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,RIGHT,LOW,head)
\ProvidesFile{%
Nippon%
@@ -81,7 +81,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: japanlco.dtx 2976 2018-04-17 05:31:42Z kohm $
+%%% From File: $Id: japanlco.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: Ni,RIGHT,LOW,body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SN.lco b/Master/texmf-dist/tex/latex/koma-script/SN.lco
index 6906491ea2f..9d243dd9ccf 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SN.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SN.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,SN,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
SN%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
index e658dde1c70..2ff8f119929 100644
--- a/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/SNleft.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,SwissLeft,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
SNleft%
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
index 7b8e1742185..2b6050e8230 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
index 9c139eda065..43a3cf3de30 100644
--- a/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/UScommercial9DW.lco
@@ -8,7 +8,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,head')
%% scrkernel-letterclassoptions.dtx (with options: `lco,UScommercial9DW,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
UScommercial9DW
@@ -79,7 +79,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{scr@fromname@var}{%
\LCOWarningNoLine{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/float.hak b/Master/texmf-dist/tex/latex/koma-script/float.hak
index 762d8a77e07..b0bcb969aa1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/float.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/float.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,float,identify')
%% scrhack.dtx (with options: `hack,float,body')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{float.hak}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
(hacking package
float)%
]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\scr@ifexpected{\newfloat}{%
\long\def\newfloat#1#2#3{\@namedef{ext@#1}{#3}
\let\float@do=\relax
diff --git a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
index 9bd5fc2b558..47a1c1cc8ed 100644
--- a/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/floatrow.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,floatrow,identify')
%% scrhack.dtx (with options: `hack,floatrow,body')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{floatrow.hak}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
(hacking package
floatrow)%
]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\scr@ifexpected{\DeclareNewFloatType}{%
\long\def\DeclareNewFloatType#1#2{\def\FB@captype{#1}%
\expandafter\edef\csname ftype@#1\endcsname{\the\c@float@type}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
index a37732525e2..b6b52ff7813 100644
--- a/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/hyperref.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,hyperref,identify')
%% scrhack.dtx (with options: `hack,hyperref,body')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{hyperref.hak}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
(hacking package
hyperref)%
]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\scr@ifexpected\@schapter{%
\def\@schapter#1{%
\H@old@schapter{#1}%
@@ -116,7 +116,6 @@
Maybe you are using a unsupported hyperref version}%
}%
}
-
\scr@ifexpected\@spart{%
\def\@spart#1{%
\H@old@spart{#1}%
@@ -152,7 +151,6 @@
Maybe you are using a unsupported hyperref version}%
}%
}
-
\scr@ifexpected\@ssect{%
\def\@ssect#1#2#3#4#5{%
\H@old@ssect{#1}{#2}{#3}{#4}{#5}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/komamarks.sty b/Master/texmf-dist/tex/latex/koma-script/komamarks.sty
new file mode 100644
index 00000000000..0ad6ee3f2c7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/komamarks.sty
@@ -0,0 +1,276 @@
+%%
+%% This is file `komamarks.sty',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% komamarks.dtx (with options: `package,trace,identify')
+%% komamarks.dtx (with options: `package,trace,init')
+%% komamarks.dtx (with options: `package,trace,options')
+%% komamarks.dtx (with options: `package,trace,processoptions')
+%% komamarks.dtx (with options: `package,trace,body')
+%% komamarks.dtx (with options: `package,trace,final')
+%% scrlogo.dtx (with options: `logo')
+%%
+%% Copyright (c) 2012-2019 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
+%% find a complete unmodified copy of LaTeX2e at
+%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
+%%
+%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $
+%%% (run: identify)
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{komamarks}[%
+ 2018/05/03 v0.3199 KOMA-Script
+ package
+ (providing extra marks)]
+%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $
+%%% (run: init)
+\RequirePackage{scrbase}
+\RequirePackage{scrlfile}
+%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $
+%%% (run: options)
+%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $
+%%% (run: processoptions)
+\ProcessOptions\relax
+%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $
+%%% (run: body)
+\newcommand*{\marksboth}[3]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \ExecuteDoHook{marks/relax}%
+ \unrestored@protected@edef\@themark{{#2}{#3}}%
+ \global\expandafter\let\csname @themarks\the#1\endcsname\@themark
+ \@temptokena \expandafter{\@themark}%
+ \marks#1{\the\@temptokena}%
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\def\unrestored@protected@edef{%
+ \let\protect\@unexpandable@protect
+ \edef
+}
+\newcommand*{\marksright}[2]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \ExecuteDoHook{marks/relax}%
+ \@ifundefined{@themarks\the#1}{%
+ \def\@themark{{}{}}%
+ }{%
+ \expandafter\let\expandafter\@themark\csname @themarks\the#1\endcsname
+ }%
+ \expandafter\@marksright\@themark {#2}%
+ \global\expandafter\let\csname @themarks\the#1\endcsname\@themark
+ \@temptokena \expandafter{\@themark}%
+ \marks#1{\the\@temptokena}%
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\newcommand*{\@marksright}[3]{%
+ \@temptokena {#1}%
+ \unrestored@protected@edef\@themark{{\the\@temptokena}{#3}}%
+}
+\newcommand*{\leftfirstmarks}[1]{%
+ \expandafter\@leftmark\firstmarks#1\@empty\@empty
+}
+\newcommand*{\lefttopmarks}[1]{%
+ \expandafter\@leftmark\topmarks#1\@empty\@empty
+}
+\newcommand*{\leftbotmarks}[1]{%
+ \expandafter\@leftmark\botmarks#1\@empty\@empty
+}
+\newcommand*{\leftmarks}{\leftbotmarks}
+\newcommand*{\rightfirstmarks}[1]{%
+ \expandafter\@rightmark\firstmarks#1\@empty\@empty
+}
+\newcommand*{\righttopmarks}[1]{%
+ \expandafter\@rightmark\topmarks#1\@empty\@empty
+}
+\newcommand*{\rightbotmarks}[1]{%
+ \expandafter\@rightmark\botmarks#1\@empty\@empty
+}
+\newcommand*{\rightmarks}{\rightfirstmarks}
+\AfterPackage*{multicol}{%
+ \PackageWarning{komamarks}{%
+ komamarks does not yet support multicols
+ }%
+}
+\newcommand*{\marksall}[2]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \ExecuteDoHook{marks/relax}%
+ \unrestored@protected@edef\@themark{#2}%
+ \global\expandafter\let\csname @themarks\the#1\endcsname\@themark
+ \@temptokena \expandafter{\@themark}%
+ \marks#1{\the\@temptokena}%
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\newcommand*{\marksnth}[3]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \ExecuteDoHook{marks/relax}%
+ \@tempcnta=\z@
+ \let\@themark\@empty
+ \@ifundefined{@themarks\the#1}{}{%
+ \expandafter\expandafter\expandafter\@tfor
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter:%
+ \expandafter\expandafter\expandafter=%
+ \csname @themarks\the#1\endcsname\do {%
+ \advance\@tempcnta \@ne
+ \ifnum \number #2=\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{#3}}%
+ \else
+ \unrestored@protected@edef\@themark{\@themark{\reserved@a}}%
+ \fi
+ }%
+ }%
+ \@whilenum \number #2>\@tempcnta\do {%
+ \advance\@tempcnta \@ne
+ \ifnum \number #2=\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{#3}}%
+ \else
+ \unrestored@protected@edef\@themark{\@themark{}}%
+ \fi
+ }%
+ \global\expandafter\let\csname @themarks\the#1\endcsname\@themark
+ \@temptokena \expandafter{\@themark}%
+ \marks#1{\the\@temptokena}%
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\newcommand*{\marksnthplus}[4]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \ExecuteDoHook{marks/relax}%
+ \@tempcnta=\z@
+ \let\@themark\@empty
+ \@ifundefined{@themarks\the#1}{}{%
+ \expandafter\expandafter\expandafter\@tfor
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter:%
+ \expandafter\expandafter\expandafter=%
+ \csname @themarks\the#1\endcsname\do {%
+ \advance\@tempcnta \@ne
+ \ifnum \number #2=\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{#3}}%
+ \else
+ \ifnum \number #2>\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{\reserved@a}}%
+ \else
+ \unrestored@protected@edef\@themark{\@themark{#4}}%
+ \fi
+ \fi
+ }%
+ }%
+ \@whilenum \number #2>\@tempcnta\do {%
+ \advance\@tempcnta \@ne
+ \ifnum \number #2=\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{#3}}%
+ \else
+ \unrestored@protected@edef\@themark{\@themark{}}%
+ \fi
+ }%
+ \global\expandafter\let\csname @themarks\the#1\endcsname\@themark
+ \@temptokena \expandafter{\@themark}%
+ \marks#1{\the\@temptokena}%
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\newcommand*{\marksnthcleartail}[3]{%
+ \begingroup
+ \let\label\relax \let\index\relax \let\glossary\relax
+ \ExecuteDoHook{marks/relax}%
+ \@tempcnta=\z@
+ \let\@themark\@empty
+ \@ifundefined{@themarks\the#1}{}{%
+ \expandafter\expandafter\expandafter\@tfor
+ \expandafter\expandafter\expandafter\reserved@a
+ \expandafter\expandafter\expandafter:%
+ \expandafter\expandafter\expandafter=%
+ \csname @themarks\the#1\endcsname\do {%
+ \advance\@tempcnta \@ne
+ \ifnum \number #2=\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{#3}}%
+ \else
+ \ifnum \number #2>\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{\reserved@a}}%
+ \fi
+ \fi
+ }%
+ }%
+ \@whilenum \number #2>\@tempcnta\do {%
+ \advance\@tempcnta \@ne
+ \ifnum \number #2=\@tempcnta
+ \unrestored@protected@edef\@themark{\@themark{#3}}%
+ \else
+ \unrestored@protected@edef\@themark{\@themark{}}%
+ \fi
+ }%
+ \global\expandafter\let\csname @themarks\the#1\endcsname\@themark
+ \@temptokena \expandafter{\@themark}%
+ \marks#1{\the\@temptokena}%
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi
+}
+\newcommand*{\nthmarknotdefined}{}
+\newcommand*{\nthtopmarks}[2]{%
+ \expandafter\@nthofm\expandafter{\topmarks#1}{#2}%
+}
+\newcommand*{\nthfirstmarks}[2]{%
+ \expandafter\@nthofm\expandafter{\firstmarks#1}{#2}%
+}
+\newcommand*{\nthbotmarks}[2]{%
+ \expandafter\@nthofm\expandafter{\botmarks#1}{#2}%
+}
+\newcommand{\@nthofm}[2]{%
+ \begingroup
+ \@tempcnta=\z@
+ \let\reserved@a\nthmarknotdefined
+ \@tfor\reserved@b:=#1\do{%
+ \advance\@tempcnta\@ne
+ \ifnum \number #2=\@tempcnta
+ \let\reserved@a\reserved@b
+ \fi
+ }%
+ \expandafter\def\expandafter\reserved@a\expandafter{\expandafter\endgroup
+ \reserved@a}%
+ \reserved@a
+}
+%%% From File: $Id: komamarks.dtx 3199 2019-08-26 10:04:56Z kohm $
+%%% (run: final)
+%%% 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}}}{}
+\endinput
+%%
+%% End of file `komamarks.sty'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/listings.hak b/Master/texmf-dist/tex/latex/koma-script/listings.hak
index 00203e834d9..b2df79d0096 100644
--- a/Master/texmf-dist/tex/latex/koma-script/listings.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/listings.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,listings,identify')
%% scrhack.dtx (with options: `hack,listings,body')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{listings.hak}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
(hacking package
listings)%
]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\newcommand*{\scr@do@hack@listings}{%
\RequirePackage{tocbasic}%
\addtotoclist[float]{lol}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/lscape.hak b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
index 7b56d0da813..a5fb1fceb1d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/lscape.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/lscape.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,lscape,identify')
%% scrhack.dtx (with options: `hack,lscape,body')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{lscape.hak}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
(hacking package
lscape)%
]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\xpatchcmd{\landscape}{\textheight=\vsize}{%
\if@scrhack@lscape
\scrh@LT@textheight=\vsize
diff --git a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
index 7a4991b6d72..5f36fc92c62 100644
--- a/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/nomencl.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,nomencl,identify')
%% scrhack.dtx (with options: `hack,nomencl,body')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{nomencl.hak}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
(hacking package
nomencl)%
]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\RequirePackage{tocbasic}
\@ifpackagelater{nomencl}{2019/01/01}{%
\PackageInfo{scrhack}{only `tocbasic' loaded for `nomencl'}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
index e1c147add4f..ac9a5094386 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scraddr.sty
@@ -7,7 +7,7 @@
%% scraddr.dtx (with options: `scraddr')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2006-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2006-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -35,11 +35,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scraddr.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scraddr.dtx 3262 2019-10-10 08:25:29Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scraddr}
[2013/09/30 v1.1c KOMA-Script
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index dd627ee7cee..a4af59af4c6 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -6,7 +6,7 @@
%%
%% scrkernel-version.dtx (with options: `class,article')
%% scrkernel-basics.dtx (with options: `load')
-%% tocbasic.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')
%% scrkernel-compatibility.dtx (with options: `class,article,init')
@@ -52,7 +52,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,article,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -80,11 +80,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -115,27 +115,35 @@
\newcommand*{\KOMAClassName}{%
scrartcl%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
article%
}
-\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
-\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
]
-\addtotoclist{toc}
-\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
+\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
+\addtotoclist[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 $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
\newcommand*{\scr@dotchangeatdocument}[1]{%
\ClassError{\KOMAClassName}{%
@@ -187,7 +195,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -260,10 +268,11 @@
\@namedef{scr@v@3.26}{17}
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
+\@namedef{scr@v@3.27}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
@@ -338,7 +347,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -394,11 +403,11 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-\newcommand*\@ptsize{%
+\providecommand*\@ptsize{%
11%
}
\newcommand*{\@pt@scan}{%
@@ -482,7 +491,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -498,7 +507,9 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twoside\flushbottom
- \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \else
+ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi
+ \fi
\fi
\KOMA@kav@xreplacevalue{.%
\KOMAClassFileName
@@ -520,7 +531,12 @@
{\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
+ \else
+ \onecolumn
+ \if@twoside\flushbottom\else
+ \raggedbottom
+ \fi
+ \fi
\fi}%
\fi
}
@@ -592,7 +608,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -758,7 +774,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@titlepage
\@titlepagefalse
@@ -791,11 +807,11 @@
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
\KOMA@ifkey{abstract}{@abstrt}
-\KOMA@DeclareStandardOption{abstracton}{abstract=true}
-\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+\KOMA@DeclareDeprecatedOption{abstracton}{abstract=true}
+\KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false}
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{numbers}{%
\KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -831,6 +847,30 @@
\AtBeginDocument{%
\@ifpackageloaded{bookmark}{}{%
\if@scr@autoloadbookmarkpackage
+ \scr@ifundefinedorrelax{Hy@driver}{%
+ \ClassWarning{\KOMAClassName}{%
+ `hyperref' loaded but `\string\Hy@driver' undefined.\MessageBreak
+ This should not happen!\MessageBreak
+ Maybe `hyperref' not loaded or unknown version?%
+ }%
+ }{%
+ \ifstr{\Hy@driver}{hdvips}{%
+ \providecommand*{\BookmarkDriverDefault}{dvips}%
+ }{%
+ \ifstr{\Hy@driver}{hdvipdfm}{%
+ \providecommand*{\BookmarkDriverDefault}{dvipdfm}%
+ }{%
+ \ifstr{\Hy@driver}{hdvipson}{%
+ \providecommand*{\BookmarkDriverDefault}{dvipsone}%
+ }{%
+ \ifstr{\Hy@driver}{htexture}{%
+ \providecommand*{\BookmarkDriverDefault}{textures}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
\ClassInfo{\KOMAClassName}{%
loading recommended package `bookmark'.\MessageBreak
Using `bookmark' together with `hyperref' is
@@ -840,8 +880,11 @@
option\MessageBreak
`bookmarkpackage=false' before \string\begin{document}
and\MessageBreak
- you can avoid this message with
- `\string\usepackage{bookmark}'\MessageBreak
+ you can avoid this message adding:\MessageBreak
+ \space\space\string\usepackage
+ \scr@ifundefinedorrelax{BookmarkDriverDefault}{}{%
+ [\BookmarkDriverDefault]%
+ }{bookmark}\MessageBreak
before \string\begin{document}%
}%
\RequirePackage{bookmark}%
@@ -849,15 +892,18 @@
\else
\if@filesw
\ClassWarning{\KOMAClassName}{%
- seems someone has broken package auxhook.\MessageBreak
- Usually this happens, if auxhook is loaded or used\MessageBreak
+ seems someone has broken package `auxhook'.\MessageBreak
+ Usually this happens, if `auxhook' is loaded or used\MessageBreak
implicitly or explicitly by patching
- `\string\document'%
+ \string\document%
\scr@ifundefinedorrelax{AtEndPreamble}{}{%
\MessageBreak
- or via etoolbox command \string\AtEndPreamble
+ or via etoolbox command \string\AtEndPreamble%
}.\MessageBreak
- Trying an emergency workaround%
+ Trying an emergency workaround.\MessageBreak
+ You can avoid this warning adding:\MessageBreak
+ \space\space\string\usepackage{auxhook}\MessageBreak
+ before \string\begin{document}%
}%
\@beginmainauxhook
\fi
@@ -963,7 +1009,7 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
@@ -1068,7 +1114,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1203,7 +1249,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -1274,7 +1320,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
@@ -1503,7 +1549,7 @@
\KOMA@DeclareDeprecatedOption{liststotocnumbered}{listof=numbered}
\KOMA@DeclareDeprecatedOption{listsleft}{listof=flat}
\KOMA@DeclareDeprecatedOption{listsindent}{listof=graduated}
-%%% From File: $Id: scrkernel-bibliography.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
@@ -1671,7 +1717,7 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
@@ -1756,21 +1802,21 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2245,13 +2291,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z 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 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2296,7 +2342,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -2416,6 +2462,19 @@
\expandafter\let\csname #1@listi\endcsname=\@listi
\def\@listi{\csname #1@listi\endcsname\@list@extra}%
}
+\AfterPackage{amsthm}{%
+ \RequirePackage{xpatch}%
+ \xpatchcmd{\deferred@thm@head}{\addvspace{-\parskip}}{}{%
+ \ClassInfoNoLine{\KOMAClassName}{%
+ amsthm's \string\deferred@thm@head\space patched}%
+ }{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ cannot patch amsthm's \string\deferred@thm@head.\MessageBreak
+ This could result in wrong spacing before theorem\MessageBreak
+ environments defined by package `amsthm'%
+ }%
+ }%
+}
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
@@ -2425,7 +2484,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -2569,7 +2628,7 @@
{\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\vfill\null
\if@twoside
\@tempswatrue
@@ -2588,7 +2647,7 @@
\begin{minipage}[b]{\textwidth}
\@lowertitleback
\end{minipage}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\fi
\else
\ifx\@uppertitleback\@empty\else
@@ -2611,7 +2670,7 @@
\next@tdpage\null\vfill
{\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\cleardoubleemptypage
\fi
\ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
@@ -2692,7 +2751,7 @@
\@maketitle
\fi
\ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
- \@thanks
+ \@thanks\global\let\@thanks\@empty
\endgroup
\fi
\setcounter{footnote}{0}%
@@ -2842,10 +2901,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -2859,7 +2918,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
@@ -2871,7 +2930,7 @@
\hfill
\fi
}%
- % F^^fcr die Eintr^^e4ge die Schrift von Element sectionentry verwenden.
+ % 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%
@@ -2879,40 +2938,36 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z 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 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{3}
\newcommand*{\ifnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@secondoftwo
- }{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \if@currentusenumber
+ \scr@ifundefinedorrelax{#1numdepth}{%
\expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
- }%
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \else
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \fi
+ }%
+ \else
+ \expandafter\@secondoftwo
+ \fi
}
\newcommand*{\ifunnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@firstoftwo
- }{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- }%
+ \ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}%
}
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
@@ -2978,6 +3033,7 @@
\fi
\fi
\newcommand*{\scr@startsection}[6]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\if@noskipsec \leavevmode \fi
\par
\@tempskipa \glueexpr #4\relax
@@ -3022,18 +3078,18 @@
\csname iffalse\endcsname
\fi
}%
- \csname scr@startsection@hook\endcsname
+ \ExecuteDoHook{heading/postinit/#1}%
\if@nobreak
\everypar{}%
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
\kernel@ifstar {%
- \csname scr@preto@ssect@hook\endcsname
+ \ExecuteDoHook{heading/branch/star/#1}%
\def\scr@s@ct@@nn@m@{#1}%
\@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
}{%
- \csname scr@preto@sect@hook\endcsname
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\scr@section@dblarg{%
\@sect{#1}{\numexpr #2\relax}{\glueexpr #3\relax}{\glueexpr #4\relax}%
{\glueexpr #5\relax}{#6}%
@@ -3043,7 +3099,7 @@
\else
\ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
changed.\MessageBreak
- \KOMAClassName\space needs it's own Definition of
+ \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
@@ -3054,14 +3110,16 @@
KOMA-Script that fixes the problem, please\MessageBreak
send a report to the KOMA-Script author.\MessageBreak
Note, that this alternative approach does not\MessageBreak
- execute `\string\scr@startsection@hook',\MessageBreak
- `\string\scr@preto@ssect@hook', or
- `\string\scr@preto@sect@hook'\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
and does always use `runin=bysign' and\MessageBreak
`afterindent=bysign'%
}%
\let\scr@saved@startsection\@startsection
\newcommand*{\scr@startsection}[6]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\kernel@ifstar {%
\scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*%
@@ -3099,16 +3157,34 @@
\newcommand*\startsection@afterindent{%
\scr@startsection@ulm@error\startsection@afterindent}
\newcommand*{\At@startsection}[1]{%
- \@ifundefined{scr@startsection@hook}{\let\scr@startsection@hook\@empty}{}%
- \l@addto@macro{\scr@startsection@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\At@startsection'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/postinit}
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/postinit}{\scr@doonlyifstyleofargis{#1}{section}}%
+}
+\newcommand*{\scr@doonlyifstyleofargis}[3]{%
+ \IfSectionCommandStyleIs{#3}{#2}{#1}{}%
}
\newcommand*{\Before@ssect}[1]{%
- \@ifundefined{scr@preto@ssect@hook}{\let\scr@preto@ssect@hook\@empty}{}%
- \l@addto@macro{\scr@preto@ssect@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\Before@ssect'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/branch/star}%
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/branch/star}{\scr@onlyifstyleofargis{#1}{section}}%
}
\newcommand*{\Before@sect}[1]{%
- \@ifundefined{scr@preto@sect@hook}{\let\scr@preto@sect@hook\@empty}{}%
- \l@addto@macro{\scr@preto@sect@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\Before@sect'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/branch/nostar}%
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/branch/nostar}{\scr@onlyifstyleofargis{#1}{section}}%
}
\newcommand{\scr@section@dblarg}[1]{%
\kernel@ifnextchar[%]
@@ -3129,10 +3205,22 @@
\expandafter\scr@startsection
\fi
}
+\newcommand*{\UseNumberUsageError}[2]{%
+ \ClassError{\KOMAClassName}{%
+ \string\IfUseNumber\space not allowed%
+ }{%
+ You cannot use \string\IfUseNumber\space outside a heading.\MessageBreak
+ If you'd continue, I'll ignore both arguments, because I do not
+ know\MessageBreak
+ whether to use the first or the second argument.%
+ }%
+}
+\newcommand*{\IfUseNumber}[2]{}%
+\let\IfUseNumber\UseNumberUsageError
\newcommand*{\SecDef}[2]{\kernel@ifstar{#2}{\scr@section@dblarg{#1}}}
\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
\let\secdef\SecDef
-\def\@tempa#1#2#3#4#5#6[#7]#8{%
+\def\scr@latex@sect#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
\let\@svsec\@empty
\else
@@ -3164,7 +3252,8 @@
#7}}%
\fi
\@xsect{#5}}
-\ifx\@sect\@tempa\else
+\ifx\@sect\scr@latex@sect\else
+ \let\scr@latex@sect\@sect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@sect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3178,6 +3267,7 @@
\else
\scr@istest#7=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#8},head={#8},reference={#8},#7}%
\else
@@ -3202,7 +3292,12 @@
\fi
}%
\let\IfUsePrefixLine\@secondoftwo
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\let\@svsec\@empty
\else
\refstepcounter{#1}%
@@ -3212,8 +3307,15 @@
\ifdim
\scr@sect@runin{\z@}{\p@}{\glueexpr #5\relax}>\z@
\begingroup
+ \ifx\@svsec\@empty
+ \let\IfUseNumber\@secondoftwo
+ \else
+ \let\IfUseNumber\@firstoftwo
+ \fi
+ \ExecuteDoHook{heading/begingroup/#1}%
#6{\nobreak\interlinepenalty \@M
\sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
\ifx\@currenttocentry\@empty\else
@@ -3223,7 +3325,12 @@
\addtocentrydefault{#1}{##1}{##2}%
}%
}{}%
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\csname add#1tocentry\endcsname{}{\@currenttocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
@@ -3232,6 +3339,12 @@
\fi
\else
\def\@svsechd{%
+ \ifx\@svsec\@empty
+ \let\IfUseNumber\@secondoftwo
+ \else
+ \let\IfUseNumber\@firstoftwo
+ \fi
+ \ExecuteDoHook{heading/begingroup/#1}%
#6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
\expandafter\csname #1mark\expandafter\endcsname
\expandafter{\@currentheadentry}%
@@ -3242,13 +3355,19 @@
\addtocentrydefault{#1}{####1}{####2}%
}%
}{}%
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\csname add#1tocentry\endcsname{}{\@currenttocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
\@currenttocentry}%
\fi
\fi
+ \ExecuteDoHook{heading/endgroup/#1}%
}%
\fi
\let\IfUsePrefixLine\scr@IfUsePrefixLineWarning
@@ -3280,6 +3399,7 @@
}%
\FamilyKeyStateProcessed
}
+\FamilyInverseBoolKey[.section]{KOMAarg}{nonumber}{@currentusenumber}
\newcommand*{\scr@istest}{}
\def\scr@istest#1=#2\@nil{%
\ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
@@ -3291,7 +3411,7 @@
\newcommand{\sectioncatchphraseformat}[4]{%
\hskip #2#3#4%
}
-\def\@tempa#1#2#3#4#5{%
+\def\scr@latex@ssect#1#2#3#4#5{%
\@tempskipa #3\relax
\ifdim \@tempskipa>\z@
\begingroup
@@ -3303,7 +3423,9 @@
\def\@svsechd{#4{\hskip #1\relax #5}}%
\fi
\@xsect{#3}}
-\ifx\@ssect\@tempa\else
+\ifx\@ssect\scr@latex@ssect
+\else
+ \let\scr@latex@ssect\@ssect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@ssect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3313,7 +3435,7 @@
\fi
\def\@ssect#1#2#3#4#5{%
\scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{%
- \ClassWarning{\KOMAClassName}{incompatible usage of
+ \ClassWarning{\KOMAClassName}{Incompatible usage of
\string\@ssect\space detected.\MessageBreak
You've used the KOMA-Script implementation of
\string\@ssect\MessageBreak
@@ -3325,23 +3447,33 @@
\ifdim
\scr@sect@runin{\z@}{\p@}{\glueexpr #3\relax}>\z@
\begingroup
+ \let\IfUseNumber\@secondoftwo
+ \edef\reserved@a{%
+ \noexpand\ExecuteDoHook{heading/begingroup/\scr@s@ct@@nn@m@}%
+ }\reserved@a
#4{\nobreak\interlinepenalty \@M
\expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
{\glueexpr #1\relax}\@empty{#5}\@@par}%
+ \edef\reserved@a{%
+ \noexpand\ExecuteDoHook{heading/endgroup/\scr@s@ct@@nn@m@}%
+ }\reserved@a
\endgroup
\else
\edef\@svsechd{%
+ \unexpanded{\let\IfUseNumber\@secondoftwo}%
+ \noexpand\ExecuteDoHook{heading/begingroup/\scr@s@ct@@nn@m@}%
\unexpanded{#4}{%
\noexpand\nobreak
\noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
\unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
}%
+ \noexpand\ExecuteDoHook{heading/endgroup/\scr@s@ct@@nn@m@}%
}%
\fi
\let\scr@s@ct@@nn@m@\relax
\@xsect{\glueexpr #3\relax}%
}
-\def\@tempa#1{%
+\def\scr@latex@xsect#1{%
\@tempskipa #1\relax
\ifdim \@tempskipa>\z@
\par \nobreak
@@ -3366,7 +3498,8 @@
\fi
\ignorespaces
}
-\ifx\@xsect\@tempa\else
+\ifx\@xsect\scr@latex@xsect\else
+ \let\scr@latex@xsect\@xsect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@xsect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3409,7 +3542,7 @@
}
\newcommand*{\scr@IfUsePrefixLineWarning}[2]{%
\ClassWarning{\KOMAClassName}{%
- usage of \string\IfUsePrefixLine\space outside
+ Usage of \string\IfUsePrefixLine\space outside
section command\MessageBreak
style makes no sense, because the behaviour not only\MessageBreak
depends on class options but also on the run-time\MessageBreak
@@ -3672,7 +3805,11 @@
}%
\DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{%
\IfArgIsEmpty{##1}{%
- \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \@ifundefined{scr@dte@\scr@dsc@current @style}{}{%
+ \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \relax
+ }%
+ \expandafter\let\csname scr@tso@\scr@dsc@current @style\endcsname
\relax
\FamilyKeyStateProcessed
}{%
@@ -3680,6 +3817,7 @@
\FamilyKeyStateUnknownValue
}{%
\@namedef{scr@dte@\scr@dsc@current @style}{##1}%
+ \@namedef{scr@tso@\scr@dsc@current @style}{##1}%
\FamilyKeyStateProcessed
}%
}%
@@ -3699,19 +3837,24 @@
\endgroup
\@firstofone{%
\@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
- \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{%
\scr@ifundefinedorrelax{l@\scr@dsc@current}{%
- \@namedef{scr@dte@\scr@dsc@current @style}{default}%
+ \@namedef{scr@tso@\scr@dsc@current @style}{default}%
}{}%
}{}%
\let\scr@dsc@tocstyle@options\@empty
\let\scr@dsc@extra@relax@opts\@empty
- \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{%
+ \expandafter\let
+ \csname scr@tso@\scr@dsc@current @style\expandafter\endcsname
+ \csname scr@dte@\scr@dsc@current @style\endcsname
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{}{%
\begingroup
\def\scr@dte@current{#2}%
\edef\reserved@a{%
\noexpand\@ExecuteTOCEntryStyleInitCode{%
- \@nameuse{scr@dte@\scr@dsc@current @style}%
+ \@nameuse{scr@tso@\scr@dsc@current @style}%
}{\scr@dsc@current}%
}\reserved@a
\def\do@endgroup{\endgroup}%
@@ -3819,10 +3962,26 @@
\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}%
+ }{%
+ \expandafter\ifnum \csname #2numdepth\endcsname>-\maxdimen
+ \@nameuse{scr@dsc@style@%
+ \@nameuse{scr@\scr@dsc@current @style}%
+ @neededoptionstest}%
+ \else
+ \ClassError{\KOMAClassName}{%
+ `level' must be > -\the\numexpr\maxdimen\relax
+ }{%
+ KOMA-Script internally sets `secnumdepth' to
+ -\the\numexpr\maxdimen\relax\space
+ to locally switch of\MessageBreak
+ the numbering, i.e., inside running heads.\MessageBreak
+ Because of this, you can define section commands with\MessageBreak
+ `level' greater than -\the\numexpr\maxdimen\relax\space only.%
+ }%
+ \let\local@endgroup\endgroup
+ \aftergroup\@gobbletwo
+ \fi
+ }%
\local@endgroup
\@firstofone{%
\@ifundefined{c@#2}{\newcounter{#2}}{}%
@@ -3880,10 +4039,14 @@
\csname add#2tocentry\endcsname[2]{%
\addtocentrydefault{#2}{##1}{##2}%
}%
- \scr@ifundefinedorrelax{scr@dte@#2@style}{%
+ \scr@ifundefinedorrelax{scr@tso@#2@style}{%
+ \expandafter\let\csname scr@tso@#2@style\expandafter\endcsname
+ \csname scr@dte@#2@style\endcsname
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#2@style}{%
}{%
\DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{%
- \@nameuse{scr@dte@#2@style}%
+ \@nameuse{scr@tso@#2@style}%
}{#2}%
}%
\scr@ifundefinedorrelax{l@#2}{%
@@ -4165,8 +4328,47 @@
\let\scr@local@leveloffset\relax
\let\scr@local@tocleveloffset\relax
}
+\newcommand*{\IfSectionCommandStyleIs}[2]{%
+ \scr@ifundefinedorrelax{#1}{%
+ \ClassError{\KOMAClassName}{%
+ \expandafter\string\csname #1\endcsname\space not defined}{%
+ You cannot compare the section command style of an undefined command.}%
+ }{%
+ \scr@ifundefinedorrelax{scr@#1@style}{%
+ \ClassError{\KOMAClassName}{%
+ \expandafter\string\csname #1\endcsname\space not a valid section
+ command%
+ }{%
+ You cannot detect the section command style of a command, that
+ has\MessageBreak
+ never been defined as a section command by KOMA-Script.%
+ }%
+ }%
+ }%
+ \scr@ifundefinedorrelax{scr@dsc@def@style@#2@command}{%
+ \ClassError{\KOMAClassName}{%
+ unknown section command style `#2'%
+ }{}%
+ }%
+ \ifstr{\@nameuse{scr@#1@style}}{#2}%
+}
\newcommand*{\bprot@dottedtocline}[5]{%
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
+ \ClassWarning{\KOMAClassName}{%
+ usage of `\string\bprot@dottedtocline' is deprecated.\MessageBreak
+ Maybe an old auxiliary file has been used.\MessageBreak
+ Note, this command will be removed from\MessageBreak
+ KOMA-Script soon. So if this warning message\MessageBreak
+ persists after one more LaTeX run, you should\MessageBreak
+ redeclare the corresponding ToC entries using\MessageBreak
+ \string\DeclareTOCStyleEntry[\MessageBreak
+ \space\space level=\detokenize{#1},\MessageBreak
+ \space\space indent=\detokenize{#2},\MessageBreak
+ \space\space numwidth=\detokenize{#3}]{default}{...},\MessageBreak
+ where `...' is the name of the ToC level.\MessageBreak
+ Note, in future usage of `\string\bprot@dottedtocline'\MessageBreak
+ could result in an error%
+ }%
\ifnum #1>\c@tocdepth \else
\ifnum \lastpenalty<\numexpr 20010-#1\relax
\addpenalty{\@lowpenalty}%
@@ -4204,6 +4406,7 @@
\csname appendixmore\endcsname
}
\newcommand*{\scr@startpart}[1]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\par
\@tempskipa=\glueexpr\@nameuse{scr@#1@beforeskip}\relax
\@ifundefined{scr@#1@afterindent}{\@afterindentfalse}{%
@@ -4216,16 +4419,19 @@
\fi
}%
}%
+ \ExecuteDoHook{heading/postinit/#1}%
\partheadstartvskip
\expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname
}
\newcommand{\scr@@startpart}{}
\long\def\scr@@startpart#1[#2]#3{%
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\ifnum \scr@osectarg=\z@
\@scr@tempswafalse
\else
\scr@istest#2=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}%
\else
@@ -4269,8 +4475,9 @@
\fi
}%
\begingroup
- \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\def\IfUseNumber{\ifnumbered{#1}}%
+ \ExecuteDoHook{heading/begingroup/#1}%
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\normalfont\usekomafont{disposition}{\nobreak
\IfUseNumber{%
@@ -4291,6 +4498,7 @@
\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
\fi
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\nobreak
\@tempskipa=\glueexpr\@nameuse{scr@#1@afterskip}\relax\relax
@@ -4299,13 +4507,15 @@
\@afterheading
}
\newcommand{\scr@@startspart}[2]{%
+ \ExecuteDoHook{heading/branch/star/#1}%
\begingroup
\let\@mkboth\@gobbletwo
\hy@insteadofrefstepcounter{#1}%
\endgroup
\begingroup
- \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\let\IfUseNumber\@secondoftwo
+ \ExecuteDoHook{heading/begingroup/#1}%
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\normalfont\usekomafont{disposition}{%
\nobreak
@@ -4314,6 +4524,7 @@
}%
\@mkboth{}{}%
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\nobreak
\@tempskipa=\glueexpr\csname scr@#1@afterskip\endcsname\relax\relax
@@ -4326,24 +4537,26 @@
}
\newcommand*{\hy@insteadofrefstepcounter}[1]{}
\let\hy@insteadofrefstepcounter\@gobble
-\BeforePackage{hyperref}{%
+\newcommand*{\scr@chapter@before@hyperref@patch}{%
\let\scr@orig@chapter\@chapter
\let\scr@orig@schapter\@schapter
\let\scr@orig@addchap\@addchap
}
-\AfterPackage!{hyperref}{%
+\BeforePackage{hyperref}{\scr@chapter@before@hyperref@patch}
+\newcommand*{\scr@chapter@after@hyperref@patch}{%
\let\@chapter\scr@orig@chapter
\let\@schapter\scr@orig@schapter
\let\@addchap\scr@orig@addchap
\ifx\hy@insteadofrefstepcounter\@gobble
\renewcommand*{\hy@insteadofrefstepcounter}[1]{%
- \Hy@MakeCurrentHrefAuto{#1*}%
+ \Hy@MakeCurrentHrefAuto{##1*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
}%
\fi
}
+\AfterPackage!{hyperref}{\scr@chapter@after@hyperref@patch}
\newcommand*{\addparttocentry}[2]{%
\addtocentrydefault{part}{#1}{#2}%
}
@@ -4542,7 +4755,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -4697,12 +4910,27 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage'}
-\scr@package@not@recommended{titlesec}{%
- the package only\MessageBreak
- if you really need it, because it breaks several\MessageBreak
- KOMA-Script features, i.e., option `headings' and\MessageBreak
- the extended optional argument of the section\MessageBreak
- commands}
+\AfterPackage*{sectsty}{%
+ \@ifpackagelater{sectsty}{2002/02/26}{%
+ \ClassInfo{\KOMAClassName}{Unknown `sectsty' release.\MessageBreak
+ Cross your fingers, that is compatible%
+ }%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Incompatible package `sectsty' loaded!\MessageBreak
+ Package `sectsty' up to version 2.0.2 is incompatible\MessageBreak
+ with KOMA-Script from version 2.8e released in 2001.\MessageBreak
+ You should avoid that package and configure the\MessageBreak
+ section titles of your document using the KOMA-Script\MessageBreak
+ user interface, e.g., \string\chapterlinesformat,\MessageBreak
+ \string\RedeclareSectionCommand\space etc. or you should ask\MessageBreak
+ the `sectsty' maintainer for a more compatible release.\MessageBreak
+ Ignoring this warning could result in several error\MessageBreak
+ messages and formatting issues after loading package\MessageBreak
+ `sectsty'%
+ }%
+ }%
+}
\scr@package@not@recommended{tocbibind}{%
options like `listof=totoc'\MessageBreak
or `bibliography=totoc', or commands like\MessageBreak
@@ -4821,75 +5049,35 @@
\let\scr@mt@saved@sect\relax
\fi
}
-\BeforePackage{titlesec}{%
- \let\scr@ttl@saved@section\section
- \let\scr@ttl@saved@subsection\subsection
- \let\scr@ttl@saved@subsubsection\subsubsection
- \let\scr@ttl@saved@paragraph\paragraph
- \let\scr@ttl@saved@subparagraph\subparagraph
-}
\AfterPackage{titlesec}{%
- \@ifpackagelater{titlesec}{2016/03/22}{%
- \ClassInfo{\KOMAClassName}{%
- Deactivating the `titlesec' workaround,\MessageBreak
- because package is newer than expected%
+ \@ifpackagelater{titlesec}{2019/07/17}{%
+ \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak
+ Cross your fingers, that is compatible%
}%
}{%
- \ClassWarning{\KOMAClassName}{%
- Activating an ugly workaround for a missing\MessageBreak
- feature of package `titlesec`%
- }%
- \def\scr@ttl@@extract#1\scr@startsection#2#3#4#5#6#7#8{%
- \@tempskipa=#5
- \@tempskipb=#6
- \ifdim\@tempskipa<\z@
- \toks@{\titlespacing*#8{#4}}%
- \@tempskipa-\@tempskipa
- \else
- \toks@{\titlespacing#8{#4}}%
- \fi
- \@ifundefined{ttl@space}{}{%
- \ttl@assign\@tempskipa*\ttl@space\relax\beforetitleunit}%
- \ifdim\@tempskipb<\z@
- \if@tempswa
- \titleformat#8[runin]%
- {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \else
- \titleformat#8[runin]%
- {#7}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \fi
- \@tempskipb-\@tempskipb
- \else
- \if@tempswa
- \titleformat#8%
- {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \else
- \titleformat#8%
- {#7}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \fi
- \@ifundefined{ttl@space}{}{%
- \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
- \fi
- \edef\ttl@a{\the\toks@{\the\@tempskipa}{\the\@tempskipb}}
- \ttl@a}%
- \expandafter\scr@ttl@@extract\scr@ttl@saved@section\section
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subsection\subsection
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subsubsection\subsubsection
- \expandafter\scr@ttl@@extract\scr@ttl@saved@paragraph\paragraph
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subparagraph\subparagraph
- \let\scr@ttl@saved@section\relax
- \let\scr@ttl@saved@subsection\relax
- \let\scr@ttl@saved@subsubsection\relax
- \let\scr@ttl@saved@paragraph\relax
- \let\scr@ttl@saved@subparagraph\relax
- \let\scr@ttl@@extract\relax
+ \scr@class@titlesec@warning
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+\providecommand*{\scr@class@titlesec@warning}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of this version of package `titlesec'\MessageBreak
+ with KOMA-Script class `\KOMAClassName' is\MessageBreak
+ not recommended, because the package does not\MessageBreak
+ support KOMA-Script classes, but break them.\MessageBreak
+ If you want to use `titlesec' with KOMA-Script\MessageBreak
+ classes instead of using the KOMA-Script's\MessageBreak
+ user interface to configure the headings of\MessageBreak
+ parts,
+ sections, subsections
+ ... subparagraphs,\MessageBreak
+ please ask the author of `titlesec' for support.\MessageBreak
+ Expect errors like:\MessageBreak
+ \space\space- ``Illegal unit of measure (pt inserted).''\MessageBreak
+ \space\space- ``Missing number, treated as zero''\MessageBreak
+ after loading `titlesec'%
+ }%
+}
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -4985,7 +5173,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -4996,7 +5184,7 @@
\providecommand*{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -5791,7 +5979,7 @@
\else\expandafter\captionbelow\fi
}
]{lot}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
@@ -5949,15 +6137,12 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
\ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
]
-\newcommand*\@pnumwidth{1.55em}
-\newcommand*\@tocrmarg {2.55em}
-\newcommand*\@dotsep{4.5}
\newcommand*{\scr@dottedtocline}{}
\newcommand*{\last@l@number}{}
\newcommand*{\@l@number}{}
@@ -6008,7 +6193,7 @@
\protected@write\@auxout{}{%
\string\gdef\expandafter\string\csname#1@l@number\endcsname{%
\@l@number}}%
- }
+}
\g@addto@macro\tocbasic@@before@hook{%
\if@dynlist\expandafter\before@starttoc\expandafter{\@currext}\fi
}
@@ -6017,6 +6202,8 @@
}
\newcommand*\contentsname{Contents}
\newcommand*\listoftocname{\contentsname}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\contentsname{Contents}%
\setcounter{tocdepth}{3}
\newcommand*\toc@heading{%
\ClassWarning{\KOMAClassName}{%
@@ -6085,12 +6272,16 @@
\global\let\scr@float@addtolists@warning\relax
}
\renewcommand*\listfigurename{List of Figures}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\listfigurename{List of Figures}
\renewcommand*\listoflofname{\listfigurename}
\renewcommand*\listoflofentryname{\figurename}
\renewcommand*\listtablename{List of Tables}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables}
\renewcommand*\listoflotname{\listtablename}
\renewcommand*\listoflotentryname{\tablename}
-%%% From File: $Id: scrkernel-bibliography.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\refname{References}
\newcommand*{\bibpreamble}{\relax}
@@ -6176,7 +6367,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
@@ -6218,7 +6409,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\if@twocolumn
\setlength{\leftmargini}{2em}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls
new file mode 100644
index 00000000000..a4056babb12
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrarticle.cls
@@ -0,0 +1,88 @@
+%%
+%% This is file `scrarticle.cls',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `class,article,long')
+%%
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
+%% 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 $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+\endgroup
+\providecommand*{\scr@clsextension}{\@clsextension}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
+\newcommand*{\KOMAClassName}{%
+ scrartcl%
+}
+\newcommand*{\ClassName}{%
+ article%
+}
+\newcommand*{\KOMALongClassName}{}
+\edef\KOMALongClassName{scr\ClassName}
+\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
+\edef\KOMALongClassFileName{\KOMALongClassFileName}
+\ProvidesClass{\KOMALongClassName}[%
+ 2019/10/12 v3.27 KOMA-Script
+ document class (\ClassName)%
+]
+\let\ClassName\relax
+\expandafter\let\expandafter\KOMAClassName\expandafter\relax
+\expandafter\LoadClassWithOptions\expandafter{\KOMAClassName}
+\endinput
+%%
+%% End of file `scrarticle.cls'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
index cc41be4b157..51a91eae932 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbase.sty
@@ -13,7 +13,7 @@
%% scrkernel-language.dtx (with options: `package,body,base')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2002-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,11 +41,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,19 +67,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrbase%
}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(%
KOMA-Script-independent
@@ -153,21 +153,25 @@
}
\newcommand*{\scr@if@familymember}[3]{%
\scr@if@family{#2}{#3}{%
- \edef\reserved@a{%
- \noexpand\in@{#2#1,}{\csname #2@key@familylist\endcsname}}%
- \reserved@a
- \ifin@
- \expandafter\@firstofone
- \else
- \PackageError{scrbase}{%
- unknown member `#1' at family `#2'%
- }{%
- You've tried to #3 for member `#1' of family `#2'.\MessageBreak
- This my be done only for previous defined family members.\MessageBreak
- You should call `\string\DefineFamilyMember[{#1}]{#2}' first.%
- }%
- \expandafter\@gobble
- \fi
+ \IfArgIsEmpty{#1}{%
+ \@firstofone
+ }{%
+ \edef\reserved@a{%
+ \noexpand\in@{#2#1,}{\csname #2@key@familylist\endcsname}}%
+ \reserved@a
+ \ifin@
+ \expandafter\@firstofone
+ \else
+ \PackageError{scrbase}{%
+ unknown member `#1' at family `#2'%
+ }{%
+ You've tried to #3 for member `#1' of family `#2'.\MessageBreak
+ This my be done only for previous defined family members.\MessageBreak
+ You should call `\string\DefineFamilyMember[{#1}]{#2}' first.%
+ }%
+ \expandafter\@gobble
+ \fi
+ }%
}%
}
\newcommand*{\DefineFamilyKey}[3][.\@currname.\@currext]{%
@@ -418,6 +422,13 @@
}
\@tempa{ }
\long\def\scr@sp@c#1\@nil#2\relax#3{\@temptokena{#1}\edef#3{\the\@temptokena}}
+\newcommand{\IfArgIsEmpty}[1]{%
+ \if\relax\detokenize{#1}\relax
+ \expandafter\@firstoftwo
+ \else
+ \expandafter\@secondoftwo
+ \fi
+}
\@ifundefined{l@addto@macro}{}{%
\begingroup
\long\def\reserved@a#1#2{%
@@ -446,7 +457,7 @@
\long\def\l@addto@macro#1#2{%
\edef#1{\unexpanded\expandafter{#1#2}}%
}%
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\dont@let@as@internal@defined}{/}
\newif\if@let@as@internalonly@defined\@let@as@internalonly@definedfalse
@@ -464,13 +475,13 @@
\fi
}
\FamilyProcessOptions{KOMA}\relax
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrlfile.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $
\RequirePackage{scrlfile}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\XdivY}[2]{%
\numexpr ( #1 + #2 / 2 ) / #2 - 1\relax
@@ -478,6 +489,20 @@
\newcommand*{\XmodY}[2]{%
\numexpr #1 - #2 * \XdivY{#1}{#2}\relax
}
+\newcommand{\scr@ForEachTrimmedListElement}[2]{%
+ \begingroup
+ \def\reserved@a{\endgroup}%
+ \@for \reserved@b:=#1 \do {%
+ \scr@trim@spaces\reserved@b
+ \ifx\reserved@b\@empty\else
+ \edef\reserved@a{%
+ \unexpanded\expandafter{\reserved@a#2}%
+ {\unexpanded\expandafter{\reserved@b}}%
+ }%
+ \fi
+ }%
+ \reserved@a
+}
\newcommand\scr@trim@spaces[1]{%
\expandafter\scr@sp@def\expandafter#1\expandafter{#1}%
}
@@ -575,13 +600,6 @@
}%
\reserved@a#1#2\@nil
}
-\newcommand*{\IfArgIsEmpty}[1]{%
- \if\relax\detokenize{#1}\relax
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
-}
\newcommand*{\ifislengthprimitive}[1]{%
\IfArgIsEmpty{#1}{\@secondoftwo}{\scr@ifislengthprimitive#1\@nil}%
}
@@ -1043,7 +1061,7 @@
}
\newcommand\ifnumber[1]{%
\begingroup\@tempswafalse\let\scr@next\test@number
- \expandafter\scr@next#1\scr@next
+ \IfArgIsEmpty{#1}{}{\expandafter\scr@next#1\scr@next}%
\if@tempswa
\aftergroup\@firstoftwo
\else
@@ -1301,7 +1319,8 @@
\def\markleft##1{\scr@ActiveMkBothtrue}%
\def\markboth##1{\scr@ActiveMkBothtrue}%
\def\markdouble##1{\scr@ActiveMkBothtrue}%
- \def\mark##1{\scr@ActiveMkBothtrue}
+ \def\mark##1{\scr@ActiveMkBothtrue}%
+ \def\marks##1##2{\scr@ActiveMkBothtrue}%
\scr@ActiveMkBothfalse
\setbox\@tempboxa\vbox{\@mkboth{}{}}%
\endgroup
@@ -1351,6 +1370,9 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed\else
\PackageError{scrbase}{%
unknown option
+ \ifx\FamilyKeyState\FamilyKeyStateUnknownValue
+ value at
+ \fi
`\expandafter\detokenize\expandafter{\scr@key@atlist}'%
}{%
Member `#1' of family `#2'\MessageBreak
@@ -1393,6 +1415,9 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed\else
\PackageError{scrbase}{%
unknown option
+ \ifx\FamilyKeyState\FamilyKeyStateUnknownValue
+ value at
+ \fi
`\expandafter\detokenize\expandafter{\scr@key@atlist}'%
}{%
Option
@@ -1449,9 +1474,19 @@
\expandafter\scr@key@split@name@value\scr@key@atlist==\@nil
\let\scr@key@run@errors\@empty
\scr@key@found@false
- \edef\reserved@a{\csname #1@key@familylist\endcsname}%
+ \edef\reserved@a{#1,\csname #1@key@familylist\endcsname}%
\@for\reserved@a:=\reserved@a\do{%
- \scr@ifundefinedorrelax{KV@\reserved@a @\scr@key@name}{}{%
+ \scr@ifundefinedorrelax{KV@\reserved@a @\scr@key@name}{%
+ \ifstr{\reserved@a}{#1}{}{%
+ \scr@ifundefinedorrelax{KV@\reserved@a @@else@}{}{%
+ \expandafter\scr@execute@elseoption\expandafter{\reserved@a}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \scr@key@found@true
+ \let\scr@key@run@errors\relax
+ \fi
+ }%
+ }%
+ }{%
\expandafter\scr@execute@option\expandafter{\reserved@a}%
\scr@key@found@true
\ifx\scr@key@run@errors\relax\else
@@ -1462,21 +1497,21 @@
\edef\scr@key@run@errors{%
\unexpanded\expandafter{\scr@key@run@errors}%
\noexpand\MessageBreak
- \FamilyMemberOfKey: unkown value
- `\expandafter\detokenize\expandafter{\scr@key@value}'.%
+ \space\space- `\FamilyMemberOfKey': unkown value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
}%
\else
\ifx\FamilyKeyState\FamilyKeyStateNeedValue
\edef\scr@key@run@errors{%
\unexpanded\expandafter{\scr@key@run@errors}%
\noexpand\MessageBreak
- \FamilyMemberOfKey: value expected.
+ \space\space- `\FamilyMemberOfKey': value expected
}%
\else
\edef\scr@key@run@errors{%
\unexpanded\expandafter{\scr@key@run@errors}%
\noexpand\MessageBreak
- \FamilyMemberOfKey: \FamilyKeyState.
+ \space\space- `\FamilyMemberOfKey': \FamilyKeyState
}%
\fi
\fi
@@ -1487,34 +1522,92 @@
\ifscr@key@found@
\ifx\scr@key@run@errors\relax\else
\ifx\scr@key@run@errors\@empty\else
+ \scr@ifundefinedorrelax{KV@#1@@else@}{%
+ \PackageError{scrbase}{%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ The members of family `#1' cannot set option
+ `\scr@key@name'
+ \ifx\scr@key@value\@empty\else
+ \MessageBreak
+ to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.\MessageBreak
+ Here's what each member says:
+ \scr@key@run@errors\MessageBreak
+ o\expandafter\@gobble
+ }%
+ }{%
+ \scr@execute@elseoption{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \PackageInfo{scrbase}{%
+ option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ \MessageBreak
+ processed by `@else@' option of family\MessageBreak
+ `#1', after the members said:
+ \scr@key@run@errors\MessageBreak
+ o\expandafter\@gobble
+ }%
+ \let\scr@key@run@errors\relax
+ \else
+ \PackageError{scrbase}{%
+ unknown option
+ \ifx\FamilyKeyState\FamilyKeyStateUnknownValue
+ value at
+ \fi
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ The members of family `#1' cannot set option
+ `\scr@key@name'
+ \ifx\scr@key@value\@empty\else
+ \MessageBreak
+ to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.\MessageBreak
+ Here's what each member says:
+ \scr@key@run@errors\MessageBreak
+ o\expandafter\@gobble
+ }%
+ \fi
+ }%
+ \fi
+ \fi
+ \else
+ \scr@ifundefinedorrelax{KV@#1@@else@}{%
+ \PackageError{scrbase}{%
+ unknown option
+ `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
+ }{%
+ No one of the members of family `#1'\MessageBreak
+ can handle option `\scr@key@name'.\MessageBreak
+ So it cannot be set%
+ \ifx\scr@key@value\@empty\else
+ \space to value
+ `\expandafter\detokenize\expandafter{\scr@key@value}'%
+ \fi.%
+ }%
+ }{%
+ \scr@execute@elseoption{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \else
\PackageError{scrbase}{%
unknown option
+ \ifx\FamilyKeyState\FamilyKeyStateUnknownValue
+ value at
+ \fi
`\expandafter\detokenize\expandafter{\scr@key@atlist}'%
}{%
- The members of family `#1' cannot set option
- `\scr@key@name'
+ No one of the members of family `#1'\MessageBreak
+ can handle option `\scr@key@name'.\MessageBreak
+ So it cannot be set%
\ifx\scr@key@value\@empty\else
- \MessageBreak
- to value
+ \space to value
`\expandafter\detokenize\expandafter{\scr@key@value}'%
- \fi.\MessageBreak
- Here's what each member says:
- \scr@key@run@errors
+ \fi.%
}%
\fi
- \fi
- \else
- \PackageError{scrbase}{%
- unknown option
- `\expandafter\detokenize\expandafter{\scr@key@atlist}'%
- }{%
- No one of the members of family `#1'\MessageBreak
- can handle option `\scr@key@name'.\MessageBreak
- So it cannot be set%
- \ifx\scr@key@value\@empty\else
- \space to value
- `\expandafter\detokenize\expandafter{\scr@key@value}'%
- \fi.%
}%
\fi
\fi
@@ -1591,7 +1684,7 @@
\noexpand\def\noexpand\scr@key@name@else{%
\unexpanded\expandafter{\scr@key@name@else}%
}%
- }
+ }%
\scr@ifundefinedorrelax{scr@key@value@else}{%
\unexpanded{\let\scr@key@value@else\relax}%
}{%
@@ -1752,14 +1845,16 @@
\DefineFamilyKey[{#1}]{#2}{#3}[true]{\FamilySetBool{#2}{#3}{#4}{##1}}%
}
\newcommand*{\FamilySetBool}[4]{%
- \ifstr{#4}{true}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
- \ifstr{#4}{on}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
- \ifstr{#4}{yes}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
- \ifstr{#4}{false}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
- \ifstr{#4}{off}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
- \ifstr{#4}{no}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
- \FamilyUnknownKeyValue{#1}{#2}{#4}{%
- `true', `on', `yes', `false', `off', `no'%
+ \ifstr{#4}{}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{true}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{on}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{yes}{\@nameuse{#3true}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{false}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{off}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
+ \ifstr{#4}{no}{\@nameuse{#3false}\FamilyKeyStateProcessed}{%
+ \FamilyUnknownKeyValue{#1}{#2}{#4}{%
+ `true', `on', `yes', `false', `off', `no'%
+ }%
}%
}%
}%
@@ -1769,6 +1864,23 @@
}%
\let\FamilyElseValues\@empty
}
+\newcommand*{\FamilyInverseBoolKey}[4][.\@currname.\@currext]{%
+ \@ifundefined{if#4}{%
+ \expandafter\newif\csname if#4\endcsname
+ \@nameuse{#4true}%
+ }{}%
+ \DefineFamilyKey[{#1}]{#2}{#3}[true]{\FamilySetInverseBool{#2}{#3}{#4}{##1}}%
+}
+\newcommand*{\FamilySetInverseBool}[4]{%
+ \FamilySetBool{#1}{#2}{#3}{#4}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\ifx\csname if#3\expandafter\endcsname\csname iftrue\endcsname
+ \@nameuse{#3false}%
+ \else
+ \@nameuse{#3true}%
+ \fi
+ \fi
+}
\newcommand*{\FamilyCounterKey}[3][.\@currname.\@currext]{%
\kernel@ifnextchar [%]
{\Family@@Counter@@Key{#1}{#2}{#3}}%
@@ -2035,14 +2147,108 @@
\newcommand{\Family@CS@Key}[4]{%
\DefineFamilyKey[{#1}]{#2}{#3}{\@namedef{#4}{##1}\FamilyKeyStateProcessed}%
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+\newcommand*{\ForDoHook}[2]{%
+ \ifstr{#1}{}{%
+ \PackageError{scrbase}{empty do-hook specificator}{%
+ You've tried to use an empty do-hook specificator,\MessageBreak
+ but do-hook specificators must not be empty.%
+ }%
+ }{%
+ \let\scr@hookname\relax
+ \edef\scr@hookargument{#1}%
+ \loop
+ \scr@hooksplit@specificator\scr@hookname\scr@hookargument
+ \scr@hookargument
+ \begingroup\edef\reserved@a{%
+ \unexpanded{\endgroup #2}{\scr@hookname}{\scr@hookargument}%
+ }\reserved@a
+ \ifx\scr@hookargument\@empty\else
+ \repeat
+ \let\scr@hookname\relax
+ \let\scr@hookargument\relax
+ }%
+}
+\newcommand*{\SplitDoHook}[3]{%
+ \ifstr{#1}{}{%
+ \PackageWarning{scrbase}{empty do-hook specificator}%
+ \let#2\@empty\let#3\@empty
+ }{%
+ \let#2\relax
+ \edef\reserved@a{%
+ \unexpanded{\scr@hooksplit@specificator{#2}{#3}}{#1}%
+ }\reserved@a
+ }%
+}
+\newcommand*{\scr@hooksplit@specificator}[3]{%
+ \expandafter\scr@@hooksplit@specificator\expandafter#1\expandafter#2#3/\@nil
+}
+\newcommand*{\scr@@hooksplit@specificator}{}
+\def\scr@@hooksplit@specificator#1#2#3/#4\@nil{%
+ \scr@ifundefinedorrelax{scr@hookname}{\def#1{#3}}{%
+ \edef#1{#1/#3}%
+ }%
+ \def#2{#4}%
+ \ifx#2\@empty\else \scr@@hookargument#2#4\@nil\fi
+}
+\newcommand*{\scr@@hookargument}{}
+\def\scr@@hookargument#1#2/\@nil{\def#1{#2}}%
+\newcommand*{\ExecuteDoHook}[1]{%
+ \@ifundefined{scr@execute@dohook}{%
+ \def\scr@execute@dohook##1##2{%
+ \def\scr@hook@do####1{####1{##2}}%
+ \@nameuse{scr@dohook@##1}%
+ \@nameuse{scr@otdohook@##1}%
+ \expandafter\global\expandafter\let
+ \csname scr@otdohook@##1\endcsname\@empty
+ \let\scr@hook@do\relax
+ }%
+ \ForDoHook{#1}{\scr@execute@dohook}%
+ \let\scr@execute@dohook\relax
+ }{%
+ \PackageWarning{scrbase}{cascaded do-hook detected.\MessageBreak
+ It seems, that the do-hook `\detokenize{#1}'\MessageBreak
+ is be executed, while another do-hook is active.\MessageBreak
+ This is not allowed and therefore ignored%
+ }%
+ }%
+}
+\newcommand*{\AddtoDoHook}[2]{%
+ \ifstr{#1}{}{%
+ \PackageError{scrbase}{empty hook specificator}{%
+ As hook specificators can never be empty, the first argument\MessageBreak
+ of \string\AddtoDoHook\space must expand to an not empty string.%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{scr@dohook@#1}{\@namedef{scr@dohook@#1}{}}{}%
+ \expandafter\l@addto@macro\csname scr@dohook@#1\endcsname{%
+ \scr@hook@do{#2}%
+ }%
+ }%
+}
+\newcommand*{\AddtoOneTimeDoHook}[2]{%
+ \ifstr{#1}{}{%
+ \PackageError{scrbase}{empty hook specificator}{%
+ As hook specificators can never be empty, the first argument\MessageBreak
+ of \string\AddtoDoHook\space must expand to an not empty string.%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{scr@otdohook@#1}{\@namedef{scr@otdohook@#1}{}}{}%
+ \expandafter\l@addto@macro\csname scr@otdohook@#1\endcsname{%
+ \scr@hook@do{#2}%
+ }%
+ }%
+}
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\defcaptionname}{%
\kernel@ifstar\scr@def@scaptionname\scr@def@captionname
}
\newcommand*{\scr@def@scaptionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\def#2{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2102,9 +2308,52 @@
}%
\fi
}
+\newcommand*{\scr@ifactivelanguageisoneof}[1]{%
+ \begingroup
+ \@tempswafalse
+ \@onelevel@sanitize\languagename
+ \edef\reserved@a{#1}%
+ \@for \reserved@a:=\reserved@a\do{%
+ \scr@trim@spaces\reserved@a
+ \@onelevel@sanitize\reserved@a
+ \ifx\languagename\reserved@a
+ \@tempswatrue
+ \else
+ \edef\reserved@b{\detokenize{german}}%
+ \ifx\languagename\reserved@b
+ \edef\reserved@b{%
+ \expandafter\ifx\csname if@german@oldspelling\expandafter\endcsname
+ \csname iffalse\endcsname n\fi
+ \expandafter\ifx \csname if@austrian@locale\expandafter\endcsname
+ \csname iftrue\endcsname austrian\else
+ \expandafter\ifx\csname if@swiss@locale\expandafter\endcsname
+ \csname iftrue\endcsname swiss\else german\fi\fi
+ }%
+ \@onelevel@sanitize\reserved@b
+ \ifx\reserved@a\reserved@b \@tempswatrue\fi
+ \fi
+ \if@tempswa\else
+ \ifcsname l@\reserved@a\endcsname
+ \expandafter\ifnum \csname l@\reserved@a\endcsname=\language
+ \@tempswatrue
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ \if@tempswa
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \endgroup
+}
\newcommand*{\scr@def@captionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\def#2{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2121,6 +2370,8 @@
\@tempswafalse
\ifcsname extras\scr@reserved@a\endcsname
\let#2\relax
+ \expandafter\providecommand\expandafter*%
+ \csname abx@extras@\scr@reserved@a\endcsname{}%
\csname extras\scr@reserved@a\endcsname
\ifx #2\relax \else \aftergroup\@tempswatrue \fi
\fi
@@ -2174,8 +2425,11 @@
\kernel@ifstar\scr@provide@scaptionname\scr@provide@captionname
}
\newcommand*{\scr@provide@scaptionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\providecommand*{#2}{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2190,6 +2444,8 @@
\else
\begingroup
\let#2\relax
+ \expandafter\providecommand\expandafter*%
+ \csname abx@extras@\scr@reserved@a\endcsname{}%
\csname extras\scr@reserved@a\endcsname
\csname captions\scr@reserved@a\endcsname
\ifx #2\relax \aftergroup\@firstofone
@@ -2214,8 +2470,11 @@
}%
}
\newcommand*{\scr@provide@captionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\providecommand*{#2}{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2230,6 +2489,8 @@
\else
\begingroup
\let#2\relax
+ \expandafter\providecommand\expandafter*%
+ \csname abx@extras@\scr@reserved@a\endcsname{}%
\csname captions\scr@reserved@a\endcsname
\csname extras\scr@reserved@a\endcsname
\ifx #2\relax \aftergroup\@firstofone
@@ -2257,8 +2518,11 @@
\kernel@ifstar\scr@new@scaptionname\scr@new@captionname
}
\newcommand*{\scr@new@scaptionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\providecommand*{#2}{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2272,6 +2536,8 @@
\else
\begingroup
\let#2\relax
+ \expandafter\providecommand\expandafter*%
+ \csname abx@extras@\scr@reserved@a\endcsname{}%
\csname captions\scr@reserved@a\endcsname
\csname extras\scr@reserved@a\endcsname
\ifx #2\relax
@@ -2302,8 +2568,11 @@
}%
}
\newcommand*{\scr@new@captionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\providecommand*{#2}{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2317,6 +2586,8 @@
\else
\begingroup
\let#2\relax
+ \expandafter\providecommand\expandafter*%
+ \csname abx@extras@\scr@reserved@a\endcsname{}%
\csname captions\scr@reserved@a\endcsname
\csname extras\scr@reserved@a\endcsname
\ifx #2\relax
@@ -2350,8 +2621,11 @@
\kernel@ifstar\scr@renew@scaptionname\scr@renew@captionname
}
\newcommand*{\scr@renew@scaptionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\renewcommand*{#2}{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2365,6 +2639,8 @@
\else
\begingroup
\let#2\relax
+ \expandafter\providecommand\expandafter*%
+ \csname abx@extras@\scr@reserved@a\endcsname{}%
\csname captions\scr@reserved@a\endcsname
\csname extras\scr@reserved@a\endcsname
\ifx #2\relax
@@ -2394,8 +2670,11 @@
}%
}
\newcommand*{\scr@renew@captionname}[3]{%
- \if@atdocument \expandafter\@firstofone
- \else \expandafter\AtBeginDocument
+ \if@atdocument
+ \expandafter\@firstofone
+ \else
+ \scr@ifactivelanguageisoneof{#1}{\renewcommand*{#2}{#3}}{}%
+ \expandafter\AtBeginDocument
\fi
{%
\begingroup
@@ -2409,6 +2688,8 @@
\else
\begingroup
\let#2\relax
+ \expandafter\providecommand\expandafter*%
+ \csname abx@extras@\scr@reserved@a\endcsname{}%
\csname extras\scr@reserved@a\endcsname
\ifx #2\relax
\csname captions\scr@reserved@a\endcsname
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
index 6824b4f6df9..b2e0f4a9a11 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrbook.cls
@@ -6,7 +6,7 @@
%%
%% scrkernel-version.dtx (with options: `class,book')
%% scrkernel-basics.dtx (with options: `load')
-%% tocbasic.dtx (with options: `class,load,chapter')
+%% scrkernel-listsof.dtx (with options: `class,book,prepare')
%% scrkernel-tocstyle.dtx (with options: `class,book,prepare')
%% scrkernel-sections.dtx (with options: `class,book,prepare')
%% scrkernel-compatibility.dtx (with options: `class,book,init')
@@ -52,7 +52,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,book,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -80,11 +80,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -115,29 +115,35 @@
\newcommand*{\KOMAClassName}{%
scrbook%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
book%
}
-\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
-\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
+\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
+\addtotoclist[ToC]{toc}
+\ifstr{\ext@toc}{toc}{}{%
+ \expandafter\addtotoclist
+ \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]%
+ \expandafter{\ext@toc}%
+}
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-\addtotoclist{toc}
-\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrighttrue
@@ -213,7 +219,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -286,10 +292,11 @@
\@namedef{scr@v@3.26}{17}
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
+\@namedef{scr@v@3.27}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
@@ -363,7 +370,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -419,11 +426,11 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-\newcommand*\@ptsize{%
+\providecommand*\@ptsize{%
11%
}
\newcommand*{\@pt@scan}{%
@@ -507,7 +514,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -523,7 +530,9 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twoside\flushbottom
- \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \else
+ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi
+ \fi
\fi
\KOMA@kav@xreplacevalue{.%
\KOMAClassFileName
@@ -545,7 +554,12 @@
{\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
+ \else
+ \onecolumn
+ \if@twoside\flushbottom\else
+ \raggedbottom
+ \fi
+ \fi
\fi}%
\fi
}
@@ -617,7 +631,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -783,7 +797,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@titlepage
\@titlepagetrue
@@ -815,9 +829,9 @@
}{titlepage}{\if@titlepage true\else false\fi}
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -881,6 +895,30 @@
\AtBeginDocument{%
\@ifpackageloaded{bookmark}{}{%
\if@scr@autoloadbookmarkpackage
+ \scr@ifundefinedorrelax{Hy@driver}{%
+ \ClassWarning{\KOMAClassName}{%
+ `hyperref' loaded but `\string\Hy@driver' undefined.\MessageBreak
+ This should not happen!\MessageBreak
+ Maybe `hyperref' not loaded or unknown version?%
+ }%
+ }{%
+ \ifstr{\Hy@driver}{hdvips}{%
+ \providecommand*{\BookmarkDriverDefault}{dvips}%
+ }{%
+ \ifstr{\Hy@driver}{hdvipdfm}{%
+ \providecommand*{\BookmarkDriverDefault}{dvipdfm}%
+ }{%
+ \ifstr{\Hy@driver}{hdvipson}{%
+ \providecommand*{\BookmarkDriverDefault}{dvipsone}%
+ }{%
+ \ifstr{\Hy@driver}{htexture}{%
+ \providecommand*{\BookmarkDriverDefault}{textures}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
\ClassInfo{\KOMAClassName}{%
loading recommended package `bookmark'.\MessageBreak
Using `bookmark' together with `hyperref' is
@@ -890,8 +928,11 @@
option\MessageBreak
`bookmarkpackage=false' before \string\begin{document}
and\MessageBreak
- you can avoid this message with
- `\string\usepackage{bookmark}'\MessageBreak
+ you can avoid this message adding:\MessageBreak
+ \space\space\string\usepackage
+ \scr@ifundefinedorrelax{BookmarkDriverDefault}{}{%
+ [\BookmarkDriverDefault]%
+ }{bookmark}\MessageBreak
before \string\begin{document}%
}%
\RequirePackage{bookmark}%
@@ -899,15 +940,18 @@
\else
\if@filesw
\ClassWarning{\KOMAClassName}{%
- seems someone has broken package auxhook.\MessageBreak
- Usually this happens, if auxhook is loaded or used\MessageBreak
+ seems someone has broken package `auxhook'.\MessageBreak
+ Usually this happens, if `auxhook' is loaded or used\MessageBreak
implicitly or explicitly by patching
- `\string\document'%
+ \string\document%
\scr@ifundefinedorrelax{AtEndPreamble}{}{%
\MessageBreak
- or via etoolbox command \string\AtEndPreamble
+ or via etoolbox command \string\AtEndPreamble%
}.\MessageBreak
- Trying an emergency workaround%
+ Trying an emergency workaround.\MessageBreak
+ You can avoid this warning adding:\MessageBreak
+ \space\space\string\usepackage{auxhook}\MessageBreak
+ before \string\begin{document}%
}%
\@beginmainauxhook
\fi
@@ -1121,7 +1165,7 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
@@ -1226,7 +1270,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1361,7 +1405,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -1432,7 +1476,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
@@ -1708,7 +1752,7 @@
\BeforeTOCHead{\@chaptertolistsfalse}
\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
@@ -1877,7 +1921,7 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
@@ -1962,22 +2006,22 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openright}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2459,13 +2503,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z 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 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2510,7 +2554,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -2630,6 +2674,19 @@
\expandafter\let\csname #1@listi\endcsname=\@listi
\def\@listi{\csname #1@listi\endcsname\@list@extra}%
}
+\AfterPackage{amsthm}{%
+ \RequirePackage{xpatch}%
+ \xpatchcmd{\deferred@thm@head}{\addvspace{-\parskip}}{}{%
+ \ClassInfoNoLine{\KOMAClassName}{%
+ amsthm's \string\deferred@thm@head\space patched}%
+ }{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ cannot patch amsthm's \string\deferred@thm@head.\MessageBreak
+ This could result in wrong spacing before theorem\MessageBreak
+ environments defined by package `amsthm'%
+ }%
+ }%
+}
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
@@ -2639,7 +2696,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -2783,7 +2840,7 @@
{\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\vfill\null
\if@twoside
\@tempswatrue
@@ -2802,7 +2859,7 @@
\begin{minipage}[b]{\textwidth}
\@lowertitleback
\end{minipage}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\fi
\else
\ifx\@uppertitleback\@empty\else
@@ -2825,7 +2882,7 @@
\next@tdpage\null\vfill
{\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\cleardoubleemptypage
\fi
\ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
@@ -2906,7 +2963,7 @@
\@maketitle
\fi
\ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
- \@thanks
+ \@thanks\global\let\@thanks\@empty
\endgroup
\fi
\setcounter{footnote}{0}%
@@ -3023,10 +3080,10 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3040,7 +3097,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -3060,40 +3117,36 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@secondoftwo
- }{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \if@currentusenumber
+ \scr@ifundefinedorrelax{#1numdepth}{%
\expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
- }%
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \else
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \fi
+ }%
+ \else
+ \expandafter\@secondoftwo
+ \fi
}
\newcommand*{\ifunnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@firstoftwo
- }{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- }%
+ \ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}%
}
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
@@ -3159,6 +3212,7 @@
\fi
\fi
\newcommand*{\scr@startsection}[6]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\if@noskipsec \leavevmode \fi
\par
\@tempskipa \glueexpr #4\relax
@@ -3203,18 +3257,18 @@
\csname iffalse\endcsname
\fi
}%
- \csname scr@startsection@hook\endcsname
+ \ExecuteDoHook{heading/postinit/#1}%
\if@nobreak
\everypar{}%
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
\kernel@ifstar {%
- \csname scr@preto@ssect@hook\endcsname
+ \ExecuteDoHook{heading/branch/star/#1}%
\def\scr@s@ct@@nn@m@{#1}%
\@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
}{%
- \csname scr@preto@sect@hook\endcsname
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\scr@section@dblarg{%
\@sect{#1}{\numexpr #2\relax}{\glueexpr #3\relax}{\glueexpr #4\relax}%
{\glueexpr #5\relax}{#6}%
@@ -3224,7 +3278,7 @@
\else
\ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
changed.\MessageBreak
- \KOMAClassName\space needs it's own Definition of
+ \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
@@ -3235,14 +3289,16 @@
KOMA-Script that fixes the problem, please\MessageBreak
send a report to the KOMA-Script author.\MessageBreak
Note, that this alternative approach does not\MessageBreak
- execute `\string\scr@startsection@hook',\MessageBreak
- `\string\scr@preto@ssect@hook', or
- `\string\scr@preto@sect@hook'\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
and does always use `runin=bysign' and\MessageBreak
`afterindent=bysign'%
}%
\let\scr@saved@startsection\@startsection
\newcommand*{\scr@startsection}[6]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\kernel@ifstar {%
\scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*%
@@ -3280,16 +3336,34 @@
\newcommand*\startsection@afterindent{%
\scr@startsection@ulm@error\startsection@afterindent}
\newcommand*{\At@startsection}[1]{%
- \@ifundefined{scr@startsection@hook}{\let\scr@startsection@hook\@empty}{}%
- \l@addto@macro{\scr@startsection@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\At@startsection'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/postinit}
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/postinit}{\scr@doonlyifstyleofargis{#1}{section}}%
+}
+\newcommand*{\scr@doonlyifstyleofargis}[3]{%
+ \IfSectionCommandStyleIs{#3}{#2}{#1}{}%
}
\newcommand*{\Before@ssect}[1]{%
- \@ifundefined{scr@preto@ssect@hook}{\let\scr@preto@ssect@hook\@empty}{}%
- \l@addto@macro{\scr@preto@ssect@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\Before@ssect'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/branch/star}%
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/branch/star}{\scr@onlyifstyleofargis{#1}{section}}%
}
\newcommand*{\Before@sect}[1]{%
- \@ifundefined{scr@preto@sect@hook}{\let\scr@preto@sect@hook\@empty}{}%
- \l@addto@macro{\scr@preto@sect@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\Before@sect'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/branch/nostar}%
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/branch/nostar}{\scr@onlyifstyleofargis{#1}{section}}%
}
\newcommand{\scr@section@dblarg}[1]{%
\kernel@ifnextchar[%]
@@ -3310,10 +3384,22 @@
\expandafter\scr@startsection
\fi
}
+\newcommand*{\UseNumberUsageError}[2]{%
+ \ClassError{\KOMAClassName}{%
+ \string\IfUseNumber\space not allowed%
+ }{%
+ You cannot use \string\IfUseNumber\space outside a heading.\MessageBreak
+ If you'd continue, I'll ignore both arguments, because I do not
+ know\MessageBreak
+ whether to use the first or the second argument.%
+ }%
+}
+\newcommand*{\IfUseNumber}[2]{}%
+\let\IfUseNumber\UseNumberUsageError
\newcommand*{\SecDef}[2]{\kernel@ifstar{#2}{\scr@section@dblarg{#1}}}
\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
\let\secdef\SecDef
-\def\@tempa#1#2#3#4#5#6[#7]#8{%
+\def\scr@latex@sect#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
\let\@svsec\@empty
\else
@@ -3345,7 +3431,8 @@
#7}}%
\fi
\@xsect{#5}}
-\ifx\@sect\@tempa\else
+\ifx\@sect\scr@latex@sect\else
+ \let\scr@latex@sect\@sect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@sect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3359,6 +3446,7 @@
\else
\scr@istest#7=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#8},head={#8},reference={#8},#7}%
\else
@@ -3383,7 +3471,12 @@
\fi
}%
\let\IfUsePrefixLine\@secondoftwo
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\let\@svsec\@empty
\else
\refstepcounter{#1}%
@@ -3393,8 +3486,15 @@
\ifdim
\scr@sect@runin{\z@}{\p@}{\glueexpr #5\relax}>\z@
\begingroup
+ \ifx\@svsec\@empty
+ \let\IfUseNumber\@secondoftwo
+ \else
+ \let\IfUseNumber\@firstoftwo
+ \fi
+ \ExecuteDoHook{heading/begingroup/#1}%
#6{\nobreak\interlinepenalty \@M
\sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
\ifx\@currenttocentry\@empty\else
@@ -3404,7 +3504,12 @@
\addtocentrydefault{#1}{##1}{##2}%
}%
}{}%
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\csname add#1tocentry\endcsname{}{\@currenttocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
@@ -3413,6 +3518,12 @@
\fi
\else
\def\@svsechd{%
+ \ifx\@svsec\@empty
+ \let\IfUseNumber\@secondoftwo
+ \else
+ \let\IfUseNumber\@firstoftwo
+ \fi
+ \ExecuteDoHook{heading/begingroup/#1}%
#6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
\expandafter\csname #1mark\expandafter\endcsname
\expandafter{\@currentheadentry}%
@@ -3423,13 +3534,19 @@
\addtocentrydefault{#1}{####1}{####2}%
}%
}{}%
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\csname add#1tocentry\endcsname{}{\@currenttocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
\@currenttocentry}%
\fi
\fi
+ \ExecuteDoHook{heading/endgroup/#1}%
}%
\fi
\let\IfUsePrefixLine\scr@IfUsePrefixLineWarning
@@ -3461,6 +3578,7 @@
}%
\FamilyKeyStateProcessed
}
+\FamilyInverseBoolKey[.section]{KOMAarg}{nonumber}{@currentusenumber}
\newcommand*{\scr@istest}{}
\def\scr@istest#1=#2\@nil{%
\ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
@@ -3472,7 +3590,7 @@
\newcommand{\sectioncatchphraseformat}[4]{%
\hskip #2#3#4%
}
-\def\@tempa#1#2#3#4#5{%
+\def\scr@latex@ssect#1#2#3#4#5{%
\@tempskipa #3\relax
\ifdim \@tempskipa>\z@
\begingroup
@@ -3484,7 +3602,9 @@
\def\@svsechd{#4{\hskip #1\relax #5}}%
\fi
\@xsect{#3}}
-\ifx\@ssect\@tempa\else
+\ifx\@ssect\scr@latex@ssect
+\else
+ \let\scr@latex@ssect\@ssect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@ssect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3494,7 +3614,7 @@
\fi
\def\@ssect#1#2#3#4#5{%
\scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{%
- \ClassWarning{\KOMAClassName}{incompatible usage of
+ \ClassWarning{\KOMAClassName}{Incompatible usage of
\string\@ssect\space detected.\MessageBreak
You've used the KOMA-Script implementation of
\string\@ssect\MessageBreak
@@ -3506,23 +3626,33 @@
\ifdim
\scr@sect@runin{\z@}{\p@}{\glueexpr #3\relax}>\z@
\begingroup
+ \let\IfUseNumber\@secondoftwo
+ \edef\reserved@a{%
+ \noexpand\ExecuteDoHook{heading/begingroup/\scr@s@ct@@nn@m@}%
+ }\reserved@a
#4{\nobreak\interlinepenalty \@M
\expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
{\glueexpr #1\relax}\@empty{#5}\@@par}%
+ \edef\reserved@a{%
+ \noexpand\ExecuteDoHook{heading/endgroup/\scr@s@ct@@nn@m@}%
+ }\reserved@a
\endgroup
\else
\edef\@svsechd{%
+ \unexpanded{\let\IfUseNumber\@secondoftwo}%
+ \noexpand\ExecuteDoHook{heading/begingroup/\scr@s@ct@@nn@m@}%
\unexpanded{#4}{%
\noexpand\nobreak
\noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
\unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
}%
+ \noexpand\ExecuteDoHook{heading/endgroup/\scr@s@ct@@nn@m@}%
}%
\fi
\let\scr@s@ct@@nn@m@\relax
\@xsect{\glueexpr #3\relax}%
}
-\def\@tempa#1{%
+\def\scr@latex@xsect#1{%
\@tempskipa #1\relax
\ifdim \@tempskipa>\z@
\par \nobreak
@@ -3547,7 +3677,8 @@
\fi
\ignorespaces
}
-\ifx\@xsect\@tempa\else
+\ifx\@xsect\scr@latex@xsect\else
+ \let\scr@latex@xsect\@xsect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@xsect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3590,7 +3721,7 @@
}
\newcommand*{\scr@IfUsePrefixLineWarning}[2]{%
\ClassWarning{\KOMAClassName}{%
- usage of \string\IfUsePrefixLine\space outside
+ Usage of \string\IfUsePrefixLine\space outside
section command\MessageBreak
style makes no sense, because the behaviour not only\MessageBreak
depends on class options but also on the run-time\MessageBreak
@@ -3985,7 +4116,11 @@
}%
\DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{%
\IfArgIsEmpty{##1}{%
- \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \@ifundefined{scr@dte@\scr@dsc@current @style}{}{%
+ \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \relax
+ }%
+ \expandafter\let\csname scr@tso@\scr@dsc@current @style\endcsname
\relax
\FamilyKeyStateProcessed
}{%
@@ -3993,6 +4128,7 @@
\FamilyKeyStateUnknownValue
}{%
\@namedef{scr@dte@\scr@dsc@current @style}{##1}%
+ \@namedef{scr@tso@\scr@dsc@current @style}{##1}%
\FamilyKeyStateProcessed
}%
}%
@@ -4012,19 +4148,24 @@
\endgroup
\@firstofone{%
\@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
- \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{%
\scr@ifundefinedorrelax{l@\scr@dsc@current}{%
- \@namedef{scr@dte@\scr@dsc@current @style}{default}%
+ \@namedef{scr@tso@\scr@dsc@current @style}{default}%
}{}%
}{}%
\let\scr@dsc@tocstyle@options\@empty
\let\scr@dsc@extra@relax@opts\@empty
- \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{%
+ \expandafter\let
+ \csname scr@tso@\scr@dsc@current @style\expandafter\endcsname
+ \csname scr@dte@\scr@dsc@current @style\endcsname
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{}{%
\begingroup
\def\scr@dte@current{#2}%
\edef\reserved@a{%
\noexpand\@ExecuteTOCEntryStyleInitCode{%
- \@nameuse{scr@dte@\scr@dsc@current @style}%
+ \@nameuse{scr@tso@\scr@dsc@current @style}%
}{\scr@dsc@current}%
}\reserved@a
\def\do@endgroup{\endgroup}%
@@ -4132,10 +4273,26 @@
\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}%
+ }{%
+ \expandafter\ifnum \csname #2numdepth\endcsname>-\maxdimen
+ \@nameuse{scr@dsc@style@%
+ \@nameuse{scr@\scr@dsc@current @style}%
+ @neededoptionstest}%
+ \else
+ \ClassError{\KOMAClassName}{%
+ `level' must be > -\the\numexpr\maxdimen\relax
+ }{%
+ KOMA-Script internally sets `secnumdepth' to
+ -\the\numexpr\maxdimen\relax\space
+ to locally switch of\MessageBreak
+ the numbering, i.e., inside running heads.\MessageBreak
+ Because of this, you can define section commands with\MessageBreak
+ `level' greater than -\the\numexpr\maxdimen\relax\space only.%
+ }%
+ \let\local@endgroup\endgroup
+ \aftergroup\@gobbletwo
+ \fi
+ }%
\local@endgroup
\@firstofone{%
\@ifundefined{c@#2}{\newcounter{#2}}{}%
@@ -4193,10 +4350,14 @@
\csname add#2tocentry\endcsname[2]{%
\addtocentrydefault{#2}{##1}{##2}%
}%
- \scr@ifundefinedorrelax{scr@dte@#2@style}{%
+ \scr@ifundefinedorrelax{scr@tso@#2@style}{%
+ \expandafter\let\csname scr@tso@#2@style\expandafter\endcsname
+ \csname scr@dte@#2@style\endcsname
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#2@style}{%
}{%
\DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{%
- \@nameuse{scr@dte@#2@style}%
+ \@nameuse{scr@tso@#2@style}%
}{#2}%
}%
\scr@ifundefinedorrelax{l@#2}{%
@@ -4478,6 +4639,30 @@
\let\scr@local@leveloffset\relax
\let\scr@local@tocleveloffset\relax
}
+\newcommand*{\IfSectionCommandStyleIs}[2]{%
+ \scr@ifundefinedorrelax{#1}{%
+ \ClassError{\KOMAClassName}{%
+ \expandafter\string\csname #1\endcsname\space not defined}{%
+ You cannot compare the section command style of an undefined command.}%
+ }{%
+ \scr@ifundefinedorrelax{scr@#1@style}{%
+ \ClassError{\KOMAClassName}{%
+ \expandafter\string\csname #1\endcsname\space not a valid section
+ command%
+ }{%
+ You cannot detect the section command style of a command, that
+ has\MessageBreak
+ never been defined as a section command by KOMA-Script.%
+ }%
+ }%
+ }%
+ \scr@ifundefinedorrelax{scr@dsc@def@style@#2@command}{%
+ \ClassError{\KOMAClassName}{%
+ unknown section command style `#2'%
+ }{}%
+ }%
+ \ifstr{\@nameuse{scr@#1@style}}{#2}%
+}
\newcommand*{\use@preamble}[1]{%
\@ifundefined{#1@preamble}{}{%
\@nameuse{#1@preamble}%
@@ -4588,6 +4773,21 @@
}
\newcommand*{\bprot@dottedtocline}[5]{%
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
+ \ClassWarning{\KOMAClassName}{%
+ usage of `\string\bprot@dottedtocline' is deprecated.\MessageBreak
+ Maybe an old auxiliary file has been used.\MessageBreak
+ Note, this command will be removed from\MessageBreak
+ KOMA-Script soon. So if this warning message\MessageBreak
+ persists after one more LaTeX run, you should\MessageBreak
+ redeclare the corresponding ToC entries using\MessageBreak
+ \string\DeclareTOCStyleEntry[\MessageBreak
+ \space\space level=\detokenize{#1},\MessageBreak
+ \space\space indent=\detokenize{#2},\MessageBreak
+ \space\space numwidth=\detokenize{#3}]{default}{...},\MessageBreak
+ where `...' is the name of the ToC level.\MessageBreak
+ Note, in future usage of `\string\bprot@dottedtocline'\MessageBreak
+ could result in an error%
+ }%
\ifnum #1>\c@tocdepth \else
\ifnum \lastpenalty<\numexpr 20010-#1\relax
\addpenalty{\@lowpenalty}%
@@ -4638,6 +4838,7 @@
\csname appendixmore\endcsname
}
\newcommand*{\scr@startpart}[1]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\if@openright\cleardoublepage\else\clearpage\fi
\scr@ifundefinedorrelax{#1pagestyle}{}{%
\ifstr{#1pagestyle}{}{}{%
@@ -4661,6 +4862,7 @@
\fi
}%
}%
+ \ExecuteDoHook{heading/postinit/#1}%
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{#1@o}\strut\par}%
\vskip-\baselineskip\nobreak
@@ -4668,11 +4870,13 @@
}
\newcommand{\scr@@startpart}{}
\long\def\scr@@startpart#1[#2]#3{%
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\ifnum \scr@osectarg=\z@
\@scr@tempswafalse
\else
\scr@istest#2=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}%
\else
@@ -4716,8 +4920,9 @@
\fi
}%
\begingroup
- \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\def\IfUseNumber{\ifnumbered{#1}}%
+ \ExecuteDoHook{heading/begingroup/#1}%
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\normalfont\usekomafont{disposition}{\nobreak
\IfUseNumber{%
@@ -4739,18 +4944,21 @@
\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
\fi
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\@nameuse{@end#1}%
\@afterheading
}
\newcommand{\scr@@startspart}[2]{%
+ \ExecuteDoHook{heading/branch/star/#1}%
\begingroup
\let\@mkboth\@gobbletwo
\hy@insteadofrefstepcounter{#1}%
\endgroup
\begingroup
- \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\let\IfUseNumber\@secondoftwo
+ \ExecuteDoHook{heading/begingroup/#1}%
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\normalfont\usekomafont{disposition}{%
\nobreak
@@ -4759,6 +4967,7 @@
}%
\@mkboth{}{}%
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\@nameuse{@end#1}%
}
@@ -4777,24 +4986,26 @@
}
\newcommand*{\hy@insteadofrefstepcounter}[1]{}
\let\hy@insteadofrefstepcounter\@gobble
-\BeforePackage{hyperref}{%
+\newcommand*{\scr@chapter@before@hyperref@patch}{%
\let\scr@orig@chapter\@chapter
\let\scr@orig@schapter\@schapter
\let\scr@orig@addchap\@addchap
}
-\AfterPackage!{hyperref}{%
+\BeforePackage{hyperref}{\scr@chapter@before@hyperref@patch}
+\newcommand*{\scr@chapter@after@hyperref@patch}{%
\let\@chapter\scr@orig@chapter
\let\@schapter\scr@orig@schapter
\let\@addchap\scr@orig@addchap
\ifx\hy@insteadofrefstepcounter\@gobble
\renewcommand*{\hy@insteadofrefstepcounter}[1]{%
- \Hy@MakeCurrentHrefAuto{#1*}%
+ \Hy@MakeCurrentHrefAuto{##1*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
}%
\fi
}
+\AfterPackage!{hyperref}{\scr@chapter@after@hyperref@patch}
\newcommand*{\addparttocentry}[2]{%
\addtocentrydefault{part}{#1}{#2}%
}
@@ -4837,6 +5048,7 @@
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
\newcommand*{\scr@startchapter}[1]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\if@openright\cleardoublepage\else\clearpage\fi
\scr@ifundefinedorrelax{#1pagestyle}{}{%
\ifstr{#1pagestyle}{}{}{%
@@ -4855,15 +5067,18 @@
}%
}%
}%
+ \ExecuteDoHook{heading/postinit/#1}%
\expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname
}
\newcommand*{\scr@@startchapter}{}
\def\scr@@startchapter#1[#2]#3{%
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\ifnum \scr@osectarg=\z@
\@scr@tempswafalse
\else
\scr@istest#2=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}%
\else
@@ -4934,6 +5149,7 @@
\@afterheading
}
\newcommand*{\scr@@startschapter}[2]{%
+ \ExecuteDoHook{heading/branch/star/#1}%
\begingroup
\let\@mkboth\@gobbletwo
\hy@insteadofrefstepcounter{#1}%
@@ -4976,14 +5192,15 @@
}%
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\def\IfUseNumber{\ifnumbered{#1}}%
\if@mainmatter\else\let\IfUseNumber\@secondoftwo\fi
+ \ExecuteDoHook{heading/begingroup/#1}%
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
\else
\let\IfUsePrefixLine\@secondoftwo
\fi
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\normalfont\usekomafont{disposition}{%
\usekomafont{#1}{%
\settoheight{\@tempskipa}{%
@@ -5016,6 +5233,7 @@
}%
}%
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
}%
\nobreak\par\nobreak
\@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax
@@ -5031,13 +5249,14 @@
}%
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\let\IfUseNumber\@secondoftwo
+ \ExecuteDoHook{heading/begingroup/#1}%
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
\else
\let\IfUsePrefixLine\@secondoftwo
\fi
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\normalfont\usekomafont{disposition}{%
\usekomafont{#1}{%
\raggedchapter
@@ -5052,6 +5271,7 @@
}%
}%
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
}%
\nobreak\par\nobreak
\@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax
@@ -5248,9 +5468,7 @@
}
\newcounter{section}[chapter]
\renewcommand*\thesection{%
- \ifnum \scr@compatibility>\@nameuse{scr@v@2.97d} % the space before this
- % comment should be \relax but hyperref has a
- % not documented problem with \relax
+ \expandafter\ifnum\scr@v@is@gt{2.97d}%
\if@mainmatter\thechapter.\fi
\else
\thechapter.%
@@ -5367,7 +5585,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -5397,7 +5615,7 @@
\setlength\fboxrule{.4\p@}
\@addtoreset{equation}{chapter}
\renewcommand*\theequation{%
- \expandafter\ifnum\scr@v@is@gt{2.97d}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.97d}%
\if@mainmatter\thechapter.\fi
\else
\thechapter.%
@@ -5528,12 +5746,27 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage'}
-\scr@package@not@recommended{titlesec}{%
- the package only\MessageBreak
- if you really need it, because it breaks several\MessageBreak
- KOMA-Script features, i.e., option `headings' and\MessageBreak
- the extended optional argument of the section\MessageBreak
- commands}
+\AfterPackage*{sectsty}{%
+ \@ifpackagelater{sectsty}{2002/02/26}{%
+ \ClassInfo{\KOMAClassName}{Unknown `sectsty' release.\MessageBreak
+ Cross your fingers, that is compatible%
+ }%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Incompatible package `sectsty' loaded!\MessageBreak
+ Package `sectsty' up to version 2.0.2 is incompatible\MessageBreak
+ with KOMA-Script from version 2.8e released in 2001.\MessageBreak
+ You should avoid that package and configure the\MessageBreak
+ section titles of your document using the KOMA-Script\MessageBreak
+ user interface, e.g., \string\chapterlinesformat,\MessageBreak
+ \string\RedeclareSectionCommand\space etc. or you should ask\MessageBreak
+ the `sectsty' maintainer for a more compatible release.\MessageBreak
+ Ignoring this warning could result in several error\MessageBreak
+ messages and formatting issues after loading package\MessageBreak
+ `sectsty'%
+ }%
+ }%
+}
\scr@package@not@recommended{tocbibind}{%
options like `listof=totoc'\MessageBreak
or `bibliography=totoc', or commands like\MessageBreak
@@ -5651,75 +5884,35 @@
\let\scr@mt@saved@sect\relax
\fi
}
-\BeforePackage{titlesec}{%
- \let\scr@ttl@saved@section\section
- \let\scr@ttl@saved@subsection\subsection
- \let\scr@ttl@saved@subsubsection\subsubsection
- \let\scr@ttl@saved@paragraph\paragraph
- \let\scr@ttl@saved@subparagraph\subparagraph
-}
\AfterPackage{titlesec}{%
- \@ifpackagelater{titlesec}{2016/03/22}{%
- \ClassInfo{\KOMAClassName}{%
- Deactivating the `titlesec' workaround,\MessageBreak
- because package is newer than expected%
+ \@ifpackagelater{titlesec}{2019/07/17}{%
+ \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak
+ Cross your fingers, that is compatible%
}%
}{%
- \ClassWarning{\KOMAClassName}{%
- Activating an ugly workaround for a missing\MessageBreak
- feature of package `titlesec`%
- }%
- \def\scr@ttl@@extract#1\scr@startsection#2#3#4#5#6#7#8{%
- \@tempskipa=#5
- \@tempskipb=#6
- \ifdim\@tempskipa<\z@
- \toks@{\titlespacing*#8{#4}}%
- \@tempskipa-\@tempskipa
- \else
- \toks@{\titlespacing#8{#4}}%
- \fi
- \@ifundefined{ttl@space}{}{%
- \ttl@assign\@tempskipa*\ttl@space\relax\beforetitleunit}%
- \ifdim\@tempskipb<\z@
- \if@tempswa
- \titleformat#8[runin]%
- {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \else
- \titleformat#8[runin]%
- {#7}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \fi
- \@tempskipb-\@tempskipb
- \else
- \if@tempswa
- \titleformat#8%
- {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \else
- \titleformat#8%
- {#7}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \fi
- \@ifundefined{ttl@space}{}{%
- \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
- \fi
- \edef\ttl@a{\the\toks@{\the\@tempskipa}{\the\@tempskipb}}
- \ttl@a}%
- \expandafter\scr@ttl@@extract\scr@ttl@saved@section\section
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subsection\subsection
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subsubsection\subsubsection
- \expandafter\scr@ttl@@extract\scr@ttl@saved@paragraph\paragraph
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subparagraph\subparagraph
- \let\scr@ttl@saved@section\relax
- \let\scr@ttl@saved@subsection\relax
- \let\scr@ttl@saved@subsubsection\relax
- \let\scr@ttl@saved@paragraph\relax
- \let\scr@ttl@saved@subparagraph\relax
- \let\scr@ttl@@extract\relax
+ \scr@class@titlesec@warning
+ }%
+}
+\providecommand*{\scr@class@titlesec@warning}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of this version of package `titlesec'\MessageBreak
+ with KOMA-Script class `\KOMAClassName' is\MessageBreak
+ not recommended, because the package does not\MessageBreak
+ support KOMA-Script classes, but break them.\MessageBreak
+ If you want to use `titlesec' with KOMA-Script\MessageBreak
+ classes instead of using the KOMA-Script's\MessageBreak
+ user interface to configure the headings of\MessageBreak
+ parts,
+ chapters, sections
+ ... subparagraphs,\MessageBreak
+ please ask the author of `titlesec' for support.\MessageBreak
+ Expect errors like:\MessageBreak
+ \space\space- ``Illegal unit of measure (pt inserted).''\MessageBreak
+ \space\space- ``Missing number, treated as zero''\MessageBreak
+ after loading `titlesec'%
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -5820,7 +6013,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{headings}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -5831,7 +6024,7 @@
\providecommand*{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -6616,7 +6809,7 @@
}
]{lof}
\renewcommand*\thefigure{%
- \expandafter\ifnum\scr@v@is@gt{2.97d}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.97d}%
\if@mainmatter\thechapter.\fi
\else
\thechapter.%
@@ -6637,14 +6830,14 @@
}
]{lot}
\renewcommand*\thetable{%
- \expandafter\ifnum\scr@v@is@gt{2.97d}\relax
+ \expandafter\ifnum\scr@v@is@gt{2.97d}%
\if@mainmatter\thechapter.\fi
\else
\thechapter.%
\fi
\@arabic\c@table
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
@@ -6803,7 +6996,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -6815,9 +7008,6 @@
\AtAddToTocList[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
-\newcommand*\@pnumwidth{1.55em}
-\newcommand*\@tocrmarg {2.55em}
-\newcommand*\@dotsep{4.5}
\newcommand*{\scr@dottedtocline}{}
\newcommand*{\last@l@number}{}
\newcommand*{\@l@number}{}
@@ -6868,7 +7058,7 @@
\protected@write\@auxout{}{%
\string\gdef\expandafter\string\csname#1@l@number\endcsname{%
\@l@number}}%
- }
+}
\g@addto@macro\tocbasic@@before@hook{%
\if@dynlist\expandafter\before@starttoc\expandafter{\@currext}\fi
}
@@ -6877,6 +7067,8 @@
}
\newcommand*\contentsname{Contents}
\newcommand*\listoftocname{\contentsname}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\contentsname{Contents}%
\setcounter{tocdepth}{2}
\newcommand*\toc@heading{%
\ClassWarning{\KOMAClassName}{%
@@ -6945,12 +7137,16 @@
\global\let\scr@float@addtolists@warning\relax
}
\renewcommand*\listfigurename{List of Figures}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\listfigurename{List of Figures}
\renewcommand*\listoflofname{\listfigurename}
\renewcommand*\listoflofentryname{\figurename}
\renewcommand*\listtablename{List of Tables}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables}
\renewcommand*\listoflotname{\listtablename}
\renewcommand*\listoflotentryname{\tablename}
-%%% From File: $Id: scrkernel-bibliography.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
@@ -7036,7 +7232,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
@@ -7077,7 +7273,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\if@twocolumn
\setlength{\leftmargini}{2em}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
index 22b0b1a1a6b..7477954de23 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrdate.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrdate,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,11 +39,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,24 +65,24 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrdate}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(day of the week)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
-%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
+%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
\newcommand*{\CenturyPart}[1]{\XdivY{#1}{100}}
\newcommand*{\DecadePart}[1]{\XmodY{#1}{100}}
\newcommand*{\@GaussYear}[3]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
index 33475e57d12..590ffb1478b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrextend.sty
@@ -33,7 +33,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `package,extend,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -61,11 +61,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: preidentify)
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname KOMAClassName\endcsname\relax\else
@@ -78,7 +78,7 @@
}%
\expandafter\endinput
\fi
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -100,16 +100,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
\ProvidesPackage{scrextend}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package (extend other classes with features of KOMA-Script classes)%
]
\newcommand*{\scr@ext@activate}[1]{%
@@ -133,13 +133,13 @@
\expandafter\g@addto@macro\csname scr@ext@activate@#1\endcsname
}%
}
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
@@ -212,8 +212,9 @@
\@namedef{scr@v@3.26}{17}
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
+\@namedef{scr@v@3.27}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrextend.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrextend.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{extendedfeature}{%
\scr@ext@activate{#1}%
@@ -237,7 +238,7 @@
\def\FamilyKeyState{Option `extendedfeature' too late}%
}%
}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -292,7 +293,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -351,7 +352,7 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\providecommand*{\@fontsizefilebase}{scrsize}
\KOMA@key{fontsize}{%
@@ -388,7 +389,7 @@
scrextend.\scr@pkgextension
}{fontsize}{#1}%
}
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\scr@ext@activateable{title}{%
\scr@ifundefinedorrelax{if@titlepage}{%
@@ -432,9 +433,9 @@
\KOMA@DeclareStandardOption%
[scrextend]%
{notitlepage}{titlepage=false}
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{cleardoublepage}{%
\begingroup%
@@ -516,9 +517,9 @@
{\pagestyle{#1}\cleardoublestandardpage}}
\newcommand*{\cleardoubleemptypage}{\cleardoublepageusingstyle{empty}}
\newcommand*{\cleardoubleplainpage}{\cleardoublepageusingstyle{plain}}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -589,16 +590,16 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -955,7 +956,7 @@
because I do not change it%
}%
}
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\scr@ext@addto@activateable{title}{%
\newcommand*{\@extratitle}{}%
@@ -1101,7 +1102,7 @@
{\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\vfill\null
\if@twoside
\@tempswatrue
@@ -1120,7 +1121,7 @@
\begin{minipage}[b]{\textwidth}
\@lowertitleback
\end{minipage}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\fi
\else
\ifx\@uppertitleback\@empty\else
@@ -1143,7 +1144,7 @@
\next@tdpage\null\vfill
{\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\cleardoubleemptypage
\fi
\ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
@@ -1224,7 +1225,7 @@
\@maketitle
\fi
\ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
- \@thanks
+ \@thanks\global\let\@thanks\@empty
\endgroup
\fi
\setcounter{footnote}{0}%
@@ -1343,11 +1344,11 @@
\newkomafont{dedication}{\Large}
\newcommand*{\scr@fnt@title}{\titlefont}%
\newcommand*{\scr@fnt@subject}{\subject@font}%
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\scr@ifundefinedorrelax{if@restonecol}{%
\expandafter\newif\csname if@restonecol\endcsname
@@ -1441,14 +1442,14 @@
{\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}%
}
\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand\deffootnote[4][]{%
\expandafter\ifnum\scr@v@is@ge{3.22}\relax
@@ -1580,7 +1581,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newenvironment{labeling}[2][]{%
\def\sc@septext{#1}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
index 5f2cd52ab2e..11c4187004a 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrfontsizes.sty
@@ -10,7 +10,7 @@
%% scrkernel-fonts.dtx (with options: `package,generator,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -38,11 +38,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -64,21 +64,21 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: identify)
\ProvidesPackage{scrfontsizes}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package (font size file generator)]
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\@ifundefined{changefontsizes}{\RequirePackage{scrextend}}{}
\newcommand*{\generatefontfile}[1]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
index 890ad799052..5af28ed7199 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrhack.sty
@@ -11,7 +11,7 @@
%% scrhack.dtx (with options: `package,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,11 +39,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,22 +65,22 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% using: package,identify
\ProvidesPackage{scrhack}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ package (hacking other packages)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% using: package,option
\KOMA@ifkey{hyperref}{@scrhack@hyperref}%
\KOMAExecuteOptions{hyperref=true}%
@@ -98,8 +98,10 @@
\RequirePackage{xpatch}%
\KOMA@ifkey{lscape}{@scrhack@lscape}%
\KOMAExecuteOptions{lscape=true}%
+\KOMA@ifkey{standardsections}{@scrhack@standardsections}
+\KOMAExecuteOptions{standardsections=false}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% using: package,body
\newcommand{\scr@ifexpected}[2]{%
\begingroup
@@ -201,6 +203,12 @@
}%
\fi
}
+\AtEndOfPackage{%
+ \if@scrhack@standardsections
+ \PackageInfo{scrhack}{loading standard classes sections hack}%
+ \input{standardsections.hak}%
+ \fi
+}
%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
index 5ee1bbb68da..d1ee78fd7c9 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrjura.sty
@@ -4,10 +4,15 @@
%%
%% The original source files were:
%%
-%% scrjura.dtx (with options: `package')
+%% scrjura.dtx (with options: `package,identify')
+%% scrjura.dtx (with options: `package,init')
+%% scrjura.dtx (with options: `package,options')
+%% scrjura.dtx (with options: `package,postoptions')
+%% scrjura.dtx (with options: `package,body')
+%% scrjura.dtx (with options: `package,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2007-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -35,17 +40,20 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrjura.dtx 3033 2018-09-21 07:36:59Z kohm $
+%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrjura}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(for jurists)
]
+%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: init)
\@ifpackageloaded{hyperref}{%
\PackageError{scrjura}{Package hyperref already loaded}{%
If you want to use package scrjura with package hyperref, you have to
@@ -57,44 +65,42 @@
}
\RequirePackage{scrkbase}[2013/03/26]
\RequirePackage{tocbasic}
+\DeclareTOCStyleEntry[%
+ indent=1.5em,
+ numwidth=2em,
+ level=\maxdimen
+]{default}{cpar}
+%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: options)
\DeclareOption{contract}{%
\g@addto@macro\document\contract%
}
-\newcounter{juratoclevel}\setcounter{juratoclevel}{\@M}
\KOMA@key{juratotoc}[true]{%
- \begingroup
- \KOMA@set@ifkey{juratoclevel}{@tempswa}{#1}%
- \ifx\FamilyKeyState\FamilyKeyStateProcessed
- \if@tempswa
- \setcounter{juratoclevel}{2}%
- \else
- \setcounter{juratoclevel}{\@M}%
- \fi
+ \KOMA@set@ifkey{juratotoc}{@tempswa}{#1}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \if@tempswa
+ \DeclareTOCStyleEntry[level=2]{default}{cpar}%
\else
- \setcounter{juratoclevel}{#1}%
+ \DeclareTOCStyleEntry[level=\maxdimen]{default}{cpar}%
\fi
- \endgroup
- \FamilyKeyStateProcessed
- \KOMA@kav@xreplacevalue{.scrjura.sty}{juratotoc}{\value{juratoclevel}}%
+ \else
+ \DeclareTOCStyleEntry[level=#1]{default}{cpar}%
+ \fi
+ \KOMA@kav@xreplacevalue{.scrjura.sty}{juratotoc}{\cpartocdepth}%
}
-\KOMA@kav@xadd{.scrjura.sty}{juratotoc}{\value{juratoclevel}}%
-\providecommand*{\toclevel@cpar}{\arabic{juratoclevel}}
-\newcommand*{\cpar@numberwidth}{2em}
-\newcommand*{\cpar@indent}{1.5em}
+\KOMA@kav@xadd{.scrjura.sty}{juratotoc}{\cpartocdepth}%
\KOMA@key{juratocnumberwidth}{%
- \begingroup\setlength{\@tempdima}{#1}\endgroup
- \renewcommand*{\cpar@numberwidth}{#1}%
+ \DeclareTOCStyleEntry[numwidth=#1]{default}{cpar}%
\FamilyKeyStateProcessed
- \KOMA@kav@replacevalue{.scrjura.sty}{juratocnumberwidth}{\cpar@numberwidth}%
+ \KOMA@kav@replacevalue{.scrjura.sty}{juratocnumberwidth}{#1}%
}
-\KOMA@kav@add{.scrjura.sty}{juratocnumberwidth}{\cpar@numberwidth}
+\KOMA@kav@add{.scrjura.sty}{juratocnumberwidth}{2em}
\KOMA@key{juratocindent}{%
- \begingroup\setlength{\@tempdima}{#1}\endgroup
- \renewcommand*{\cpar@indent}{#1}%
+ \DeclareTOCStyleEntry[indent=#1]{default}{cpar}%
\FamilyKeyStateProcessed
- \KOMA@kav@replacevalue{.scrjura.sty}{juratocindent}{\cpar@indent}%
+ \KOMA@kav@replacevalue{.scrjura.sty}{juratocindent}{#1}%
}
-\KOMA@kav@add{.scrjura.sty}{juratocindent}{\cpar@indent}%
+\KOMA@kav@add{.scrjura.sty}{juratocindent}{1.5em}%
\KOMA@ifkey{juratitlepagebreak}{@juratitlepagebreak}
\newif\ifparnumber
\KOMA@key{parnumber}[true]{%
@@ -262,7 +268,11 @@
\KOMA@kav@add{.scrjura.sty}{ref}{sentencelong}%
\KOMA@DeclareDeprecatedOption[scrjura]{parcitename}{ref=parlong}
\KOMA@DeclareDeprecatedOption[scrjura]{sentencecitename}{ref=sentencelong}
+%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: postoptions)
\KOMAProcessOptions\relax
+%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: body)
\providecommand*{\DeprecatedParagraph}{%
\PackageError{scrjura}{modification of old document needed}{%
It seem that this document was made for scrjura up to version
@@ -635,6 +645,20 @@
\newcommand*{\ManualPar}{%
\let\scrjura@everypar\relax
}
+\CheckCommand*{\@afterheading}{%
+ \@nobreaktrue
+ \everypar{%
+ \if@nobreak
+ \@nobreakfalse
+ \clubpenalty \@M
+ \if@afterindent \else
+ {\setbox\z@\lastbox}%
+ \fi
+ \else
+ \clubpenalty \@clubpenalty
+ \everypar{}%
+ \fi}%
+}
\newcommand*{\scrjura@afterheading}{%
\@nobreaktrue
\everypar{%
@@ -713,15 +737,6 @@
}%
}
\EndIncludeInRelease
-\newcommand*{\l@cpar}[2]{%
- \ifnum\value{juratoclevel}>\value{tocdepth}\else
- \scr@ifundefinedorrelax{bprot@dottedtocline}{%
- \@dottedtocline
- }{%
- \bprot@dottedtocline
- }{\value{juratoclevel}}{\cpar@indent}{\cpar@numberwidth}{#1}{#2}%
- \fi
-}
\DeclareRobustCommand*{\scrjura@separator}[1]{#1}
\DeclareRobustCommand*{\scrjura@usetype}[1]{\scrjura@@usetype{#1}}
\newcommand*{\scrjura@@usetype}[1]{}
@@ -973,9 +988,14 @@
\newcounter{sentence}[par]
\renewcommand*{\thesentence}{\arabic{sentence}}
\newcommand*{\theHsentence}{\theHpar-\arabic{sentence}}
-\renewcommand*{\p@sentence}{\expandafter\p@@sentence}
-\newcommand*{\p@@sentence}[1]{\p@par{{\par@cite{\thepar}}%
- \scrjura@separator{\nobreakspace}}{\sentence@cite{#1}}}
+\scr@ifundefinedorrelax{labelformat}{%
+ \renewcommand*{\p@sentence}{\expandafter\p@@sentence}
+ \newcommand*{\p@@sentence}[1]{\p@par{{\par@cite{\thepar}}%
+ \scrjura@separator{\nobreakspace}}{\sentence@cite{#1}}}%
+}{%
+ \labelformat{sentence}{\p@par{{\par@cite{\thepar}}%
+ \scrjura@separator{\nobreakspace}}{\sentence@cite{#1}}}%
+}
\newcommand*{\contract@sentence}{%
\ifvmode
\if@endpe
@@ -1086,6 +1106,8 @@
}%
\fi
}
+%%% From File: $Id: scrjura.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: final)
%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
\@ifundefined{KOMAScript}{%
\DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
index ed174a21fc3..4606f77cadc 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrkbase.sty
@@ -13,7 +13,7 @@
%% scrkernel-fonts.dtx (with options: `package,body,scrkbase')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,11 +41,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -67,19 +67,19 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{%
scrkbase%
}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(%
KOMA-Script-dependent
@@ -243,16 +243,16 @@
}
\newcommand*{\KOMAProcessOptions}{\FamilyProcessOptions{KOMA}}
\@onlypreamble\KOMAProcessOptions
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrlfile.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $
\RequirePackage{scrlfile}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\KOMAExecuteOptions}[1][.\@currname.\@currext]{%
\FamilyExecuteOptions[#1]{KOMA}%
@@ -420,7 +420,7 @@
}%
\KOMAoptions{#3}%
}
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\IfExistskomafont}[1]{%
\scr@ifundefinedorrelax{scr@fnt@#1}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty
index d59c941a517..9a5a5b66be8 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-fancyhdr.sty
@@ -13,7 +13,7 @@
%% scrlayer-fancyhdr.dtx (with options: `interface,trace,fancyhdr,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2018-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2018-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,15 +41,15 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-fancyhdr.dtx ALPHA (see date below) kohm $
+%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-fancyhdr}[%
- 2018/09/10 r0 ALPHA KOMA-Script
+ 2018/05/03 v0.1.3138 ALPHA KOMA-Script
package
(end user interface for scrlayer)]
\PackageWarningNoLine{scrlayer-fancyhdr}{%
@@ -58,7 +58,7 @@
YOU SHOULD NOT USE THIS PACKAGE FOR\MessageBreak
ANYTHING ELSE BUT TESTING%
}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -70,9 +70,9 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-fancyhdr.dtx ALPHA (see date below) kohm $
+%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $
%%% (run: init)
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
@@ -215,9 +215,9 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-fancyhdr.dtx ALPHA (see date below) kohm $
+%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $
%%% (run: options)
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
@@ -289,7 +289,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-fancyhdr.dtx ALPHA (see date below) kohm $
+%%% From File: $Id: scrlayer-fancyhdr.dtx 3138 2019-04-04 06:24:53Z kohm $
%%% (run: body)
\RequirePackage{fancyhdr}
\DeclareNewLayer[%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
index 2908644528d..8e0cfd129c7 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-notecolumn.sty
@@ -14,7 +14,7 @@
%% scrlayer-notecolumn.dtx (with options: `interface,trace,notecolumn,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2013-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2013-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -42,18 +42,18 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-notecolumn}[%
- 2018/08/29 v0.1.3011 KOMA-Script
+ 2019/06/27 v0.3.3161 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -65,7 +65,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: init)
\@tempswatrue
\scr@ifundefinedorrelax{pdfsavepos}{%
@@ -98,7 +98,7 @@
}%
\batchmode\csname @@end\endcsname\end
\fi
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
@@ -241,12 +241,12 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: options)
\KOMA@ifkey{autoclearnotecolumns}{slnc@autoclearnotecolumns}\slnc@autoclearnotecolumnstrue
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns}
\scrlayer@AddCsToInterface{KV@KOMA.\@currname.\@currext @autoclearnotecolumns@default}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
@@ -318,7 +318,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: body)
\scrlayerAddToInterface\DeclareNoteColumn{%
\newcommand*{\DeclareNoteColumn}[2][]{%
@@ -344,6 +344,23 @@
\expandafter\let\csname slnc@#2@width\endcsname\relax
}%
}{}%
+ \@ifundefined{slnc@#2@colorstack}{%
+ \scr@ifundefinedorrelax{pdfcolorstackinit}{%
+ \scr@ifundefinedorrelax{pdffeedback}{}{%
+ \expandafter\chardef\csname slnc@#2@colorstack\endcsname=
+ \pdffeedback colorstackinit direct {\slnc@initial@black}%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@colorstack\endcsname\relax
+ }%
+ }%
+ }{%
+ \expandafter\chardef\csname slnc@#2@colorstack\endcsname=
+ \pdfcolorstackinit direct {\slnc@initial@black}%
+ \scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
+ \expandafter\let\csname slnc@#2@colorstack\endcsname\relax
+ }%
+ }%
+ }{}%
\@ifundefined{scr@fnt@notecolumn.#2}{%
\@ifundefined{@notecolumn.#2font}{%
\scrlayerOnAutoRemoveInterface[scrlayer-notecolumn.sty]{%
@@ -390,6 +407,17 @@
\@cons\slnc@processnotecolumns{{#2}}%
}%
}
+\scrlayerAddToInterface\slnc@initial@black{%
+ \newcommand*{\slnc@initial@black}{0 g 0 G}%
+ \AfterPackage*{color}{%
+ \let\slnc@initial@black\current@color
+ \AtBeginDocument{\let\slnc@initial@black\default@color}%
+ }%
+ \AfterPackage*{xcolor}{%
+ \let\slnc@initial@black\current@color
+ \AtBeginDocument{\let\slnc@initial@black\default@color}%
+ }%
+}
\scrlayerAddToInterface\slnc@processnotecolumns{%
\newcommand*{\slnc@processnotecolumns}{}%
}
@@ -693,8 +721,8 @@
\expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
\expandafter\hsize\csname slnc@#1@width\endcsname
\normalfont\normalsize
+ \slnc@switchcolorstack{#1}%
{%
- \let\color\@gobble
\usekomafont{notecolumn.#1}{%
\slnc@notesyncfonttest{#1}%
\expandafter\ifvoid\csname slnc@#1@box\endcsname
@@ -794,12 +822,14 @@
\expandafter\ifvoid\csname slnc@#1@box\endcsname
\else
\expandafter\setbox\csname slnc@#1@box\endcsname\vbox{%
- \expandafter\unvbox\csname slnc@#1@box\endcsname
+ \slnc@switchcolorstack{#1}%
+ \expandafter\unvbox\csname slnc@#1@box\endcsname
}%
\fi
\else
\PackageInfo{scrlayer-notecolumn}{Flush note box `#1'}%
\usekomafont{notecolumn.#1}{%
+ \slnc@switchcolorstack{#1}%
\expandafter\box\csname slnc@#1@box\endcsname%
}%
\fi
@@ -810,6 +840,50 @@
\endgroup
}
}
+\scrlayerAddToInterface{\slnc@switchcolorstack}{%
+ \newcommand*{\slnc@switchcolorstack}[1]{%
+ \scr@ifundefinedorrelax{slnc@#1@colorstack}{%
+ \def\set@color{%
+ \PackageWarningNoLine{scrlayer-notecolumn}{%
+ unsupported change of colour!\MessageBreak
+ It seems you are using a TeX engine,\MessageBreak
+ that does not support switching the\MessageBreak
+ colour stack like pdfTeX or luaTeX do.\MessageBreak
+ Because of this, usage of \string\color,\MessageBreak
+ \string\textcolor\space etc. inside a note
+ column\MessageBreak
+ is not supported%
+ }%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{@pdfcolorstack}{%
+ }{%
+ \expandafter\let\expandafter\@pdfcolorstack
+ \csname slnc@#1@colorstack\endcsname
+ }%
+ \scr@ifundefinedorrelax{pdfcolorstack}{%
+ \scr@ifundefinedorrelax{pdfextension}{%
+ \PackageError{scrlayer-notecolumm}{%
+ colour stack defined but not usable%
+ }{%
+ \expandafter\string
+ \csname slnc@#1@colorstack\endcsname\space defined
+ \MessageBreak
+ but neither \string\pdfcolorstack\space nor
+ \string\pdfextension.\MessageBreak
+ This should never happen!%
+ }%
+ }{%
+ \pdfextension colorstack
+ \csname slnc@#1@colorstack\endcsname current\relax
+ }%
+ }{%
+ \pdfcolorstack
+ \csname slnc@#1@colorstack\endcsname current\relax
+ }%
+ }%
+ }%
+}
\scrlayerAddToInterface\slnc@restoreinnote{%
\let\slnc@restoreinnote\@empty
}
@@ -829,6 +903,21 @@
\restoreinnote\index
\restoreinnote\glossary
}
+\scrlayerAddToInterface\slnc@catcodes{%
+ \newcommand*{\slnc@catcodes}{}%
+}
+\AtBeginDocument{%
+ \begingroup
+ \def\do#1{%
+ \protected@xdef\slnc@catcodes{\slnc@catcodes
+ \catcode`\protect#1=\the\catcode`#1\relax
+ }%
+ }%
+ \dospecials
+ \let\protect\noexpand
+ \xdef\slnc@catcodes{\slnc@catcodes\catcode`\protect\@=11\relax}%
+ \endgroup
+}
\scrlayerAddToInterface\slnc@readnotes{%
\newcommand*\slnc@readnotes[1]{%
\ifeof\slnc@file\else
@@ -838,13 +927,16 @@
\@tempswatrue
\fi
\@whilesw\if@tempswa\fi{%
- \edef\reserved@a{%
- \noexpand\makeatletter
+ \begingroup
+ \slnc@catcodes
\endlinechar\m@ne
- \read\noexpand\slnc@file to\noexpand\reserved@a
- \endlinechar\the\endlinechar\relax
- \catcode`\noexpand\@=\the\catcode`\@\relax
- }%
+ \read\slnc@file to\reserved@a
+ \edef\reserved@a{%
+ \endgroup
+ \noexpand\def\noexpand\reserved@a{%
+ \unexpanded\expandafter{\reserved@a}%
+ }%
+ }%
\reserved@a
\expandafter\slnc@iofv\expandafter\reserved@b\reserved@a
\@empty\@empty\@empty\@empty\@empty
@@ -1322,7 +1414,7 @@
\@esphack
}%
}
-%%% From File: $Id: scrlayer-notecolumn.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlayer-notecolumn.dtx 3161 2019-06-27 06:41:04Z kohm $
%%% (run: final)
\DeclareNoteColumn{marginpar}
\let\reserved@a\clearpage
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
index 840d9f6ff8c..e2b8b7f225f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer-scrpage.sty
@@ -13,7 +13,7 @@
%% scrlayer-scrpage.dtx (with options: `interface,trace,scrpage,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2012-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -41,18 +41,18 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer-scrpage.dtx 3017 2018-09-05 06:27:27Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer-scrpage}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(end user interface for scrlayer)]
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: init)
\RequirePackage{scrlayer}
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -64,7 +64,7 @@
}
\let\scrlayer@AtEndOfPackage\AtEndOfPackage
\scrlayerInitInterface
-%%% From File: $Id: scrlayer-scrpage.dtx 3017 2018-09-05 06:27:27Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $
%%% (run: init)
\AtEndOfPackage{%
\sls@auto@pagestyleset%
@@ -81,7 +81,7 @@
{pagestyleset=KOMA-Script}%
}%
}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: options)
\KOMA@key{markcase}{%
\scrlayer@AtEndOfPackage{%
@@ -226,7 +226,7 @@
\KOMA@kav@replacebool{.scrlayer.sty}{autoremoveinterfaces}
{scrlayer@autoremoveinterfaces}%
}
-%%% From File: $Id: scrlayer-scrpage.dtx 3017 2018-09-05 06:27:27Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $
%%% (run: options)
\KOMA@key{headwidth}{%
\begingroup
@@ -719,7 +719,7 @@
KV@KOMA.scrlayer-scrpage.sty@autoenlargeheadfoot@default}
\scrlayer@AddCsToInterface{sls@autoenlargetrue}
\scrlayer@AddCsToInterface{sls@autoenlargefalse}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\expandafter\let
@@ -791,7 +791,7 @@
\expandafter\let
\csname KV@KOMA.\@currname.\@currext @autoremoveinterfaces@default\endcsname
\relax
-%%% From File: $Id: scrlayer-scrpage.dtx 3017 2018-09-05 06:27:27Z kohm $
+%%% From File: $Id: scrlayer-scrpage.dtx 3141 2019-04-05 07:52:27Z kohm $
%%% (run: body)
\scrlayerAddToInterface\setheadwidth{%
\newcommand*{\setheadwidth}[2][]{%
@@ -974,6 +974,9 @@
\fi
\fi
}
+\@ifundefined{LaTeXcentering}{\let\LaTeXcentering\centering}{}
+\@ifundefined{LaTeXraggedleft}{\let\LaTeXraggedleft\raggedleft}{}
+\@ifundefined{LaTeXraggedright}{\let\LaTeXraggedright\raggedright}{}
\scrlayerAddToInterface\defpagestyle{%
\newcommand*{\defpagestyle}[3]{%
\sls@defhead{#1}#2\@empty\@empty\@empty
@@ -1611,48 +1614,48 @@
\newcommand*{\sls@def@pair@page@style@member}[1]{%
\defpagestyle{#1}{%
{%
- \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright
\strut\@nameuse{sls@ps@#1@even@left@head}\strut}}%
- \parbox{\sls@headwidth}{\centering
+ \parbox{\sls@headwidth}{\LaTeXcentering
\strut\@nameuse{sls@ps@#1@even@middle@head}\strut}%
- \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft
\strut\@nameuse{sls@ps@#1@even@right@head}\strut}}%
}{%
- \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright
\strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}%
- \parbox{\sls@headwidth}{\centering
+ \parbox{\sls@headwidth}{\LaTeXcentering
\strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}%
- \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft
\strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}%
}{%
- \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@headwidth}{\LaTeXraggedright
\strut\@nameuse{sls@ps@#1@odd@left@head}\strut}}%
- \parbox{\sls@headwidth}{\centering
+ \parbox{\sls@headwidth}{\LaTeXcentering
\strut\@nameuse{sls@ps@#1@odd@middle@head}\strut}%
- \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@headwidth}{\LaTeXraggedleft
\strut\@nameuse{sls@ps@#1@odd@right@head}\strut}}%
}%
}{%
{%
- \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright
\strut\@nameuse{sls@ps@#1@even@left@foot}\strut}}%
- \parbox{\sls@footwidth}{\centering
+ \parbox{\sls@footwidth}{\LaTeXcentering
\strut\@nameuse{sls@ps@#1@even@middle@foot}\strut}%
- \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft
\strut\@nameuse{sls@ps@#1@even@right@foot}\strut}}%
}{%
- \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright
\strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}%
- \parbox{\sls@footwidth}{\centering
+ \parbox{\sls@footwidth}{\LaTeXcentering
\strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}%
- \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft
\strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}%
}{%
- \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\raggedright
+ \makebox[0pt][\IfRTL{r}{l}]{\parbox{\sls@footwidth}{\LaTeXraggedright
\strut\@nameuse{sls@ps@#1@odd@left@foot}\strut}}%
- \parbox{\sls@footwidth}{\centering
+ \parbox{\sls@footwidth}{\LaTeXcentering
\strut\@nameuse{sls@ps@#1@odd@middle@foot}\strut}%
- \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\raggedleft
+ \makebox[0pt][\IfRTL{l}{r}]{\parbox{\sls@footwidth}{\LaTeXraggedleft
\strut\@nameuse{sls@ps@#1@odd@right@foot}\strut}}%
}%
}%
@@ -1741,10 +1744,10 @@
\newcommand*{\@ihead}{\kernel@ifnextchar[{\@@@ihead}{\@@ihead}}%
}
\scrlayerAddToInterface\@@ihead{%
- \newcommand*{\@@ihead}[1]{\rehead{#1}\lohead{#1}}%
+ \newcommand{\@@ihead}[1]{\rehead{#1}\lohead{#1}}%
}
\scrlayerAddToInterface\@@@ihead{%
- \newcommand*{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}%
+ \newcommand{\@@@ihead}[2][]{\rehead[{#1}]{#2}\lohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\ohead{%
\newcommand*{\ohead}{\kernel@ifstar {\@dblarg\@@@ohead}{\@ohead}}%
@@ -1753,10 +1756,10 @@
\newcommand*{\@ohead}{\kernel@ifnextchar[{\@@@ohead}{\@@ohead}}%
}
\scrlayerAddToInterface\@@ohead{%
- \newcommand*{\@@ohead}[1]{\lehead{#1}\rohead{#1}}%
+ \newcommand{\@@ohead}[1]{\lehead{#1}\rohead{#1}}%
}
\scrlayerAddToInterface\@@@ohead{%
- \newcommand*{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}%
+ \newcommand{\@@@ohead}[2][]{\lehead[{#1}]{#2}\rohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\chead{%
\newcommand*{\chead}{\kernel@ifstar {\@dblarg\@@@chead}{\@chead}}%
@@ -1765,10 +1768,10 @@
\newcommand*{\@chead}{\kernel@ifnextchar[{\@@@chead}{\@@chead}}%
}
\scrlayerAddToInterface\@@chead{%
- \newcommand*{\@@chead}[1]{\cehead{#1}\cohead{#1}}%
+ \newcommand{\@@chead}[1]{\cehead{#1}\cohead{#1}}%
}
\scrlayerAddToInterface\@@@chead{%
- \newcommand*{\@@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}%
+ \newcommand{\@@@chead}[2][]{\cehead[{#1}]{#2}\cohead[{#1}]{#2}}%
}
\scrlayerAddToInterface\lehead{%
\newcommand*{\lehead}{\sls@renewelement{even}{left}{head}}%
@@ -1795,10 +1798,10 @@
\newcommand*{\@ifoot}{\kernel@ifnextchar[{\@@@ifoot}{\@@ifoot}}%
}
\scrlayerAddToInterface\@@ifoot{%
- \newcommand*{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}%
+ \newcommand{\@@ifoot}[1]{\refoot{#1}\lofoot{#1}}%
}
\scrlayerAddToInterface\@@@ifoot{%
- \newcommand*{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}%
+ \newcommand{\@@@ifoot}[2][]{\refoot[{#1}]{#2}\lofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\ofoot{%
\newcommand*{\ofoot}{\kernel@ifstar {\@dblarg\@@@ofoot}{\@ofoot}}%
@@ -1807,10 +1810,10 @@
\newcommand*{\@ofoot}{\kernel@ifnextchar[{\@@@ofoot}{\@@ofoot}}%
}
\scrlayerAddToInterface\@@ofoot{%
- \newcommand*{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}%
+ \newcommand{\@@ofoot}[1]{\lefoot{#1}\rofoot{#1}}%
}
\scrlayerAddToInterface\@@@ofoot{%
- \newcommand*{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}%
+ \newcommand{\@@@ofoot}[2][]{\lefoot[{#1}]{#2}\rofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\cfoot{%
\newcommand*{\cfoot}{\kernel@ifstar {\@dblarg\@@@cfoot}{\@cfoot}}%
@@ -1819,10 +1822,10 @@
\newcommand*{\@cfoot}{\kernel@ifnextchar[{\@@@cfoot}{\@@cfoot}}%
}
\scrlayerAddToInterface\@@cfoot{%
- \newcommand*{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}%
+ \newcommand{\@@cfoot}[1]{\cefoot{#1}\cofoot{#1}}%
}
\scrlayerAddToInterface\@@@cfoot{%
- \newcommand*{\@@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}%
+ \newcommand{\@@@cfoot}[2][]{\cefoot[{#1}]{#2}\cofoot[{#1}]{#2}}%
}
\scrlayerAddToInterface\lefoot{%
\newcommand*{\lefoot}{\sls@renewelement{even}{left}{foot}}%
@@ -1856,7 +1859,7 @@
}%
}
\scrlayerAddToInterface\sls@@@renewelement{%
- \newcommand*{\sls@@@renewelement}[4]{%
+ \newcommand{\sls@@@renewelement}[4]{%
\scr@ifundefinedorrelax{sls@ps@\sls@currentheadings @#1@#2@#3}{%
\@namedef{sls@ps@scrheadings@#1@#2@#3}{#4}%
}{%
@@ -1865,13 +1868,13 @@
}%
}
\scrlayerAddToInterface\sls@@@@renewelement{%
- \def\sls@@@@renewelement#1#2#3[#4]#5{%
+ \long\def\sls@@@@renewelement#1#2#3[#4]#5{%
\sls@@renewplainelement{#1}{#2}{#3}{#4}%
\sls@@@renewelement{#1}{#2}{#3}{#5}%
}%
}
\scrlayerAddToInterface\sls@@renewplainelement{%
- \newcommand*{\sls@@renewplainelement}[4]{%
+ \newcommand{\sls@@renewplainelement}[4]{%
\scr@ifundefinedorrelax{sls@ps@\sls@currentplain @#1@#2@#3}{%
\@namedef{sls@ps@plain.scrheadings@#1@#2@#3}{#4}%
}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
index b09b2348253..f49b2b25d7b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlayer.sty
@@ -11,7 +11,7 @@
%% scrlayer.dtx (with options: `package,trace,scrlayer,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2012-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2012-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,18 +39,18 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{scrlayer}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(defining layers and page styles)]
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: init)
\RequirePackage{scrkbase}[2013/03/05]
\scr@ifundefinedorrelax{scrlayer@AtEndOfPackage}{%
@@ -115,7 +115,7 @@
\setlength{\footheight}{\baselineskip}
\fi
}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: options)
\KOMA@key{markcase}{%
\begingroup
@@ -281,7 +281,7 @@
\KOMA@ifkey{draft}{scrlayer@draft}
\KOMA@ifkey{forceoverwrite}{scrlayer@forceoverwrite}
\KOMA@ifkey{autoremoveinterfaces}{scrlayer@autoremoveinterfaces}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: body)
\KOMAProcessOptions\relax
\newcommand*{\rightfirstmark}{\expandafter\@rightmark\firstmark\@empty\@empty}
@@ -421,7 +421,7 @@
\else\if@mainmatter \csname #1markformat\endcsname\fi\fi
##1%
}%
- }\@empty
+ }{}%
}%
}{}%
}
@@ -2258,7 +2258,7 @@
\@ifundefined{scrlayer@#1@onremove}{\@namedef{scrlayer@#1@onremove}{}}{}%
\expandafter\l@addto@macro\csname scrlayer@#1@onremove\endcsname{#2}%
}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: final)
\DeclareNewPageStyleByLayers{@everystyle@}{}
\RedeclarePageStyleByLayers{empty}{}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.cls b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls
new file mode 100644
index 00000000000..91f6684278a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.cls
@@ -0,0 +1,90 @@
+%%
+%% This is file `scrletter.cls',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `class,letter,long')
+%%
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
+%% 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 $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+\endgroup
+\providecommand*{\scr@clsextension}{\@clsextension}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
+\newcommand*{\KOMAClassName}{%
+ scrartcl%
+}
+\newcommand*{\ClassName}{%
+ article%
+}
+\newcommand*{\KOMALongClassName}{}
+\def\KOMALongClassName{scrletter}
+\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
+\edef\KOMALongClassFileName{\KOMALongClassFileName}
+\ProvidesClass{\KOMALongClassName}[%
+ 2019/10/12 v3.27 KOMA-Script
+ document class (\ClassName)%
+]
+\let\ClassName\relax
+\providecommand*{\@ptsize}{12}
+\expandafter\let\expandafter\KOMAClassName\expandafter\relax
+\expandafter\LoadClassWithOptions\expandafter{\KOMAClassName}
+\RequirePackage{scrletter}
+\endinput
+%%
+%% End of file `scrletter.cls'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
index 7919eec60fd..86b25a5dc81 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrletter.sty
@@ -7,7 +7,6 @@
%% scrkernel-version.dtx (with options: `package,letter')
%% scrkernel-basics.dtx (with options: `load')
%% scrkernel-miscellaneous.dtx (with options: `package,letter,init')
-%% scrkernel-compatibility.dtx (with options: `package,letter,init')
%% scrkernel-typearea.dtx (with options: `package,letter,init')
%% scrkernel-miscellaneous.dtx (with options: `package,letter,option')
%% scrkernel-letterclassoptions.dtx (with options: `package,letter,option')
@@ -30,7 +29,7 @@
%% scrkernel-circularletters.dtx (with options: `package,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -58,11 +57,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -84,20 +83,20 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
\ProvidesPackage{scrletter}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
letter package extending any KOMA-Script class%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\scr@ifundefinedorrelax{KOMAClassName}{%
\PackageWarningNoLine{scrletter}{%
@@ -121,85 +120,11 @@
}
\providecommand*{\par@updaterelative}{}
}{}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
-\providecommand*
- {\scr@compatibility}{\scr@v@last}
-\@namedef{scr@v@first}{0}
-\@namedef{scr@v@2.9}{0}
-\@namedef{scr@v@2.9t}{0}
-\@namedef{scr@v@2.9u}{1}
-\@namedef{scr@v@2.95}{2}
-\@namedef{scr@v@2.95a}{2}
-\@namedef{scr@v@2.95b}{2}
-\@namedef{scr@v@2.96}{2}
-\@namedef{scr@v@2.96a}{3}
-\@namedef{scr@v@2.97}{3}
-\@namedef{scr@v@2.97a}{3}
-\@namedef{scr@v@2.97b}{3}
-\@namedef{scr@v@2.97c}{4}
-\@namedef{scr@v@2.97d}{5}
-\@namedef{scr@v@2.97e}{6}
-\@namedef{scr@v@2.98}{6}
-\@namedef{scr@v@2.98a}{6}
-\@namedef{scr@v@2.98b}{6}
-\@namedef{scr@v@2.98c}{7}
-\@namedef{scr@v@3.00}{8}
-\@namedef{scr@v@3.01}{8}
-\@namedef{scr@v@3.01a}{8}
-\@namedef{scr@v@3.01b}{9}
-\@namedef{scr@v@3.01c}{9}
-\@namedef{scr@v@3.02}{9}
-\@namedef{scr@v@3.02b}{9}
-\@namedef{scr@v@3.02c}{10}
-\@namedef{scr@v@3.03}{10}
-\@namedef{scr@v@3.03a}{10}
-\@namedef{scr@v@3.03b}{10}
-\@namedef{scr@v@3.04}{10}
-\@namedef{scr@v@3.04a}{10}
-\@namedef{scr@v@3.05}{10}
-\@namedef{scr@v@3.05a}{10}
-\@namedef{scr@v@3.06}{10}
-\@namedef{scr@v@3.07}{10}
-\@namedef{scr@v@3.08}{10}
-\@namedef{scr@v@3.08a}{10}
-\@namedef{scr@v@3.08b}{10}
-\@namedef{scr@v@3.09}{10}
-\@namedef{scr@v@3.09a}{10}
-\@namedef{scr@v@3.10}{10}
-\@namedef{scr@v@3.10a}{10}
-\@namedef{scr@v@3.10b}{10}
-\@namedef{scr@v@3.11}{10}
-\@namedef{scr@v@3.11a}{10}
-\@namedef{scr@v@3.11b}{10}
-\@namedef{scr@v@3.12}{11}
-\@namedef{scr@v@3.13}{12}
-\@namedef{scr@v@3.13a}{13}
-\@namedef{scr@v@3.14}{13}
-\@namedef{scr@v@3.15}{14}
-\@namedef{scr@v@3.16}{14}
-\@namedef{scr@v@3.17}{15}
-\@namedef{scr@v@3.17a}{15}
-\@namedef{scr@v@3.17c}{15}
-\@namedef{scr@v@3.18}{15}
-\@namedef{scr@v@3.18a}{15}
-\@namedef{scr@v@3.19}{15}
-\@namedef{scr@v@3.19a}{15}
-\@namedef{scr@v@3.20}{15}
-\@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@3.25}{17}
-\@namedef{scr@v@3.26}{17}
-\@namedef{scr@v@3.26a}{17}
-\@namedef{scr@v@3.26b}{17}
-\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
-%%% (run: init)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -217,7 +142,7 @@
}
\AtEndOfPackage
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
@@ -233,15 +158,15 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -469,6 +394,7 @@
\expandafter\in@@#1#2\in@\in@@
}
\newif\if@refwide
+\newif\if@refline\@reflinetrue
\newcommand*{\@datepos}{1}
\KOMA@key{refline}[wide]{%
\begingroup
@@ -476,12 +402,15 @@
{dateleft}{2},{leftdate}{2},%
{dateright}{3},{rightdate}{3},%
{nodate}{4}%
+ ,{no}{5},{off}{5},{false}{5}%
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
- \ifcase\@tempa
+ \ifcase\@tempa% wide
\endgroup
\@refwidetrue
+ \@reflinetrue
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{false}%
\KOMA@kav@remove{.%
scrletter.\scr@pkgextension
}{refline}{wide}%
@@ -491,9 +420,11 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{wide}%
- \or
+ \or% narrow
\endgroup
\@refwidefalse
+ \@reflinetrue
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{false}%
\KOMA@kav@remove{.%
scrletter.\scr@pkgextension
}{refline}{wide}%
@@ -503,7 +434,7 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{narrow}%
- \or
+ \or% dateleft
\endgroup
\def\@datepos{2}%
\KOMA@kav@remove{.%
@@ -518,7 +449,7 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{dateleft}%
- \or
+ \or% dateright
\endgroup
\def\@datepos{1}%
\KOMA@kav@remove{.%
@@ -533,7 +464,7 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{dateright}%
- \or
+ \or% nodate
\endgroup
\def\@datepos{0}%
\KOMA@kav@remove{.%
@@ -548,6 +479,12 @@
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{refline}{nodate}%
+ \or% false
+ \endgroup
+ \@reflinefalse
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{refline}{wide}%
+ \KOMA@kav@remove{.scrletter.\scr@pkgextension}{reline}{narrow}%
+ \KOMA@kav@add{.scrletter.\scr@pkgextension}{refline}{false}%
\fi
\else
\endgroup
@@ -710,68 +647,103 @@
\newif\if@scrsymbols
\KOMA@key{symbolicnames}[true]{%
\KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
- \KOMA@kav@replacebool{.%
- scrletter.\scr@pkgextension
- }{symbolicnames}{@scrsymbols}%
- \if@scrsymbols
- \if@atdocument
- \begingroup
- \@tempswafalse
- \scr@ifundefinedorrelax{Telefon}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{FAX}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Email}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Mobilefone}{\@tempswatrue}{%
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \KOMA@set@ncmdkey{symbolicnames}{reserved@a}{%
+ {marvosym}{0},%
+ {fontawesome}{1},{awesome}{1},%
+ }{#1}%
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \@scrsymbolstrue
+ \ifcase \number\reserved@a
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \def\scr@symbols@font{fontawesome}%
+ \fi
+ \fi
+ \fi
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ scrletter.\scr@pkgextension
+ }{symbolicnames}{#1}%
+ \if@scrsymbols
+ \ifstr{\scr@symbols@font}{marvosym}{%
+ \def\scr@symbol@phone{\Telefon}%
+ \def\scr@symbol@fax{\FAX}%
+ \def\scr@symbol@email{\Email}%
+ \def\scr@symbol@mobilephone{\Mobilefone}%
+ \def\scr@symbol@www{\@empty}%
+ }{%
+ \def\scr@symbol@phone{\faPhone}%
+ \def\scr@symbol@fax{\faFax}%
+ \def\scr@symbol@email{\faEnvelopeO}%
+ \def\scr@symbol@mobilephone{\faMobilePhone}%
+ \def\scr@symbol@www{\faGlobe}%
+ }%
+ \if@atdocument
+ \begingroup
+ \@tempswafalse
+ \expandafter\ifdefined\scr@symbol@phone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@fax\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@email\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@mobilephone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@www\else\@tempswatrue\fi
+ \if@tempswa
+ \aftergroup\@scrsymbolsfalse
+ \PackageWarning{scrletter}{%
+ Option `symbolicnames=#1'
+ ignorred.\MessageBreak
+ You've tried to set option `symbolicnames'\MessageBreak
+ after \string\begin{document}, but without\MessageBreak
+ loading package `\scr@symbols@font' before.\MessageBreak
+ You should either switch on option\MessageBreak
+ `symbolicnames' before \string\begin{document}\MessageBreak
+ or load package `\scr@letter@symbols@font' in the
+ document\MessageBreak
+ preamble to avoid this warning%
}%
- }%
- }%
- \if@tempswa
- \aftergroup\@scrsymbolsfalse
- \PackageWarning{scrletter}{%
- Option `symbolicnames'
- ignorred.\MessageBreak
- You've tried to set option `symbolicnames'\MessageBreak
- after \string\begin{document}, but without\MessageBreak
- loading package `marvosym' before.\MessageBreak
- You should either switch on option\MessageBreak
- `symbolicnames' before \string\begin{document}\MessageBreak
- or load package `marvosym' in the document\MessageBreak
- preamble to avoid this warning%
- }%
- \fi
- \endgroup
- \else
- \ifx\@fileswith@pti@ns\@badrequireerror
- \ifstr{\@currext}{\@clsextension}{%
- \expandafter\AtEndOfClass
- }{%
- \ifstr{\@currext}{\@pksextension}{%
- \expandafter\AtEndOfPackage
+ \fi
+ \endgroup
+ \else
+ \ifx\@fileswith@pti@ns\@badrequireerror
+ \ifstr{\@currext}{\@clsextension}{%
+ \expandafter\AtEndOfClass
}{%
- \expandafter\AtBeginDocument
+ \ifstr{\@currext}{\@pkgextension}{%
+ \expandafter\AtEndOfPackage
+ }{%
+ \expandafter\AtBeginDocument
+ }%
}%
- }%
- \else
- \expandafter\@firstofone
+ \else
+ \expandafter\@firstofone
+ \fi
+ {\RequirePackage{\scr@symbols@font}}%
\fi
- {\RequirePackage{marvosym}}%
\fi
\fi
}
\KOMA@kav@add{.%
scrletter.\scr@pkgextension
}{symbolicnames}{false}%
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+\newcommand*{\scr@symbols@font}{}
+\newcommand*{\scr@symbol@phone}{\undefined}
+\newcommand*{\scr@symbol@fax}{\undefined}
+\newcommand*{\scr@symbol@email}{\undefined}
+\newcommand*{\scr@symbol@mobilephone}{\undefined}
+\newcommand*{\scr@symbol@www}{\undefined}
+%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\providecommand*{\scr@endstrut}{\unskip\ifhmode\nobreak\strut\fi}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -943,7 +915,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
@@ -1024,7 +996,7 @@
english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\bankname{Bank account}%
\g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
- \g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{australian}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
\g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
@@ -1514,7 +1486,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
@@ -1641,8 +1613,52 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+\newcommand*{\foreachkomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{\unexpanded{#2}{\reserved@a}}\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachkomavarifempty}[3]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}%
+ {\unexpanded{#2}{\reserved@a}}%
+ {\unexpanded{#3}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachnonemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
+\newcommand*{\if@plength}[1]{%
+ \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}%
+}
+\newcommand*{\Ifplength}{\if@plength}
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -1652,11 +1668,10 @@
pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
already defined%
}{%
- You tried to define a new pseudo-length using
- \string\@newplength\MessageBreak
- which is already defined. Try another name or
- better\MessageBreak
- Don't use this KOMA-Script internal macro}%
+ You've tried to define a new pseudo-length using\MessageBreak
+ \string\@newplength\space
+ or \string\newplength.\MessageBreak
+ Please, try another name}%
}%
}
\newcommand*{\newplength}{\@newplength}
@@ -1737,7 +1752,7 @@
\@tempa%
}
\newcommand*{\addtoplength}{\@addtoplength}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{%
\letterpagemark
@@ -1769,7 +1784,7 @@
\rofoot[\ifnum\@pageat=5 \pagemark\fi]%
{}%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newkomavar{firsthead}
\setkomavar{firsthead}{%
@@ -1781,7 +1796,6 @@
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
\ifkomavarempty{fromaddress}{}{%
- \csname scr@default@firsthead@fromaddress@hook\endcsname
\ignorespaces\usekomavar{fromaddress}%
}%
}%
@@ -2027,7 +2041,7 @@
\ignorespaces%
}
\newcommand{\vb@t@z}[1]{{%
- \setbox\z@\vbox to\z@{#1\vss}%
+ \setbox\z@\vbox to\z@{\color@begingroup #1\color@endgroup\vss}%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\setlength{\baselineskip}{\z@}%
\setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
@@ -2065,26 +2079,9 @@
}
\newcommand*{\@vfoldmark}[1]{%
\begingroup
- \@expandtwoargs\in@{#1}{\@usefolds}%
- \ifin@
- \ifdim \useplength{lfoldmarkhpos}=\z@\else
- \vb@t@z{%
- \ifdim \useplength{foldmarkvpos}<\z@
- \nobreak\vskip \paperheight\nobreak
- \fi
- \vskip \useplength{foldmarkvpos}%
- \vskip \useplength{foldmarkthickness}%
- \rlap{\move@topl
- \setlength{\@tempdima}{\useplength{lfoldmarkhpos}}%
- \addtolengthplength[-.5]{\@tempdima}{foldmarkthickness}%
- \hskip\@tempdima
- \usekomafont{foldmark}{%
- \rule{\useplength{foldmarkthickness}}%
- {\useplength{lfoldmarklength}}%
- }%
- }%
- }%
- \ignorespaces
+ \ifdim \useplength{lfoldmarkhpos}=\z@\else
+ \@expandtwoargs\in@{#1}{\@usefolds}%
+ \ifin@
\fi
\fi
\endgroup
@@ -2128,7 +2125,7 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox\z@\vbox{#3}%
+ \setbox\z@\vbox{\color@begingroup #3\color@endgroup}%
\setlength{\@tempdima}{#2}%
\setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
\ifdim \@tempdimb>\@tempdima%
@@ -2498,7 +2495,7 @@
\fi
\ifkomavarempty{location}{%
\typeout{Location field: empty}%
- }{%
+ }{%
\typeout{Location field: yes}%
\ifdim \useplength{lochpos}=\z@%
\@setplength{lochpos}{\useplength{toaddrhpos}}%
@@ -2655,7 +2652,8 @@
\addtoreffields{invoice}%
}
\defaultreffields
-\newcommand*{\@datefield}{{%
+\newcommand*{\@datefield}{%
+ {%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\ifdim\useplength{refwidth}=\z@
\if@refwide
@@ -2828,13 +2826,27 @@
\fi
}
\newenvironment{letter}[2][]{%
+ \if@twocolumn
+ \PackageWarning{scrletter}{%
+ twocolumn mode not supported.\MessageBreak
+ If you really want a twocolumned letter, you should\MessageBreak
+ use package `multicol' and add a `multicols'\MessageBreak
+ environment inside your letter.\MessageBreak
+ Switching back to oneside%
+ }%
+ \letter@restonecoltrue
+ \expandafter\onecolumn
+ \else
+ \letter@restonecolfalse
+ \fi
\cleardoubleoddemptypage
+ \raggedbottom
\scr@ifundefinedorrelax{letterpagestyle}{}{%
\ifx\letterpagestyle\@empty\else
\pagestyle{\letterpagestyle}%
\fi
}%
-\let\pagemark\letterpagemark
+ \let\pagemark\letterpagemark
\refstepcounter{letter}%
\let\thisletter\@currentlabel
\setcounter{page}{\@ne}%
@@ -2847,19 +2859,27 @@
\let\@currentlabel\thisletter
\label{\thisletter.lastpage}%
\@@par\pagebreak\@@par%
+ \ifletter@restonecol\twocolumn\fi
}
+\newif\ifletter@restonecol
\newcommand*{\thisletter}{outside.letter.undefined}
\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}}
\newcommand*{\stopletter}{}
\newcommand{\@processto}[1]{%
- \ifx\relax#1\relax\else
- \expandafter\@xproc#1\\\@nil\ifkomavarempty{toaddress}{}{%
- \expandafter\@xproc#1\@nil}%
- \fi
+ \IfArgIsEmpty{#1}{%
+ }{%
+ \expandafter\@xproc#1\\\@nil
+ \ifx\reserved@b\@empty\else\expandafter\@xproc#1\@nil\fi
+ \protected@edef\reserved@a{%
+ \noexpand\setkomavar{toname}{\reserved@a}%
+ \noexpand\setkomavar{toaddress}{\reserved@b}%
+ }\reserved@a
+ }%
}
\newcommand*{\@xproc}{}
\long\def\@xproc#1\\#2\@nil{%
- \setkomavar{toname}{#1}\setkomavar{toaddress}{#2}}
+ \def\reserved@a{#1}\def\reserved@b{#2}%
+}
\g@addto@macro\flushbottom{%
\g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}%
}
@@ -2885,8 +2905,10 @@
\@PapersizeWarning
\@gen@firsthead
\@mkboth{\scr@fromname@var}{\scr@subject@var}%
- \thispagestyle{empty}\noindent
- \@foldmarks\@firstheadfootfield\@addrfield\@locfield
+ \thispagestyle{empty}%
+ \noindent
+ \@foldmarks\@firstheadfootfield
+ \@addrfield\@locfield
\ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
\@datefield
\@makelettertitle
@@ -2981,17 +3003,17 @@
\setkomavar{enclseparator}{: }
\newkomavar{backaddressseparator}
\setkomavar{backaddressseparator}{,\nobreakspace}
-\newkomavar[\if@scrsymbols\Telefon\else\phonename\fi]{phoneseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@phone\else\phonename\fi]{phoneseparator}
\setkomavar{phoneseparator}{\if@scrsymbols\else:\fi\nobreakspace}
\newkomavar[%
- \if@scrsymbols\Mobilefone\else\mobilephonename\fi
+ \if@scrsymbols\scr@symbol@mobilephone\else\mobilephonename\fi
]{mobilephoneseparator}
\setkomavar{mobilephoneseparator}{\usekomavar{phoneseparator}}
-\newkomavar[\if@scrsymbols\FAX\else\faxname\fi]{faxseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@fax\else\faxname\fi]{faxseparator}
\setkomavar{faxseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\Email\else\emailname\fi]{emailseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@email\else\emailname\fi]{emailseparator}
\setkomavar{emailseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\else\wwwname\fi]{urlseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@www\else\wwwname\fi]{urlseparator}
\setkomavar{urlseparator}{\if@scrsymbols\else:\nobreakspace\fi}
\newkomavar{zipcodeseparator}
\setkomavar{zipcodeseparator}{\,--\,}
@@ -3034,7 +3056,7 @@
}%
\scr@saved@date{#1}%
}
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
index ea3c70aa091..8f21ce83202 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlfile.sty
@@ -7,7 +7,7 @@
%% scrlfile.dtx (with options: `scrlfile')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2002-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2002-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -35,21 +35,36 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrlfile.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrlfile.dtx 3243 2019-10-07 13:32:53Z kohm $
\ProvidesPackage{scrlfile}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(loading files)]
\ExecuteOptions{}
\ProcessOptions\relax
-\CheckCommand{\InputIfFileExists}[2]{%
+\long\def\reserved@a#1#2{%
\IfFileExists{#1}%
- {#2\@addtofilelist{#1}\@@input \@filef@und}}
-\renewcommand{\InputIfFileExists}[2]{%
+ {#2\@addtofilelist{#1}\@@input \@filef@und}}%
+\ifx\reserved@a\InputIfFileExists\else
+ \expandafter\CheckCommand\expandafter*\expandafter\InputIfFileExists
+ \expandafter{%
+ \expandafter\protect\csname InputIfFileExists \endcsname
+ }%
+ \expandafter\CheckCommand \csname InputIfFileExists \endcsname[2]{%
+ \IfFileExists {#1}{%
+ \expandafter \@swaptwoargs \expandafter {\@filef@und }%
+ {#2\@addtofilelist {#1}\@@input }%
+ }%
+ }%
+\fi
+\expandafter\renewcommand\expandafter*\expandafter\InputIfFileExists
+\expandafter{\expandafter
+ \protect\csname InputIfFileExists \endcsname}%
+\expandafter\long\expandafter\def\csname InputIfFileExists \endcsname#1#2{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname #1-@alias\endcsname\relax
\expandafter\@secondoftwo
@@ -62,12 +77,15 @@
#1-@alias\endcsname}{#2}%
}%
{\IfFileExists{#1}{%
- \scr@load@hook{before}{#1}%
- #2\@addtofilelist{#1}%
- \@@input \@filef@und
- \scr@load@hook{after}{#1}%
+ \expandafter\scr@input@withhook\expandafter{\@filef@und}{#1}{#2}%
}}%
}
+\newcommand{\scr@input@withhook}[3]{%
+ \scr@load@hook{before}{#2}%
+ #3\@addtofilelist{#2}%
+ \@@input #1%
+ \scr@load@hook{after}{#2}%
+}%
\newcommand*{\scr@@loadwithoptions}{}
\newcommand*{\scr@loadwithoptions}{}
\let\scr@loadwithoptions\@loadwithoptions
@@ -160,11 +178,12 @@
}%
}
\newcommand*{\@@@AfterClass}[2]{%
- \begingroup\ifx\csname #2.\@clsextension-h@@k\endcsname\relax
- \aftergroup\@sAfterClass
- \else
- \aftergroup\AfterAtEndOfClass
- \fi
+ \begingroup
+ \expandafter\ifx\csname #2.\@clsextension-h@@k\endcsname\relax
+ \aftergroup\@sAfterClass
+ \else
+ \aftergroup\AfterAtEndOfClass
+ \fi
\endgroup{#2}%
}
\newcommand*{\AfterAtEndOfClass}[1]{%
@@ -200,11 +219,12 @@
}%
}
\newcommand*{\@@@AfterPackage}[2]{%
- \begingroup\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax
- \aftergroup\@sAfterPackage
- \else
- \aftergroup\AfterAtEndOfPackage
- \fi
+ \begingroup
+ \expandafter\ifx\csname #2.\@pkgextension-h@@k\endcsname\relax
+ \aftergroup\@sAfterPackage
+ \else
+ \aftergroup\AfterAtEndOfPackage
+ \fi
\endgroup{#2}%
}
\newcommand*{\AfterAtEndOfPackage}[1]{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
index 76ff91f260d..9bda6855229 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrlttr2.cls
@@ -41,7 +41,7 @@
%% scrkernel-circularletters.dtx (with options: `class,letter,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -69,11 +69,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -95,7 +95,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -104,19 +104,19 @@
\newcommand*{\KOMAClassName}{%
scrlttr2%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
letter%
}
-\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
-\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -189,10 +189,11 @@
\@namedef{scr@v@3.26}{17}
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
+\@namedef{scr@v@3.27}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -242,7 +243,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -296,7 +297,7 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\lco@test}{%
\IfFileExists{\CurrentOption.lco}{%
@@ -314,7 +315,7 @@
}
\AtEndOfClass
{\LoadLetterOption{DIN}}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@orgdate\@orgdatetrue
\KOMA@key{numericaldate}[true]{%
@@ -330,9 +331,9 @@
}{orgdate}{true}
\KOMA@DeclareDeprecatedOption{scrdate}{numericaldate=true}
\KOMA@DeclareDeprecatedOption{orgdate}{numericaldate=false}
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-\newcommand*\@ptsize{%
+\providecommand*\@ptsize{%
12%
}
\newcommand*{\@pt@scan}{%
@@ -416,11 +417,11 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -435,7 +436,10 @@
}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
- \raggedbottom
+ \if@twoside\flushbottom
+ \else
+ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi
+ \fi
\fi
\KOMA@kav@xreplacevalue{.%
\KOMAClassFileName
@@ -457,7 +461,12 @@
{\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
+ \else
+ \onecolumn
+ \if@twoside\flushbottom\else
+ \raggedbottom
+ \fi
+ \fi
\fi}%
\fi
}
@@ -529,7 +538,7 @@
\DeclareOption*{%
\lco@test
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -695,7 +704,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
@@ -800,9 +809,9 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -873,9 +882,9 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{firsthead}{@firsthead}
\KOMAExecuteOptions{firsthead=true}
@@ -1143,7 +1152,7 @@
}{#1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\aftergroup\FamilyKeyStateProcessed
- \ifcase\@tempa
+ \ifcase\@tempa% wide
\endgroup
\@refwidetrue
\KOMA@kav@remove{.%
@@ -1155,7 +1164,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{wide}%
- \or
+ \or% narrow
\endgroup
\@refwidefalse
\KOMA@kav@remove{.%
@@ -1167,7 +1176,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{narrow}%
- \or
+ \or% dateleft
\endgroup
\def\@datepos{2}%
\KOMA@kav@remove{.%
@@ -1182,7 +1191,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{dateleft}%
- \or
+ \or% dateright
\endgroup
\def\@datepos{1}%
\KOMA@kav@remove{.%
@@ -1197,7 +1206,7 @@
\KOMA@kav@add{.%
\KOMAClassFileName
}{refline}{dateright}%
- \or
+ \or% nodate
\endgroup
\def\@datepos{0}%
\KOMA@kav@remove{.%
@@ -1374,66 +1383,101 @@
\newif\if@scrsymbols
\KOMA@key{symbolicnames}[true]{%
\KOMA@set@ifkey{symbolicnames}{@scrsymbols}{#1}%
- \KOMA@kav@replacebool{.%
- \KOMAClassFileName
- }{symbolicnames}{@scrsymbols}%
- \if@scrsymbols
- \if@atdocument
- \begingroup
- \@tempswafalse
- \scr@ifundefinedorrelax{Telefon}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{FAX}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Email}{\@tempswatrue}{%
- \scr@ifundefinedorrelax{Mobilefone}{\@tempswatrue}{%
- }%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \KOMA@set@ncmdkey{symbolicnames}{reserved@a}{%
+ {marvosym}{0},%
+ {fontawesome}{1},{awesome}{1},%
+ }{#1}%
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \@scrsymbolstrue
+ \ifcase \number\reserved@a
+ \def\scr@symbols@font{marvosym}%
+ \else
+ \def\scr@symbols@font{fontawesome}%
+ \fi
+ \fi
+ \fi
+ \ifx \FamilyKeyState\FamilyKeyStateProcessed
+ \KOMA@kav@xreplacevalue{.%
+ \KOMAClassFileName
+ }{symbolicnames}{#1}%
+ \if@scrsymbols
+ \ifstr{\scr@symbols@font}{marvosym}{%
+ \def\scr@symbol@phone{\Telefon}%
+ \def\scr@symbol@fax{\FAX}%
+ \def\scr@symbol@email{\Email}%
+ \def\scr@symbol@mobilephone{\Mobilefone}%
+ \def\scr@symbol@www{\@empty}%
+ }{%
+ \def\scr@symbol@phone{\faPhone}%
+ \def\scr@symbol@fax{\faFax}%
+ \def\scr@symbol@email{\faEnvelopeO}%
+ \def\scr@symbol@mobilephone{\faMobilePhone}%
+ \def\scr@symbol@www{\faGlobe}%
+ }%
+ \if@atdocument
+ \begingroup
+ \@tempswafalse
+ \expandafter\ifdefined\scr@symbol@phone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@fax\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@email\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@mobilephone\else\@tempswatrue\fi
+ \expandafter\ifdefined\scr@symbol@www\else\@tempswatrue\fi
+ \if@tempswa
+ \aftergroup\@scrsymbolsfalse
+ \ClassWarning{\KOMAClassName}{%
+ Option `symbolicnames=#1'
+ ignorred.\MessageBreak
+ You've tried to set option `symbolicnames'\MessageBreak
+ after \string\begin{document}, but without\MessageBreak
+ loading package `\scr@symbols@font' before.\MessageBreak
+ You should either switch on option\MessageBreak
+ `symbolicnames' before \string\begin{document}\MessageBreak
+ or load package `\scr@letter@symbols@font' in the
+ document\MessageBreak
+ preamble to avoid this warning%
}%
- }%
- }%
- \if@tempswa
- \aftergroup\@scrsymbolsfalse
- \ClassWarning{scrlttr2}{%
- Option `symbolicnames'
- ignorred.\MessageBreak
- You've tried to set option `symbolicnames'\MessageBreak
- after \string\begin{document}, but without\MessageBreak
- loading package `marvosym' before.\MessageBreak
- You should either switch on option\MessageBreak
- `symbolicnames' before \string\begin{document}\MessageBreak
- or load package `marvosym' in the document\MessageBreak
- preamble to avoid this warning%
- }%
- \fi
- \endgroup
- \else
- \ifx\@fileswith@pti@ns\@badrequireerror
- \ifstr{\@currext}{\@clsextension}{%
- \expandafter\AtEndOfClass
- }{%
- \ifstr{\@currext}{\@pksextension}{%
- \expandafter\AtEndOfPackage
+ \fi
+ \endgroup
+ \else
+ \ifx\@fileswith@pti@ns\@badrequireerror
+ \ifstr{\@currext}{\@clsextension}{%
+ \expandafter\AtEndOfClass
}{%
- \expandafter\AtBeginDocument
+ \ifstr{\@currext}{\@pkgextension}{%
+ \expandafter\AtEndOfPackage
+ }{%
+ \expandafter\AtBeginDocument
+ }%
}%
- }%
- \else
- \expandafter\@firstofone
+ \else
+ \expandafter\@firstofone
+ \fi
+ {\RequirePackage{\scr@symbols@font}}%
\fi
- {\RequirePackage{marvosym}}%
\fi
\fi
}
\KOMA@kav@add{.%
\KOMAClassFileName
}{symbolicnames}{false}%
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+\newcommand*{\scr@symbols@font}{}
+\newcommand*{\scr@symbol@phone}{\undefined}
+\newcommand*{\scr@symbol@fax}{\undefined}
+\newcommand*{\scr@symbol@email}{\undefined}
+\newcommand*{\scr@symbol@mobilephone}{\undefined}
+\newcommand*{\scr@symbol@www}{\undefined}
+%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\expandafter\ifnum \@nameuse{scr@v@2.95}>\scr@compatibility\relax
\newcommand*{\@setif}[2][]{%
@@ -1446,7 +1490,7 @@
\expandafter\endgroup\@tempa
}%
\fi
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -1921,7 +1965,7 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\skip\@mpfootins}{\skip\footins}
\setlength\fboxsep{3\p@}
@@ -2033,7 +2077,7 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage'}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\LoadLetterOption}[1]{%
\@ifundefined{@restore@catcode@level}%
@@ -2207,7 +2251,7 @@
\newcommand*{\LetterOptionNeedsPapersize}[2]{%
\edef\LOPNP@size{#2}\edef\LOPNP@option{#1}%
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\g@addnumerical@date}[2]{%
\@ifundefined{date#1}{%
@@ -2288,7 +2332,7 @@
english,newzealand,%
UKenglish,ukenglish,USenglish,usenglish}\bankname{Bank account}%
\g@addnumerical@date{american}{\number\month/\number\day/\number\year}%
- \g@addnumerical@date{australien}{\number\day/\number\month/\number\year}%
+ \g@addnumerical@date{australian}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{british}{\number\day/\number\month/\number\year}%
\g@addnumerical@date{canadian}{\number\year/\number\month/\number\day}%
\g@addnumerical@date{english}{\number\day/\number\month/\number\year}%
@@ -2778,7 +2822,7 @@
\fi
\fi
}
-%%% From File: $Id: scrkernel-variables.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-variables.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\newkomavar}{%
\kernel@ifstar {\@tempswatrue\@newkomavar}{\@tempswafalse\@newkomavar}}
@@ -2905,8 +2949,52 @@
}%
\endgroup
}
-%%% From File: $Id: scrkernel-pseudolengths.dtx 2980 2018-04-26 12:06:09Z kohm $
+\newcommand*{\foreachkomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{\unexpanded{#2}{\reserved@a}}\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachkomavarifempty}[3]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}%
+ {\unexpanded{#2}{\reserved@a}}%
+ {\unexpanded{#3}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{\unexpanded{#2}{\reserved@a}}{}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+\newcommand*{\foreachnonemptykomavar}[2]{%
+ \@for \reserved@a:=#1\do{%
+ \scr@trim@spaces\reserved@a
+ \ifx\reserved@a\@empty\else
+ \edef\reserved@a{%
+ \noexpand\ifkomavarempty{\reserved@a}{}{\unexpanded{#2}{\reserved@a}}%
+ }\expandafter\reserved@a
+ \fi
+ }%
+}
+%%% From File: $Id: scrkernel-pseudolengths.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
+\newcommand*{\if@plength}[1]{%
+ \@ifundefined{ltr@len@#1}{\@secondoftwo}{\@firstoftwo}%
+}
+\newcommand*{\Ifplength}{\if@plength}
\newcommand*{\@newplength}[1]{%
\@ifundefined{ltr@len@#1}{%
\expandafter\let\csname ltr@len@#1\endcsname=\z@%
@@ -2916,11 +3004,10 @@
pseudo-length \expandafter\string\csname ltr@len@#1\endcsname
already defined%
}{%
- You tried to define a new pseudo-length using
- \string\@newplength\MessageBreak
- which is already defined. Try another name or
- better\MessageBreak
- Don't use this KOMA-Script internal macro}%
+ You've tried to define a new pseudo-length using\MessageBreak
+ \string\@newplength\space
+ or \string\newplength.\MessageBreak
+ Please, try another name}%
}%
}
\newcommand*{\newplength}{\@newplength}
@@ -3001,7 +3088,7 @@
\@tempa%
}
\newcommand*{\addtoplength}{\@addtoplength}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -3013,7 +3100,7 @@
\let\x@@paper =\relax
\let\scr@pti@nerr@r =\relax
\RequirePackage{typearea}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -3131,6 +3218,19 @@
\expandafter\let\csname #1@listi\endcsname=\@listi
\def\@listi{\csname #1@listi\endcsname\@list@extra}%
}
+\AfterPackage{amsthm}{%
+ \RequirePackage{xpatch}%
+ \xpatchcmd{\deferred@thm@head}{\addvspace{-\parskip}}{}{%
+ \ClassInfoNoLine{\KOMAClassName}{%
+ amsthm's \string\deferred@thm@head\space patched}%
+ }{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ cannot patch amsthm's \string\deferred@thm@head.\MessageBreak
+ This could result in wrong spacing before theorem\MessageBreak
+ environments defined by package `amsthm'%
+ }%
+ }%
+}
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
@@ -3140,7 +3240,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -3237,12 +3337,12 @@
}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
@@ -3400,7 +3500,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\leftmargini}{2.5em}
\setlength{\leftmarginii}{2.2em}
@@ -3551,7 +3651,7 @@
\newcommand*{\scr@fnt@descriptionlabel}{\descfont}
\newkomafont{labelinglabel}{}
\newkomafont{labelingseparator}{}
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\@firsthead}{%
\ClassWarning{scrlttr2}{%
@@ -3571,7 +3671,6 @@
{\usekomafont{fromrule}{\rule{\useplength{firstheadwidth}}{.4pt}}}\\
}%
\ifkomavarempty{fromaddress}{}{%
- \csname scr@default@firsthead@fromaddress@hook\endcsname
\ignorespaces\usekomavar{fromaddress}%
}%
}%
@@ -3841,7 +3940,7 @@
\ignorespaces%
}
\newcommand{\vb@t@z}[1]{{%
- \setbox\z@\vbox to\z@{#1\vss}%
+ \setbox\z@\vbox to\z@{\color@begingroup #1\color@endgroup\vss}%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\setlength{\baselineskip}{\z@}%
\setlength{\@tempdima}{\ht0}\addtolength{\@tempdima}{\dp0}%
@@ -3879,9 +3978,9 @@
}
\newcommand*{\@vfoldmark}[1]{%
\begingroup
- \@expandtwoargs\in@{#1}{\@usefolds}%
- \ifin@
- \ifdim \useplength{lfoldmarkhpos}=\z@\else
+ \ifdim \useplength{lfoldmarkhpos}=\z@\else
+ \@expandtwoargs\in@{#1}{\@usefolds}%
+ \ifin@
\vb@t@z{%
\ifdim \useplength{foldmarkvpos}<\z@
\nobreak\vskip \paperheight\nobreak
@@ -3942,7 +4041,7 @@
\begingroup%
\vbox to #2{#1#3}%
\if@savevbox@warning\@savevbox@warningfalse%
- \setbox\z@\vbox{#3}%
+ \setbox\z@\vbox{\color@begingroup #3\color@endgroup}%
\setlength{\@tempdima}{#2}%
\setlength{\@tempdimb}{\ht0}\addtolength{\@tempdimb}{\dp0}%
\ifdim \@tempdimb>\@tempdima%
@@ -4312,7 +4411,7 @@
\fi
\ifkomavarempty{location}{%
\typeout{Location field: empty}%
- }{%
+ }{%
\typeout{Location field: yes}%
\ifdim \useplength{lochpos}=\z@%
\@setplength{lochpos}{\useplength{toaddrhpos}}%
@@ -4469,7 +4568,8 @@
\addtoreffields{invoice}%
}
\defaultreffields
-\newcommand*{\@datefield}{{%
+\newcommand*{\@datefield}{%
+ {%
\setparsizes{\z@}{\z@}{\z@ plus 1fil}\par@updaterelative
\ifdim\useplength{refwidth}=\z@
\if@refwide
@@ -4674,7 +4774,21 @@
\setkomavar{nextfoot}%
}
\newenvironment{letter}[2][]{%
+ \if@twocolumn
+ \ClassWarning{\KOMAClassName}{%
+ twocolumn mode not supported.\MessageBreak
+ If you really want a twocolumned letter, you should\MessageBreak
+ use package `multicol' and add a `multicols'\MessageBreak
+ environment inside your letter.\MessageBreak
+ Switching back to oneside%
+ }%
+ \letter@restonecoltrue
+ \expandafter\onecolumn
+ \else
+ \letter@restonecolfalse
+ \fi
\cleardoubleoddemptypage
+ \raggedbottom
\scr@ifundefinedorrelax{letterpagestyle}{}{%
\ifx\letterpagestyle\@empty\else
\pagestyle{\letterpagestyle}%
@@ -4692,19 +4806,27 @@
\let\@currentlabel\thisletter
\label{\thisletter.lastpage}%
\@@par\pagebreak\@@par%
+ \ifletter@restonecol\twocolumn\fi
}
+\newif\ifletter@restonecol
\newcommand*{\thisletter}{outside.letter.undefined}
\newcommand*{\letterlastpage}{\pageref{\thisletter.lastpage}}
\newcommand*{\stopletter}{}
\newcommand{\@processto}[1]{%
- \ifx\relax#1\relax\else
- \expandafter\@xproc#1\\\@nil\ifkomavarempty{toaddress}{}{%
- \expandafter\@xproc#1\@nil}%
- \fi
+ \IfArgIsEmpty{#1}{%
+ }{%
+ \expandafter\@xproc#1\\\@nil
+ \ifx\reserved@b\@empty\else\expandafter\@xproc#1\@nil\fi
+ \protected@edef\reserved@a{%
+ \noexpand\setkomavar{toname}{\reserved@a}%
+ \noexpand\setkomavar{toaddress}{\reserved@b}%
+ }\reserved@a
+ }%
}
\newcommand*{\@xproc}{}
\long\def\@xproc#1\\#2\@nil{%
- \setkomavar{toname}{#1}\setkomavar{toaddress}{#2}}
+ \def\reserved@a{#1}\def\reserved@b{#2}%
+}
\g@addto@macro\flushbottom{%
\g@addto@macro\stopletter{\vskip \z@\@plus.0001fil\relax}%
}
@@ -4729,8 +4851,10 @@
\@PapersizeWarning
\@gen@firsthead
\@mkboth{\scr@fromname@var}{\scr@subject@var}%
- \thispagestyle{empty}\noindent
- \@foldmarks\@firstheadfootfield\@addrfield\@locfield
+ \thispagestyle{empty}%
+ \noindent
+ \@foldmarks\@firstheadfootfield
+ \@addrfield\@locfield
\ifdim\useplength{subjectvpos}=\z@\else\@subjfield\fi
\@datefield
\@makelettertitle
@@ -4825,17 +4949,17 @@
\setkomavar{enclseparator}{: }
\newkomavar{backaddressseparator}
\setkomavar{backaddressseparator}{,\nobreakspace}
-\newkomavar[\if@scrsymbols\Telefon\else\phonename\fi]{phoneseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@phone\else\phonename\fi]{phoneseparator}
\setkomavar{phoneseparator}{\if@scrsymbols\else:\fi\nobreakspace}
\newkomavar[%
- \if@scrsymbols\Mobilefone\else\mobilephonename\fi
+ \if@scrsymbols\scr@symbol@mobilephone\else\mobilephonename\fi
]{mobilephoneseparator}
\setkomavar{mobilephoneseparator}{\usekomavar{phoneseparator}}
-\newkomavar[\if@scrsymbols\FAX\else\faxname\fi]{faxseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@fax\else\faxname\fi]{faxseparator}
\setkomavar{faxseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\Email\else\emailname\fi]{emailseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@email\else\emailname\fi]{emailseparator}
\setkomavar{emailseparator}{\if@scrsymbols\else:\fi\nobreakspace}
-\newkomavar[\if@scrsymbols\else\wwwname\fi]{urlseparator}
+\newkomavar[\if@scrsymbols\scr@symbol@www\else\wwwname\fi]{urlseparator}
\setkomavar{urlseparator}{\if@scrsymbols\else:\nobreakspace\fi}
\newkomavar{zipcodeseparator}
\setkomavar{zipcodeseparator}{\,--\,}
@@ -4878,7 +5002,7 @@
}%
\scr@saved@date{#1}%
}
-%%% From File: $Id: scrkernel-circularletters.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-circularletters.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\adrentry}[7]{%
\addrentry{#1}{#2}{#3}{#4}{#5}{#6}{#7}{}}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
index 7001365a4af..c4c0cfa9350 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrpage2.sty
@@ -7,7 +7,7 @@
%% scrpage.dtx (with options: `scrpage')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -35,14 +35,14 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrpage.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrpage.dtx 3256 2019-10-10 07:06:49Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrpage2}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(page head and foot)]
\PackageWarning{scrpage2}{usage of obsolete package!\MessageBreak
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreport.cls b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls
new file mode 100644
index 00000000000..d06c8c28132
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreport.cls
@@ -0,0 +1,88 @@
+%%
+%% This is file `scrreport.cls',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `class,report,long')
+%%
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
+%% 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 $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+\endgroup
+\providecommand*{\scr@clsextension}{\@clsextension}
+\AtBeginDocument{%
+ \let\scr@clsextension\@clsextension
+}
+\newcommand*{\KOMAClassName}{%
+ scrreprt%
+}
+\newcommand*{\ClassName}{%
+ report%
+}
+\newcommand*{\KOMALongClassName}{}
+\edef\KOMALongClassName{scr\ClassName}
+\newcommand*{\KOMALongClassFileName}{\KOMALongClassName.\@clsextension}
+\edef\KOMALongClassFileName{\KOMALongClassFileName}
+\ProvidesClass{\KOMALongClassName}[%
+ 2019/10/12 v3.27 KOMA-Script
+ document class (\ClassName)%
+]
+\let\ClassName\relax
+\expandafter\let\expandafter\KOMAClassName\expandafter\relax
+\expandafter\LoadClassWithOptions\expandafter{\KOMAClassName}
+\endinput
+%%
+%% End of file `scrreport.cls'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index 3dd4911aa2d..f5a50fd17a4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -6,7 +6,7 @@
%%
%% scrkernel-version.dtx (with options: `class,report')
%% scrkernel-basics.dtx (with options: `load')
-%% tocbasic.dtx (with options: `class,load,chapter')
+%% scrkernel-listsof.dtx (with options: `class,book,prepare')
%% scrkernel-tocstyle.dtx (with options: `class,report,prepare')
%% scrkernel-sections.dtx (with options: `class,report,prepare')
%% scrkernel-compatibility.dtx (with options: `class,report,init')
@@ -52,7 +52,7 @@
%% scrkernel-listsandtabulars.dtx (with options: `class,report,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -80,11 +80,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@clsextension}{\@clsextension}
\AtBeginDocument{%
@@ -115,29 +115,35 @@
\newcommand*{\KOMAClassName}{%
scrreprt%
}
+\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
+\edef\KOMAClassFileName{\KOMAClassFileName}
\newcommand*{\ClassName}{%
report%
}
-\newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
-\edef\KOMAClassFileName{\KOMAClassFileName}
\ProvidesClass{\KOMAClassName}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
document class (\ClassName)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: prepare)
\RequirePackage{tocbasic}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
]
\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
+\AtAddToTocList[ToC]{\setuptoc{\@currext}{onecolumn}}%
+\addtotoclist[ToC]{toc}
+\ifstr{\ext@toc}{toc}{}{%
+ \expandafter\addtotoclist
+ \expandafter[\expandafter T\expandafter o\expandafter C\expandafter ]%
+ \expandafter{\ext@toc}%
+}
\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-\addtotoclist{toc}
-\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
\newif\if@openright
\@openrightfalse
@@ -213,7 +219,7 @@
\newcommand*{\size@paragraph}{}
\newcommand*{\size@subparagraph}{}
\newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\newcommand*
{\scr@compatibility}{\scr@v@last}
@@ -286,10 +292,11 @@
\@namedef{scr@v@3.26}{17}
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
+\@namedef{scr@v@3.27}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@scr@emulatestandardclasses
\let\scr@emulatestandardclassestrue\relax
@@ -364,7 +371,7 @@
\newcommand*{\scr@v@is@ge}[1]{%
\numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{draft}[true]{%
\KOMA@set@ifkey{draft}{@tempswa}{#1}%
@@ -420,11 +427,11 @@
\newcommand*{\@gr@gsffamily}{%
\if@egregdoesnotlikesansseriftitles\else\sffamily\fi
}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-\newcommand*\@ptsize{%
+\providecommand*\@ptsize{%
11%
}
\newcommand*{\@pt@scan}{%
@@ -508,7 +515,7 @@
\BeforePackage{tex4ht}{%
\let\scr@defineobsoletefonts\thr@@
}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: options)
\KOMA@key{twoside}[true]{%
\if@atdocument\else\PassOptionsToPackage{twoside=#1}{typearea}\fi%
@@ -524,7 +531,9 @@
\ifx\FamilyKeyState\FamilyKeyStateProcessed
\expandafter\ifnum\scr@v@is@ge{3.17}%
\if@twoside\flushbottom
- \else\if@twocolumn\flushbottom\else\raggedbottom\fi\fi
+ \else
+ \if@twocolumn\sloppy\flushbottom\else\raggedbottom\fi
+ \fi
\fi
\KOMA@kav@xreplacevalue{.%
\KOMAClassFileName
@@ -546,7 +555,12 @@
{\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
+ \else
+ \onecolumn
+ \if@twoside\flushbottom\else
+ \raggedbottom
+ \fi
+ \fi
\fi}%
\fi
}
@@ -618,7 +632,7 @@
}
\DeclareOption*{%
\x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\setparsizes}[3]{%
\edef\f@parindent{\the\parindent}%
@@ -784,7 +798,7 @@
\KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
\KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@titlepage
\@titlepagetrue
@@ -817,11 +831,11 @@
\KOMA@DeclareStandardOption%
{notitlepage}{titlepage=false}
\KOMA@ifkey{abstract}{@abstrt}
-\KOMA@DeclareStandardOption{abstracton}{abstract=true}
-\KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+\KOMA@DeclareDeprecatedOption{abstracton}{abstract=true}
+\KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false}
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{open}{%
\KOMA@set@ncmdkey{open}{@tempa}{%
@@ -885,6 +899,30 @@
\AtBeginDocument{%
\@ifpackageloaded{bookmark}{}{%
\if@scr@autoloadbookmarkpackage
+ \scr@ifundefinedorrelax{Hy@driver}{%
+ \ClassWarning{\KOMAClassName}{%
+ `hyperref' loaded but `\string\Hy@driver' undefined.\MessageBreak
+ This should not happen!\MessageBreak
+ Maybe `hyperref' not loaded or unknown version?%
+ }%
+ }{%
+ \ifstr{\Hy@driver}{hdvips}{%
+ \providecommand*{\BookmarkDriverDefault}{dvips}%
+ }{%
+ \ifstr{\Hy@driver}{hdvipdfm}{%
+ \providecommand*{\BookmarkDriverDefault}{dvipdfm}%
+ }{%
+ \ifstr{\Hy@driver}{hdvipson}{%
+ \providecommand*{\BookmarkDriverDefault}{dvipsone}%
+ }{%
+ \ifstr{\Hy@driver}{htexture}{%
+ \providecommand*{\BookmarkDriverDefault}{textures}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
\ClassInfo{\KOMAClassName}{%
loading recommended package `bookmark'.\MessageBreak
Using `bookmark' together with `hyperref' is
@@ -894,8 +932,11 @@
option\MessageBreak
`bookmarkpackage=false' before \string\begin{document}
and\MessageBreak
- you can avoid this message with
- `\string\usepackage{bookmark}'\MessageBreak
+ you can avoid this message adding:\MessageBreak
+ \space\space\string\usepackage
+ \scr@ifundefinedorrelax{BookmarkDriverDefault}{}{%
+ [\BookmarkDriverDefault]%
+ }{bookmark}\MessageBreak
before \string\begin{document}%
}%
\RequirePackage{bookmark}%
@@ -903,15 +944,18 @@
\else
\if@filesw
\ClassWarning{\KOMAClassName}{%
- seems someone has broken package auxhook.\MessageBreak
- Usually this happens, if auxhook is loaded or used\MessageBreak
+ seems someone has broken package `auxhook'.\MessageBreak
+ Usually this happens, if `auxhook' is loaded or used\MessageBreak
implicitly or explicitly by patching
- `\string\document'%
+ \string\document%
\scr@ifundefinedorrelax{AtEndPreamble}{}{%
\MessageBreak
- or via etoolbox command \string\AtEndPreamble
+ or via etoolbox command \string\AtEndPreamble%
}.\MessageBreak
- Trying an emergency workaround%
+ Trying an emergency workaround.\MessageBreak
+ You can avoid this warning adding:\MessageBreak
+ \space\space\string\usepackage{auxhook}\MessageBreak
+ before \string\begin{document}%
}%
\@beginmainauxhook
\fi
@@ -1125,7 +1169,7 @@
\KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
\KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
\KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@ifkey{headsepline}{@hsl}%
\KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
@@ -1230,7 +1274,7 @@
\KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
\KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
\KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@captionabove\@captionabovefalse
\newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1365,7 +1409,7 @@
\DeclareOption{origlongtable}{\@komalongtablefalse}
\KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
\KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{footnotes}{%
\ifx\@footnotemark\scr@saved@footnotemark
@@ -1436,7 +1480,7 @@
\csname FN@mf@prepare\endcsname
\ifhmode\spacefactor\@x@sf\fi
\relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newif\if@tocleft
\KOMA@key{toc}{%
@@ -1712,7 +1756,7 @@
\BeforeTOCHead{\@chaptertolistsfalse}
\KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
\KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand{\newbibstyle}[3][]{%
\scr@ifundefinedorrelax{scr@bibstyle@#2}{%
@@ -1881,7 +1925,7 @@
\KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
\KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
\KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\newcommand*{\idx@@heading}{%
\ifidx@leveldown
@@ -1966,22 +2010,22 @@
\KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
\KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
\KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{headings=openany}
\KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: execoption)
\KOMAExecuteOptions{%
parskip=false,%
headings=big%
}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\scr@setlength[4]{%
\expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2456,13 +2500,13 @@
\@nomath\sfb}
\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 3262 2019-10-10 08:25:29Z 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 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\@BCOR =\relax
\let\@@BCOR =\relax
@@ -2507,7 +2551,7 @@
}\reserved@a
\fi
\fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setlength{\lineskip}{\p@}
\setlength{\normallineskip}{\p@}
@@ -2627,6 +2671,19 @@
\expandafter\let\csname #1@listi\endcsname=\@listi
\def\@listi{\csname #1@listi\endcsname\@list@extra}%
}
+\AfterPackage{amsthm}{%
+ \RequirePackage{xpatch}%
+ \xpatchcmd{\deferred@thm@head}{\addvspace{-\parskip}}{}{%
+ \ClassInfoNoLine{\KOMAClassName}{%
+ amsthm's \string\deferred@thm@head\space patched}%
+ }{%
+ \ClassWarningNoLine{\KOMAClassName}{%
+ cannot patch amsthm's \string\deferred@thm@head.\MessageBreak
+ This could result in wrong spacing before theorem\MessageBreak
+ environments defined by package `amsthm'%
+ }%
+ }%
+}
\l@addto@macro{\@listi}{\@list@extra}%
\let\@listI=\@listi
\l@addto@macro{\@listii}{\@list@extra}%
@@ -2636,7 +2693,7 @@
\@lowpenalty = 51
\@medpenalty =151
\@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 3052 2019-01-01 12:47:38Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\@extratitle}{}%
\newcommand{\extratitle}[1]{\gdef\@extratitle{%
@@ -2780,7 +2837,7 @@
{\usekomafont{publishers}{\@publishers \par}}%
\vskip 3em
\end{center}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\vfill\null
\if@twoside
\@tempswatrue
@@ -2799,7 +2856,7 @@
\begin{minipage}[b]{\textwidth}
\@lowertitleback
\end{minipage}\par
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\fi
\else
\ifx\@uppertitleback\@empty\else
@@ -2822,7 +2879,7 @@
\next@tdpage\null\vfill
{\centering\usekomafont{dedication}{\@dedication \par}}%
\vskip \z@ \@plus3fill
- \@thanks\let\@thanks\@empty
+ \@thanks\global\let\@thanks\@empty
\cleardoubleemptypage
\fi
\ifx\titlepage@restore\relax\else\clearpage\titlepage@restore\fi
@@ -2903,7 +2960,7 @@
\@maketitle
\fi
\ifx\titlepagestyle\@empty\else\thispagestyle{\titlepagestyle}\fi
- \@thanks
+ \@thanks\global\let\@thanks\@empty
\endgroup
\fi
\setcounter{footnote}{0}%
@@ -3054,10 +3111,10 @@
\fi
}
\newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,part)
\CloneTOCEntryStyle{tocline}{part}
\TOCEntryStyleStartInitCode{part}{%
@@ -3071,7 +3128,7 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,chapter)
\CloneTOCEntryStyle{tocline}{chapter}
\TOCEntryStyleStartInitCode{chapter}{%
@@ -3091,40 +3148,36 @@
\expandafter\providecommand\expandafter*%
\csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,section)
\CloneTOCEntryStyle{tocline}{section}
\TOCEntryStyleStartInitCode{section}{%
\expandafter\providecommand%
\csname scr@tso@#1@linefill\endcsname{\TOCLineLeaderFill\relax}%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: class,style,default)
\CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\setcounter{secnumdepth}{2}
\newcommand*{\ifnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@secondoftwo
- }{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \if@currentusenumber
+ \scr@ifundefinedorrelax{#1numdepth}{%
\expandafter\@secondoftwo
- \else
- \expandafter\@firstoftwo
- \fi
- }%
+ }{%
+ \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \else
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \fi
+ }%
+ \else
+ \expandafter\@secondoftwo
+ \fi
}
\newcommand*{\ifunnumbered}[1]{%
- \scr@ifundefinedorrelax{#1numdepth}{%
- \@firstoftwo
- }{%
- \expandafter\ifnum \@nameuse{#1numdepth}>\c@secnumdepth
- \expandafter\@firstoftwo
- \else
- \expandafter\@secondoftwo
- \fi
- }%
+ \ifnumbered{#1}{\@secondoftwo}{\@firstoftwo}%
}
\BeforeClosingMainAux{%
\if@autodot\if@filesw\immediate\write\@mainaux{%
@@ -3190,6 +3243,7 @@
\fi
\fi
\newcommand*{\scr@startsection}[6]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\if@noskipsec \leavevmode \fi
\par
\@tempskipa \glueexpr #4\relax
@@ -3234,18 +3288,18 @@
\csname iffalse\endcsname
\fi
}%
- \csname scr@startsection@hook\endcsname
+ \ExecuteDoHook{heading/postinit/#1}%
\if@nobreak
\everypar{}%
\else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
\kernel@ifstar {%
- \csname scr@preto@ssect@hook\endcsname
+ \ExecuteDoHook{heading/branch/star/#1}%
\def\scr@s@ct@@nn@m@{#1}%
\@ssect{\glueexpr #3\relax}{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}%
}{%
- \csname scr@preto@sect@hook\endcsname
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\scr@section@dblarg{%
\@sect{#1}{\numexpr #2\relax}{\glueexpr #3\relax}{\glueexpr #4\relax}%
{\glueexpr #5\relax}{#6}%
@@ -3255,7 +3309,7 @@
\else
\ClassWarningNoLine{\KOMAClassName}{`\string\@startsection' has been
changed.\MessageBreak
- \KOMAClassName\space needs it's own Definition of
+ \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
@@ -3266,14 +3320,16 @@
KOMA-Script that fixes the problem, please\MessageBreak
send a report to the KOMA-Script author.\MessageBreak
Note, that this alternative approach does not\MessageBreak
- execute `\string\scr@startsection@hook',\MessageBreak
- `\string\scr@preto@ssect@hook', or
- `\string\scr@preto@sect@hook'\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
and does always use `runin=bysign' and\MessageBreak
`afterindent=bysign'%
}%
\let\scr@saved@startsection\@startsection
\newcommand*{\scr@startsection}[6]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\kernel@ifstar {%
\scr@saved@startsection{#1}{\numexpr #2\relax}{\glueexpr #3\relax}%
{\glueexpr #4\relax}{\glueexpr #5\relax}{#6}*%
@@ -3311,16 +3367,34 @@
\newcommand*\startsection@afterindent{%
\scr@startsection@ulm@error\startsection@afterindent}
\newcommand*{\At@startsection}[1]{%
- \@ifundefined{scr@startsection@hook}{\let\scr@startsection@hook\@empty}{}%
- \l@addto@macro{\scr@startsection@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\At@startsection'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/postinit}
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/postinit}{\scr@doonlyifstyleofargis{#1}{section}}%
+}
+\newcommand*{\scr@doonlyifstyleofargis}[3]{%
+ \IfSectionCommandStyleIs{#3}{#2}{#1}{}%
}
\newcommand*{\Before@ssect}[1]{%
- \@ifundefined{scr@preto@ssect@hook}{\let\scr@preto@ssect@hook\@empty}{}%
- \l@addto@macro{\scr@preto@ssect@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\Before@ssect'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/branch/star}%
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/branch/star}{\scr@onlyifstyleofargis{#1}{section}}%
}
\newcommand*{\Before@sect}[1]{%
- \@ifundefined{scr@preto@sect@hook}{\let\scr@preto@sect@hook\@empty}{}%
- \l@addto@macro{\scr@preto@sect@hook}{#1}%
+ \ClassInfo{\KOMAClassName}{%
+ Usage of deprecated command `\string\Before@sect'
+ mapped to\MessageBreak
+ `\string\AddtoDoHook{heading/branch/nostar}%
+ {...\string\@gobble}'%
+ }%
+ \AddtoDoHook{heading/branch/nostar}{\scr@onlyifstyleofargis{#1}{section}}%
}
\newcommand{\scr@section@dblarg}[1]{%
\kernel@ifnextchar[%]
@@ -3341,10 +3415,22 @@
\expandafter\scr@startsection
\fi
}
+\newcommand*{\UseNumberUsageError}[2]{%
+ \ClassError{\KOMAClassName}{%
+ \string\IfUseNumber\space not allowed%
+ }{%
+ You cannot use \string\IfUseNumber\space outside a heading.\MessageBreak
+ If you'd continue, I'll ignore both arguments, because I do not
+ know\MessageBreak
+ whether to use the first or the second argument.%
+ }%
+}
+\newcommand*{\IfUseNumber}[2]{}%
+\let\IfUseNumber\UseNumberUsageError
\newcommand*{\SecDef}[2]{\kernel@ifstar{#2}{\scr@section@dblarg{#1}}}
\CheckCommand*{\secdef}[2]{\@ifstar{#2}{\@dblarg{#1}}}
\let\secdef\SecDef
-\def\@tempa#1#2#3#4#5#6[#7]#8{%
+\def\scr@latex@sect#1#2#3#4#5#6[#7]#8{%
\ifnum #2>\c@secnumdepth
\let\@svsec\@empty
\else
@@ -3376,7 +3462,8 @@
#7}}%
\fi
\@xsect{#5}}
-\ifx\@sect\@tempa\else
+\ifx\@sect\scr@latex@sect\else
+ \let\scr@latex@sect\@sect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@sect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3390,6 +3477,7 @@
\else
\scr@istest#7=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#8},head={#8},reference={#8},#7}%
\else
@@ -3414,7 +3502,12 @@
\fi
}%
\let\IfUsePrefixLine\@secondoftwo
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\let\@svsec\@empty
\else
\refstepcounter{#1}%
@@ -3424,8 +3517,15 @@
\ifdim
\scr@sect@runin{\z@}{\p@}{\glueexpr #5\relax}>\z@
\begingroup
+ \ifx\@svsec\@empty
+ \let\IfUseNumber\@secondoftwo
+ \else
+ \let\IfUseNumber\@firstoftwo
+ \fi
+ \ExecuteDoHook{heading/begingroup/#1}%
#6{\nobreak\interlinepenalty \@M
\sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\expandafter\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
\ifx\@currenttocentry\@empty\else
@@ -3435,7 +3535,12 @@
\addtocentrydefault{#1}{##1}{##2}%
}%
}{}%
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\csname add#1tocentry\endcsname{}{\@currenttocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
@@ -3444,6 +3549,12 @@
\fi
\else
\def\@svsechd{%
+ \ifx\@svsec\@empty
+ \let\IfUseNumber\@secondoftwo
+ \else
+ \let\IfUseNumber\@firstoftwo
+ \fi
+ \ExecuteDoHook{heading/begingroup/#1}%
#6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
\expandafter\csname #1mark\expandafter\endcsname
\expandafter{\@currentheadentry}%
@@ -3454,13 +3565,19 @@
\addtocentrydefault{#1}{####1}{####2}%
}%
}{}%
- \ifnum \numexpr #2\relax>\c@secnumdepth
+ \ifcase
+ \if@currentusenumber
+ \ifnum \numexpr #2\relax>\c@secnumdepth \z@\else \@ne\fi
+ \else
+ \z@
+ \fi
\csname add#1tocentry\endcsname{}{\@currenttocentry}%
\else
\csname add#1tocentry\endcsname{\csname the#1\endcsname}{%
\@currenttocentry}%
\fi
\fi
+ \ExecuteDoHook{heading/endgroup/#1}%
}%
\fi
\let\IfUsePrefixLine\scr@IfUsePrefixLineWarning
@@ -3492,6 +3609,7 @@
}%
\FamilyKeyStateProcessed
}
+\FamilyInverseBoolKey[.section]{KOMAarg}{nonumber}{@currentusenumber}
\newcommand*{\scr@istest}{}
\def\scr@istest#1=#2\@nil{%
\ifx\relax#2\relax\@scr@tempswafalse\else\@scr@tempswatrue\fi
@@ -3503,7 +3621,7 @@
\newcommand{\sectioncatchphraseformat}[4]{%
\hskip #2#3#4%
}
-\def\@tempa#1#2#3#4#5{%
+\def\scr@latex@ssect#1#2#3#4#5{%
\@tempskipa #3\relax
\ifdim \@tempskipa>\z@
\begingroup
@@ -3515,7 +3633,9 @@
\def\@svsechd{#4{\hskip #1\relax #5}}%
\fi
\@xsect{#3}}
-\ifx\@ssect\@tempa\else
+\ifx\@ssect\scr@latex@ssect
+\else
+ \let\scr@latex@ssect\@ssect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@ssect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3525,7 +3645,7 @@
\fi
\def\@ssect#1#2#3#4#5{%
\scr@ifundefinedorrelax{scr@s@ct@@nn@m@}{%
- \ClassWarning{\KOMAClassName}{incompatible usage of
+ \ClassWarning{\KOMAClassName}{Incompatible usage of
\string\@ssect\space detected.\MessageBreak
You've used the KOMA-Script implementation of
\string\@ssect\MessageBreak
@@ -3537,23 +3657,33 @@
\ifdim
\scr@sect@runin{\z@}{\p@}{\glueexpr #3\relax}>\z@
\begingroup
+ \let\IfUseNumber\@secondoftwo
+ \edef\reserved@a{%
+ \noexpand\ExecuteDoHook{heading/begingroup/\scr@s@ct@@nn@m@}%
+ }\reserved@a
#4{\nobreak\interlinepenalty \@M
\expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
{\glueexpr #1\relax}\@empty{#5}\@@par}%
+ \edef\reserved@a{%
+ \noexpand\ExecuteDoHook{heading/endgroup/\scr@s@ct@@nn@m@}%
+ }\reserved@a
\endgroup
\else
\edef\@svsechd{%
+ \unexpanded{\let\IfUseNumber\@secondoftwo}%
+ \noexpand\ExecuteDoHook{heading/begingroup/\scr@s@ct@@nn@m@}%
\unexpanded{#4}{%
\noexpand\nobreak
\noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
\unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
}%
+ \noexpand\ExecuteDoHook{heading/endgroup/\scr@s@ct@@nn@m@}%
}%
\fi
\let\scr@s@ct@@nn@m@\relax
\@xsect{\glueexpr #3\relax}%
}
-\def\@tempa#1{%
+\def\scr@latex@xsect#1{%
\@tempskipa #1\relax
\ifdim \@tempskipa>\z@
\par \nobreak
@@ -3578,7 +3708,8 @@
\fi
\ignorespaces
}
-\ifx\@xsect\@tempa\else
+\ifx\@xsect\scr@latex@xsect\else
+ \let\scr@latex@xsect\@xsect
\ClassWarning{\KOMAClassName}{%
Unexpected definition of \string\@xsect!\MessageBreak
Please send information about this to\MessageBreak
@@ -3621,7 +3752,7 @@
}
\newcommand*{\scr@IfUsePrefixLineWarning}[2]{%
\ClassWarning{\KOMAClassName}{%
- usage of \string\IfUsePrefixLine\space outside
+ Usage of \string\IfUsePrefixLine\space outside
section command\MessageBreak
style makes no sense, because the behaviour not only\MessageBreak
depends on class options but also on the run-time\MessageBreak
@@ -4016,7 +4147,11 @@
}%
\DefineFamilyKey[.dsc]{KOMAarg}{tocstyle}{%
\IfArgIsEmpty{##1}{%
- \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \@ifundefined{scr@dte@\scr@dsc@current @style}{}{%
+ \expandafter\let\csname scr@dte@\scr@dsc@current @style\endcsname
+ \relax
+ }%
+ \expandafter\let\csname scr@tso@\scr@dsc@current @style\endcsname
\relax
\FamilyKeyStateProcessed
}{%
@@ -4024,6 +4159,7 @@
\FamilyKeyStateUnknownValue
}{%
\@namedef{scr@dte@\scr@dsc@current @style}{##1}%
+ \@namedef{scr@tso@\scr@dsc@current @style}{##1}%
\FamilyKeyStateProcessed
}%
}%
@@ -4043,19 +4179,24 @@
\endgroup
\@firstofone{%
\@nameuse{scr@dsc@style@\@nameuse{scr@\scr@dsc@current @style}@options}%
- \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{%
\scr@ifundefinedorrelax{l@\scr@dsc@current}{%
- \@namedef{scr@dte@\scr@dsc@current @style}{default}%
+ \@namedef{scr@tso@\scr@dsc@current @style}{default}%
}{}%
}{}%
\let\scr@dsc@tocstyle@options\@empty
\let\scr@dsc@extra@relax@opts\@empty
- \scr@ifundefinedorrelax{scr@dte@\scr@dsc@current @style}{}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{%
+ \expandafter\let
+ \csname scr@tso@\scr@dsc@current @style\expandafter\endcsname
+ \csname scr@dte@\scr@dsc@current @style\endcsname
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dsc@current @style}{}{%
\begingroup
\def\scr@dte@current{#2}%
\edef\reserved@a{%
\noexpand\@ExecuteTOCEntryStyleInitCode{%
- \@nameuse{scr@dte@\scr@dsc@current @style}%
+ \@nameuse{scr@tso@\scr@dsc@current @style}%
}{\scr@dsc@current}%
}\reserved@a
\def\do@endgroup{\endgroup}%
@@ -4163,10 +4304,26 @@
\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}%
+ }{%
+ \expandafter\ifnum \csname #2numdepth\endcsname>-\maxdimen
+ \@nameuse{scr@dsc@style@%
+ \@nameuse{scr@\scr@dsc@current @style}%
+ @neededoptionstest}%
+ \else
+ \ClassError{\KOMAClassName}{%
+ `level' must be > -\the\numexpr\maxdimen\relax
+ }{%
+ KOMA-Script internally sets `secnumdepth' to
+ -\the\numexpr\maxdimen\relax\space
+ to locally switch of\MessageBreak
+ the numbering, i.e., inside running heads.\MessageBreak
+ Because of this, you can define section commands with\MessageBreak
+ `level' greater than -\the\numexpr\maxdimen\relax\space only.%
+ }%
+ \let\local@endgroup\endgroup
+ \aftergroup\@gobbletwo
+ \fi
+ }%
\local@endgroup
\@firstofone{%
\@ifundefined{c@#2}{\newcounter{#2}}{}%
@@ -4224,10 +4381,14 @@
\csname add#2tocentry\endcsname[2]{%
\addtocentrydefault{#2}{##1}{##2}%
}%
- \scr@ifundefinedorrelax{scr@dte@#2@style}{%
+ \scr@ifundefinedorrelax{scr@tso@#2@style}{%
+ \expandafter\let\csname scr@tso@#2@style\expandafter\endcsname
+ \csname scr@dte@#2@style\endcsname
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#2@style}{%
}{%
\DeclareTOCStyleEntry[\scr@dsc@tocstyle@options]{%
- \@nameuse{scr@dte@#2@style}%
+ \@nameuse{scr@tso@#2@style}%
}{#2}%
}%
\scr@ifundefinedorrelax{l@#2}{%
@@ -4509,6 +4670,30 @@
\let\scr@local@leveloffset\relax
\let\scr@local@tocleveloffset\relax
}
+\newcommand*{\IfSectionCommandStyleIs}[2]{%
+ \scr@ifundefinedorrelax{#1}{%
+ \ClassError{\KOMAClassName}{%
+ \expandafter\string\csname #1\endcsname\space not defined}{%
+ You cannot compare the section command style of an undefined command.}%
+ }{%
+ \scr@ifundefinedorrelax{scr@#1@style}{%
+ \ClassError{\KOMAClassName}{%
+ \expandafter\string\csname #1\endcsname\space not a valid section
+ command%
+ }{%
+ You cannot detect the section command style of a command, that
+ has\MessageBreak
+ never been defined as a section command by KOMA-Script.%
+ }%
+ }%
+ }%
+ \scr@ifundefinedorrelax{scr@dsc@def@style@#2@command}{%
+ \ClassError{\KOMAClassName}{%
+ unknown section command style `#2'%
+ }{}%
+ }%
+ \ifstr{\@nameuse{scr@#1@style}}{#2}%
+}
\newcommand*{\use@preamble}[1]{%
\@ifundefined{#1@preamble}{}{%
\@nameuse{#1@preamble}%
@@ -4619,6 +4804,21 @@
}
\newcommand*{\bprot@dottedtocline}[5]{%
\expandafter\ifnum\scr@v@is@gt{2.96}\relax
+ \ClassWarning{\KOMAClassName}{%
+ usage of `\string\bprot@dottedtocline' is deprecated.\MessageBreak
+ Maybe an old auxiliary file has been used.\MessageBreak
+ Note, this command will be removed from\MessageBreak
+ KOMA-Script soon. So if this warning message\MessageBreak
+ persists after one more LaTeX run, you should\MessageBreak
+ redeclare the corresponding ToC entries using\MessageBreak
+ \string\DeclareTOCStyleEntry[\MessageBreak
+ \space\space level=\detokenize{#1},\MessageBreak
+ \space\space indent=\detokenize{#2},\MessageBreak
+ \space\space numwidth=\detokenize{#3}]{default}{...},\MessageBreak
+ where `...' is the name of the ToC level.\MessageBreak
+ Note, in future usage of `\string\bprot@dottedtocline'\MessageBreak
+ could result in an error%
+ }%
\ifnum #1>\c@tocdepth \else
\ifnum \lastpenalty<\numexpr 20010-#1\relax
\addpenalty{\@lowpenalty}%
@@ -4657,6 +4857,7 @@
\csname appendixmore\endcsname
}
\newcommand*{\scr@startpart}[1]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\if@openright\cleardoublepage\else\clearpage\fi
\scr@ifundefinedorrelax{#1pagestyle}{}{%
\ifstr{#1pagestyle}{}{}{%
@@ -4680,6 +4881,7 @@
\fi
}%
}%
+ \ExecuteDoHook{heading/postinit/#1}%
\partheadstartvskip
\vbox to\z@{\vss\use@preamble{#1@o}\strut\par}%
\vskip-\baselineskip\nobreak
@@ -4687,11 +4889,13 @@
}
\newcommand{\scr@@startpart}{}
\long\def\scr@@startpart#1[#2]#3{%
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\ifnum \scr@osectarg=\z@
\@scr@tempswafalse
\else
\scr@istest#2=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}%
\else
@@ -4735,8 +4939,9 @@
\fi
}%
\begingroup
- \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\def\IfUseNumber{\ifnumbered{#1}}%
+ \ExecuteDoHook{heading/begingroup/#1}%
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\normalfont\usekomafont{disposition}{\nobreak
\IfUseNumber{%
@@ -4758,18 +4963,21 @@
\csname #1mark\expandafter\endcsname\expandafter{\@currentheadentry}%
\fi
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\@nameuse{@end#1}%
\@afterheading
}
\newcommand{\scr@@startspart}[2]{%
+ \ExecuteDoHook{heading/branch/star/#1}%
\begingroup
\let\@mkboth\@gobbletwo
\hy@insteadofrefstepcounter{#1}%
\endgroup
\begingroup
- \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\let\IfUseNumber\@secondoftwo
+ \ExecuteDoHook{heading/begingroup/#1}%
+ \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
\raggedpart
\normalfont\usekomafont{disposition}{%
\nobreak
@@ -4778,6 +4986,7 @@
}%
\@mkboth{}{}%
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
\endgroup
\@nameuse{@end#1}%
}
@@ -4796,24 +5005,26 @@
}
\newcommand*{\hy@insteadofrefstepcounter}[1]{}
\let\hy@insteadofrefstepcounter\@gobble
-\BeforePackage{hyperref}{%
+\newcommand*{\scr@chapter@before@hyperref@patch}{%
\let\scr@orig@chapter\@chapter
\let\scr@orig@schapter\@schapter
\let\scr@orig@addchap\@addchap
}
-\AfterPackage!{hyperref}{%
+\BeforePackage{hyperref}{\scr@chapter@before@hyperref@patch}
+\newcommand*{\scr@chapter@after@hyperref@patch}{%
\let\@chapter\scr@orig@chapter
\let\@schapter\scr@orig@schapter
\let\@addchap\scr@orig@addchap
\ifx\hy@insteadofrefstepcounter\@gobble
\renewcommand*{\hy@insteadofrefstepcounter}[1]{%
- \Hy@MakeCurrentHrefAuto{#1*}%
+ \Hy@MakeCurrentHrefAuto{##1*}%
\Hy@raisedlink{%
\hyper@anchorstart{\@currentHref}\hyper@anchorend
}%
}%
\fi
}
+\AfterPackage!{hyperref}{\scr@chapter@after@hyperref@patch}
\newcommand*{\addparttocentry}[2]{%
\addtocentrydefault{part}{#1}{#2}%
}
@@ -4856,6 +5067,7 @@
\newkomafont{partentry}{\usekomafont{disposition}\large}
\newkomafont{partentrypagenumber}{}
\newcommand*{\scr@startchapter}[1]{%
+ \ExecuteDoHook{heading/preinit/#1}%
\if@openright\cleardoublepage\else\clearpage\fi
\scr@ifundefinedorrelax{#1pagestyle}{}{%
\ifstr{#1pagestyle}{}{}{%
@@ -4874,15 +5086,18 @@
}%
}%
}%
+ \ExecuteDoHook{heading/postinit/#1}%
\expandafter\SecDef\csname @#1\expandafter\endcsname\csname @s#1\endcsname
}
\newcommand*{\scr@@startchapter}{}
\def\scr@@startchapter#1[#2]#3{%
+ \ExecuteDoHook{heading/branch/nostar/#1}%
\ifnum \scr@osectarg=\z@
\@scr@tempswafalse
\else
\scr@istest#2=\@nil
\fi
+ \@currentusenumbertrue
\if@scr@tempswa
\setkeys{KOMAarg.section}{tocentry={#3},head={#3},reference={#3},#2}%
\else
@@ -4951,6 +5166,7 @@
\@afterheading
}
\newcommand*{\scr@@startschapter}[2]{%
+ \ExecuteDoHook{heading/branch/star/#1}%
\begingroup
\let\@mkboth\@gobbletwo
\hy@insteadofrefstepcounter{#1}%
@@ -4993,13 +5209,14 @@
}%
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\def\IfUseNumber{\ifnumbered{#1}}%
+ \ExecuteDoHook{heading/begingroup/#1}%
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
\else
\let\IfUsePrefixLine\@secondoftwo
\fi
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\normalfont\usekomafont{disposition}{%
\usekomafont{#1}{%
\settoheight{\@tempskipa}{%
@@ -5032,6 +5249,7 @@
}%
}%
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
}%
\nobreak\par\nobreak
\@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax
@@ -5047,13 +5265,14 @@
}%
\chapterheadstartvskip
{%
- \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\let\IfUseNumber\@secondoftwo
+ \ExecuteDoHook{heading/begingroup/#1}%
\if@chapterprefix
\let\IfUsePrefixLine\@firstoftwo
\else
\let\IfUsePrefixLine\@secondoftwo
\fi
+ \setlength{\parindent}{\z@}\setlength{\parfillskip}{\z@ plus 1fil}%
\normalfont\usekomafont{disposition}{%
\usekomafont{#1}{%
\raggedchapter
@@ -5068,6 +5287,7 @@
}%
}%
}%
+ \ExecuteDoHook{heading/endgroup/#1}%
}%
\nobreak\par\nobreak
\@tempskipa=\glueexpr \csname scr@#1@afterskip\endcsname\relax\relax
@@ -5369,7 +5589,7 @@
\fi
\newcommand*{\scr@fnt@disposition}{\sectfont}
\aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2995 2018-07-18 06:46:34Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newif\if@restonecol
\newcommand{\dictum}[2][]{\par%
@@ -5526,12 +5746,27 @@
`parskip' with one of it's several values}
\scr@package@not@recommended{titleps}{%
package `scrlayer-scrpage'}
-\scr@package@not@recommended{titlesec}{%
- the package only\MessageBreak
- if you really need it, because it breaks several\MessageBreak
- KOMA-Script features, i.e., option `headings' and\MessageBreak
- the extended optional argument of the section\MessageBreak
- commands}
+\AfterPackage*{sectsty}{%
+ \@ifpackagelater{sectsty}{2002/02/26}{%
+ \ClassInfo{\KOMAClassName}{Unknown `sectsty' release.\MessageBreak
+ Cross your fingers, that is compatible%
+ }%
+ }{%
+ \ClassWarning{\KOMAClassName}{%
+ Incompatible package `sectsty' loaded!\MessageBreak
+ Package `sectsty' up to version 2.0.2 is incompatible\MessageBreak
+ with KOMA-Script from version 2.8e released in 2001.\MessageBreak
+ You should avoid that package and configure the\MessageBreak
+ section titles of your document using the KOMA-Script\MessageBreak
+ user interface, e.g., \string\chapterlinesformat,\MessageBreak
+ \string\RedeclareSectionCommand\space etc. or you should ask\MessageBreak
+ the `sectsty' maintainer for a more compatible release.\MessageBreak
+ Ignoring this warning could result in several error\MessageBreak
+ messages and formatting issues after loading package\MessageBreak
+ `sectsty'%
+ }%
+ }%
+}
\scr@package@not@recommended{tocbibind}{%
options like `listof=totoc'\MessageBreak
or `bibliography=totoc', or commands like\MessageBreak
@@ -5649,75 +5884,35 @@
\let\scr@mt@saved@sect\relax
\fi
}
-\BeforePackage{titlesec}{%
- \let\scr@ttl@saved@section\section
- \let\scr@ttl@saved@subsection\subsection
- \let\scr@ttl@saved@subsubsection\subsubsection
- \let\scr@ttl@saved@paragraph\paragraph
- \let\scr@ttl@saved@subparagraph\subparagraph
-}
\AfterPackage{titlesec}{%
- \@ifpackagelater{titlesec}{2016/03/22}{%
- \ClassInfo{\KOMAClassName}{%
- Deactivating the `titlesec' workaround,\MessageBreak
- because package is newer than expected%
+ \@ifpackagelater{titlesec}{2019/07/17}{%
+ \ClassInfo{\KOMAClassName}{Unknown `titesec' release.\MessageBreak
+ Cross your fingers, that is compatible%
}%
}{%
- \ClassWarning{\KOMAClassName}{%
- Activating an ugly workaround for a missing\MessageBreak
- feature of package `titlesec`%
- }%
- \def\scr@ttl@@extract#1\scr@startsection#2#3#4#5#6#7#8{%
- \@tempskipa=#5
- \@tempskipb=#6
- \ifdim\@tempskipa<\z@
- \toks@{\titlespacing*#8{#4}}%
- \@tempskipa-\@tempskipa
- \else
- \toks@{\titlespacing#8{#4}}%
- \fi
- \@ifundefined{ttl@space}{}{%
- \ttl@assign\@tempskipa*\ttl@space\relax\beforetitleunit}%
- \ifdim\@tempskipb<\z@
- \if@tempswa
- \titleformat#8[runin]%
- {\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \else
- \titleformat#8[runin]%
- {#7}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \fi
- \@tempskipb-\@tempskipb
- \else
- \if@tempswa
- \titleformat#8%
- {\ttl@fil\ttl@fonts\ttl@sizes{#3}}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \else
- \titleformat#8%
- {#7}{\@seccntformat{#2}}%
- {\z@}\ttl@passexplicit
- \fi
- \@ifundefined{ttl@space}{}{%
- \ttl@assign\@tempskipb*\ttl@space\relax\aftertitleunit}%
- \fi
- \edef\ttl@a{\the\toks@{\the\@tempskipa}{\the\@tempskipb}}
- \ttl@a}%
- \expandafter\scr@ttl@@extract\scr@ttl@saved@section\section
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subsection\subsection
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subsubsection\subsubsection
- \expandafter\scr@ttl@@extract\scr@ttl@saved@paragraph\paragraph
- \expandafter\scr@ttl@@extract\scr@ttl@saved@subparagraph\subparagraph
- \let\scr@ttl@saved@section\relax
- \let\scr@ttl@saved@subsection\relax
- \let\scr@ttl@saved@subsubsection\relax
- \let\scr@ttl@saved@paragraph\relax
- \let\scr@ttl@saved@subparagraph\relax
- \let\scr@ttl@@extract\relax
+ \scr@class@titlesec@warning
+ }%
+}
+\providecommand*{\scr@class@titlesec@warning}{%
+ \ClassWarning{\KOMAClassName}{%
+ Usage of this version of package `titlesec'\MessageBreak
+ with KOMA-Script class `\KOMAClassName' is\MessageBreak
+ not recommended, because the package does not\MessageBreak
+ support KOMA-Script classes, but break them.\MessageBreak
+ If you want to use `titlesec' with KOMA-Script\MessageBreak
+ classes instead of using the KOMA-Script's\MessageBreak
+ user interface to configure the headings of\MessageBreak
+ parts,
+ chapters, sections
+ ... subparagraphs,\MessageBreak
+ please ask the author of `titlesec' for support.\MessageBreak
+ Expect errors like:\MessageBreak
+ \space\space- ``Illegal unit of measure (pt inserted).''\MessageBreak
+ \space\space- ``Missing number, treated as zero''\MessageBreak
+ after loading `titlesec'%
}%
}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\set@tempdima@hw}{%
\setlength{\@tempdima}{\textwidth}%
@@ -5816,7 +6011,7 @@
\newcommand*{\indexpagestyle}{plain}
\pagestyle{plain}
\pagenumbering{arabic}
-%%% From File: $Id: scrlayer.dtx 3015 2018-09-03 10:51:32Z kohm $
+%%% From File: $Id: scrlayer.dtx 3196 2019-08-26 09:20:16Z kohm $
%%% (run: body)
\providecommand*{\@mkleft}{%
\IfActiveMkBoth{\markleft}{\@gobble}%
@@ -5827,7 +6022,7 @@
\providecommand*{\@mkdouble}[1]{%
\@mkboth{#1}{#1}%
}
-%%% From File: $Id: scrkernel-floats.dtx 2701 2017-11-15 14:02:01Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand\marginline[1]{%
\marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -6632,7 +6827,7 @@
\thechapter.%
\@arabic\c@table
}
-%%% From File: $Id: scrkernel-footnotes.dtx 2979 2018-04-17 06:01:18Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\renewcommand*\footnoterule{%
\normalsize\ftn@rule@test@values
@@ -6791,7 +6986,7 @@
\endgroup
\@footnotemark
}
-%%% From File: $Id: scrkernel-listsof.dtx 2864 2018-01-16 07:55:20Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\g@addto@macro{\numberline@numberpostfix}{\autodot}
\usetocbasicnumberline[%
@@ -6803,9 +6998,6 @@
\AtAddToTocList[float]{%
\setuptoc{\@currext}{chapteratlist}%
}
-\newcommand*\@pnumwidth{1.55em}
-\newcommand*\@tocrmarg {2.55em}
-\newcommand*\@dotsep{4.5}
\newcommand*{\scr@dottedtocline}{}
\newcommand*{\last@l@number}{}
\newcommand*{\@l@number}{}
@@ -6856,7 +7048,7 @@
\protected@write\@auxout{}{%
\string\gdef\expandafter\string\csname#1@l@number\endcsname{%
\@l@number}}%
- }
+}
\g@addto@macro\tocbasic@@before@hook{%
\if@dynlist\expandafter\before@starttoc\expandafter{\@currext}\fi
}
@@ -6865,6 +7057,8 @@
}
\newcommand*\contentsname{Contents}
\newcommand*\listoftocname{\contentsname}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\contentsname{Contents}%
\setcounter{tocdepth}{2}
\newcommand*\toc@heading{%
\ClassWarning{\KOMAClassName}{%
@@ -6933,12 +7127,16 @@
\global\let\scr@float@addtolists@warning\relax
}
\renewcommand*\listfigurename{List of Figures}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\listfigurename{List of Figures}
\renewcommand*\listoflofname{\listfigurename}
\renewcommand*\listoflofentryname{\figurename}
\renewcommand*\listtablename{List of Tables}
+\providecaptionname{american,australian,british,canadian,english,newzealand,%
+ UKenglish,ukenglish,USenglish,usenglish}\listtablename{List of Tables}
\renewcommand*\listoflotname{\listtablename}
\renewcommand*\listoflotentryname{\tablename}
-%%% From File: $Id: scrkernel-bibliography.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*\bibname{Bibliography}
\newcommand*{\bibpreamble}{\relax}
@@ -7024,7 +7222,7 @@
}
\newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
\newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 3016 2018-09-03 11:40:59Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\index@preamble}{}
\let\index@preamble=\relax
@@ -7065,7 +7263,7 @@
\par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
}
\newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2640 2017-05-08 09:36:55Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\if@twocolumn
\setlength{\leftmargini}{2em}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
index 5fcac60274b..9612448e887 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize10pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,10pt')
%% scrkernel-paragraphs.dtx (with options: `clo,10pt')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: 10pt)
\ProvidesFile{%
scrsize10pt.clo%
@@ -150,7 +150,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
index 956a645c6a2..482ef2874c1 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize11pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,11pt')
%% scrkernel-paragraphs.dtx (with options: `clo,11pt')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: 11pt)
%%% (run: 12pt)
\ProvidesFile{%
@@ -151,7 +151,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
index c66013d52d1..1ba7562786f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
+++ b/Master/texmf-dist/tex/latex/koma-script/scrsize12pt.clo
@@ -8,7 +8,7 @@
%% scrkernel-fonts.dtx (with options: `clo,12pt')
%% scrkernel-paragraphs.dtx (with options: `clo,12pt')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,9 +62,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-fonts.dtx 3047 2018-12-22 15:51:54Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{%
scrsize12pt.clo%
}[\KOMAScriptVersion\space font size class option %
@@ -149,7 +149,7 @@
\def\@listvi {\leftmargin\leftmarginvi
\labelwidth\leftmarginvi
\advance\labelwidth-\labelsep}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3064 2019-02-01 07:40:28Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3262 2019-10-10 08:25:29Z kohm $
\@ifundefined{@list@extra}{}{%
\expandafter\ifnum\scr@v@is@ge{3.17}\par@updaterelative\fi
\l@addto@macro{\@listi}{\@list@extra}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
index bb90bc6c02c..fc07a194b8c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrtime.sty
@@ -11,7 +11,7 @@
%% scrtime.dtx (with options: `package,scrtime,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -39,11 +39,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -65,28 +65,28 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrtime}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(time of LaTeX run)%
]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
\newif\if@Hxii
\KOMA@ifkey{12h}{@Hxii}
\KOMA@DeclareDeprecatedOption[scrtime]{24h}{12h=false}
\KOMAProcessOptions\relax
-%%% From File: $Id: scrtime.dtx 2649 2017-05-29 09:39:43Z kohm $
+%%% From File: $Id: scrtime.dtx 3256 2019-10-10 07:06:49Z kohm $
\def\thistime{%
\kernel@ifstar
{\let\@tempif\iffalse\@thistime}
diff --git a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
index 228c6995505..2dd871b278b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/scrwfile.sty
@@ -7,7 +7,7 @@
%% scrwfile.dtx (with options: `package,trace,scrwfile,identify,option,body')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2010-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2010-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -35,11 +35,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrwfile.dtx 1805 2014-10-13 08:55:20Z kohm $
+%%% From File: $Id: scrwfile.dtx 3137 2019-04-04 06:07:07Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{scrwfile}
[2013/08/05 v0.1f-alpha KOMA-Script package (write and clone files)]
diff --git a/Master/texmf-dist/tex/latex/koma-script/setspace.hak b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
index 2dc669eb1f1..c7ac5b48e98 100644
--- a/Master/texmf-dist/tex/latex/koma-script/setspace.hak
+++ b/Master/texmf-dist/tex/latex/koma-script/setspace.hak
@@ -8,7 +8,7 @@
%% scrhack.dtx (with options: `hack,setspace,identify')
%% scrhack.dtx (with options: `hack,setspace,body')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -36,11 +36,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -62,16 +62,16 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\ProvidesFile{setspace.hak}[%
- 2019/02/01 v3.26b KOMA-Script
- package
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
(hacking package
setspace)%
]
-%%% From File: $Id: scrhack.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
\scr@ifexpected{\onehalfspacing}{%
\long\def\onehalfspacing{%
\setstretch{1.25}% default
diff --git a/Master/texmf-dist/tex/latex/koma-script/standardsections.hak b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak
new file mode 100644
index 00000000000..5397901869b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/koma-script/standardsections.hak
@@ -0,0 +1,616 @@
+%%
+%% This is file `standardsections.hak',
+%% generated with the docstrip utility, extended by scrdocstrip.
+%%
+%% The original source files were:
+%%
+%% scrkernel-version.dtx (with options: `file,standardsections.hak')
+%% scrhack.dtx (with options: `hack,standardsections,identify')
+%% scrhack.dtx (with options: `hack,standardsections,body')
+%%
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
+%%
+%% This file was generated from file(s) of the KOMA-Script bundle.
+%% ---------------------------------------------------------------
+%%
+%% It may be distributed under the conditions of the
+%% LaTeX Project Public License in the version distributed together
+%% with KOMA-Script, see file `lppl.txt' or `lppl-de.txt'.
+%%
+%% This file may only be distributed together with a copy of the
+%% KOMA-Script bundle. You may however distribute the
+%% KOMA-Script bundle without all such generated files. See also
+%% `lppl.txt' or `lppl-de.txt' for additional information.
+%%
+%% The list of files belonging to KOMA-Script distribution is given in
+%% the file `manifest.txt'. See also `lppl.txt' or `lppl-de.txt' for
+%% additional information.
+%%
+%% If this file is a beta version, you may not be allowed to distribute
+%% it. Look at the comments below to see if this is the case.
+%%
+%% English and German manuals are part of KOMA-Script bundle.
+%% ----------------------------------------------------------
+%%
+%% See `README'.
+%%
+%% The KOMA-Script bundle (but maybe not this file) was based upon the
+%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
+%% 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 $
+\begingroup
+ \catcode`\@11\relax
+ \ifx\KOMAScriptVersion\undefined
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \gdef\KOMAScriptVersion{#1}%
+ }%
+ \else
+ \newcommand*{\@CheckKOMAScriptVersion}[1]{%
+ \def\@tempa{#1}%
+ \ifx\KOMAScriptVersion\@tempa\else
+ \@latex@warning@no@line{%
+ \noexpand\KOMAScriptVersion\space is
+ `\KOMAScriptVersion',\MessageBreak
+ but `#1' was expected!\MessageBreak
+ You should not use classes, packages or files
+ from\MessageBreak
+ different KOMA-Script versions%
+ }%
+ \fi
+ }
+ \fi
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
+\endgroup
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
+\ProvidesFile{standardsections.hak}[%
+ 2019/10/12 v3.27 KOMA-Script
+ scrhack part
+ (defining standard LaTeX class section headings)%
+]
+%%% From File: $Id: scrhack.dtx 3262 2019-10-10 08:25:29Z kohm $
+\PackageWarningNoLine{scrhack}{%
+ You are loosing every kind of support because of\MessageBreak
+ using the dangerous standard classes sections hack!\MessageBreak
+ This hack can break several classes and packages.\MessageBreak
+ However, sometimes it is needed to make a\MessageBreak
+ package work%
+}%
+\PackageInfo{scrhack}{%
+ Using code from the standard LaTeX classes.\MessageBreak
+ For more information about this code and the\MessageBreak
+ license of this code, please see:\MessageBreak
+ https://ctan.org/tex-archive/macros/latex/base/classes.dtx
+}%
+\@ifpackageloaded{hyperref}{%
+ \PackageWarning{scrhack}{this hack should not be loaded after `hyperref'}%
+}{}
+\@ifpackageloaded{titlesec}{%
+ \PackageWarning{scrhack}{this hack should not be loaded after `titlesec'}%
+}{}
+\@ifpackageloaded{sectsty}{%
+ \PackageWarning{scrhack}{this hack should not be loaded after `sectsty'}%
+}{}
+\@ifpackageloaded{sectsty}{%
+ \PackageWarning{scrhack}{this hack should not be loaded after `sectsty'}%
+}{}
+\scr@ifundefinedorrelax{chapter}{%
+ \scr@ifundefinedorrelax{c@part}{\newcounter{part}}{}%
+ \scr@ifundefinedorrelax{c@section}{\newcounter{section}}{}%
+ \scr@ifundefinedorrelax{c@subsection}{\newcounter{subsection}[section]}{}%
+ \scr@ifundefinedorrelax{c@subsubsection}{%
+ \newcounter{subsubsection}[subsection]}{}%
+ \scr@ifundefinedorrelax{c@paragraph}{%
+ \newcounter{paragraph}[subsubsection]}{}%
+ \scr@ifundefinedorrelax{c@subparagraph}{%
+ \newcounter{subparagraph}[paragraph]}{}%
+ \renewcommand\thepart {\@Roman\c@part}%
+ \renewcommand\thesection {\@arabic\c@section}%
+ \renewcommand\thesubsection {\thesection.\@arabic\c@subsection}%
+ \renewcommand\thesubsubsection{\thesubsection.\@arabic\c@subsubsection}%
+ \renewcommand\theparagraph {\thesubsubsection.\@arabic\c@paragraph}%
+ \renewcommand\thesubparagraph {\theparagraph.\@arabic\c@subparagraph}%
+ \def\part{%
+ \if@noskipsec \leavevmode \fi
+ \par
+ \addvspace{4ex}%
+ \@afterindentfalse
+ \secdef\@part\@spart}%
+ \def\@part[#1]#2{%
+ \ifnum \c@secnumdepth >\m@ne
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+ \else
+ \addcontentsline{toc}{part}{#1}%
+ \fi
+ {\parindent \z@ \raggedright
+ \interlinepenalty \@M
+ \normalfont
+ \ifnum \c@secnumdepth >\m@ne
+ \Large\bfseries \partname\nobreakspace\thepart
+ \par\nobreak
+ \fi
+ \huge \bfseries #2%
+ \markboth{}{}\par}%
+ \nobreak
+ \vskip 3ex
+ \@afterheading}%
+ \def\@spart#1{%
+ {\parindent \z@ \raggedright
+ \interlinepenalty \@M
+ \normalfont
+ \huge \bfseries #1\par}%
+ \nobreak
+ \vskip 3ex
+ \@afterheading}%
+ \def\section{\@startsection {section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {2.3ex \@plus.2ex}%
+ {\normalfont\Large\bfseries}}%
+ \def\subsection{\@startsection{subsection}{2}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\large\bfseries}}%
+ \def\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {3.25ex \@plus1ex \@minus.2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+ {3.25ex \@plus1ex \@minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+}{%
+ \scr@ifundefinedorrelax{c@part}{\newcounter{part}}{}%
+ \scr@ifundefinedorrelax{c@chapter}{\newcounter{chapter}}{}%
+ \scr@ifundefinedorrelax{c@section}{\newcounter{section}[chapter]}{}%
+ \scr@ifundefinedorrelax{c@subsection}{\newcounter{subsection}[section]}{}%
+ \scr@ifundefinedorrelax{c@subsubsection}{%
+ \newcounter{subsubsection}[subsection]}{}%
+ \scr@ifundefinedorrelax{c@paragraph}{%
+ \newcounter{paragraph}[subsubsection]}{}%
+ \scr@ifundefinedorrelax{c@subparagraph}{%
+ \newcounter{subparagraph}[paragraph]}{}%
+ \def\@chapapp{\chaptername}%
+ \scr@ifundefinedorrelax{frontmatter}{%
+ \def\part{%
+ \if@openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{plain}%
+ \if@twocolumn
+ \onecolumn
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
+ \null\vfil
+ \secdef\@part\@spart}
+
+ \def\@part[#1]#2{%
+ \ifnum \c@secnumdepth >-2\relax
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+ \else
+ \addcontentsline{toc}{part}{#1}%
+ \fi
+ \markboth{}{}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \ifnum \c@secnumdepth >-2\relax
+ \huge\bfseries \partname\nobreakspace\thepart
+ \par
+ \vskip 20\p@
+ \fi
+ \Huge \bfseries #2\par}%
+ \@endpart}
+ \def\@spart#1{%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \Huge \bfseries #1\par}%
+ \@endpart}
+ \def\@endpart{\vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi}
+ \def\chapter{\if@openright\cleardoublepage\else\clearpage\fi
+ \thispagestyle{plain}%
+ \global\@topnum\z@
+ \@afterindentfalse
+ \secdef\@chapter\@schapter}
+ \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}%
+ {\protect\numberline{\thechapter}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}{\protect\addvspace{10\p@}}%
+ \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}
+ \def\@makechapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright \normalfont
+ \ifnum \c@secnumdepth >\m@ne
+ \huge\bfseries \@chapapp\space \thechapter
+ \par\nobreak
+ \vskip 20\p@
+ \fi
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}
+ \def\@schapter#1{\if@twocolumn
+ \@topnewpage[\@makeschapterhead{#1}]%
+ \else
+ \@makeschapterhead{#1}%
+ \@afterheading
+ \fi}
+ \def\@makeschapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright
+ \normalfont
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}
+ \def\section{\@startsection {section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {2.3ex \@plus.2ex}%
+ {\normalfont\Large\bfseries}}%
+ \def\subsection{\@startsection{subsection}{2}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\large\bfseries}}%
+ \def\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {3.25ex \@plus1ex \@minus.2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+ {3.25ex \@plus1ex \@minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ }{%
+ \scr@ifundefinedorrelax{if@mainmatter}{%
+ \expandafter\newif\csname if@mainmatter\endcsname
+ }{}%
+ \def\frontmatter{%
+ \cleardoublepage
+ \@mainmatterfalse
+ \pagenumbering{roman}}%
+ \def\mainmatter{%
+ \cleardoublepage
+ \@mainmattertrue
+ \pagenumbering{arabic}}%
+ \def\backmatter{%
+ \if@openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \@mainmatterfalse}%
+ \def\part{%
+ \if@openright
+ \cleardoublepage
+ \else
+ \clearpage
+ \fi
+ \thispagestyle{plain}%
+ \if@twocolumn
+ \onecolumn
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
+ \null\vfil
+ \secdef\@part\@spart}%
+
+ \def\@part[#1]#2{%
+ \ifnum \c@secnumdepth >-2\relax
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\thepart\hspace{1em}#1}%
+ \else
+ \addcontentsline{toc}{part}{#1}%
+ \fi
+ \markboth{}{}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \ifnum \c@secnumdepth >-2\relax
+ \huge\bfseries \partname\nobreakspace\thepart
+ \par
+ \vskip 20\p@
+ \fi
+ \Huge \bfseries #2\par}%
+ \@endpart}%
+ \def\@spart#1{%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \Huge \bfseries #1\par}%
+ \@endpart}%
+ \def\@endpart{\vfil\newpage
+ \if@twoside
+ \if@openright
+ \null
+ \thispagestyle{empty}%
+ \newpage
+ \fi
+ \fi
+ \if@tempswa
+ \twocolumn
+ \fi}%
+ \def\chapter{\if@openright\cleardoublepage\else\clearpage\fi
+ \thispagestyle{plain}%
+ \global\@topnum\z@
+ \@afterindentfalse
+ \secdef\@chapter\@schapter}%
+ \def\@chapter[#1]#2{\ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter
+ \refstepcounter{chapter}%
+ \typeout{\@chapapp\space\thechapter.}%
+ \addcontentsline{toc}{chapter}%
+ {\protect\numberline{\thechapter}#1}%
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \else
+ \addcontentsline{toc}{chapter}{#1}%
+ \fi
+ \chaptermark{#1}%
+ \addtocontents{lof}{\protect\addvspace{10\p@}}%
+ \addtocontents{lot}{\protect\addvspace{10\p@}}%
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#2}]%
+ \else
+ \@makechapterhead{#2}%
+ \@afterheading
+ \fi}%
+ \def\@makechapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright \normalfont
+ \ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter
+ \huge\bfseries \@chapapp\space \thechapter
+ \par\nobreak
+ \vskip 20\p@
+ \fi
+ \fi
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}%
+ \def\@schapter#1{\if@twocolumn
+ \@topnewpage[\@makeschapterhead{#1}]%
+ \else
+ \@makeschapterhead{#1}%
+ \@afterheading
+ \fi}%
+ \def\@makeschapterhead#1{%
+ \vspace*{50\p@}%
+ {\parindent \z@ \raggedright
+ \normalfont
+ \interlinepenalty\@M
+ \Huge \bfseries #1\par\nobreak
+ \vskip 40\p@
+ }}%
+ \def\section{\@startsection {section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {2.3ex \@plus.2ex}%
+ {\normalfont\Large\bfseries}}%
+ \def\subsection{\@startsection{subsection}{2}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\large\bfseries}}%
+ \def\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-3.25ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\paragraph{\@startsection{paragraph}{4}{\z@}%
+ {3.25ex \@plus1ex \@minus.2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ \def\subparagraph{\@startsection{subparagraph}{5}{\parindent}%
+ {3.25ex \@plus1ex \@minus .2ex}%
+ {-1em}%
+ {\normalfont\normalsize\bfseries}}%
+ }%
+}% End of the derived code.
+\scr@ifundefinedorrelax{scr@saved@startsection}{}{%
+ \ifx\@startsection\scr@saved@startsection\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@startsection,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@startsection\scr@saved@startsection
+ \fi
+}
+\scr@ifundefinedorrelax{scr@latex@sect}{}{%
+ \ifx\@sect\scr@latex@sect\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@sect,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@sect\scr@latex@sect
+ \fi
+}
+\scr@ifundefinedorrelax{scr@latex@ssect}{}{%
+ \ifx\@ssect\scr@latex@ssect\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@ssect,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@sect\scr@latex@ssect
+ \fi
+}
+\scr@ifundefinedorrelax{scr@latex@xsect}{}{%
+ \ifx\@xsect\scr@latex@xsect\else
+ \PackageWarningNoLine{scrhack}{%
+ Resetting \string\@xsect,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\@sect\scr@latex@sect
+ \fi
+}
+\scr@ifundefinedorrelax{DeclareSectionCommand}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\DeclareSectionCommand\space
+ and all derivates deactivated,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \let\DeclareSectionCommand\undefined
+ \let\DeclareSectionCommands\undefined
+ \let\RedeclareSectionCommand\undefined
+ \let\RedeclareSectionCommands\undefined
+ \let\DeclareNewSectionCommand\undefined
+ \let\DeclareNewSectionCommands\undefined
+ \let\ProvideSectionCommand\undefined
+ \let\ProvideSectionCommands\undefined
+}
+\let\scr@chapter@before@hyperref@patch\relax
+\let\scr@chapter@after@hyperref@patch\relax
+\scr@ifundefinedorrelax{scr@osectarg}{}{%
+ \def\reserved@a{0}%
+ \ifx\scr@osectarg\reserved@a\else
+ \let\scr@osectarg\reserved@a
+ \PackageWarningNoLine{scrhack}{%
+ Extended option handling for section commands deactivated,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \fi
+}%
+\scr@ifundefinedorrelax{scr@activate@xsection}{}{%
+ \renewcommand*{\scr@activate@xsection}[1]{%
+ \edef\scr@osectarg{#1}\def\reserved@a{0}%
+ \ifx\scr@osectarg\reserved@a
+ \else
+ \let\scr@osectarg\reserved@a
+ \PackageWarning{scrhack}{%
+ Because of loading the standard classes\MessageBreak
+ sections hack, the extended option handling\MessageBreak
+ of section commands failed%
+ }%
+ \fi
+ }%
+}
+\scr@ifundefinedorrelax{partformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\partformat\space
+ deactivated,\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{chapterformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\chapterformat\space
+ deactivated,\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{sectionformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\sectionformat\space set to
+ `\string\thesection\string\quad',\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\sectionformat}{\thesection\quad}%
+}
+\scr@ifundefinedorrelax{subsectionformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\subsectionformat\space set to
+ `\string\thesubsection\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\subsectionformat}{\thesubsection\quad}%
+}
+\scr@ifundefinedorrelax{subsubsectionformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\subsubsectionformat\space set to
+ `\string\thesubsubsection\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\subsubsectionformat}{\thesubsubsection\quad}%
+}
+\scr@ifundefinedorrelax{paragraphformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\paragraphformat\space set to
+ `\string\theparagraph\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\paragraphformat}{\theparagraph\quad}%
+}
+\scr@ifundefinedorrelax{subparagraphformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ \string\subparagraphformat\space set to
+ `\string\thesubparagraph\string\quad'\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+ \renewcommand*{\subparagraphformat}{\thesubparagraph\quad}%
+}
+\scr@ifundefinedorrelax{partlineswithprefixformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\partlineswithprefixformat\space deactivated,\MessageBreak
+ because of loading the standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{chapterlineswithprefixformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\chapterlineswithprefixformat\space and\MessageBreak
+ \string\chapterlinesformat\space deactivated,\MessageBreak
+ because of using standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{sectionlinesformat}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ Usage of \string\sectionlinesformat\space and\MessageBreak
+ \string\sectioncatchphraseformat\space deactivated,\MessageBreak
+ because of using standard classes sections hack%
+ }%
+}
+\scr@ifundefinedorrelax{KOMAClassName}{}{%
+ \PackageWarningNoLine{scrhack}{%
+ KOMA-Script option `headings' removed,\MessageBreak
+ because of loading standard classes sections hack%
+ }%
+ \RelaxFamilyKey[.\KOMAClassFileName]{KOMA}{headings}%
+ \KOMA@kav@removekey{.\KOMAClassFileName}{headings}%
+}
+\def\scr@class@titlesec@warning{%
+ \PackageWarning{scrhack}{%
+ Usage of `titlesec' should work, because of\MessageBreak
+ loading the standard classes sections hack.\MessageBreak
+ However, you should know, there is not any\MessageBreak
+ support for this combination by the\MessageBreak
+ KOMA-Script author%
+ }%
+}
+\endinput
+%%
+%% End of file `standardsections.hak'.
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 44e2cccd305..a081d5e3f6c 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -16,11 +16,12 @@
%% scrkernel-tocstyle.dtx (with options: `package,style,undottedtocline')
%% scrkernel-tocstyle.dtx (with options: `package,style,largetocline')
%% scrkernel-tocstyle.dtx (with options: `package,style,tocline')
+%% scrkernel-tocstyle.dtx (with options: `package,style,toctext')
%% scrkernel-tocstyle.dtx (with options: `package,style,default')
%% tocbasic.dtx (with options: `package,exit')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2008-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 2008-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -48,28 +49,28 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(handling toc-files)%
]
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: prepare)
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: prepare)
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: option)
\ProcessOptions\relax
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: body)
\RequirePackage{scrbase}
\AfterPackage*{multitoc}{%
@@ -159,6 +160,7 @@
\tb@listoftocs
\reserved@a
}
+\newcommand*{\categoryoftoc}{\owneroftoc}
\newcommand*{\AtAddToTocList}{%
\kernel@ifnextchar [%]
\@@AtAddToTocList\@AtAddToTocList
@@ -353,6 +355,10 @@
\setlength{\parfillskip}{\z@\@plus 1fil}%
\csname tocbasic@@before@hook\endcsname
\csname tb@#1@before@hook\endcsname
+ \let\tocbasic@saved@input\@input
+ \def\@input##1{%
+ \let\@input\tocbasic@saved@input\@input{##1}\par
+ }%
\@starttoc{#1}%
\csname tb@#1@after@hook\endcsname
\csname tocbasic@@after@hook\endcsname
@@ -681,6 +687,9 @@
\DefineFamilyKey[.toc]{KOMAarg}{owner}{%
\tb@ifvalueisnotempty{##1}{\edef\tb@nt@owner{##1}}%
}%
+ \DefineFamilyKey[.toc]{KOMAarg}{category}{%
+ \tb@ifvalueisnotempty{##1}{\edef\tb@nt@owner{##1}}%
+ }%
\DefineFamilyKey[.toc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
\FamilyExecuteOptions[.toc]{KOMAarg}{#1}%
\RelaxFamilyKey[.toc]{KOMAarg}{@else@}%
@@ -692,7 +701,7 @@
\DefineFamilyKey[.toc]{KOMAarg}{type}{\FamilyKeyStateProcessed}%
\DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}%
\DefineFamilyKey[.toc]{KOMAarg}{extension}{\FamilyKeyStateProcessed}%
- \DefineFamilyKey[.toc]{KOMAarg}{owner}{\FamilyKeyStateProcessed}%
+ \DefineFamilyKey[.toc]{KOMAarg}{category}{\FamilyKeyStateProcessed}%
\ifstr{\tb@nt@tocentrystyle}{}{}{%
\begingroup
\let\scr@dte@current\tb@nt@type
@@ -703,6 +712,7 @@
\l@addto@macro\tb@nt@extra@relax@opts{%
\RelaxFamilyKey[.toc]{KOMAarg}{toc##1}%
\RelaxFamilyKey[.toc]{KOMAarg}{tocentry##1}%
+ \RelaxFamilyKey[.toc]{KOMAarg}{tocentry##1:}%
}%
}%
\kernel@ifnextchar[%]
@@ -722,6 +732,9 @@
\l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1:}{%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1:={####1}}%
+ }%
}%
}%
\def\@dodefault##1[##2]{%
@@ -737,6 +750,9 @@
\l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
\FamilyKeyStateProcessed
}%
+ \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1:}{%
+ \l@addto@macro{\tb@nt@tocstyle@options}{,##1:={####1}}%
+ }%
}%
}%
\scr@dte@doopts
@@ -845,6 +861,7 @@
\RelaxFamilyKey[.toc]{KOMAarg}{atend}%
\RelaxFamilyKey[.toc]{KOMAarg}{atbegin}%
\tb@nt@extra@relax@opts
+ \RelaxFamilyKey[.toc]{KOMAarg}{category}%
\RelaxFamilyKey[.toc]{KOMAarg}{owner}%
\RelaxFamilyKey[.toc]{KOMAarg}{extension}%
\RelaxFamilyKey[.toc]{KOMAarg}{tocentrystyle}%
@@ -1016,7 +1033,7 @@
}%
}
\newcommand*{\tb@nt@autofloattype}{16}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\scr@numberline}[1]{%
\numberline@box{%
@@ -1068,7 +1085,9 @@
\begingroup
\def\do@endgroup{\endgroup}%
\def\do##1{%
- \l@addto@macro\do@endgroup{\RelaxFamilyKey[.dte]{KOMAarg}{##1}}%
+ \l@addto@macro\do@endgroup{%
+ \RelaxFamilyKey[.dte]{KOMAarg}{##1}%
+ }%
\scr@dte@gobbleopt
}%
\scr@dte@doopts
@@ -1085,6 +1104,21 @@
\@DefineTOCEntryOption{#1}{#2}{%
\@DefineTOCEntryLengthOptionMacro{#2}{#3}{#4}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #3\scr@dte@current#4\expandafter\endcsname
+ \csname #3##1#4\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2+}{%
+ \@DefineTOCEntryAddLengthOptionMacro{#2+}{#3}{#4}{##1}%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}%
+ \noexpand\do{#2:}\noexpand\do{#2+}%
+ }%
}
\newcommand*{\@DefineTOCEntryLengthOptionWithDefault}{}
\def\@DefineTOCEntryLengthOptionWithDefault#1#2[#3]#4#5#6{%
@@ -1092,6 +1126,21 @@
\@DefineTOCEntryOption{#1}{#2}[{#3}]{%
\@DefineTOCEntryLengthOptionMacro{#2}{#4}{#5}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#4##1#5}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #4\scr@dte@current#5\expandafter\endcsname
+ \csname #4##1#5\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2+}{%
+ \@DefineTOCEntryAddLengthOptionMacro{#2+}{#4}{#5}{##1}%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}%
+ \noexpand\do{#2:}\noexpand\do{#2+}%
+ }%
}
\newcommand*{\@DefineTOCEntryLengthOptionMacro}[4]{%
\protected@edef\reserved@a{%
@@ -1106,6 +1155,26 @@
\fi
\fi
}
+\newcommand*{\@DefineTOCEntryAddLengthOptionMacro}[4]{%
+ \@ifundefined{#2\scr@dte@current#3}{%
+ \FamilyKeyStateUnknownValue
+ }{%
+ \protected@edef\reserved@a{%
+ \noexpand\FamilySetLength{KOMAarg}{#1}{\noexpand\@tempskipa}{#4}%
+ }\reserved@a
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \ifscr@dte@expandtopt
+ \expandafter\edef\csname #2\scr@dte@current#3\endcsname{%
+ \the\glueexpr\@tempskipa
+ +\csname #2\scr@dte@current#3\endcsname\relax}%
+ \else
+ \expandafter\protected@edef\csname #2\scr@dte@current#3\endcsname{%
+ \the\glueexpr #4%
+ +\csname #2\scr@dte@current#3\endcsname\relax}%
+ \fi
+ \fi
+ }%
+}
\newcommand*{\@DefineTOCEntryNumberOption}[2]{%
\kernel@ifnextchar [%]
{\@DefineTOCEntryNumberOptionWithDefault{#1}{#2}}
@@ -1116,6 +1185,21 @@
\@DefineTOCEntryOption{#1}{#2}{%
\@DefineTOCEntryNumberOptionMacro{#2}{#3}{#4}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #3\scr@dte@current#4\expandafter\endcsname
+ \csname #3##1#4\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2+}{%
+ \@DefineTOCEntryAddNumberOptionMacro{#2+}{#3}{#4}{##1}%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}%
+ \noexpand\do{#2:}\noexpand\do{#2+}%
+ }%
}
\newcommand*{\@DefineTOCEntryNumberOptionWithDefault}{}
\def\@DefineTOCEntryNumberOptionWithDefault#1#2[#3]#4#5#6{%
@@ -1123,6 +1207,21 @@
\@DefineTOCEntryOption{#1}{#2}[{#3}]{%
\@DefineTOCEntryNumberOptionMacro{#2}{#4}{#5}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#4##1#5}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #4\scr@dte@current#5\expandafter\endcsname
+ \csname #4##1#5\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2+}{%
+ \@DefineTOCEntryAddNumberOptionMacro{#2+}{#4}{#5}{##1}%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}%
+ \noexpand\do{#2:}\noexpand\do{#2+}%
+ }%
}
\newcommand*{\@DefineTOCEntryNumberOptionMacro}[4]{%
\protected@edef\reserved@a{%
@@ -1131,6 +1230,20 @@
}{#4}%
}\reserved@a
}
+\newcommand*{\@DefineTOCEntryAddNumberOptionMacro}[4]{%
+ \@ifundefined{#2\scr@dte@current#3}{%
+ \FamilyKeyStateUnknownValue
+ }{%
+ \FamilySetCounterMacro{KOMAarg}{#1}{%
+ \reserved@a
+ }{#4}%
+ \ifx\FamilyKeyState\FamilyKeyStateProcessed
+ \expandafter\edef\csname #2\scr@dte@current#3\endcsname{%
+ \the\numexpr \reserved@a+\csname #2\scr@dte@current#3\endcsname\relax
+ }%
+ \fi
+ }%
+}
\newcommand*{\@DefineTOCEntryBooleanOption}[2]{%
\kernel@ifnextchar [%]
{\@DefineTOCEntryBoolOptionWithDefault{#1}{#2}}
@@ -1143,6 +1256,17 @@
\@DefineTOCEntryOption{#1}{#2}[true]{%
\@DefineTOCEntryBoolOptionMacro{#2}{#3}{#4}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{if#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname if#3\scr@dte@current#4\expandafter\endcsname
+ \csname if#3##1#4\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
}
\newcommand*{\@DefineTOCEntryBoolOptionWithDefault}{}
\def\@DefineTOCEntryBoolOptionWithDefault#1#2[#3]#4#5#6{%
@@ -1152,6 +1276,17 @@
\@DefineTOCEntryOption{#1}{#2}[{#3}]{%
\@DefineTOCEntryBoolOptionMacro{#2}{#4}{#5}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{if#4##1#5}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname if#4\scr@dte@current#5\expandafter\endcsname
+ \csname if#4##1#5\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
}
\newcommand*{\@DefineTOCEntryBoolOptionMacro}[4]{%
\@ifundefined{if#2\scr@dte@current#3}{%
@@ -1169,6 +1304,17 @@
\@DefineTOCEntryOption{#1}{#2}[true]{%
\@DefineTOCEntryIfOptionMacro{#2}{#3}{#4}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{If#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname If#3\scr@dte@current#4\expandafter\endcsname
+ \csname If#3##1#4\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
}
\newcommand*{\@DefineTOCEntryIfOptionWithDefault}{}
\def\@DefineTOCEntryIfOptionWithDefault#1#2[#3]#4#5#6{%
@@ -1176,6 +1322,17 @@
\@DefineTOCEntryOption{#1}{#2}[{#3}]{%
\@DefineTOCEntryIfOptionMacro{#2}{#4}{#5}{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{If#4##1#5}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname If#4\scr@dte@current#5\expandafter\endcsname
+ \csname If#4##1#5\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
}
\newcommand*{\@DefineTOCEntryIfOptionMacro}[4]{%
\FamilySetBool{KOMAarg}{#1}{@tempswa}{#4}%
@@ -1202,10 +1359,32 @@
\@DefineTOCEntryOption{#1}{#2}{%
\@DefineTOCEntryCommandOptionMacro{#2}{#3}{#4}[#5]{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #3\scr@dte@current#4\expandafter\endcsname
+ \csname #3##1#4\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
\or
\@DefineTOCEntryOption{#1}{#2}{%
\@DefineTOCEntryCommandOptionMacro{#2}{#3}{#4}[#5]{##1{####1}}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#3##1#4}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #3\scr@dte@current#4\expandafter\endcsname
+ \csname #3##1#4\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
\else
\PackageError{tocbasic%
}{only one argument supported}{%
@@ -1224,14 +1403,47 @@
\@DefineTOCEntryOption{#1}{#2}[{#3}]{%
\@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#4##1#5}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #4\scr@dte@current#5\expandafter\endcsname
+ \csname #4##1#5\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
\or
\@DefineTOCEntryOption{#1}{#2}[{#3}]{%
\@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1{####1}}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#4##1#5}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #4\scr@dte@current#5\expandafter\endcsname
+ \csname #4##1#5\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
\or
\@DefineTOCEntryOption{#1}{#2}[{#3}]{%
\@DefineTOCEntryCommandOptionMacro{#2}{#4}{#5}[#6]{##1{####1}{####2}}%
}%
+ \DefineFamilyKey[.dte]{KOMAarg}{#2:}{%
+ \scr@ifundefinedorrelax{#4##1#5}{\FamilyKeyStateUnknownValue}{%
+ \expandafter\let
+ \csname #4\scr@dte@current#5\expandafter\endcsname
+ \csname #4##1#5\endcsname
+ \FamilyKeyStateProcessed
+ }%
+ }%
+ \edef\scr@dte@doopts{%
+ \unexpanded\expandafter{\scr@dte@doopts}\noexpand\do{#2:}%
+ }%
\else
\PackageError{tocbasic%
}{only one argument supported}{%
@@ -1281,6 +1493,7 @@
}
\newcommand*{\@ExecuteTOCEntryStyleInitCode}[2]{%
\let\scr@dte@doopts\@empty
+ \expandafter\let\csname scr@dte@#1@needs\endcsname\relax
\scr@ifundefinedorrelax{scr@dte@#1@init}{}{%
\def\DefineTOCEntryBooleanOption{\@DefineTOCEntryBooleanOption{#1}}%
\def\DefineTOCEntryCommandOption{\@DefineTOCEntryCommandOption{#1}}%
@@ -1358,6 +1571,7 @@
\if@tempswa
\@nameuse{scr@dte@def@l@#2}{#3}%
\expandafter\edef\csname scr@dte@#3@style\endcsname{#2}%
+ \expandafter\edef\csname scr@tso@#3@style\endcsname{#2}%
\expandafter\let\csname toclevel@#3\expandafter\endcsname
\csname #3tocdepth\endcsname
\if@atdocument\else
@@ -1417,10 +1631,13 @@
\expandafter\let\csname scr@dte@#2@init\expandafter\endcsname
\csname scr@dte@#1@init\endcsname
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+\providecommand*\@pnumwidth{1.55em}
+\providecommand*\@tocrmarg {2.55em}
+\providecommand*\@dotsep {4.5}
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: style,gobble)
\DeclareTOCEntryStyle{gobble}{}%
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: style,dottedtocline)
\DeclareTOCEntryStyle{dottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1546,10 +1763,15 @@
}%
}{}%
}]{%
- \@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}%
- {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
+ \iftocfeature{\@currext}{noindent}{%
+ \@dottedtocline{\@nameuse{#1tocdepth}}{\z@}%
+ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
+ }{%
+ \@dottedtocline{\@nameuse{#1tocdepth}}{\@nameuse{scr@tso@#1@indent}}%
+ {\@nameuse{scr@tso@#1@numwidth}}{##1}{##2}%
+ }%
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: style,undottedtocline)
\DeclareTOCEntryStyle{undottedtocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1695,8 +1917,12 @@
\leavevmode
\bfseries
\advance\leftskip\@tempdima
- \advance\leftskip\@nameuse{scr@tso@#1@indent}%
- \hskip -\dimexpr \leftskip-\@nameuse{scr@tso@#1@indent}\relax
+ \iftocfeature{\@currext}{noindent}{%
+ \hskip -\leftskip
+ }{%
+ \advance\leftskip\@nameuse{scr@tso@#1@indent}%
+ \hskip -\dimexpr \leftskip-\@nameuse{scr@tso@#1@indent}\relax
+ }%
##1%
\nobreak
\hfil \nobreak\hb@xt@\@pnumwidth{\hss ##2}%
@@ -1705,7 +1931,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: style, largetocline)
\DeclareTOCEntryStyle{largetocline}[{%
\DefineTOCEntryLengthOption{indent}%
@@ -1802,7 +2028,10 @@
\leavevmode
\large
\bfseries
- \advance\leftskip\@nameuse{scr@tso@#1@indent}%
+ \iftocfeature{\@currext}{noindent}{%
+ }{%
+ \advance\leftskip\@nameuse{scr@tso@#1@indent}%
+ }%
##1%
\hfil \nobreak\hb@xt@\@pnumwidth{\hss ##2}%
\par
@@ -1815,7 +2044,7 @@
\endgroup
\fi
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: style,tocline)
\DeclareTOCEntryStyle{tocline}[{%
\DefineTOCEntryLengthOption{beforeskip}%
@@ -1842,6 +2071,10 @@
{scr@tso@}{@pagenumberbox}[1]{page number box}%
\DefineTOCEntryCommandOption{pagenumberformat}%
{scr@tso@}{@pagenumberformat}[1]{page number format}%
+ \DefineTOCEntryLengthOption{pagenumberwidth}%
+ {scr@tso@}{@pagenumberwidth}{width of page number box}%
+ \DefineTOCEntryLengthOption{rightindent}%
+ {scr@tso@}{@rightindent}{entry's text right indent}%
\DefineTOCEntryOption{raggedentrytext}[true]{%
\FamilySetBool{KOMAarg}{raggedentrytext}{@tempswa}{##1}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -1920,6 +2153,32 @@
\@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}%
}%
}{}%
+ \scr@ifundefinedorrelax{scr@tso@#1@pagenumberwidth}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@pagenumberwidth}{%
+ \@namedef{scr@tso@#1@pagenumberwidth}{\@pnumwidth}%
+ }{%
+ \expandafter\let
+ \csname scr@tso@#1@pagenumberwidth\expandafter\endcsname
+ \csname scr@tso@\scr@dte@nosub{#1}@pagenumberwidth\endcsname
+ }%
+ }{%
+ \@namedef{scr@tso@#1@pagenumberwidth}{\@pnumwidth}%
+ }%
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#1@rightindent}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@rightindent}{%
+ \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}%
+ }{%
+ \expandafter\let
+ \csname scr@tso@#1@rightindent\expandafter\endcsname
+ \csname scr@tso@\scr@dte@nosub{#1}@rightindent\endcsname
+ }%
+ }{%
+ \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}%
+ }%
+ }{}%
\@ifundefined{scr@tso@#1@indent}{%
\ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
\ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
@@ -2115,7 +2374,7 @@
}%
\expandafter\providecommand%
\csname scr@tso@#1@pagenumberbox\endcsname[1]{%
- \hb@xt@\@pnumwidth{\hfil ##1}}%
+ \hb@xt@\@nameuse{scr@dte@pagenumberwidth}{\hfil ##1}}%
\expandafter\providecommand\csname Ifscr@tso@#1@dynnumwidth\endcsname[2]{##2}%
}]{%
\scr@dte@tocline{#1}{##1}{##2}%
@@ -2151,13 +2410,21 @@
\tocbasic@DependOnPenaltyAndTOCLevel{#1}%
\addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax
{%
- \leftskip \@nameuse{scr@tso@#1@indent}\relax
- \rightskip \@tocrmarg
+ \iftocfeature{\@currext}{noindent}{%
+ \leftskip \z@
+ }{%
+ \leftskip \@nameuse{scr@tso@#1@indent}\relax
+ }%
+ \rightskip \@nameuse{scr@tso@#1@rightindent}\relax
\parfillskip -\rightskip
\@nameuse{Ifscr@tso@#1@raggedpage}{%
\addtolength{\parfillskip}{\z@ \@plus 1fil}%
}{}%
- \parindent \@nameuse{scr@tso@#1@indent}\relax
+ \iftocfeature{\@currext}{noindent}{%
+ \parindent \z@
+ }{%
+ \parindent \@nameuse{scr@tso@#1@indent}\relax
+ }%
\@afterindenttrue
\interlinepenalty\@M
\expandafter\ifx\csname ragged#1entry\endcsname\raggedright
@@ -2225,6 +2492,8 @@
{%
\normalfont\normalsize\@nameuse{scr@tso@#1@linefill}%
\nobreak
+ \expandafter\let\expandafter\scr@dte@pagenumberwidth
+ \csname scr@tso@#1@pagenumberwidth\endcsname
\@nameuse{scr@tso@#1@pagenumberbox}{%
\@nameuse{scr@tso@#1@pagenumberformat}{#3}%
}%
@@ -2258,10 +2527,240 @@
\mkern \@dotsep mu\hbox{#1}\mkern \@dotsep
mu$}\hfill
}
-%%% From File: $Id: scrkernel-tocstyle.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
+%%% (run: style,toctext)
+\DeclareTOCEntryStyle{toctext}[{%
+ \DefineTOCEntryCommandOption{entryformat}%
+ {scr@tso@}{@entryformat}[1]{entry format}%
+ \DefineTOCEntryCommandOption{entrynumberformat}%
+ {scr@tso@}{@numberformat}[1]{entry number format}%
+ \DefineTOCEntryCommandOption{prepagenumber}%
+ {scr@tso@}{@prepagenumber}{separator between text and page number}%
+ \DefineTOCEntryLengthOption{numsep}%
+ {scr@tso@}{@numsep}{entry number separation}%
+ \DefineTOCEntryCommandOption{onstartfirstentry}%
+ {scr@tso@}{@onstartfirstentry}{output at start of paragraph}%
+ \DefineTOCEntryCommandOption{onstartentry}%
+ {scr@tso@}{@onstartentry}{output at start of all entries but the first}%
+ \DefineTOCEntryCommandOption{onendlastentry}%
+ {scr@tso@}{@onendlastentry}{output at end of paragraph}%
+ \DefineTOCEntryCommandOption{afterpar}%
+ {scr@tso@}{@afterpar}{settings after end of paragraph}%
+ \DefineTOCEntryCommandOption{onendentry}%
+ {scr@tso@}{@onendentry}{output at end of all entries but the last}%
+ \DefineTOCEntryCommandOption{pagenumberformat}%
+ {scr@tso@}{@pagenumberformat}[1]{page number format}%
+ \DefineTOCEntryLengthOption{rightindent}%
+ {scr@tso@}{@rightindent}{entry's text right indent}%
+ \DefineTOCEntryIfOption{raggedright}%
+ {scr@tso@}{@raggedright}{use raggedright for the whole paragraph}%
+ \DefineTOCEntryLengthOption{indent}%
+ {scr@tso@}{@indent}{entry indent}%
+ \scr@ifundefinedorrelax{#1tocdepth}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{\scr@dte@nosub{#1}tocdepth}{}{%
+ \expandafter\edef\csname #1tocdepth\endcsname{%
+ \the\numexpr \noexpand\@nameuse{\scr@dte@nosub{#1}tocdepth}+\@ne\relax
+ }%
+ }%
+ }{}%
+ }{}%
+ \@ifundefined{#1tocdepth}{%
+ \ifstr{#1}{part}{\@namedef{#1tocdepth}{-1}}{%
+ \ifstr{#1}{chapter}{\@namedef{#1tocdepth}{0}}{%
+ \ifstr{#1}{section}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{subsection}{\@namedef{#1tocdepth}{2}}{%
+ \ifstr{#1}{subsubsection}{\@namedef{#1tocdepth}{3}}{%
+ \ifstr{#1}{paragraph}{\@namedef{#1tocdepth}{4}}{%
+ \ifstr{#1}{subparagraph}{\@namedef{#1tocdepth}{5}}{%
+ \ifstr{#1}{figure}{\@namedef{#1tocdepth}{1}}{%
+ \ifstr{#1}{table}{\@namedef{#1tocdepth}{1}}{%
+ \expandafter\let\csname #1tocdepth\expandafter\endcsname
+ \csname #1numdepth\endcsname
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#1@indent}{%
+ \@ifundefined{scr@#1@tocindent}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@indent}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{}{%
+ \expandafter\edef\csname scr@tso@#1@indent\endcsname{%
+ \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}%
+ \relax
+ }%
+ }%
+ }{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@numwidth}{%
+ \expandafter\edef\csname scr@tso@#1@indent\endcsname{%
+ \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@indent}%
+ \relax
+ }%
+ }{%
+ \expandafter\edef\csname scr@tso@#1@indent\endcsname{%
+ \glueexpr \noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@indent}%
+ +\noexpand\@nameuse{scr@tso@\scr@dte@nosub{#1}@numwidth}%
+ \relax
+ }%
+ }%
+ }%
+ }{}%
+ }{%
+ \@namedef{scr@tso@#1@indent}{\@nameuse{scr@#1@tocindent}}%
+ }%
+ }{}%
+ \scr@ifundefinedorrelax{scr@tso@#1@rightindent}{%
+ \ifstrstart{#1}{sub}{%
+ \scr@ifundefinedorrelax{scr@tso@\scr@dte@nosub{#1}@rightindent}{%
+ \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}%
+ }{%
+ \expandafter\let
+ \csname scr@tso@#1@rightindent\expandafter\endcsname
+ \csname scr@tso@\scr@dte@nosub{#1}@rightindent\endcsname
+ }%
+ }{%
+ \@namedef{scr@tso@#1@rightindent}{\@tocrmarg}%
+ }%
+ }{}%
+ \@ifundefined{scr@tso@#1@indent}{%
+ \ifstr{#1}{figure}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{table}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{part}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \ifstr{#1}{chapter}{\@namedef{scr@tso@#1@indent}{0em}}{%
+ \scr@ifundefinedorrelax{l@chapter}{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{0pt}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{3.8em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{7em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{%
+ \ifstr{#1}{section}{\@namedef{scr@tso@#1@indent}{1.5em}}{%
+ \ifstr{#1}{subsection}{\@namedef{scr@tso@#1@indent}{3.8em}}{%
+ \ifstr{#1}{subsubsection}{%
+ \@namedef{scr@tso@#1@indent}{7.0em}%
+ }{%
+ \ifstr{#1}{paragraph}{%
+ \@namedef{scr@tso@#1@indent}{10em}%
+ }{%
+ \ifstr{#1}{subparagraph}{%
+ \@namedef{scr@tso@#1@indent}{12em}%
+ }{%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }%
+ }{}%
+ \expandafter\providecommand\expandafter*%
+ \csname scr@tso@#1@numsep\endcsname{.4em}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@onstartfirstentry\endcsname{}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@onstartentry\endcsname{}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@onendlastentry\endcsname{}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@onendentry\endcsname{\quad}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@afterpar\endcsname{}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@numberformat\endcsname[1]{##1}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@entryformat\endcsname[1]{##1}%
+ \expandafter\providecommand%
+ \csname Ifscr@tso@#1@raggedright\endcsname[2]{##2}%
+ \expandafter\providecommand%
+ \csname scr@tso@#1@prepagenumber\endcsname{\nobreakspace}%
+}]{%
+ \scr@dte@toctext{#1}{##1}{##2}%
+}
+\newcommand*{\scr@dte@toctext}[3]{%
+ \ifnum \@nameuse{#1tocdepth}>\c@tocdepth
+ \else
+ \ifhmode
+ \scr@dte@toctext@lastend
+ \@nameuse{scr@tso@#1@onstartentry}%
+ \else
+ \leavevmode
+ \def\par{%
+ \scr@dte@toctext@raggedright
+ \scr@dte@toctext@parend
+ \@par
+ \scr@dte@toctext@afterpar
+ \global\let\scr@dte@toctext@afterpar\relax
+ \global\let\scr@dte@toctext@parend\relax
+ \global\let\scr@dte@toctext@raggedright\relax
+ }%
+ \global\let\scr@dte@toctext@afterpar\@empty
+ \iftocfeature{\@currext}{noindent}{%
+ \leftskip \z@
+ }{%
+ \leftskip \@nameuse{scr@tso@#1@indent}\relax
+ }%
+ \rightskip \@nameuse{scr@tso@#1@rightindent}\relax
+ \parfillskip \z@ \@plus 1fill\relax
+ \edef\@noitemerr{\unexpanded{\par\def\@noitemerr}%
+ {\unexpanded\expandafter{\@noitemerr}}}%
+ \@nameuse{scr@tso@#1@onstartfirstentry}%
+ \fi
+ \@nameuse{Ifscr@tso@#1@raggedright}{%
+ \let\\\@centercr
+ \gdef\scr@dte@toctext@raggedright{%
+ \@rightskip\@flushglue
+ \addtolength\rightskip\@rightskip
+ }%
+ }{}%
+ \l@addto@macro\scr@dte@toctext@afterpar{\@nameuse{scr@tso@#1@afterpar}}%
+ \expandafter\global\expandafter\let\expandafter\scr@dte@toctext@lastend
+ \csname scr@tso@#1@onendentry\endcsname
+ \expandafter\global\expandafter\let\expandafter\scr@dte@toctext@parend
+ \csname scr@tso@#1@onendlastentry\endcsname
+ {%
+ \usetocbasicnumberline
+ \def\numberline@box##1{%
+ \mbox{%
+ \@nameuse{scr@tso@#1@numberformat}{\ignorespaces ##1\unskip}%
+ \hskip\@nameuse{scr@tso@#1@numsep}\relax
+ }%
+ }%
+ \@nameuse{scr@tso@#1@entryformat}{%
+ \ignorespaces#2\unskip
+ \@nameuse{scr@tso@#1@prepagenumber}%
+ \@nameuse{scr@tso@#1@pagenumberformat}{\ignorespaces #3\unskip}%
+ }%
+ }%
+ \fi
+}
+\newcommand*{\scr@dte@toctext@raggedright}{}
+\newcommand*{\scr@dte@toctext@parend}{}
+\newcommand*{\scr@dte@toctext@lastend}{}
+%%% From File: $Id: scrkernel-tocstyle.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: style,dottedtocline)
\CloneTOCEntryStyle{dottedtocline}{default}
-%%% From File: $Id: tocbasic.dtx 3050 2018-12-30 14:36:55Z kohm $
+%%% From File: $Id: tocbasic.dtx 3256 2019-10-10 07:06:49Z kohm $
%%% (run: exit)
\AtBeginDocument{%
\@ifundefined{MakeMarkcase}{%
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
index 13ce7adbe4f..e6adcb7539f 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocstyle.sty
@@ -7,7 +7,7 @@
%% tocstyle.dtx (with options: `package,trace,tocstyle')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 2007-2017 by Markus Kohm <komascript(at)gmx.info>
+%% Copyright (c) 2007-2019 by Markus Kohm <komascript(at)gmx.info>
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -27,32 +27,20 @@
%% `tocstyle.dtx' and `scrlogo.dtx'. You may however distribute the files
%% `tocstyle.dtx' and `scrlogo.dtx' without this file.
%%
-%% If this file is a beta version, you are not allowed to distribute it.
-%%
-%% English and German manuals are part of KOMA-Script bundle.
-%% ----------------------------------------------------------
-%%
%% The english manual is in `tocstyle.dtx', too.
%%
-%% The KOMA-Script bundle (but not this file) was based upon the LaTeX2.09
-%% Script family created by Frank Neukam 1993 and the LaTeX2e standard
-%% classes created by The LaTeX3 Project 1994-1996.
+%% THIS IS AN OBSOLETE PACKAGE! YOU SHOULD NOT USE IT!
%%
-%% THIS IS AN ALPHA VERSION!
-%% USAGE OF THIS VERSION IS ON YOUR OWN RISK!
-%% EVERYTHING MAY HAPPEN!
-%% EVERYTHING MAY CHANGE IN FUTURE!
-%% THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!
-%%
-%%% From File: $Id: tocstyle.dtx 2600 2017-02-23 12:07:58Z kohm $
+%%% From File: $Id: tocstyle.dtx 3249 2019-10-09 11:35:26Z kohm $
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocstyle}
- [2017/02/23 v0.2i-alpha KOMA-Script package (versatile toc styles)]
+ [2019/10/09 v0.2j-alpha deprecated package (versatile toc styles)]
\PackageWarningNoLine{tocstyle}{%
- THIS IS AN ALPHA VERSION!\MessageBreak
+ THIS IS A DEPRECATED ALPHA VERSION!\MessageBreak
USAGE OF THIS VERSION IS ON YOUR OWN RISK!\MessageBreak
EVERYTHING MAY HAPPEN!\MessageBreak
- EVERYTHING MAY CHANGE IN FUTURE!\MessageBreak
+ THE PACKAGE IS FROZEN WITH ALL IT'S BUGS!\MessageBreak
+ IT WILL BE REMOVED FROM KOMA-SCRIPT SOON!\MessageBreak
THERE IS NO SUPPORT, IF YOU USE THIS PACKAGE!\MessageBreak
Maybe it would be better, not to load this package%
}
@@ -255,9 +243,11 @@
\fi
\nobreak
\ifx\tocstyle@feature@pagenumberbox\relax
- \hb@xt@\@pnumwidth{\hfil\tocstyle@feature@pagenumberhook #5}%
+ \hb@xt@\@pnumwidth{\hfil\tocstyle@feature@pagenumberhook #5%
+ \kern-\p@\kern\p@}%
\else
- \tocstyle@feature@pagenumberbox{\tocstyle@feature@pagenumberhook #5}%
+ \tocstyle@feature@pagenumberbox{\tocstyle@feature@pagenumberhook #5%
+ \kern-\p@\kern\p@}%
\fi
\par
}%
@@ -459,7 +449,26 @@
\par}%
\fi}%
\ifx\@dottedtocline\@tempa\else
- \tocstyle@macrochangewarning\@dottedtocline
+ \def\@tempa#1#2#3#4#5{%
+ \ifnum #1>\c@tocdepth \else
+ \vskip \z@ \@plus.2\p@
+ {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip
+ \parindent #2\relax\@afterindenttrue
+ \interlinepenalty\@M
+ \leavevmode
+ \@tempdima #3\relax
+ \advance\leftskip \@tempdima \null\nobreak\hskip -\leftskip
+ {#4}\nobreak
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{.}\mkern \@dotsep
+ mu$}\hfill
+ \nobreak
+ \hb@xt@\@pnumwidth{\hfil \normalfont \normalcolor #5\kern-\p@\kern\p@}%
+ \par}%
+ \fi}%
+ \ifx\@dottedtocline\@tempa\else
+ \tocstyle@macrochangewarning\@dottedtocline
+ \fi
\fi
\let\tocstyle@saved@dottedtocline\@dottedtocline
\def\@tempa#1{\hb@xt@\@tempdima{#1\autodot\hfil}}%
diff --git a/Master/texmf-dist/tex/latex/koma-script/typearea.sty b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
index cc3fb5e316e..1c7d8c64e75 100644
--- a/Master/texmf-dist/tex/latex/koma-script/typearea.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/typearea.sty
@@ -16,7 +16,7 @@
%% scrkernel-typearea.dtx (with options: `package,typearea,final')
%% scrlogo.dtx (with options: `logo')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -44,11 +44,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -70,23 +70,23 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
\providecommand*{\scr@pkgextension}{\@pkgextension}
\AtBeginDocument{%
\let\scr@pkgextension\@pkgextension
}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: identify)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{typearea}[%
- 2019/02/01 v3.26b KOMA-Script
+ 2019/10/12 v3.27 KOMA-Script
package
(type area)]
-%%% From File: $Id: scrkernel-basics.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: load)
\RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\providecommand*
{\scr@compatibility}{\scr@v@last}
@@ -160,12 +160,13 @@
\@namedef{scr@v@3.26}{17}
\@namedef{scr@v@3.26a}{17}
\@namedef{scr@v@3.26b}{17}
+\@namedef{scr@v@3.27}{17}
\@namedef{scr@v@last}{17}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: init)
\providecommand\ta@divlist{{}{}{}{}{}{}{}{}{}{8}{10}{12}}
\providecommand\ta@divlistelse{1}
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: option)
\KOMA@key{version}[last]{%
\scr@ifundefinedorrelax{scr@v@#1}{%
@@ -220,7 +221,7 @@
\newcommand*{\scr@ta@v@is@ge}[1]{%
\numexpr\scr@ta@compatibility+\@ne >\@nameuse{scr@v@#1}
}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: options)
\providecommand*{\PaperNameToSize}[2][warning]{%
\ifstr{#2}{letter}{%
@@ -970,9 +971,9 @@
\KOMAExecuteOptions{twoside=false}
\fi
\KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\newcommand*{\ta@divfor}[1]{%
\ta@div=\z@
@@ -1710,7 +1711,7 @@
\kernel@ifstar \l@addto@macro \g@addto@macro \@areaset@end
}
\newcommand*{\@areaset@end}{}
-%%% From File: $Id: scrkernel-typearea.dtx 2993 2018-07-16 07:33:22Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: final)
\typearea[current]{current}
%%% From File: $Id: scrlogo.dtx 2640 2017-05-08 09:36:55Z kohm $
diff --git a/Master/texmf-dist/tex/latex/koma-script/visualize.lco b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
index 6ec3ef0d1d8..0d6e105476b 100644
--- a/Master/texmf-dist/tex/latex/koma-script/visualize.lco
+++ b/Master/texmf-dist/tex/latex/koma-script/visualize.lco
@@ -9,7 +9,7 @@
%% scrkernel-letterclassoptions.dtx (with options: `lco,visualize,body')
%% scrkernel-notepaper.dtx (with options: `lco,visualize,body')
%%
-%% Copyright (c) 1994-2017 Markus Kohm [komascript at gmx info]
+%% Copyright (c) 1994-2019 Markus Kohm [komascript at gmx info]
%%
%% This file was generated from file(s) of the KOMA-Script bundle.
%% ---------------------------------------------------------------
@@ -37,11 +37,11 @@
%%
%% The KOMA-Script bundle (but maybe not this file) was based upon the
%% LaTeX 2.09 Script family created by Frank Neukam 1993 and the LaTeX2e
-%% standard classes created by The LaTeX3 Project 1994-1996. You may
+%% standard classes created by The LaTeX3 Project 1994-1996. You can
%% find a complete unmodified copy of LaTeX2e at
%% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
%%
-%%% From File: $Id: scrkernel-version.dtx 3063 2019-02-01 07:39:11Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3263 2019-10-12 14:50:03Z kohm $
\begingroup
\catcode`\@11\relax
\ifx\KOMAScriptVersion\undefined
@@ -63,9 +63,9 @@
\fi
}
\fi
- \@CheckKOMAScriptVersion{2019/02/01 v3.26b KOMA-Script}%
+ \@CheckKOMAScriptVersion{2019/10/12 v3.27 KOMA-Script}%
\endgroup
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: head)
\ProvidesFile{%
visualize%
@@ -80,7 +80,7 @@
Letter class option #1 Warning: #2%
}%
}
-%%% From File: $Id: scrkernel-letterclassoptions.dtx 3011 2018-08-29 07:35:17Z kohm $
+%%% From File: $Id: scrkernel-letterclassoptions.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\RequirePackage{eso-pic}
\newcommand*{\showfields}[1]{%
@@ -577,7 +577,7 @@
\newcommand*{\showUScheck}{%
\showenvelope(8.625in,3.625in)%
}
-%%% From File: $Id: scrkernel-notepaper.dtx 3044 2018-11-16 19:00:32Z kohm $
+%%% From File: $Id: scrkernel-notepaper.dtx 3262 2019-10-10 08:25:29Z kohm $
%%% (run: body)
\endinput
%%