koma-script (20jun16)

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

1 files changed, 125 insertions, 88 deletions

diff --git a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
index c62a96922eb..1c1d0b789c4 100644
--- a/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
+++ b/Master/texmf-dist/tex/latex/koma-script/scrreprt.cls
@@ -81,7 +81,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 2215 2015-10-06 09:50:41Z kohm $
+%%% From File: $Id: scrkernel-version.dtx 2461 2016-05-19 07:17:15Z kohm $
 \begingroup
   \catcode`\@11\relax
   \ifx\KOMAScriptVersion\undefined
@@ -103,7 +103,7 @@
       \fi
     }
   \fi
-  \@CheckKOMAScriptVersion{2016/05/10 v3.20 KOMA-Script}%
+  \@CheckKOMAScriptVersion{2016/06/14 v3.21 KOMA-Script}%
 \endgroup
 \providecommand*{\scr@clsextension}{\@clsextension}
 \AtBeginDocument{%
@@ -118,23 +118,23 @@
 \newcommand*{\KOMAClassFileName}{\KOMAClassName.\@clsextension}
 \edef\KOMAClassFileName{\KOMAClassFileName}
 \ProvidesClass{\KOMAClassName}[%
-  2016/05/10 v3.20 KOMA-Script
+  2016/06/14 v3.21 KOMA-Script
   document class (\ClassName)%
 ]
-%%% From File: $Id: scrkernel-basics.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-basics.dtx 2467 2016-05-27 18:35:47Z kohm $
 \RequirePackage{scrkbase}[\KOMAScriptVersion]
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
 \RequirePackage{tocbasic}[%
-  2016/05/10 v3.20 KOMA-Script
+  2016/06/14 v3.21 KOMA-Script
 ]
 \AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
 \AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
 \addtotoclist{toc}
 \addtotoclist[float]{lof}
 \addtotoclist[float]{lot}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
 %%%            (run: prepare)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
 %%%            (run: prepare)
 \newif\if@openright
 \@openrightfalse
@@ -210,7 +210,7 @@
 \newcommand*{\size@paragraph}{}
 \newcommand*{\size@subparagraph}{}
 \newcommand*{\sectfont}{\normalcolor\@gr@gsffamily\bfseries}
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
 \newif\if@scr@emulatestandardclasses
 \let\scr@emulatestandardclassestrue\relax
 \let\scr@emulatestandardclassesfalse\relax
@@ -335,6 +335,7 @@
 \@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@last}{15}
 \newcommand*{\scr@v@is@lt}[1]{%
   \scr@compatibility<\@nameuse{scr@v@#1}
@@ -348,7 +349,7 @@
 \newcommand*{\scr@v@is@ge}[1]{%
   \numexpr\scr@compatibility+\@ne\relax>\@nameuse{scr@v@#1}
 }
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
 \KOMA@key{draft}[true]{%
   \KOMA@set@ifkey{draft}{@tempswa}{#1}%
   \ifx\FamilyKeyState\FamilyKeyStateProcessed
@@ -460,7 +461,7 @@
 \BeforePackage{tex4ht}{%
   \let\scr@defineobsoletefonts\thr@@
 }
-%%% From File: $Id: scrkernel-typearea.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
 \newcommand*{\@BCOR}{\expandafter\@@BCOR\CurrentOption BCORBCOR\@@BCOR}
 \newcommand*{\@@BCOR}{}
 \def\@@BCOR #1BCOR#2BCOR#3\@@BCOR{%
@@ -769,9 +770,9 @@
 \KOMA@ifkey{abstract}{@abstrt}
 \KOMA@DeclareStandardOption{abstracton}{abstract=true}
 \KOMA@DeclareStandardOption{abstractoff}{abstract=false}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
 %%%            (run: option)
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
 %%%            (run: option)
 \KOMA@key{open}{%
   \KOMA@set@ncmdkey{open}{@tempa}{%
@@ -1137,7 +1138,7 @@
 \KOMA@DeclareDeprecatedOption{cleardoubleempty}{cleardoublepage=empty}
 \KOMA@DeclareDeprecatedOption{cleardoubleplain}{cleardoublepage=plain}
 \KOMA@DeclareDeprecatedOption{cleardoublestandard}{cleardoublepage=current}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
 \newif\if@captionabove\@captionabovefalse
 \newif\if@tablecaptionabove\@tablecaptionabovefalse
 \newif\if@figurecaptionabove\@figurecaptionabovefalse
@@ -1863,17 +1864,17 @@
 \KOMA@kav@add{.\KOMAClassFileName}{index}{standardlevel}
 \KOMA@DeclareDeprecatedOption{idxtotoc}{index=totoc}
 %%% From File: $Id: scrkernel-listsandtabulars.dtx 2318 2016-01-29 11:40:15Z kohm $
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
 %%%            (run: execoption)
 \KOMAExecuteOptions{headings=openany}
 \KOMAExecuteOptions{numbers=autoendperiod}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
 \KOMAExecuteOptions{%
   parskip=false,%
   headings=big%
 }
 \KOMAProcessOptions\relax
-%%% From File: $Id: scrkernel-compatibility.dtx 2342 2016-02-17 11:13:55Z kohm $
+%%% From File: $Id: scrkernel-compatibility.dtx 2461 2016-05-19 07:17:15Z kohm $
 %%% From File: $Id: scrkernel-fonts.dtx 2428 2016-04-12 10:31:07Z kohm $
 \newcommand*\scr@setlength[4]{%
   \expandafter\ifnum\scr@v@is@lt{3.12}\relax
@@ -2353,7 +2354,7 @@
         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 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-typearea.dtx 2464 2016-05-27 17:14:11Z kohm $
 \let\@BCOR                =\relax
 \let\@@BCOR               =\relax
 \let\@DIV                 =\relax
@@ -2867,10 +2868,10 @@
   \fi
 }
 \newcommand*\abstractname{Abstract}
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
 %%%            (run: body)
 \let\numberline\scr@numberline
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
 %%%            (run: class,style,part)
 \CloneTOCEntryStyle{tocline}{part}
 \TOCEntryStyleStartInitCode{part}{%
@@ -2884,7 +2885,7 @@
   \expandafter\providecommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{2.25em \@plus\p@}%
 }
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
 %%%            (run: class,style,chapter)
 \CloneTOCEntryStyle{tocline}{chapter}
 \TOCEntryStyleStartInitCode{chapter}{%
@@ -2904,17 +2905,17 @@
   \expandafter\providecommand\expandafter*%
   \csname scr@tso@#1@beforeskip\endcsname{1.0em \@plus\p@}%
 }
-%%% From File: $Id: scrkernel-tocstyle.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z 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 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-tocstyle.dtx 2475 2016-06-09 07:51:01Z kohm $
 %%%            (run: class,style,default)
 \CloneTOCEntryStyle{section}{default}
-%%% From File: $Id: scrkernel-sections.dtx 2438 2016-04-27 10:58:21Z kohm $
+%%% From File: $Id: scrkernel-sections.dtx 2477 2016-06-12 09:52:43Z kohm $
 %%%            (run: body)
 \setcounter{secnumdepth}{2}
 \newcommand*{\ifnumbered}[1]{%
@@ -3161,7 +3162,7 @@
   \@tempskipa \glueexpr #5\relax\relax
   \ifdim \@tempskipa>\z@
     \begingroup
-      #6{\interlinepenalty \@M
+      #6{\nobreak\interlinepenalty \@M
         \sectionlinesformat{#1}{\glueexpr #3\relax}\@svsec{#8}\@@par}%
     \endgroup
     \expandafter\csname #1mark\expandafter\endcsname\expandafter{\scr@ds@head}%
@@ -3181,7 +3182,7 @@
     \fi
   \else
     \def\@svsechd{%
-      #6{\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
+      #6{\nobreak\sectioncatchphraseformat{#1}{\glueexpr #3\relax}\@svsec{#8}}%
        \expandafter\csname #1mark\expandafter\endcsname
        \expandafter{\scr@ds@head}%
       \ifx\scr@ds@tocentry\@empty\else
@@ -3254,13 +3255,14 @@
   \@tempskipa #3\relax
   \ifdim \@tempskipa>\z@
     \begingroup
-      #4{\interlinepenalty \@M
+      #4{\nobreak\interlinepenalty \@M
         \expandafter\sectionlinesformat\expandafter{\scr@s@ct@@nn@m@}%
         {\glueexpr #1\relax}\@empty{#5}\@@par}%
     \endgroup
   \else
     \edef\@svsechd{%
       \unexpanded{#4}{%
+        \noexpand\nobreak
         \noexpand\sectioncatchphraseformat{\scr@s@ct@@nn@m@}%
         \unexpanded{{\glueexpr #1\relax}\@empty{#5}}%
       }%
@@ -3556,6 +3558,7 @@
           \l@addto@macro\do@endgroup{%
             \l@addto@macro\scr@dsc@extra@relax@opts{%
               \RelaxFamilyKey[.dsc]{KOMAarg}{toc##1}%
+              \RelaxFamilyKey[.dsc]{KOMAarg}{tocentry##1}%
             }%
           }%
           \kernel@ifnextchar[%]
@@ -3568,6 +3571,10 @@
               \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
               \FamilyKeyStateProcessed
             }%
+            \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}{%
+              \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+              \FamilyKeyStateProcessed
+            }%
           }%
         }%
         \def\@dodefault##1[##2]{%
@@ -3576,6 +3583,10 @@
               \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
               \FamilyKeyStateProcessed
             }%
+            \DefineFamilyKey[.dsc]{KOMAarg}{tocentry##1}[##2]{%
+              \l@addto@macro{\scr@dsc@tocstyle@options}{##1={####1},}%
+              \FamilyKeyStateProcessed
+            }%
           }%
         }%
         \scr@dte@doopts
@@ -4091,11 +4102,11 @@
     \interlinepenalty \@M
     \normalfont\sectfont\nobreak
     \ifnumbered{#1}{%
-      \usekomafont{#1prefix}{\@nameuse{#1format}}%
+      \usekomafont{#1prefix}{\nobreak\@nameuse{#1format}}%
       \setlength{\@tempskipa}{\@nameuse{scr@#1@innerskip}}%
       \partheadmidvskip
     }{}%
-    \usekomafont{part}{#3}\strut
+    \usekomafont{part}{\nobreak #3}\strut
     \expandafter\ifx\csname #1mark\endcsname\@gobble
       \@mkboth{}{}%
     \else
@@ -4115,7 +4126,7 @@
     \raggedpart
     \interlinepenalty \@M
     \normalfont
-    \sectfont\nobreak\usekomafont{#1}{#2}\strut\@mkboth{}{}\par
+    \sectfont\nobreak\usekomafont{#1}{\nobreak #2}\strut\@mkboth{}{}\par
   \endgroup
   \@nameuse{@end#1}%
 }
@@ -4555,7 +4566,7 @@
     \expandafter\ifnum\scr@v@is@gt{2.96}\relax
       \setlength{\parfillskip}{\z@ plus 1fil}\fi
     \raggedsection\normalfont\sectfont\nobreak
-    \usekomafont{minisec}#1\par\nobreak}\nobreak%
+    \usekomafont{minisec}{\nobreak #1\par\nobreak}}\nobreak%
   \@afterheading
 }
 \newcommand*{\addsectiontocentry}[2]{%
@@ -4685,7 +4696,7 @@
 \fi
 \newcommand*{\scr@fnt@disposition}{\sectfont}
 \aliaskomafont{sectioning}{disposition}
-%%% From File: $Id: scrkernel-miscellaneous.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-miscellaneous.dtx 2463 2016-05-19 07:27:47Z kohm $
 \newif\if@restonecol
 \newcommand{\dictum}[2][]{\par%
   \begingroup
@@ -4969,7 +4980,7 @@
 \newcommand*{\indexpagestyle}{plain}
 \pagestyle{plain}
 \pagenumbering{arabic}
-%%% From File: $Id: scrkernel-floats.dtx 2429 2016-04-12 12:10:19Z kohm $
+%%% From File: $Id: scrkernel-floats.dtx 2468 2016-05-31 11:27:28Z kohm $
 \newcommand\marginline[1]{%
   \marginpar[\raggedleft{#1}]{\raggedright #1}%
 }
@@ -5391,71 +5402,97 @@
 }
 \newcommand{\@@makecaption}[3]{%
   \cap@margin
-  \ifonelinecaptions
-    \@tempcnta=\value{mpfootnote}\@tempcntb=\value{footnote}%
-    \let\scr@tmp@footnotetext=\@footnotetext
-    \let\@footnotetext=\@gobble
-    \sbox\@tempboxa{%
-      {\usekomafont{caption}{\strut\ignorespaces
-        #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
-        #3\unskip\strut}}%
+  \begingroup
+    \ifonelinecaptions
+      \let\stepcounter\@gobble
+      \let\refstepcounter\@gobble
+      \let\label\@gobble
+      \let\@footnotetext=\@gobble
+      \let\hypertarget\@gobbletwo
+      \settowidth{\@tempdima}{\scr@@makesinglelinecaption{#1}{#2}{#3}}%
+      \ifdim\@tempdima>\linewidth
+        \aftergroup\scr@makemultilinecaption
+      \else
+        \aftergroup\scr@makesinglelinecaption
+      \fi
+    \else
+      \aftergroup\scr@makemultilinecaption
+    \fi
+  \endgroup
+  {#1}{#2}{#3}%
+}
+\newcommand{\scr@makesinglelinecaption}[3]{%
+  {%
+    \usefontofkomafont{caption}{%
+      \hb@xt@\hsize{%
+        \cap@left
+        \scr@@makesinglelinecaption{#1}{#2}{#3}%
+        \cap@right
+      }\par\kern\dp\strutbox%
     }%
-    \let\@footnotetext=\scr@tmp@footnotetext
-    \let\scr@tmp@footnotetext=\undefined
-    \setcounter{footnote}{\@tempcntb}%
-    \setcounter{mpfootnote}{\@tempcnta}%
-  \else
-    \sbox\@tempboxa{\hspace*{2\cap@width}}%
-  \fi
-  \begingroup%
-    \setlength{\@tempdima}{\cap@width}%
-    \ifdim \wd\@tempboxa >\@tempdima
+  }\kern-\dp\strutbox
+}
+\newcommand{\scr@@makesinglelinecaption}[3]{%
+    \usekomafont{caption}{\strut\ignorespaces
+      #1{{\usekomafont{captionlabel}{#2\captionformat}}}%
+      \ignorespaces #3\unskip}%
+}
+\newcommand{\scr@makemultilinecaption}[3]{%
+  {%
+    \usefontofkomafont{caption}{%
       \hb@xt@\hsize{%
-        \setbox\@tempboxa\vbox{\hsize=\cap@width
+        \cap@left
+        \vbox{\hsize\cap@width\linewidth\hsize
           \ifdofullc@p
-            {\usekomafont{caption}{\@hangfrom{\scr@smashdp{\strut\ignorespaces
-                  #1{{\usekomafont{captionlabel}{#2\captionformat}}}}}%
-              {#3\unskip\strut\par}}}%
-          \else%
+            \@hangfrom{%
+              \strut
+              \scr@smashdp{%
+                #1{%
+                  \usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat}%
+                  }%
+                }%
+              }%
+            }%
+            {\usekomafont{caption}{#3\unskip\strut\par}}%
+          \else
             \ifdim\cap@indent<\z@
-              {\usekomafont{caption}{\strut\ignorespaces
-                #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
-                \noindent\hspace*{-\cap@indent}#3\unskip\strut\par}}%
-            \else%
+              \strut
+              #1{%
+                \usekomafont{caption}{%
+                  \usekomafont{captionlabel}{#2\captionformat\par}%
+                }%
+              }%
+              \noindent{\usekomafont{caption}{%
+                  \hspace*{-\cap@indent}#3\unskip\strut\par
+              }}%
+            \else
               \if@capbreak
-                {\usekomafont{caption}{\strut\ignorespaces
-                  #1{{\usekomafont{captionlabel}{#2\captionformat\par}}}%
-                  \noindent\@hangfrom{\hspace*{\cap@indent}}{#3\par}}}%
+                \strut
+                #1{%
+                  \usekomafont{caption}{%
+                    \usekomafont{captionlabel}{#2\captionformat\par}%
+                  }%
+                }%
+                \noindent\@hangfrom{\hspace*{\cap@indent}}%
+                {\usekomafont{caption}{#3\unskip\strut\par}}%
               \else
-                {\usekomafont{caption}{%
-                    \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
-                  {\hspace{-\cap@indent}\scr@smashdp{\ignorespaces#1%
-                    {{\usekomafont{captionlabel}{%
-                          #2\captionformat}}}}#3\unskip\strut\par}}}%
+                \@hangfrom{\scr@smashdp\strut\hspace*{\cap@indent}}%
+                {%
+                  \hspace{-\cap@indent}%
+                  \scr@smashdp{%
+                    #1{\usekomafont{captionlabel}{#2\captionformat}}%
+                  }%
+                  {\usekomafont{caption}{#3\unskip\strut}\par}%
+                }%
               \fi
             \fi
           \fi
         }%
-        \setlength{\@tempdima}{\ht\@tempboxa}%
-        \addtolength{\@tempdima}{\dp\@tempboxa}%
-        \addtolength{\@tempdima}{-\ht\strutbox}%
-        \ht\@tempboxa\ht\strutbox
-        \dp\@tempboxa\@tempdima
-        \strut\cap@left
-        \box\@tempboxa
-        \cap@right\strut
-      }%
-    \else
-      \global \@minipagefalse
-      \sbox\@tempboxa{%
-        {\usekomafont{caption}{\scr@smashdp{\strut\ignorespaces
-          #1{{\usekomafont{captionlabel}{#2\captionformat}}}}%
-          #3}}%
-      }%
-      {\usesizeofkomafont{caption}{%
-          \hb@xt@\hsize{\strut\cap@left\box\@tempboxa\cap@right\strut}}}%
-    \fi
-  \endgroup
+        \cap@right
+      }\par\kern\dp\strutbox
+    }%
+  }\kern-\dp\strutbox
 }
 \newcommand*{\scr@caption@before@longtable@warning}[1]{%
   \ClassWarning{\KOMAClassName}{%