koma-script (6may17)

git-svn-id: svn://tug.org/texlive/trunk@44226 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 220 insertions, 110 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index ce361cb443c..efa6016aded 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -9,6 +9,8 @@
 %% tocbasic.dtx  (with options: `class,load,chapter')
 %% scrkernel-tocstyle.dtx  (with options: `class,report,prepare')
 %% scrkernel-sections.dtx  (with options: `class,report,prepare')
+%% scrkernel-compatibility.dtx  (with options: `class,report,init')
+%% scrkernel-typearea.dtx  (with options: `class,report,init')
 %% scrkernel-compatibility.dtx  (with options: `class,report,option')
 %% scrkernel-miscellaneous.dtx  (with options: `class,report,option')
 %% scrkernel-language.dtx  (with options: `class,report,option')
@@ -81,7 +83,7 @@
 %% find a complete unmodified copy of LaTeX2e at
 %% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
 %% 
-%%% From File: $Id: scrkernel-version.dtx 2491 2016-07-29 08:03:57Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2592 2017-02-16 16:56:10Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -103,7 +105,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2017/01/03 v3.22 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2017/04/13 v3.23 KOMA-Script}%
 \endgroup
 \providecommand*{\scr@clsextension}{\@clsextension}
 \AtBeginDocument{%
@@ -118,23 +120,23 @@
 \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
 \edef\KOMAClassFileName{\KOMAClassFileName}
 \ProvidesClass{\KOMAClassName}[%
-  2017/01/03 v3.22 KOMA-Script
+  2017/04/13 v3.23 KOMA-Script
   document class (\ClassName)%
 ]
-%%% From File: $Id: scrkernel-basics.dtx 2490 2016-07-29 06:29:45Z kohm $
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2499 2016-09-06 07:00:45Z kohm $
+%%% From File: $Id: tocbasic.dtx 2600 2017-02-23 12:07:58Z kohm $
 \RequirePackage{tocbasic}[%
-  2017/01/03 v3.22 KOMA-Script
+  2017/04/13 v3.23 KOMA-Script
 ]
 \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
 \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
 \addtotoclist{toc}
+\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
 \addtotoclist[float]{lof}
 \addtotoclist[float]{lot}
 %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
 %%%            (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
 %%%            (run: prepare)
 \newif\if@openright
 \@openrightfalse
@@ -210,70 +212,9 @@
 \newcommand*{\size@paragraph}{}
 \newcommand*{\size@subparagraph}{}
 \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $
-\newif\if@scr@emulatestandardclasses
-\let\scr@emulatestandardclassestrue\relax
-\let\scr@emulatestandardclassesfalse\relax
-\DeclareOption{emulatestandardclasses}{%
-  \let\if@scr@emulatestandardclasses\iftrue
-  \KOMAExecuteOptions{%
-    fontsize=10pt,%
-    headings=standardclasses,%
-    cleardoublepage=current
-  }%
-  \newcommand*{\defaultpapersize}{letter}%
-  \AtEndOfClass{%
-    \setkomafont{descriptionlabel}{\bfseries}%
-    \setkomafont{dictum}{\normalfont\small}%
-    \setkomafont{caption}{}%
-    \setkomafont{captionlabel}{}%
-    \setcapindent{0pt}%
-    \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}%
-    \PreventPackageFromLoading{scrpage2}%
-    \setkomafont{pagenumber}{\normalfont}%
-    \setkomafont{pageheadfoot}{\normalfont}%
-    \cfoot[\pagemark]{}%
-    \pagestyle{plain}%
-  }%
-}
+%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (init)
 \newcommand*
   {\scr@compatibility}{\scr@v@last}
-\KOMA@key{version}[last]{%
-  \scr@ifundefinedorrelax{scr@v@#1}{%
-    \def\scr@compatibility{0}%
-    \ClassWarningNoLine{\KOMAClassName}{%
-      You have set option `version' to value `#1', but\MessageBreak
-      this value of version is not supported.\MessageBreak
-      Because of this, version was set to `first'%
-    }%
-    \FamilyKeyStateProcessed
-    \KOMA@kav@replacevalue{.%
-      \KOMAClassFileName
-    }{version}{first}%
-  }{%
-    \ClassInfoNoLine{\KOMAClassName}{%
-      Switching compatibility level to `#1'%
-    }%
-    \edef\scr@compatibility{\@nameuse{scr@v@#1}}%
-    \FamilyKeyStateProcessed
-    \KOMA@kav@xreplacevalue{.%
-      \KOMAClassFileName
-    }{version}{#1}%
-  }%
-}
-\KOMA@kav@add{.\KOMAClassFileName}{version}{last}
-\AtEndOfClass{%
-  \KOMA@key{version}[]{%
-    \ClassError{\KOMAClassName}{%
-      Option `version' too late%
-    }{%
-      Option `version' may be set only while loading the
-      class.\MessageBreak
-      But you've tried to set it up later.%
-    }%
-    \FamilyKeyStateProcessed
-  }%
-}
 \@namedef{scr@v@first}{0}
 \@namedef{scr@v@2.9}{0}
 \@namedef{scr@v@2.9t}{0}
@@ -337,7 +278,71 @@
 \@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@last}{16}
+%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (init)
+%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (option)
+\newif\if@scr@emulatestandardclasses
+\let\scr@emulatestandardclassestrue\relax
+\let\scr@emulatestandardclassesfalse\relax
+\DeclareOption{emulatestandardclasses}{%
+  \let\if@scr@emulatestandardclasses\iftrue
+  \KOMAExecuteOptions{%
+    fontsize=10pt,%
+    headings=standardclasses,%
+    cleardoublepage=current
+  }%
+  \newcommand*{\defaultpapersize}{letter}%
+  \AtEndOfClass{%
+    \setkomafont{descriptionlabel}{\bfseries}%
+    \setkomafont{dictum}{\normalfont\small}%
+    \setkomafont{caption}{}%
+    \setkomafont{captionlabel}{}%
+    \setcapindent{0pt}%
+    \RequirePackage[pagestyleset=standard,markcase=upper]{scrlayer-scrpage}%
+    \PreventPackageFromLoading{scrpage2}%
+    \setkomafont{pagenumber}{\normalfont}%
+    \setkomafont{pageheadfoot}{\normalfont}%
+    \cfoot[\pagemark]{}%
+    \pagestyle{plain}%
+  }%
+}
+\KOMA@key{version}[last]{%
+  \scr@ifundefinedorrelax{scr@v@#1}{%
+    \def\scr@compatibility{0}%
+    \ClassWarningNoLine{\KOMAClassName}{%
+      You have set option `version' to value `#1', but\MessageBreak
+      this value of version is not supported.\MessageBreak
+      Because of this, version was set to `first'%
+    }%
+    \FamilyKeyStateProcessed
+    \KOMA@kav@replacevalue{.%
+      \KOMAClassFileName
+    }{version}{first}%
+  }{%
+    \ClassInfoNoLine{\KOMAClassName}{%
+      Switching compatibility level to `#1'%
+    }%
+    \edef\scr@compatibility{\@nameuse{scr@v@#1}}%
+    \FamilyKeyStateProcessed
+    \KOMA@kav@xreplacevalue{.%
+      \KOMAClassFileName
+    }{version}{#1}%
+  }%
+}
+\KOMA@kav@add{.\KOMAClassFileName}{version}{last}
+\AtEndOfClass{%
+  \KOMA@key{version}[]{%
+    \ClassError{\KOMAClassName}{%
+      Option `version' too late%
+    }{%
+      Option `version' may be set only while loading the
+      class.\MessageBreak
+      But you've tried to set it up later.%
+    }%
+    \FamilyKeyStateProcessed
+  }%
+}
 \newcommand*{\scr@v@is@lt}[1]{%
   \scr@compatibility<\@nameuse{scr@v@#1}
 }
@@ -350,7 +355,7 @@
 \newcommand*{\scr@v@is@ge}[1]{%
   \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
 }
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
 \KOMA@key{draft}[true]{%
   \KOMA@set@ifkey{draft}{@tempswa}{#1}%
   \ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -376,8 +381,8 @@
 \newcommand*{\@gr@gsffamily}{%
   \if@egregdoesnotlikesansseriftitles\else\sffamily\fi
 }
-%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newcommand*\@ptsize{%
   11%
 }
@@ -462,7 +467,7 @@
 \BeforePackage{tex4ht}{%
   \let\scr@defineobsoletefonts\thr@@
 }
-%%% From File: $Id: scrkernel-typearea.dtx 2494 2016-08-04 07:23:47Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (option)
 \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
 \newcommand*{\@@BCOR}{}
 \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -571,7 +576,7 @@
   {onecolumn}{twocolumn=false}
 \DeclareOption*{%
   \x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
 %%%            run: option
 \newcommand*{\setparsizes}[3]{%
   \edef\f@parindent{\the\parindent}%
@@ -737,7 +742,7 @@
 \KOMA@DeclareDeprecatedOption{parindent}{parskip=false}
 \KOMA@kav@add{.\KOMAClassFileName}{parskip}{false}
 \KOMA@kav@add{.\KOMAClassFileName}{parskip}{absolute}
-%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newif\if@titlepage
 \@titlepagetrue
 \newif\if@titlepageiscoverpage
@@ -773,7 +778,7 @@
 \KOMA@DeclareStandardOption{abstractoff}{abstract=false}
 %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
 %%%            (run: option)
 \KOMA@key{open}{%
   \KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1035,7 +1040,7 @@
 \KOMA@DeclareDeprecatedOption{bigheadings}{headings=big}
 \KOMA@DeclareDeprecatedOption{normalheadings}{headings=normal}
 \KOMA@DeclareDeprecatedOption{smallheadings}{headings=small}
-%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
 \KOMA@ifkey{headsepline}{@hsl}%
 \KOMA@kav@add{.\KOMAClassFileName}{headsepline}{false}
 \KOMA@DeclareDeprecatedOption{headnosepline}{headsepline=false}
@@ -1139,7 +1144,7 @@
 \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
 \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
 \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newif\if@captionabove\@captionabovefalse
 \newif\if@tablecaptionabove\@tablecaptionabovefalse
 \newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1273,7 +1278,7 @@
 \DeclareOption{origlongtable}{\@komalongtablefalse}
 \KOMA@DeclareDeprecatedOption{onelinecaption}{captions=oneline}
 \KOMA@DeclareDeprecatedOption{noonelinecaption}{captions=nooneline}
-%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
 \KOMA@key{footnotes}{%
   \ifx\@footnotemark\scr@saved@footnotemark
   \else
@@ -1343,7 +1348,7 @@
   \csname FN@mf@prepare\endcsname
   \ifhmode\spacefactor\@x@sf\fi
   \relax}
-%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
 \newif\if@tocleft
 \KOMA@key{toc}{%
   \KOMA@set@ncmdkey{toc}{@tempa}{%
@@ -1397,12 +1402,12 @@
       \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
       \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
       \KOMA@kav@add{.\KOMAClassFileName}{toc}{indenttextentries}%
-      \setuptoc{toc}{numberline}%
+      \expandafter\setuptoc\expandafter{\ext@toc}{numberline}%
     \or % leftaligntextentries
       \KOMA@kav@remove{.\KOMAClassFileName}{toc}{indenttextentries}%
       \KOMA@kav@remove{.\KOMAClassFileName}{toc}{leftaligntextentries}%
       \KOMA@kav@add{.\KOMAClassFileName}{toc}{leftaligntextentries}%
-      \unsettoc{toc}{numberline}%
+      \expandafter\unsettoc\expandafter{\ext@toc}{numberline}%
     \or % chapterentrywithdots/sectionentrywithdots
       \KOMAoptions{chapterentrydots=true}%
     \or % chapterentrywithoutdots/sectionentrywithoutdots
@@ -1607,7 +1612,7 @@
 \BeforeTOCHead{\@chaptertolistsfalse}
 \KOMA@kav@add{.\KOMAClassFileName}{chapteratlists}{10\p@}%
 \KOMA@kav@add{.\KOMAClassFileName}{listof}{chaptergapsmall}%
-%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
 \newcommand{\newbibstyle}[3][]{%
   \scr@ifundefinedorrelax{scr@bibstyle@#2}{%
     \scr@ifundefinedorrelax{scr@bibstyle@#1}{%
@@ -1781,7 +1786,7 @@
 \KOMA@DeclareStandardOption{openbib}{bibliography=openstyle}
 \KOMA@DeclareDeprecatedOption{bibtotoc}{bibliography=totoc}
 \KOMA@DeclareDeprecatedOption{bibtotocnumbered}{bibliography=totocnumbered}
-%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newcommand*{\idx@@heading}{%
   \ifidx@leveldown
     \expandafter\section
@@ -1864,19 +1869,19 @@
 \KOMA@kav@add{.\KOMAClassFileName}{index}{notoc}
 \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
 \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
 %%%            (run: execoption)
 \KOMAExecuteOptions{headings=openany}
 \KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
 \KOMAExecuteOptions{%
   parskip=false,%
   headings=big%
 }
 \KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2491 2016-07-29 08:03:57Z kohm $
-%%% From File: $Id: scrkernel-fonts.dtx 2501 2016-09-28 05:55:32Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2596 2017-02-22 07:45:45Z kohm $ (body)
+%%% From File: $Id: scrkernel-fonts.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newcommand*\scr@setlength[4]{%
   \expandafter\ifnum\scr@v@is@lt{3.12}\relax
     \setlength{#1}{#2 \@plus#3 \@minus#4}%
@@ -2350,12 +2355,12 @@
   \@nomath\sfb}
 \DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal}
 \DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal}
-%%% From File: $Id: scrkernel-language.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-language.dtx 2592 2017-02-16 16:56:10Z kohm $
       \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 2494 2016-08-04 07:23:47Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2617 2017-04-03 13:56:55Z kohm $ (body)
 \let\@BCOR                =\relax
 \let\@@BCOR               =\relax
 \let\@DIV                 =\relax
@@ -2399,7 +2404,7 @@
     }\reserved@a
   \fi
 \fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 2351 2016-02-22 08:20:29Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 2592 2017-02-16 16:56:10Z kohm $
 %%%            run: body
 \setlength{\lineskip}{\p@}
 \setlength{\normallineskip}{\p@}
@@ -2528,7 +2533,7 @@
 \@lowpenalty  = 51
 \@medpenalty  =151
 \@highpenalty =301
-%%% From File: $Id: scrkernel-title.dtx 2227 2015-10-14 14:31:04Z kohm $
+%%% From File: $Id: scrkernel-title.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newcommand*{\@extratitle}{}%
 \newcommand{\extratitle}[1]{\gdef\@extratitle{%
     #1%
@@ -2916,7 +2921,7 @@
 %%% From File: $Id: scrkernel-tocstyle.dtx 2559 2016-12-02 08:03:11Z kohm $
 %%%            (run: class,style,default)
 \CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2565 2016-12-21 17:25:47Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2611 2017-03-27 08:06:52Z kohm $
 %%%            (run: body)
 \setcounter{secnumdepth}{2}
 \newcommand*{\ifnumbered}[1]{%
@@ -3152,6 +3157,16 @@
       \setkeys{KOMAarg.section}{tocentry={#7},head={#7},reference={#7}}%
     \fi
   \fi
+  \scr@ifundefinedorrelax{scr@mt@saved@sect}{}{%
+    \expandafter\ifx\csname #1\endcsname\section
+      \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}%
+      \addcontentsline{\ext@table}{xsect}{\@currenttocentry}%
+    \fi
+    \expandafter\ifx\csname #1\endcsname\starsection\relax
+      \addcontentsline{\ext@figure}{xsect}{\@currenttocentry}%
+      \addcontentsline{\ext@table}{xsect}{\@currenttocentry}%
+    \fi
+  }%
   \let\IfUsePrefixLine\@secondoftwo
   \ifnum \numexpr #2\relax>\c@secnumdepth
     \let\@svsec\@empty
@@ -4740,7 +4755,7 @@
 \fi
 \newcommand*{\scr@fnt@disposition}{\sectfont}
 \aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2605 2017-02-23 19:27:27Z kohm $
 \newif\if@restonecol
 \newcommand{\dictum}[2][]{\par%
   \begingroup
@@ -4807,6 +4822,8 @@
         \noexpand\string
         \noexpand\new@tpo@label{\scr@tpo}{\noexpand\arabic{page}}}%
     \fi
+    \noexpand\def\noexpand\is@thispageodd@setlabel
+    {\unexpanded\expandafter{\is@thispageodd@setlabel}}%
   }%
   #1%
   \@esphack
@@ -4857,7 +4874,95 @@
   the extended optional argument of the section\MessageBreak
   commands}
 \scr@package@not@recommended{titleps}{%
-  package `scrlayer-scrpage`}
+  package `scrlayer-scrpage'}
+\scr@package@not@recommended{minitoc}{}
+\BeforePackage{minitoc}{%
+  \let\scr@mt@saved@sect\@sect
+}
+\AfterPackage{minitoc}{%
+  \def\@tempa#1#2#3#4#5#6[#7]#8{%
+    \ifnum #2<1 \relax
+      \addtocontents{toc}{\protect\sectbegin}
+    \fi
+    \stc@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}%
+  }%
+  \ifx\@sect\@tempa
+    \def\@tempa#1#2#3#4#5#6[#7]#8{
+      \expandafter
+      \ifx\csname #1\endcsname\section\relax
+        \addcontentsline{lof}{xsect}{#7}%
+        \addcontentsline{lot}{xsect}{#7}%
+      \fi
+      \ifx\csname #1\endcsname\starsection\relax
+        \addcontentsline{lof}{xsect}{#7}%
+        \addcontentsline{lot}{xsect}{#7}%
+      \fi
+      \ifnum #2>\c@secnumdepth\relax
+        \let\@svsec\@empty
+      \else
+        \refstepcounter{#1}%
+        \edef\@svsec{\csname the#1\endcsname\hskip 1em}%
+      \fi
+      \@tempskipa #5\relax
+      \ifdim \@tempskipa>\z@
+        \begingroup #6\relax
+          \@hangfrom{\hskip #3\relax\@svsec}%
+          {\interlinepenalty \@M #8\par}%
+        \endgroup
+        \csname #1mark\endcsname{#7}%
+        \addcontentsline{toc}{#1}{%
+          \ifnum #2>\c@secnumdepth\relax
+          \else
+            \protect\numberline{\csname the#1\endcsname}%
+          \fi
+          #7%
+        }%
+      \else
+        \def\@svsechd{#6\hskip #3\relax
+          \@svsec #8\csname #1mark\endcsname{#7}%
+          \addcontentsline{toc}{#1}{%
+            \ifnum #2>\c@secnumdepth\relax
+            \else
+              \protect\numberline{\csname the#1\endcsname}
+            \fi
+            #7}%
+        }%
+      \fi
+      \@xsect{#5}%
+    }%
+    \ifx\stc@sect\@tempa
+      \ClassWarning{\KOMAClassName}{%
+        Redefining minitoc's internal command
+        `\string\stc@sect'\MessageBreak
+        to prevent minitoc to destroy several features\MessageBreak
+        of KOMA-Script%
+      }%
+      \let\stc@sect\scr@mt@saved@sect
+    \else
+      \ClassInfo{\KOMAClassName}{%
+        Deactivating the `minitoc' workaround,\MessageBreak
+        because of unexpected definition of\MessageBreak
+        `\string\stc@sect'%
+      }%
+      \let\scr@mt@saved@sect\relax
+    \fi
+  \else
+    \ifx\@sect\scr@mt@saved@sect
+      \ClassInfo{\KOMAClassName}{%
+        Deactivating the `minitoc' workaround for
+        `\string\@sect',\MessageBreak
+        because it is not needed%
+      }%
+    \else
+      \ClassInfo{\KOMAClassName}{%
+        Deactivating the `minitoc' workaround,\MessageBreak
+        because of unexpected definition of\MessageBreak
+        `\string\@sect'%
+      }%
+    \fi
+    \let\scr@mt@saved@sect\relax
+  \fi
+}
 \BeforePackage{titlesec}{%
   \let\scr@ttl@saved@section\section
   \let\scr@ttl@saved@subsection\subsection
@@ -4868,11 +4973,11 @@
 \AfterPackage{titlesec}{%
   \@ifpackagelater{titlesec}{2016/03/22}{%
     \ClassInfo{\KOMAClassName}{%
-      Deactivating the `titlesec` workaround,\MessageBreak
+      Deactivating the `titlesec' workaround,\MessageBreak
       because package is newer than expected%
     }%
   }{%
-    \PackageWarning{\KOMAClassName}{%
+    \ClassWarning{\KOMAClassName}{%
       Activating an ugly workaround for a missing\MessageBreak
       feature of package `titlesec`%
     }%
@@ -4926,7 +5031,7 @@
     \let\scr@ttl@@extract\relax
   }%
 }
-%%% From File: $Id: scrkernel-pagestyles.dtx 2304 2015-12-12 08:55:47Z kohm $
+%%% From File: $Id: scrkernel-pagestyles.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newcommand*{\set@tempdima@hw}{%
   \setlength{\@tempdima}{\textwidth}%
   \if@mincl
@@ -5024,7 +5129,7 @@
 \newcommand*{\indexpagestyle}{plain}
 \pagestyle{plain}
 \pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2498 2016-09-01 19:44:10Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newcommand\marginline[1]{%
   \marginpar[\raggedleft{#1}]{\raggedright #1}%
 }
@@ -5718,7 +5823,7 @@
 }{%
   \end@dblfloat
 }
-%%% From File: $Id: scrkernel-footnotes.dtx 2571 2017-01-03 13:04:47Z kohm $
+%%% From File: $Id: scrkernel-footnotes.dtx 2613 2017-03-27 08:12:13Z kohm $
 \renewcommand*\footnoterule{%
   \normalsize\ftn@rule@test@values
   \kern-\dimexpr 2.6\p@+\ftn@rule@height\relax
@@ -5774,6 +5879,7 @@
 \newcommand\deffootnote[4][]{%
   \expandafter\ifnum\scr@v@is@ge{3.22}\relax
     \long\def\@makefntext##1{%
+      \raggedfootnote
       \leftskip #2
       \l@addto@macro\@trivlist{%
         \ifnum\@listdepth=\@ne\advance\leftmargin #2\relax\fi
@@ -5814,6 +5920,7 @@
   \fi
   \def\@@makefnmark{\hbox{\ftnm@font{#4}}}%
 }
+\newcommand*{\raggedfootnote}{}
 \newcommand*{\ftn@font}{\normalfont}
 \newcommand*{\scr@fnt@footnote}{\ftn@font}
 \newcommand*{\ftnm@font}{}
@@ -5874,7 +5981,7 @@
   \endgroup
   \@footnotemark
 }
-%%% From File: $Id: scrkernel-listsof.dtx 2384 2016-03-15 11:58:53Z kohm $
+%%% From File: $Id: scrkernel-listsof.dtx 2612 2017-03-27 08:08:30Z kohm $
 \g@addto@macro{\numberline@numberpostfix}{\autodot}
 \usetocbasicnumberline[%
   \ClassInfo{\KOMAClassName}{Redefining `\string\numberline'}%
@@ -5963,10 +6070,13 @@
 }
 \newcommand*{\toc@l@number}{}
 \newcommand*{\tableofcontents}{%
-  \begingroup\let\if@dynlist\if@tocleft\listoftoc{toc}\endgroup
+  \begingroup
+    \let\if@dynlist\if@tocleft
+    \expandafter\listoftoc\expandafter{\ext@toc}%
+  \endgroup
 }
 \newcommand{\addtocentrydefault}[3]{%
-  \tocbasic@addxcontentsline{toc}{#1}{#2}{#3}%
+  \expandafter\tocbasic@addxcontentsline\expandafter{\ext@toc}{#1}{#2}{#3}%
 }
 \newcommand*{\float@listhead}[1]{%
   \scr@float@listhead@warning
@@ -6019,11 +6129,11 @@
 \newcommand*\listtablename{List of Tables}
 \newcommand*\listoflotname{\listtablename}
 \newcommand*\listoflotentryname{\tablename}
-\newcommand*\listoffigures{\listoftoc{lof}}
+\newcommand*\listoffigures{\listoftoc{\ext@figure}}
 \newcommand*\l@figure{\@dottedtocline{1}{1.5em}{2.3em}}
-\newcommand*\listoftables{\listoftoc{lot}}
+\newcommand*\listoftables{\listoftoc{\ext@table}}
 \let\l@table\l@figure
-%%% From File: $Id: scrkernel-bibliography.dtx 2144 2015-06-17 15:38:01Z kohm $
+%%% From File: $Id: scrkernel-bibliography.dtx 2600 2017-02-23 12:07:58Z kohm $
 \newcommand*\bibname{Bibliography}
 \newcommand*{\bibpreamble}{\relax}
 \let\bibpreamble\relax
@@ -6108,7 +6218,7 @@
 }
 \newcommand{\AfterBibliographyPreamble}{\g@addto@macro\bib@before@hook}
 \newcommand{\AtEndBibliography}{\g@addto@macro\bib@after@hook}
-%%% From File: $Id: scrkernel-index.dtx 2182 2015-08-25 09:10:08Z kohm $
+%%% From File: $Id: scrkernel-index.dtx 2592 2017-02-16 16:56:10Z kohm $
 \newcommand*{\index@preamble}{}
 \let\index@preamble=\relax
 \newcommand{\setindexpreamble}[1]{\def\index@preamble{#1}}
@@ -6156,7 +6266,7 @@
   \par \vskip 10\p@ \@plus5\p@ \@minus3\p@\relax
 }
 \newcommand*\indexname{Index}
-%%% From File: $Id: scrkernel-listsandtabulars.dtx 2503 2016-10-21 08:54:46Z kohm $
+%%% From File: $Id: scrkernel-listsandtabulars.dtx 2592 2017-02-16 16:56:10Z kohm $
 \if@twocolumn
   \setlength{\leftmargini}{2em}
 \else
@@ -6315,7 +6425,7 @@
 \newcommand*{\scr@fnt@descriptionlabel}{\descfont}
 \newkomafont{labelinglabel}{}
 \newkomafont{labelingseparator}{}
-%%% From File: $Id: scrlogo.dtx 1380 2013-10-01 15:31:55Z mjk $
+%%% From File: $Id: scrlogo.dtx 2592 2017-02-16 16:56:10Z kohm $
 \@ifundefined{KOMAScript}{%
   \DeclareRobustCommand{\KOMAScript}{\textsf{K\kern.05em O\kern.05em%
       M\kern.05em A\kern.1em-\kern.1em Script}}}{}