diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/tocbasic.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/koma-script/tocbasic.dtx | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx index 9afd1be9a2d..86d5a72d482 100644 --- a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx +++ b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx @@ -1,4 +1,4 @@ -% \CheckSum{1455} +% \CheckSum{1465} % \iffalse meta-comment % ====================================================================== % tocbasic.dtx @@ -57,12 +57,12 @@ % Right brace \} Tilde \~} % % \iffalse -%%% From File: $Id: tocbasic.dtx 2041 2015-03-25 08:42:54Z kohm $ +%%% From File: $Id: tocbasic.dtx 2146 2015-06-20 06:38:46Z kohm $ %<*dtx> \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi \begingroup \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}} - \filedate$Date: 2015-03-25 09:42:54 +0100 (Wed, 25 Mar 2015) $ + \filedate$Date: 2015-06-20 08:38:46 +0200 (Sat, 20 Jun 2015) $ \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}} \filerevision$Revision: 1962 $ \endgroup @@ -2826,10 +2826,11 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macrocode} % \end{macro} % \begin{macro}{\tb@nt@listname} +% \changes{v3.18}{2015/06/20}{using \cs{def} instead of \cs{edef}} % The list itself has a heading. A |\list<type>name| will also be defined. % \begin{macrocode} \define@key{tocbasic}{listname}{% - \tb@ifvalueisnotempty{listname}{#1}{\edef\tb@nt@listname{#1}}% + \tb@ifvalueisnotempty{listname}{#1}{\def\tb@nt@listname{#1}}% } % \end{macrocode} % \end{macro} @@ -2931,7 +2932,9 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. } % \end{macrocode} % \end{macro} -% Now the command to define a new list and maybe float or nonfloat. +% Now the command to define a new list and maybe float or nonfloat. +% \changes{v3.18}{2015/06/20}{\cs{tb@nt@types} and \cs{tb@nt@listname} are +% initialised \cs{relax}}^^A % \begin{macrocode} \newcommand*{\DeclareNewTOC}[2][]{% \tb@floatfalse @@ -2941,10 +2944,10 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. \def\tb@nt@floatpos{tbp}% \def\tb@nt@ext{#2}% \def\tb@nt@type{#2}% - \def\tb@nt@types{\tb@nt@type s}% + \let\tb@nt@types\relax \def\tb@nt@owner{float}% - \def\tb@nt@name{\expandafter\MakeUppercase\tb@nt@type}% - \def\tb@nt@listname{List of \expandafter\MakeUppercase\tb@nt@types}% + \def\tb@nt@name{\expandafter\protect\expandafter\MakeUppercase\tb@nt@type}% + \let\tb@nt@listname\relax \def\tb@nt@level{1}% \def\tb@nt@indent{1em}% \def\tb@nt@hang{1.5em}% @@ -2962,11 +2965,18 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}. % \end{macrocode} % Then we need the TOC itself with a name: % \begin{macrocode} + \scr@ifundefinedorrelax{tb@nt@types}{% + \edef\tb@nt@types{\tb@nt@type s}% + }{}% + \scr@ifundefinedorrelax{tb@nt@listname}{% + \protected@edef\tb@nt@listname{List of \protect\MakeUppercase\tb@nt@types}% + }{}% \@ifundefined{\tb@nt@type name}{% - \expandafter\let\csname \tb@nt@type name\endcsname\tb@nt@name + \expandafter\protected@edef\csname \tb@nt@type name\endcsname{\tb@nt@name}% }{% \iftb@forcenames - \expandafter\let\csname \tb@nt@type name\endcsname\tb@nt@name + \expandafter\protected@edef\csname \tb@nt@type name\endcsname + {\tb@nt@name}% \fi }% \@ifundefined{list\tb@nt@type name}{% |