koma-script (28jun21)

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

1 files changed, 28 insertions, 80 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
index 5460d403262..5752dece681 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrartcl.cls
@@ -84,7 +84,7 @@
 %% find a complete unmodified copy of LaTeX2e at
 %% <http://mirror.ctan.org/tex-archive/macros/latex/base/>.
 %% 
-%%% From File: $Id: scrkernel-version.dtx 3586 2021-03-17 13:57:48Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 3609 2021-06-25 08:18:08Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -106,7 +106,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2021/03/17 v3.33 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2021/06/25 v3.34 KOMA-Script}%
 \endgroup
 \providecommand*{\scr@clsextension}{\@clsextension}
 \AtBeginDocument{%
@@ -121,16 +121,16 @@
   article%
 }
 \ProvidesClass{\KOMAClassName}[%
-  2021/03/17 v3.33 KOMA-Script
+  2021/06/25 v3.34 KOMA-Script
   document class (\ClassName)%
 ]
-%%% From File: $Id: scrkernel-basics.dtx 3578 2021-03-12 16:50:00Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 3606 2021-06-08 08:28:35Z kohm $
 %%%            (run: load)
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
 %%% From File: $Id: scrkernel-listsof.dtx 3477 2020-04-11 07:26:26Z kohm $
 %%%            (run: prepare)
 \RequirePackage{tocbasic}[%
-  2021/03/17 v3.33 KOMA-Script
+  2021/06/25 v3.34 KOMA-Script
 ]
 \addtotoclist[ToC]{toc}
 \Ifstr{\ext@toc}{toc}{}{%
@@ -140,7 +140,7 @@
 }
 %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $
 %%%            (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $
 %%%            (run: prepare)
 \newcommand*{\scr@dotchangeatdocument}[1]{%
   \ClassError{\KOMAClassName}{%
@@ -168,6 +168,7 @@
 \newcommand*{\scr@altsecnumhookfalse}{%
   \@altsecnumformatfalse\global\let\@altsecnumformattrue\@altsecnumformatfalse
 }
+\IfLTXAtLeastTF{2020/10/01}{\NewHook{\KOMAClassName/appendix}}{}
 \newcommand*{\size@part}{}
 \newcommand*{\size@partnumber}{}
 \newcommand*{\scr@part@beforeskip}{%
@@ -192,7 +193,7 @@
 \newcommand*{\size@paragraph}{}
 \newcommand*{\size@subparagraph}{}
 \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $
 %%%            (run: init)
 \newcommand*
   {\scr@compatibility}{\scr@v@last}
@@ -273,10 +274,11 @@
 \@namedef{scr@v@3.31}{18}
 \@namedef{scr@v@3.32}{18}
 \@namedef{scr@v@3.33}{18}
+\@namedef{scr@v@3.34}{18}
 \@namedef{scr@v@last}{18}
 %%% From File: $Id: scrkernel-typearea.dtx 3488 2020-04-27 13:04:43Z kohm $
 %%%            (run: init)
-%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $
 %%%            (run: option)
 \newif\if@scr@emulatestandardclasses
 \let\scr@emulatestandardclassestrue\relax
@@ -409,7 +411,7 @@
 }
 %%% From File: $Id: scrkernel-language.dtx 3480 2020-04-13 09:39:03Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $
 %%%            (run: option)
 \providecommand*\@ptsize{%
   11%
@@ -622,7 +624,7 @@
 }
 \DeclareOption*{%
   \x@paper}
-%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $
 %%%            (run: option)
 \newcommand*{\setparsizes}[3]{%
   \edef\f@parindent{\the\parindent}%
@@ -825,7 +827,7 @@
 \KOMA@DeclareDeprecatedOption{abstractoff}{abstract=false}
 %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $
 %%%            (run: option)
 \KOMA@key{numbers}{%
   \KOMA@set@ncmdkey{numbers}{@tempa}{%
@@ -1144,7 +1146,7 @@
 \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
 \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
 \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $
 %%%            (run: option)
 \newif\if@captionabove\@captionabovefalse
 \newif\if@tablecaptionabove\@tablecaptionabovefalse
@@ -1835,7 +1837,7 @@
 \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
 %%% From File: $Id: scrkernel-listsandtabulars.dtx 3563 2021-02-15 18:40:44Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $
 %%%            (run: execoption)
 \KOMAExecuteOptions{numbers=autoendperiod}
 %%% From File: $Id: scrkernel-miscellaneous.dtx 3554 2021-01-28 15:40:05Z kohm $
@@ -1845,9 +1847,9 @@
   headings=big%
 }
 \KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 3547 2021-01-01 12:08:50Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 3588 2021-03-22 07:53:57Z kohm $
 %%%            (run: body)
-%%% From File: $Id: scrkernel-fonts.dtx 3390 2019-11-18 17:09:35Z kohm $
+%%% From File: $Id: scrkernel-fonts.dtx 3597 2021-05-17 12:54:47Z kohm $
 %%%            (run: body)
 \newcommand*\scr@setlength[4]{%
   \expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2375,13 +2377,13 @@
     \fi
   }%
 \fi
-%%% From File: $Id: scrkernel-paragraphs.dtx 3552 2021-01-21 09:52:21Z kohm $
+%%% From File: $Id: scrkernel-paragraphs.dtx 3596 2021-05-17 12:53:41Z kohm $
 %%%            (run: body)
 \setlength{\lineskip}{\p@}
 \setlength{\normallineskip}{\p@}
 \setlength{\columnsep}{10\p@}
 \setlength{\columnseprule}{\z@}
-\IfLTXAtLeastTF{2021/01/05}{%
+\IfLTXAtLeastTF{2021/05/01}{%
   \AddToHook{selectfont}{\par@update}%
   \AfterPackage{everysel}{%
     \IfPackageAtLeastTF{everysel}{2021/01/18}{}{%
@@ -2390,7 +2392,7 @@
       }{%
         You are using an old version of `everysel' in combination with a
         LaTeX\MessageBreak
-        version >= 2021/01/05 and KOMA-Script >= 3.33. This combination
+        version >= 2021/06/01 and KOMA-Script >= 3.33. This combination
         is\MessageBreak
         not supported.\MessageBreak
         You could switch back to an older LaTeX using package
@@ -3014,7 +3016,7 @@
 %%% From File: $Id: scrkernel-tocstyle.dtx 3507 2020-06-11 14:57:03Z kohm $
 %%%            (run: class,style,default)
 \CloneTOCEntryStyle{subsection}{default}
-%%% From File: $Id: scrkernel-sections.dtx 3567 2021-02-17 10:01:38Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 3594 2021-04-30 08:45:15Z kohm $
 %%%            (run: body)
 \setcounter{secnumdepth}{3}
 \providecommand*{\ifnumbered}{%
@@ -4539,12 +4541,15 @@
       `\string\appendix'%
     }%
   }{}%
-  \par%
+  \par
   \setcounter{section}{0}%
   \setcounter{subsection}{0}%
   \gdef\thesection{\@Alph\c@section}%
-  \csname appendixmore\endcsname
 }
+\IfLTXAtLeastTF{2020/10/01}{%
+  \g@addto@macro{\appendix}{\UseOneTimeHook{\KOMAClassName/appendix}}%
+}{}
+\g@addto@macro{\appendix}{\csname appendixmore\endcsname}
 \newcommand*{\scr@startpart}[1]{%
   \ExecuteDoHook{heading/preinit/#1}%
   \par
@@ -5339,7 +5344,7 @@
 \providecommand{\@mkdouble}[1]{%
   \@mkboth{#1}{#1}%
 }
-%%% From File: $Id: scrkernel-floats.dtx 3394 2019-11-19 11:56:28Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 3590 2021-03-22 10:30:57Z kohm $
 %%%            (run: body)
 \newcommand\marginline[1]{%
   \marginpar[\raggedleft{#1}]{\raggedright #1}%
@@ -5482,32 +5487,7 @@
   \edef\cap@indent{\the\@tempdima}%
   \dofullc@pfalse\@capbreaktrue
 }
-\AfterPackage{caption2}{%
-  \renewcommand*{\setcapindent}{%
-    \ClassWarning{\KOMAClassName}{%
-      You're using package `caption2'.\MessageBreak
-      Because of this you should also use `\string\captionstyle'
-      and\MessageBreak
-      set length '\string\captionindent' instead of
-      using\MessageBreak
-      `\string\setcapindent'%
-    }%
-    \captionstyle{indent}%
-    \kernel@ifstar{\setlength{\captionindent}}{\setlength{\captionindent}}%
-  }%
-}
 \newcommand*{\setcaphanging}{\dofullc@ptrue\@capbreakfalse}
-\AfterPackage{caption2}{%
-  \renewcommand*{\setcaphanging}{%
-    \ClassWarning{\KOMAClassName}{%
-      You're using package `caption2'.\MessageBreak
-      Because of this you should also use
-      `\string\captionstyle'\MessageBreak
-      instead of `\string\setcaphang'%
-    }
-    \captionstyle{hang}%
-  }%
-}
 \newcommand{\@makecaption}[2]{%
   \if@captionabove
     \vskip\belowcaptionskip
@@ -5590,18 +5570,6 @@
               \endgroup
   \fi\fi\fi\fi\fi
 }
-\AfterPackage{caption2}{%
-  \renewcommand*{\setcapwidth}[2][]{%
-    \ClassWarning{\KOMAClassName}{%
-      Ignorring optional argument of `\string\setcapwidth'!\MessageBreak
-      You're using package `caption2'.\MessageBreak
-      Because of this you should also use
-      `\string\setcaptionwidth'\MessageBreak
-      instead of `\string\setcapwidth'%
-    }%
-    \setcaptionwidth{#2}%
-  }%
-}%
 \newcommand*{\setcapdynwidth}[2][]{%
   \def\cap@width{#2}%
   \begingroup
@@ -5743,23 +5711,6 @@
     \@tempa
   }%
 }
-\AfterPackage{caption2}{%
-  \renewcommand*{\@setcapmargin}[2][\@tempdimb]{%
-    \setlength{\@tempdimb}{#2}%
-    \setlength{\@tempdima}{#1}%
-    \ifdim\@tempdima\@tempdimb\else
-      \ClassWarning{\KOMAClassName}{%
-        Can set only centered caption!\MessageBreak
-        You're using package `caption2'.\MessageBreak
-        Because of this you should also use
-        `\string\setcaptionmargin'\MessageBreak
-        instead of `\string\setcapmargin'%
-      }%
-    \fi
-    \addtolength{\@tempdimb}{\@tempdimb}%
-    \setcaptionmargin{.5\@tempdimb}}%
-  \let\@@setcapmargin=\@setcapmargin
-}
 \newcommand{\@@makecaption}[3]{%
   \cap@margin
   \begingroup
@@ -5788,7 +5739,7 @@
         \unexpanded\expandafter{\@xcentercr}%
       }%
       \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}%
-      \ifdim\@tempdima>\linewidth
+      \ifdim\@tempdima>\cap@width
         \aftergroup\scr@makemultilinecaption
       \else
         \aftergroup\scr@makesinglelinecaption
@@ -6026,9 +5977,6 @@
   }%
 }
 \AfterPackage{longtable}{%
-  \@ifpackageloaded{caption2}{\@komalongtablefalse
-    \scr@caption@before@longtable@warning{caption2}%
-  }{}%
   \if@komalongtable
     \renewcommand{\LT@makecaption}[3]{%
       \noalign{%