koma-script (13oct19)

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

1 files changed, 344 insertions, 338 deletions

diff --git a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
index aa133bb8343..fd90f4e8c52 100644
--- a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
+++ b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
@@ -1,8 +1,8 @@
-% \CheckSum{1592}
+% \CheckSum{1617}
 % \iffalse meta-comment
 % ======================================================================
 % tocbasic.dtx
-% Copyright (c) Markus Kohm, 2008-2018
+% Copyright (c) Markus Kohm, 2008-2019
 %
 % This file is part of the LaTeX2e KOMA-Script bundle.
 %
@@ -20,7 +20,7 @@
 % This work consists of all files listed in manifest.txt.
 % ----------------------------------------------------------------------
 % tocbasic.dtx
-% Copyright (c) Markus Kohm, 2008-2018
+% Copyright (c) Markus Kohm, 2008-2019
 %
 % Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz,
 % Version 1.3c, verteilt und/oder veraendert werden.
@@ -55,7 +55,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \iffalse
-%%% 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 $
 %<identify>%%%            (run: identify)
 %<prepare>%%%            (run: prepare)
 %<option>%%%            (run: option)
@@ -66,7 +66,7 @@
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 \begingroup
   \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
-  \filedate$Date: 2018-12-30 15:36:55 +0100 (Sun, 30 Dec 2018) $
+  \filedate$Date: 2019-10-10 09:06:49 +0200 (Thu, 10 Oct 2019) $
   \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
   \filerevision$Revision: 1962 $
 \endgroup
@@ -108,6 +108,7 @@
       \from{scrkernel-tocstyle.dtx}{package,style,undottedtocline}%
       \from{scrkernel-tocstyle.dtx}{package,style,largetocline}%
       \from{scrkernel-tocstyle.dtx}{package,style,tocline}%
+      \from{scrkernel-tocstyle.dtx}{package,style,toctext}%
       \from{scrkernel-tocstyle.dtx}{package,style,default}%
       \from{tocbasic.dtx}{package,exit}%
       \from{scrlogo.dtx}{logo}%
@@ -119,7 +120,6 @@
 \fi
 \endbatchfile
 \documentclass[parskip=half-]{scrdoc}
-\usepackage[latin1]{inputenc}
 \usepackage[english]{babel}
 \usepackage{array}
 \usepackage{listings}
@@ -266,15 +266,15 @@
 % the toc-file, so this information will be stored additionally.
 %
 % \begin{macro}{\tb@listoftocs}
-%   This is the list of toc-files. The list will be:
-%   \begin{quote}
+% This is the list of toc-files. The list will be:
+% \begin{quote}
 %   \cs{do}\marg{extension}\marg{class or
 %   package}\cs{do}\marg{extension}\marg{class or package}\dots
-%   \end{quote}
-%   With this, adding and processing the list will be very fast but removing
-%   an element will be very slow.
+% \end{quote}
+% With this, adding and processing the list will be very fast but removing
+% an element will be very slow.
 %
-%   The initial state of the list will be \emph{empty}.
+% The initial state of the list will be \emph{empty}.
 %    \begin{macrocode}
 %<*body>
 \newcommand*{\tb@listoftocs}{}
@@ -282,11 +282,11 @@
 % \end{macro}
 %
 % \begin{macro}{\ifattoclist}
-%   This command tests, if an extension is already at the list of
-%   toc-files. The extension has to be the first argument. The second argument
-%   will be done, if the extension is already at the list of toc-files. The
-%   third argument will be done, if the extension is at the list of toc-files
-%   not yet.
+% This command tests, if an extension is already at the list of
+% toc-files. The extension has to be the first argument. The second argument
+% will be done, if the extension is already at the list of toc-files. The
+% third argument will be done, if the extension is at the list of toc-files
+% not yet.
 %    \begin{macrocode}
 \newcommand{\ifattoclist}[1]{%
   \begingroup
@@ -302,22 +302,22 @@
 % \end{macro}
 %
 % \begin{macro}{\addtotoclist}
-%   \changes{v1.0a}{2008/11/11}{internal \cs{@addtotoclist} renamed to
-%     \cs{scr@addtotoclist} because of package \textsf{floatfram}}.^^A
-%   \changes{v1.0a}{2008/11/11}{internal \cs{@@addtotoclist} renamed to
-%     \cs{scr@@addtotoclist} because of package \textsf{floatfram}}.^^A
-%   \changes{v3.06a}{2010/09/14}{expand the arguments while adding them to the
-%     internal list}^^A
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
-%   This command adds an extension to the list of toc-files. The first,
-%   optional argument is the class or package name with the corresponding
-%   extension of class or package files. If this argument was omitted
-%   \textsf{tocbasic} tries to get it automatically. This should be
-%   successfull while loading a class or package but not while processing any
-%   command of a class or package after loading the class or package. The
-%   second, mandatory argument is the extension of the toc-file. NOTE: An
-%   empty first argument is not the same like omitting the first argument!
+% \changes{v1.0a}{2008/11/11}{internal \cs{@addtotoclist} renamed to
+%   \cs{scr@addtotoclist} because of package \textsf{floatfram}}.^^A
+% \changes{v1.0a}{2008/11/11}{internal \cs{@@addtotoclist} renamed to
+%   \cs{scr@@addtotoclist} because of package \textsf{floatfram}}.^^A
+% \changes{v3.06a}{2010/09/14}{expand the arguments while adding them to the
+%   internal list}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
+% This command adds an extension to the list of toc-files. The first,
+% optional argument is the class or package name with the corresponding
+% extension of class or package files. If this argument was omitted
+% \textsf{tocbasic} tries to get it automatically. This should be
+% successfull while loading a class or package but not while processing any
+% command of a class or package after loading the class or package. The
+% second, mandatory argument is the extension of the toc-file. NOTE: An
+% empty first argument is not the same like omitting the first argument!
 %    \begin{macrocode}
 \newcommand*{\addtotoclist}{%
   \kernel@ifnextchar [%]
@@ -369,9 +369,9 @@
 % \end{macro}
 %
 % \begin{macro}{\owneroftoc}
-%   \changes{v3.22}{2016/08/09}{new}
-%   Returns the owner of a TOC or uses the owner of a TOC as argument of the
-%   optional argument, if it exists.
+% \changes{v3.22}{2016/08/09}{new}%^^A
+% Returns the owner of a TOC or uses the owner of a TOC as argument of the
+% optional argument, if it exists.
 %    \begin{macrocode}
 \newcommand*{\owneroftoc}[2][\@firstofone]{%
   \begingroup
@@ -382,23 +382,30 @@
 }
 %    \end{macrocode}
 % \end{macro}
+% \begin{macro}{\categoryoftoc}
+% \changes{v3.27}{2019/05/12}{new}%^^A
+% Synonym for \cs{owneroftoc}.
+%    \begin{macrocode}
+\newcommand*{\categoryoftoc}{\owneroftoc}
+%    \end{macrocode}
+% \end{macro}
 %
 % \begin{macro}{\AtAddToTocList}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
-%   Action to be done, when adding a toc-file of a known owner. The first
-%   optional argument is the owner. The second, mandatory argument is the
-%   action. While doing the action \cs{@currext} will be the extension of the
-%   added toc-file. If the first argument was omitted \textsf{tocbasic} tries
-%   to get it automatically. This should be successfull while loading a class
-%   or package but not while processing any command of a class or package
-%   after loading the class or package. The second, mandatory argument is the
-%   extension of the toc-file. NOTE: An empty first argument is not the same
-%   like omitting the first argument, but set's up the general hook. The
-%   general hook will be done for every adding after the individual hook (this
-%   means, you may dactivate features at the individual hook before processing
-%   the general hook). But the individual hook will not be processed for
-%   toc-files without any owner!
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
+% Action to be done, when adding a toc-file of a known owner. The first
+% optional argument is the owner. The second, mandatory argument is the
+% action. While doing the action \cs{@currext} will be the extension of the
+% added toc-file. If the first argument was omitted \textsf{tocbasic} tries
+% to get it automatically. This should be successfull while loading a class
+% or package but not while processing any command of a class or package
+% after loading the class or package. The second, mandatory argument is the
+% extension of the toc-file. NOTE: An empty first argument is not the same
+% like omitting the first argument, but set's up the general hook. The
+% general hook will be done for every adding after the individual hook (this
+% means, you may dactivate features at the individual hook before processing
+% the general hook). But the individual hook will not be processed for
+% toc-files without any owner!
 %    \begin{macrocode}
 \newcommand*{\AtAddToTocList}{%
   \kernel@ifnextchar [%]
@@ -420,8 +427,8 @@
 % \end{macro}
 %
 % \begin{macro}{\tocbasic@extend@babel}
-%   NOTE: To extend the original \cs{bbl@set@language} the argument of
-%   \cs{tocbasic@extend@babel} must not be a local macro (like \cs{@currext})
+% NOTE: To extend the original \cs{bbl@set@language} the argument of
+% \cs{tocbasic@extend@babel} must not be a local macro (like \cs{@currext})
 %    \begin{macrocode}
 \newcommand*{\tocbasic@extend@babel}[1]{%
   \scr@ifundefinedorrelax{bbl@set@language}{%
@@ -434,7 +441,7 @@
         for `#1'}%
     }{%
 %    \end{macrocode}
-%   \changes{v3.23}{2017/02/23}{using \cs{BabelContentsFiles} if available}^^A
+% \changes{v3.23}{2017/02/23}{using \cs{BabelContentsFiles} if available}%^^A
 % Since version 3.9a provides adding extensions to the language switch
 % preparation. So it is used if it is available.
 %    \begin{macrocode}
@@ -461,24 +468,24 @@
   }%
 }
 %    \end{macrocode}
-%   This feature should be used for all toc-files (unless feature
-%   \texttt{nobabel} was set for the toc-file.
+% This feature should be used for all toc-files (unless feature
+% \texttt{nobabel} was set for the toc-file).
 %    \begin{macrocode}
 \AtAddToTocList[]{\expandafter\tocbasic@extend@babel\expandafter{\@currext}}
 %    \end{macrocode}
 % \end{macro}
 %
 % \begin{macro}{\removefromtoclist}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
 % \begin{macro}{\@removefromtoclist}
-%   \changes{v3.22}{2016/09/06}{missing \cs{global} added}^^A
+% \changes{v3.22}{2016/09/06}{missing \cs{global} added}%^^A
 % \begin{macro}{\@@removefromtoclist}
-%   \changes{v3.22}{2016/09/06}{missing \cs{global} added}^^A
-%   This command will remove an extension from the list of toc-files. If the
-%   first, optional argument is given, the extension will only be removed, if
-%   it was added by the given owner. NOTE: An empty first argument is not the
-%   same like omitting the first argument!
+% \changes{v3.22}{2016/09/06}{missing \cs{global} added}%^^A
+% This command will remove an extension from the list of toc-files. If the
+% first, optional argument is given, the extension will only be removed, if
+% it was added by the given owner. NOTE: An empty first argument is not the
+% same like omitting the first argument!
 %    \begin{macrocode}
 \newcommand*{\removefromtoclist}{%
   \kernel@ifnextchar [%]
@@ -526,21 +533,21 @@
 % \end{macro}
 %
 % \begin{macro}{\doforeachtocfile}
-%   \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead
-%     of \cs{def}}^^A
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
-%   This command does the second, mandatory argument for each toc-file at the
-%   list of toc-files. If the first, optional argument was given this will be
-%   done only for the toc-files of that owner. NOTE: An empty first argument
-%   is not the same like omitting the first argument!
-%
-%   While processing the second argument \cs{@currext} is the extension of
-%   the toc-file. The second argument will be processed with increased group
-%   level!
-%
-%   See \cs{addtoeachtocfile} for an example of usage of
-%   \cs{doforeachtocfile}.
+% \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead
+%   of \cs{def}}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
+% This command does the second, mandatory argument for each toc-file at the
+% list of toc-files. If the first, optional argument was given this will be
+% done only for the toc-files of that owner. NOTE: An empty first argument
+% is not the same like omitting the first argument!
+%
+% While processing the second argument \cs{@currext} is the extension of
+% the toc-file. The second argument will be processed with increased group
+% level!
+%
+% See \cs{addtoeachtocfile} for an example of usage of
+% \cs{doforeachtocfile}.
 %    \begin{macrocode}
 \newcommand{\doforeachtocfile}{%
   \kernel@ifnextchar [%]
@@ -574,15 +581,15 @@
 % \begin{macro}{\addtoeachtocfile}
 % \begin{macro}{\@addtoeachtocfile}
 % \begin{macro}{\@@addtoeachtocfile}
-%   \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}^^A
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
-%   This command calls \cs{addtocontents} with the section, mandatory
-%   argument for each toc-file at the list of toc-files. If the first,
-%   optional argument was given this will be done only for the toc-files of
-%   that owener. NOTE: An empty first argument is not the same like omitting
-%   the first argument! And don't forget to protect the commands, that should
-%   not be expanded, at the mandatory argument.
+% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
+% This command calls \cs{addtocontents} with the section, mandatory
+% argument for each toc-file at the list of toc-files. If the first,
+% optional argument was given this will be done only for the toc-files of
+% that owner. NOTE: An empty first argument is not the same like omitting
+% the first argument! And don't forget to protect the commands, that should
+% not be expanded, at the mandatory argument.
 %    \begin{macrocode}
 \newcommand{\addtoeachtocfile}{%
   \kernel@ifnextchar [%]
@@ -606,10 +613,10 @@
 % once. And we have some special commands for the table of contents.
 %
 % \begin{macro}{\addcontentslinetoeachtocfile}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
-%   Something like a combination of \cs{addtoeachtocfile} and
-%   \cs{addcontentsline}.
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
+% Something like a combination of \cs{addtoeachtocfile} and
+% \cs{addcontentsline}.
 %    \begin{macrocode}
 %<*body>
 \newcommand{\addcontentslinetoeachtocfile}{%
@@ -626,12 +633,12 @@
 % \end{macro}
 %
 % \begin{macro}{\addxcontentsline}
-%   \changes{v3.12}{2013/09/24}{new}
-%   \changes{v3.12}{2013/09/24}{Take care of new feature \texttt{numberline}}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
+% \changes{v3.12}{2013/09/24}{new}%^^A
+% \changes{v3.12}{2013/09/24}{Take care of new feature \texttt{numberline}}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
 % \begin{macro}{\@addxcontentsline}
-%   \changes{v3.12}{2013/09/24}{new (internal)}
+% \changes{v3.12}{2013/09/24}{new (internal)}%^^A
 % This will be used instead of \cs{addcontentsline} to generate numbered or
 % not numbered entries to a toc-file. First argument is the toc-file, second
 % the entry type, e.g., \texttt{chapter}, the third is the entry number or
@@ -652,7 +659,7 @@
 }
 %    \end{macrocode}
 % \begin{macro}{\nonumberline}
-%   \changes{v3.12}{2013/09/24}{new}
+% \changes{v3.12}{2013/09/24}{new}%^^A
 % Either \cs{relax} or \cs{numberline} depending on the feature
 % \texttt{numberline}.
 %    \begin{macrocode}
@@ -678,21 +685,21 @@
 % \end{macro}
 %
 % \begin{macro}{\addxcontentslinetoeachtocfile}
-%   \changes{v3.12}{2013/09/24}{new}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
+% \changes{v3.12}{2013/09/24}{new}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
 % \begin{macro}{\@addxcontentslinetoeachtocfile}
-%   \changes{v3.12}{2013/09/24}{new (internal)}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
+% \changes{v3.12}{2013/09/24}{new (internal)}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
 % \begin{macro}{\@@addxcontentslinetoeachtocfile}
-%   \changes{v3.12}{2013/09/24}{new (internal)}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
+% \changes{v3.12}{2013/09/24}{new (internal)}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
 % \begin{macro}{\@@@addxcontentslinetoeachtocfile}
-%   \changes{v3.12}{2013/09/24}{new (internal)}
+% \changes{v3.12}{2013/09/24}{new (internal)}%^^A
 % \begin{macro}{\@@@@addxcontentslinetoeachtocfile}
-%   \changes{v3.12}{2013/09/24}{new (internal)}
+% \changes{v3.12}{2013/09/24}{new (internal)}%^^A
 % Similar to \cs{addcontentslinetoeachtocfile} using
 % \cs{addxcontentsline} instead of \cs{addcontentsline}.
 %    \begin{macrocode}
@@ -734,11 +741,12 @@
 % too. Here are basics and high level commands for this.
 %
 % \begin{macro}{\tocbasic@starttoc}
-%   \changes{v3.17}{2015/03/23}{usage of feature \texttt{noparskipfake}}^^A
-%   Some basics are done like setting up \cs{parskip}, \cs{parindent} and
-%   \cs{parfillskip}, a general hook will be called, an individual hook will
-%   be called, the toc will be started, an individual hook will be called, an
-%   general hook wil be called, that's it.
+% \changes{v3.17}{2015/03/23}{usage of feature \texttt{noparskipfake}}%^^A
+% \changes{v3.27}{2019/07/08}{hack to add \cs{par} at end of (main) file}%^^A
+% Some basics are done like setting up \cs{parskip}, \cs{parindent} and
+% \cs{parfillskip}, a general hook will be called, an individual hook will
+% be called, the toc will be started, an individual hook will be called, an
+% general hook wil be called, that's it.
 %    \begin{macrocode}
 %<*body>
 \newcommand*{\tocbasic@starttoc}[1]{%
@@ -757,6 +765,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
@@ -765,9 +777,9 @@
 %    \end{macrocode}
 % \begin{macro}{\tocbasic@@before@hook}
 % \begin{macro}{\tocbasic@@after@hook}
-%   These are the general hooks. They may be used by classes and packages for
-%   commands, that should be used for all lists of not only the own lists of,
-%   e.\,g., \KOMAScript{} may use it to handle option \texttt{tocleft}.
+% These are the general hooks. They may be used by classes and packages for
+% commands, that should be used for all lists of not only the own lists of,
+% e.\,g., \KOMAScript{} may use it to handle option \texttt{tocleft}.
 %    \begin{macrocode}
 \newcommand*{\tocbasic@@before@hook}{}
 \newcommand*{\tocbasic@@after@hook}{}
@@ -775,15 +787,15 @@
 % \end{macro}
 % \end{macro}
 % \begin{macro}{\BeforeStartingTOC}
-% \changes{v3.04b}{2010/01/05}{fix: define the hook if not already defined}^^A
+% \changes{v3.04b}{2010/01/05}{fix: define the hook if not already defined}%^^A
 % \changes{v3.06}{2010/06/09}{fix: using \cs{@ifundefined} instead of
-%   undefined \cs{scr@ifundefinedorrelax}}^^A
-% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}^^A
+%   undefined \cs{scr@ifundefinedorrelax}}%^^A
+% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}%^^A
 % \begin{macro}{\AfterStartingTOC}
-% \changes{v3.04b}{2010/01/05}{fix:define the hook if not already defined}^^A
+% \changes{v3.04b}{2010/01/05}{fix:define the hook if not already defined}%^^A
 % \changes{v3.06}{2010/06/09}{fix: using \cs{@ifundefined} instead of
-%   undefined \cs{scr@ifundefinedorrelax}}^^A
-% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}^^A
+%   undefined \cs{scr@ifundefinedorrelax}}%^^A
+% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}%^^A
 % These are the commands to add code to the general or individual hooks. If
 % the first, optional argument was given, the second, mandatory argument
 % will be added to the individual hook, otherwise the general hook will be
@@ -819,17 +831,17 @@
 % \end{macro}
 %
 % \begin{macro}{\listoftoc}
-%   \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar}
-%     ersetzt}^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifstar} durch \cs{kernel@ifstar}
+%   ersetzt}%^^A
 % \begin{macro}{\@listoftoc}
-%   \changes{v1.0a}{2008/11/12}{\cs{twocolumn} fixed}^^A
-%   \changes{v1.01}{2008/11/13}{new feature \texttt{onecolumn}}^^A
-%   \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead
-%     of \cs{def}}^^A
-%   Command to handle the hole list of something. There are additional hooks
-%   for this. The first optional argument is the title for this list. If the
-%   optional argument was omitted \cs{listof\#2name} will be used. The star
-%   version does not set up a heading or switch the column number!
+% \changes{v1.0a}{2008/11/12}{\cs{twocolumn} fixed}%^^A
+% \changes{v1.01}{2008/11/13}{new feature \texttt{onecolumn}}%^^A
+% \changes{v3.09}{2011/03/01}{\cs{@currext} defined using \cs{edef} instead
+%   of \cs{def}}%^^A
+% Command to handle the hole list of something. There are additional hooks
+% for this. The first optional argument is the title for this list. If the
+% optional argument was omitted \cs{listof\#2name} will be used. The star
+% version does not set up a heading or switch the column number!
 %    \begin{macrocode}
 \newcommand*{\listoftoc}{%
   \kernel@ifstar \tocbasic@starttoc\@listoftoc
@@ -874,7 +886,7 @@
 % \end{macro}
 % \end{macro}
 %
-% \changes{v3.25}{2017/11/21}{\textsf{tocbibind} warning added}^^A
+% \changes{v3.25}{2017/11/21}{\textsf{tocbibind} warning added}%^^A
 % Using \textsf{tocbibind} and \textsf{tocbasic} together can break features
 % either of \textsf{tocbibind} or \textsf{tocbasic}.  Here we add at least a
 % warning:
@@ -917,9 +929,9 @@
 % \begin{macro}{\listofeachtoc}
 % \begin{macro}{\@listofeachtoc}
 % \begin{macro}{\@@listofeachtoc}
-%   \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}^^A
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
+% \changes{v3.03b}{2009/06/08}{typo fix at usage of \cs{doforeachtocfile}}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%     \cs{kernel@ifnextchar}}%^^A
 %   Another example of using \cs{doforeachtocfile}.
 %    \begin{macrocode}
 \newcommand*{\listofeachtoc}{%
@@ -938,11 +950,11 @@
 % \end{macro}
 %
 % \begin{macro}{\ext@toc}
-%   \changes{v3.23}{2017/02/23}{use indirect extension for toc}^^A
-%   We do not longer hard code extension \texttt{toc} for the table of
-%   contents. This allowes users to change it. Classes or other packages may
-%   also define it. So it seems to be better to \cs{providecommand} instead of
-%   \cs{newcommand} here.
+% \changes{v3.23}{2017/02/23}{use indirect extension for toc}%^^A
+% We do not longer hard code extension \texttt{toc} for the table of
+% contents. This allowes users to change it. Classes or other packages may
+% also define it. So it seems to be better to \cs{providecommand} instead of
+% \cs{newcommand} here.
 %    \begin{macrocode}
 \providecommand*{\ext@toc}{toc}
 %    \end{macrocode}
@@ -953,16 +965,16 @@
 % \changes{v3.09a}{2011/04/12}{again no explicite marks if ``numbered''}%
 % \changes{v3.12}{2013/09/24}{usage of new
 %   \cs{tocbasic@addxcontentsline}}%
-% \changes{v3.15}{2014/12/10}{moved \cs{@mkboth} inside \cs{chapter*}}^^A
-% \changes{v3.15}{2014/12/10}{usage of \cs{addsec} if available}^^A
-% \changes{v3.15}{2014/12/10}{usage of \cs{@mkright} if available}^^A
-% \changes{v3.17}{2015/03/08}{moved \cs{@mkboth} outside \cs{chapter*}}^^A
-% \changes{v3.17}{2015/03/08}{usage of \cs{@mkdouble} if available}^^A
+% \changes{v3.15}{2014/12/10}{moved \cs{@mkboth} inside \cs{chapter*}}%^^A
+% \changes{v3.15}{2014/12/10}{usage of \cs{addsec} if available}%^^A
+% \changes{v3.15}{2014/12/10}{usage of \cs{@mkright} if available}%^^A
+% \changes{v3.17}{2015/03/08}{moved \cs{@mkboth} outside \cs{chapter*}}%^^A
+% \changes{v3.17}{2015/03/08}{usage of \cs{@mkdouble} if available}%^^A
 % \changes{v3.17}{2015/03/25}{penalty and skip reconstruction after
-%   \cs{@mkright}, \cs{@mkboth}, or \cs{@mkdouble}}^^A
-% \changes{v3.26}{2018/06/22}{removed spurious group}^^A
+%   \cs{@mkright}, \cs{@mkboth}, or \cs{@mkdouble}}%^^A
+% \changes{v3.26}{2018/06/22}{removed spurious group}%^^A
 % \changes{v3.26}{2018/09/03}{usage of \cs{addsecmark} or \cs{sectionmark}
-%   instead of \cs{@mkright} or \cs{markright}}^^A
+%   instead of \cs{@mkright} or \cs{markright}}%^^A
 % Setting the headings of a list of something. The heading is the only
 % argument.
 %    \begin{macrocode}
@@ -1075,15 +1087,15 @@
 }
 %    \end{macrocode}
 % \begin{macro}{\BeforeTOCHead}
-% \changes{v3.04b}{2010/01/05}{fix: define the hook if not already defined}^^A
+% \changes{v3.04b}{2010/01/05}{fix: define the hook if not already defined}%^^A
 % \changes{v3.06}{2010/06/09}{fix: using \cs{@ifundefined} instead of
-%   undefined \cs{scr@ifundefinedorrelax}}^^A
-% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}^^A
+%   undefined \cs{scr@ifundefinedorrelax}}%^^A
+% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}%^^A
 % \begin{macro}{\AfterTOCHead}
-% \changes{v3.04b}{2010/01/05}{fix: define the hook if not already defined}^^A
+% \changes{v3.04b}{2010/01/05}{fix: define the hook if not already defined}%^^A
 % \changes{v3.06}{2010/06/09}{fix: using \cs{@ifundefined} instead of
-%   undefined \cs{scr@ifundefinedorrelax}}^^A
-% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}^^A
+%   undefined \cs{scr@ifundefinedorrelax}}%^^A
+% \changes{v3.26}{2018/08/10}{message moved to \texttt{trace}}%^^A
 % These are the commands to add code to the general or individual hooks. If
 % the first, optional argument was given, the second, mandatory argument
 % will be added to the individual hook, otherwise the general hook will be
@@ -1112,7 +1124,7 @@
 % \end{macro}
 %
 % \begin{macro}{\MakeMarkcase}
-%   Use upper-case or not?
+% Use upper-case or not?
 %    \begin{macrocode}
 %<*exit>
 \AtBeginDocument{%
@@ -1129,7 +1141,7 @@
 % \end{macro}
 %
 % \begin{macro}{\deftocheading}
-%   Define a toc headings command with one argument (the title).
+% Define a toc headings command with one argument (the title).
 %    \begin{macrocode}
 %<*body>
 \newcommand*{\deftocheading}[1]{%
@@ -1139,33 +1151,33 @@
 %
 % \begin{macro}{\setuptoc}
 % \changes{v3.26}{2018/08/29}{Verwendung von \cs{scr@trim@spaces} statt
-%   \cs{tb@@sp@def}}^^A
+%   \cs{tb@@sp@def}}%^^A
 % \begin{macro}{\unsettoc}
 % \changes{v3.26}{2018/08/29}{Verwendung von \cs{scr@trim@spaces} statt
-%   \cs{tb@@sp@def}}^^A
-%   Known features are:
-%   \begin{description}
-%   \item[\texttt{totoc}] writes the title of the list of to the table of
-%     contents
-%   \item[\texttt{numberline}] redefines \cs{nonumberline} to use
-%     \cs{numberline}
-%   \item[\texttt{numbered}] uses a numbered headings for the list of
-%   \item[\texttt{leveldown}] uses not the top level heading (e.\,g.,
-%     \cs{chapter} with book) but the first sub level (e.\,g., \cs{section} with
-%     book).
-%   \item[\texttt{nobabel}] prevents the extension to be added to the babel
-%     handling of toc-files.  To make this work, you have to set the feature
-%     before adding the extension to the list of known extension.
-%   \item[[\texttt{noprotrusion}]] prevents disabling character protrusion at
-%     the toc.
-%   \end{description}
-%   Other features may be package dependent. You may test the feature using:
-%   \begin{quote}
+%   \cs{tb@@sp@def}}%^^A
+% Known features are:
+% \begin{description}
+% \item[\texttt{totoc}] writes the title of the list of to the table of
+%   contents
+% \item[\texttt{numberline}] redefines \cs{nonumberline} to use
+%   \cs{numberline}
+% \item[\texttt{numbered}] uses a numbered headings for the list of
+% \item[\texttt{leveldown}] uses not the top level heading (e.\,g.,
+%   \cs{chapter} with book) but the first sub level (e.\,g., \cs{section} with
+%   book).
+% \item[\texttt{nobabel}] prevents the extension to be added to the babel
+%   handling of toc-files.  To make this work, you have to set the feature
+%   before adding the extension to the list of known extension.
+% \item[[\texttt{noprotrusion}]] prevents disabling character protrusion at
+%   the toc.
+% \end{description}
+% Other features may be package dependent. You may test the feature using:
+% \begin{quote}
 %   \cs{@ifundefined}\texttt{\{tocbasic@\meta{toc}@feature@\meta{feature}\}}\\
 %   \phantom{\cs{@ifundefined}}\marg{do if feature not set}\\
 %   \phantom{\cs{@ifundefined}}\marg{do if feature set}
-%   \end{quote}
-%   See \cs{tocbasic@listhead} for an example of this.
+% \end{quote}
+% See \cs{tocbasic@listhead} for an example of this.
 %    \begin{macrocode}
 \newcommand*{\setuptoc}[2]{%
   \@for\@tempa:=#2\do{%
@@ -1180,14 +1192,14 @@
   }%
 }
 %    \end{macrocode}
-%   Do not add the files, that babel handles by default.
+% Do not add the files, that babel handles by default.
 %    \begin{macrocode}
 \setuptoc{toc}{nobabel}
 \setuptoc{lof}{nobabel}
 \setuptoc{lot}{nobabel}
 %    \end{macrocode}
 % \begin{macro}{\iftocfeature}
-%   We need a test for the features
+% We need a test for the features
 %    \begin{macrocode}
 \newcommand*{\iftocfeature}[2]{%
   \scr@ifundefinedorrelax{tocbasic@#1@feature@#2}{%
@@ -1203,9 +1215,10 @@
 % \end{macro}
 %
 % \begin{macro}{\tocbasicautomode}
-%   \changes{v1.0a}{2008/11/11}{use of \cs{addtotoclist} instead of internal}%
-%   \changes{v3.07a}{2010/11/25}{fix: added missing
-%     \cs{let}\cs{@starttoc}\cs{tocbasic@starttoc}}%
+% \changes{v1.0a}{2008/11/11}{use of \cs{addtotoclist} instead of
+%   internal}%^^A
+% \changes{v3.07a}{2010/11/25}{fix: added missing
+%   \cs{let}\cs{@starttoc}\cs{tocbasic@starttoc}}%^^A
 % \textsf{tocbasic} can overtake \cs{@starttoc} to automaticly add all
 % used extensions to the list of known extensions and use
 % \cs{tocbasic@starttoc} instead of \cs{@starttoc} from \LaTeX{}
@@ -1235,18 +1248,18 @@
 % \label{sec:newfloats}
 %
 % \begin{macro}{\DeclareNewTOC}
-%   \changes{v3.06}{2010/06/01}{new high level command}^^A
-%   \changes{v3.18}{2015/06/20}{\cs{tb@nt@types} and \cs{tb@nt@listname} are
-%     initialised \cs{relax}}^^A
-%   \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
-%     \cs{kernel@ifnextchar}}^^A
-%   \changes{v3.26a}{2018/12/30}{fixed usage of \cs{kernel@ifnextchar}}^^A
-%   This command defines only a new TOC and a new caption command for this
-%   TOC.  It does not define a new foat unless option float was set!  It does
-%   not define a new nonfloat unless option nonfloat was set!  The optional
-%   argument is used to set up several settings using \textsf{keyval}.  The
-%   mandatory argument is the shortcut.  The default type is the shortcut.
-%   The extension is the shortcut.  The default owner is ``\texttt{float}''.
+% \changes{v3.06}{2010/06/01}{new high level command}%^^A
+% \changes{v3.18}{2015/06/20}{\cs{tb@nt@types} and \cs{tb@nt@listname} are
+%   initialised \cs{relax}}%^^A
+% \changes{v3.20}{2016/04/12}{\cs{@ifnextchar} replaced by
+%   \cs{kernel@ifnextchar}}%^^A
+% \changes{v3.26a}{2018/12/30}{fixed usage of \cs{kernel@ifnextchar}}%^^A
+% This command defines only a new TOC and a new caption command for this
+% TOC.  It does not define a new foat unless option float was set!  It does
+% not define a new nonfloat unless option nonfloat was set!  The optional
+% argument is used to set up several settings using \textsf{keyval}.  The
+% mandatory argument is the shortcut.  The default type is the shortcut.
+% The extension is the shortcut.  The default owner is ``\texttt{float}''.
 %    \begin{macrocode}
 %<*body>
 \DefineFamily{KOMAarg}
@@ -1268,8 +1281,8 @@
   \let\tb@nt@atend\@empty
   \def\tb@nt@tocentrystyle{default}%
 %    \end{macrocode}
-%   \changes{v3.20}{2016/04/29}{need more initialization for empty optional
-%     argument}^^A
+% \changes{v3.20}{2016/04/29}{need more initialization for empty optional
+%   argument}%^^A
 %    \begin{macrocode}
   \def\tb@nt@tocstyle@options{level=1}%
   \IfArgIsEmpty{#1}{%
@@ -1304,13 +1317,13 @@
   }{%
     \let\tb@nt@extra@relax@opts\@empty
 %    \end{macrocode}
-%   After initialisation of the local values we need to know the style of the
-%   toc entry, to define style dependend options.
+% After initialisation of the local values we need to know the style of the
+% toc entry, to define style dependend options.
 % \begin{macro}{\tb@nt@type}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   The type of list is used for environment and counter names and as part of
-%   several internal and user macros. It is needed before defining the style
-%   dependend options. So we use a first run to set it up.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% The type of list is used for environment and counter names and as part of
+% several internal and user macros. It is needed before defining the style
+% dependend options. So we use a first run to set it up.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{type}{%
       \tb@ifvalueisnotempty{##1}{\edef\tb@nt@type{##1}}%
@@ -1318,9 +1331,9 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@tocentrystyle}
-%   \changes{v3.20}{2015/12/16}{neu (intern)}
-%   The style of the toc entry. It is needed before defining the style
-%   dependend options. So we use a first run to set it up.
+% \changes{v3.20}{2015/12/16}{neu (intern)}
+% The style of the toc entry. It is needed before defining the style
+% dependend options. So we use a first run to set it up.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}[default]{%
       \IfArgIsEmpty{##1}{%
@@ -1338,10 +1351,10 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@ext}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   \changes{v3.25}{2017/11/20}{moved to pass 1}^^A
-%   Don't tell the user, that the mandatory argument of the command may be
-%   overloaded by this option. This was only done to simplify the definition.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% \changes{v3.25}{2017/11/20}{moved to pass 1}%^^A
+% Don't tell the user, that the mandatory argument of the command may be
+% overloaded by this option. This was only done to simplify the definition.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{extension}{%
       \tb@ifvalueisnotempty{##1}{\edef\tb@nt@ext{##1}}%
@@ -1349,23 +1362,28 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@owner}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   \changes{v3.26}{2018/06/09}{moved to pass 1}^^A
-%   The owner of the new list extension.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% \changes{v3.26}{2018/06/09}{moved to pass 1}%^^A
+% \changes{v3.27}{2019/05/12}{\texttt{category} is a synonym for
+%   \texttt{owner}}%^^A
+% The owner of the new list extension.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{owner}{%
       \tb@ifvalueisnotempty{##1}{\edef\tb@nt@owner{##1}}%
     }%
+    \DefineFamilyKey[.toc]{KOMAarg}{category}{%
+      \tb@ifvalueisnotempty{##1}{\edef\tb@nt@owner{##1}}%
+    }%
 %    \end{macrocode}
 % \end{macro}
-%   After this we define pseudo option \texttt{@else@} to ignore all currently
-%   not needed options. After this we do the first option execution run.
+% After this we define pseudo option \texttt{@else@} to ignore all currently
+% not needed options. After this we do the first option execution run.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{@else@}{\FamilyKeyStateProcessed}%
     \FamilyExecuteOptions[.toc]{KOMAarg}{#1}%
     \RelaxFamilyKey[.toc]{KOMAarg}{@else@}%
 %    \end{macrocode}
-% \changes{v3.26}{2018/06/09}{add extension already after first pass}^^A
+% \changes{v3.26}{2018/06/09}{add extension already after first pass}%^^A
 % First of all, every TOC needs an extension, that should be added to the
 % list of known extensions. This has to be done also, if no options has been
 % given!
@@ -1376,19 +1394,20 @@
   \addtotoclist[\tb@nt@owner]{\csname ext@\tb@nt@type\endcsname}%
   \IfArgIsEmpty{#1}{}{%
 %    \end{macrocode}
-%   For the second option pass we do not need to set up these options
-%   again. So define it as no-opt.
+% For the second option pass we do not need to set up these options
+% again. So define it as no-opt.
 %    \begin{macrocode}
     \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}%
 %    \end{macrocode}
-%   \changes{v3.20}{2015/12/16}{defining toc style depending options}^^A
-%   \changes{v3.20}{2016/06/12}{using prefix \texttt{tocentry} instead of
-%     \texttt{toc}}^^A
-%   If the toc style is empty we won't define any \cs{l@\dots}. Otherwise we
-%   need to define additional options.
+% \changes{v3.20}{2015/12/16}{defining toc style depending options}%^^A
+% \changes{v3.20}{2016/06/12}{using prefix \texttt{tocentry} instead of
+%     \texttt{toc}}%^^A
+% \changes{v3.27}{2019/10/02}{additional \texttt{:}-options}%^^A
+% If the toc style is empty we won't define any \cs{l@\dots}. Otherwise we
+% need to define additional options.
 %    \begin{macrocode}
     \ifstr{\tb@nt@tocentrystyle}{}{}{%
       \begingroup
@@ -1400,6 +1419,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[%]
@@ -1419,6 +1439,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]{%
@@ -1434,37 +1457,40 @@
               \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
       \do@endgroup
     }%
 %    \end{macrocode}
-%   After this, we need to define all the other options and do the real option
-%   execution.
+% After this, we need to define all the other options and do the real option
+% execution.
 % \begin{macro}{\tb@nt@atbegin}
-%   \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbegin}}
-%   \changes{v3.11c}{2013/02/01}{\texttt{atbegin} argument may be empty}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Additional code executed at the begin of a new defined environment.
+% \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbegin}}%^^A
+% \changes{v3.11c}{2013/02/01}{\texttt{atbegin} argument may be empty}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Additional code executed at the begin of a new defined environment.
 %    \begin{macrocode}
     \FamilyStringKey[.toc]{KOMAarg}{atbegin}{\tb@nt@atbegin}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@atend}
-%   \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbend}}
-%   \changes{v3.11c}{2013/02/01}{\texttt{atend} argument may be empty}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Additional code executed at the end of a new defined environment.
+% \changes{v3.09}{2011/03/01}{new optional identifier \texttt{atbend}}%^^A
+% \changes{v3.11c}{2013/02/01}{\texttt{atend} argument may be empty}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Additional code executed at the end of a new defined environment.
 %    \begin{macrocode}
     \FamilyStringKey[.toc]{KOMAarg}{atend}{\tb@nt@atend}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@counterwithin}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   If a counter will be defined, this counter may depend on another counter
-%   (like figure counter depends on chapter counter at book classes). If the
-%   value is empty, the counter does not depend on any other counter.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% If a counter will be defined, this counter may depend on another counter
+% (like figure counter depends on chapter counter at book classes). If the
+% value is empty, the counter does not depend on any other counter.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{counterwithin}{%
       \edef\tb@nt@counterwithin{##1}\FamilyKeyStateProcessed
@@ -1472,16 +1498,16 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\iftb@nt@float}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   \changes{v3.06}{2010/06/01}{new internal}
-%   This boolean indicates, that float environments should also be defined.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% \changes{v3.06}{2010/06/01}{new internal}%^^A
+% This boolean indicates, that float environments should also be defined.
 %    \begin{macrocode}
     \FamilyBoolKey[.toc]{KOMAarg}{float}{tb@nt@float}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@floatpos}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Simply the value for the |\fps@...| macro.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Simply the value for the |\fps@...| macro.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{floatpos}{%
       \tb@ifvalueisnotempty{##1}{\edef\tb@nt@floatpos{##1}}%
@@ -1489,9 +1515,9 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@floattype}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Simply the value for the |\ftype@...| macro. It has to be
-%   $1<=\textrm{value}<=31$.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Simply the value for the |\ftype@...| macro. It has to be
+% $1<=\textrm{value}<=31$.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{floattype}{%
       \FamilySetCounterMacro{KOMAarg}{floattype}{\reserved@d}{##1}%
@@ -1507,21 +1533,21 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\iftb@nt@forcenames}
-%   \changes{v3.06}{2010/06/01}{new internal}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   The |\...name| commands will only be defined, if they are not already
-%   defined. But some users may want to define their own names even if there
-%   are already definitions. So this boolean option may switch to force the
-%   definition.
+% \changes{v3.06}{2010/06/01}{new internal}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% The |\...name| commands will only be defined, if they are not already
+% defined. But some users may want to define their own names even if there
+% are already definitions. So this boolean option may switch to force the
+% definition.
 %    \begin{macrocode}
     \FamilyBoolKey[.toc]{KOMAarg}{forcenames}{tb@nt@forcenames}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@hang}
-%   \changes{v3.20}{2015/12/16}{undefined}^^A
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Earch entry of a TOC/list of is idented on the left side. This is the
-%   amount of the indention of the text of the entry.
+% \changes{v3.20}{2015/12/16}{undefined}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Earch entry of a TOC/list of is idented on the left side. This is the
+% amount of the indention of the text of the entry.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{hang}{%
       \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocnumwidth}{%
@@ -1546,10 +1572,10 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@indent}
-%   \changes{v3.20}{2015/12/16}{undefined}^^A
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Earch entry of a TOC/list of is idented on the left side. This is the
-%   amount of the indention of the number part.
+% \changes{v3.20}{2015/12/16}{undefined}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Earch entry of a TOC/list of is idented on the left side. This is the
+% amount of the indention of the number part.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{indent}{%
       \scr@ifundefinedorrelax{KV@KOMAarg.toc@tocindent}{%
@@ -1575,10 +1601,10 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@level}
-%   \changes{v3.20}{2015/12/16}{undefined}^^A
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Each entry to a TOC/list of has a numeric level. You may set up your own
-%   level.
+% \changes{v3.20}{2015/12/16}{undefined}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Each entry to a TOC/list of has a numeric level. You may set up your own
+% level.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{level}{%
       \PackageWarning{tocbasic}{%
@@ -1592,9 +1618,9 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@listname}
-%   \changes{v3.18}{2015/06/20}{using \cs{def} instead of \cs{edef}}^^A
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   The list itself has a heading. A |\list<type>name| will also be defined.
+% \changes{v3.18}{2015/06/20}{using \cs{def} instead of \cs{edef}}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% The list itself has a heading. A |\list<type>name| will also be defined.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{listname}{%
       \tb@ifvalueisnotempty{##1}{\def\tb@nt@listname{##1}}%
@@ -1602,9 +1628,9 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@name}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   We need a name/term for the entries of the new list. This may e.\,g. be used
-%   for |caption| output. A |\<type>name| will also be defined.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% We need a name/term for the entries of the new list. This may e.\,g. be used
+% for |caption| output. A |\<type>name| will also be defined.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{name}{%
       \tb@ifvalueisnotempty{##1}{\edef\tb@nt@name{##1}}%
@@ -1612,47 +1638,47 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\iftb@nt@nonfloat}
-%   \changes{v3.06}{2010/06/01}{new (internal)}^^A
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   This boolean indicates, that non-float environment should also be
-%   defined. The environment has the postfix ``-''.
+% \changes{v3.06}{2010/06/01}{new (internal)}%^^A
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% This boolean indicates, that non-float environment should also be
+% defined. The environment has the postfix ``-''.
 %    \begin{macrocode}
     \FamilyBoolKey[.toc]{KOMAarg}{nonfloat}{tb@nt@nonfloat}%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@nt@types}
-%   \changes{v3.20}{2015/12/16}{local valid only}^^A
-%   Sometimes the plural of the type is needed and may be defined by a
-%   seperate option.
+% \changes{v3.20}{2015/12/16}{local valid only}%^^A
+% Sometimes the plural of the type is needed and may be defined by a
+% seperate option.
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{types}{%
       \tb@ifvalueisnotempty{##1}{\edef\tb@nt@types{##1}}%
     }%
 %    \end{macrocode}
 % \end{macro}
-%   \changes{v3.25}{2017/11/20}{new (internal)}
-%   The new option \texttt{setup} allowes to setup ToC features provided by
-%   \cs{setuptoc}. Note, currently there is no test whether or not a feature
-%   does exist!
+% \changes{v3.25}{2017/11/20}{new (internal)}%^^A
+% The new option \texttt{setup} allowes to setup ToC features provided by
+% \cs{setuptoc}. Note, currently there is no test whether or not a feature
+% does exist!
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{setup}{%
       \setuptoc\tb@nt@ext{##1}%
     }%
 %    \end{macrocode}
-%   \changes{v3.25}{2017/11/20}{new (internal)}
-%   The new option \texttt{unset} allowes to unset ToC features provided
-%   by \cs{unsettoc}. Note, currently there is no test whether or not a
-%   feature does exist!
+% \changes{v3.25}{2017/11/20}{new (internal)}%^^A
+% The new option \texttt{unset} allowes to unset ToC features provided
+% by \cs{unsettoc}. Note, currently there is no test whether or not a
+% feature does exist!
 %    \begin{macrocode}
     \DefineFamilyKey[.toc]{KOMAarg}{unset}{%
       \unsettoc\tb@nt@ext{##1}%
     }%
 %    \end{macrocode}
-%   Last but not least we have to execute the options and reset the option
-%   definitions.
-% \changes{v3.25}{2017/09/27}{\texttt{nonfloat} fixed}^^A
+% Last but not least we have to execute the options and reset the option
+% definitions.
+% \changes{v3.25}{2017/09/27}{\texttt{nonfloat} fixed}%^^A
 % \changes{v3.26}{2018/06/09}{added missing reset of \texttt{unset} and
-%   \texttt{setup}}^^A
+%   \texttt{setup}}%^^A
 %    \begin{macrocode}
     \FamilyExecuteOptions[.toc]{KOMAarg}{#1}%
     \RelaxFamilyKey[.toc]{KOMAarg}{unset}%
@@ -1671,6 +1697,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}%
@@ -1684,7 +1711,7 @@
 %    \end{macrocode}
 % Then we need the TOC itself with a name:
 % \changes{v3.25}{2017/10/10}{use \cs{ext@\dots} instead of the extension
-%   itself in definition of \cs{listof\dots}}^^A
+%   itself in definition of \cs{listof\dots}}%^^A
 %    \begin{macrocode}
   \scr@ifundefinedorrelax{tb@nt@types}{%
     \edef\tb@nt@types{\tb@nt@type s}%
@@ -1717,7 +1744,7 @@
   }\@tempa
 %    \end{macrocode}
 % The list entry:
-%   \changes{v3.20}{2016/04/05}{warning if \cs{l@\dots} is undefined}^^A
+% \changes{v3.20}{2016/04/05}{warning if \cs{l@\dots} is undefined}%^^A
 %    \begin{macrocode}
   \ifstr{\tb@nt@tocentrystyle}{}{%
     \@ifundefined{l@\tb@nt@type}{%
@@ -1739,7 +1766,7 @@
   }%
 %    \end{macrocode}
 % \changes{v3.12}{2013/05/03}{fixed: definition of
-%   \cs{listof\meta{type}entryname} added as explained in the manual}
+%   \cs{listof\meta{type}entryname} added as explained in the manual}%^^A
 %    \begin{macrocode}
   \@ifundefined{listof\tb@nt@ext entryname}{%
     \expandafter\let\csname listof\tb@nt@ext entryname\endcsname\tb@nt@name
@@ -1755,8 +1782,8 @@
   \@tempswafalse
 %    \end{macrocode}
 % The float environments:
-% \changes{v3.09a}{2011/05/30}{fixed: floats may have an optional argument}
-% \changes{v3.12}{2013/12/10}{fixed: usage of default placement}
+% \changes{v3.09a}{2011/05/30}{fixed: floats may have an optional argument}%^^A
+% \changes{v3.12}{2013/12/10}{fixed: usage of default placement}%^^A
 %    \begin{macrocode}
   \iftb@nt@float
     \expandafter\newcommand\expandafter*\csname fps@\tb@nt@type\expandafter
@@ -1816,10 +1843,10 @@
   \fi
 %    \end{macrocode}
 % The counter and hooks of float and nonfloat environments:
-%   \changes{v3.10b}{2012/04/04}{\cs{noexpand} added to fix problems using
-%     \cs{autodot}}^^A
-%   \changes{v3.13}{2014/07/31}{add \cs{autodot} only to hierachical
-%     counters}^^A
+% \changes{v3.10b}{2012/04/04}{\cs{noexpand} added to fix problems using
+%   \cs{autodot}}%^^A
+% \changes{v3.13}{2014/07/31}{add \cs{autodot} only to hierachical
+%   counters}%^^A
 %    \begin{macrocode}
   \if@tempswa
     \@ifundefined{c@\tb@nt@type}{%
@@ -1864,11 +1891,11 @@
 }
 %    \end{macrocode}
 % \begin{macro}{\tb@atbegin@after}
-%   \changes{v3.09a}{2011/05/30}{new internal}%
-%   Processes command \#1 with argument \#2 and optional argument \#3 and than
-%   \verb|\csname #2@atbegin\endcsname|. This is used to add
-%   \verb|csname #2@atbegin\endcsname| at begin part of a float (but after
-%   optional argument of the float).
+% \changes{v3.09a}{2011/05/30}{new internal}%^^A
+% Processes command \#1 with argument \#2 and optional argument \#3 and than
+% \verb|\csname #2@atbegin\endcsname|. This is used to add
+% \verb|csname #2@atbegin\endcsname| at begin part of a float (but after
+% optional argument of the float).
 %    \begin{macrocode}
 \newcommand*{\tb@atbegin@after}[3]{}
 \def\tb@atbegin@after#1#2[#3]{%
@@ -1878,9 +1905,9 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@ifvalueisnotempty}
-%   \changes{v3.06}{2010/05/21}{new internal}^^A
-%   \changes{v3.20}{2015/12/16}{simpler definition}^^A
-%   This is only a helper for defining some of the keys.
+% \changes{v3.06}{2010/05/21}{new internal}%^^A
+% \changes{v3.20}{2015/12/16}{simpler definition}%^^A
+% This is only a helper for defining some of the keys.
 %    \begin{macrocode}
 \newcommand*{\tb@ifvalueisnotempty}[1]{%
   \ifstr{#1}{}{%
@@ -1894,20 +1921,20 @@
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\tb@boolkey}
-%   \changes{v3.06}{2010/05/21}{new (internal)}^^A
-%   \changes{v3.20}{2015/12/16}{undefined}^^A
+% \changes{v3.06}{2010/05/21}{new (internal)}%^^A
+% \changes{v3.20}{2015/12/16}{undefined}%^^A
 % \end{macro}
 % \begin{macro}{\tb@dimkey}
-%   \changes{v3.06}{2010/05/21}{new (internal)}^^A
-%   \changes{v3.20}{2015/12/16}{undefined}^^A
+% \changes{v3.06}{2010/05/21}{new (internal)}%^^A
+% \changes{v3.20}{2015/12/16}{undefined}%^^A
 % \end{macro}
 % \begin{macro}{\tb@numkey}
-%   \changes{v3.06}{2010/05/21}{new internal}%
-%   \changes{v3.20}{2015/12/16}{undefined}^^A
+% \changes{v3.06}{2010/05/21}{new internal}%
+% \changes{v3.20}{2015/12/16}{undefined}%^^A
 % \end{macro}
 % \begin{macro}{\tb@nt@autofloattype}
-%   \changes{v3.06}{2010/06/01}{new internal}
-%   This macro saves the float type for auto generated float types.
+% \changes{v3.06}{2010/06/01}{new internal}%^^A
+% This macro saves the float type for auto generated float types.
 %    \begin{macrocode}
 \newcommand*{\tb@nt@autofloattype}{16}
 %</body>
@@ -1925,27 +1952,6 @@
 %!KOMAScriptVersion
 ]
 %    \end{macrocode}
-%
-%<*class>
-% \KOMAScript{} classes need some additional initialization.
-%
-% \changes{v1.00}{auto-activation of feature \texttt{onecolumn}}
-% Set feature \texttt{onecolumn} for every toc file if feature
-% \texttt{leveldown} was not used.
-%    \begin{macrocode}
-%<*chapter>
-\AtAddToTocList[\@currname.\@currext]{\setuptoc{\@currext}{onecolumn}}%
-\AtAddToTocList[float]{\setuptoc{\@currext}{onecolumn}}%
-%</chapter>
-%    \end{macrocode}
-% Tell the package, what files are used:
-% \changes{v3.25}{2017/10/10}{extension \texttt{lof} not added explicitely}^^A
-% \changes{v3.25}{2017/10/10}{extension \texttt{lot} not added explicitely}^^A
-%    \begin{macrocode}
-\addtotoclist{toc}
-\ifstr{\ext@toc}{toc}{}{\expandafter\addtotoclist\expandafter{\ext@toc}}
-%    \end{macrocode}
-%</class>
 %</load>
 % \fi
 %
@@ -1956,6 +1962,6 @@
 % end of file `tocbasic.dtx'
 %%% Local Variables:
 %%% mode: doctex
-%%% coding: iso-latin-1
+%%% coding: utf-8
 %%% TeX-master: t
 %%% End: