summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-07-02 22:11:36 +0000
committerKarl Berry <karl@freefriends.org>2015-07-02 22:11:36 +0000
commit28c9b4ce4d428d1582c35205f79c62da999cf4d0 (patch)
treeebaab8a451d923c648016ddecaf5f9dcdbb043eb /Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
parenta55a0c408532e7d4dbeb629215c40b9a29b1f98d (diff)
koma-script (2jul15)
git-svn-id: svn://tug.org/texlive/trunk@37734 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/koma-script/tocbasic.sty')
-rw-r--r--Master/texmf-dist/tex/latex/koma-script/tocbasic.sty23
1 files changed, 15 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index 2a2e8d9070b..522e9af8727 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -39,10 +39,10 @@
%% find a complete unmodified copy of LaTeX2e at
%% <http://www.ctan.org/pub/tex-archive/macros/latex/base/>.
%%
-%%% 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 $
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{tocbasic}[%
- 2015/05/06 v3.17a KOMA-Script
+ 2015/07/02 v3.18 KOMA-Script
package
(handling toc-files)%
]
@@ -571,7 +571,7 @@
\tb@ifvalueisnotempty{name}{#1}{\edef\tb@nt@name{#1}}%
}
\define@key{tocbasic}{listname}{%
- \tb@ifvalueisnotempty{listname}{#1}{\edef\tb@nt@listname{#1}}%
+ \tb@ifvalueisnotempty{listname}{#1}{\def\tb@nt@listname{#1}}%
}
\newif\iftb@forcenames
\define@key{tocbasic}{forcenames}[true]{%
@@ -614,10 +614,10 @@
\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}%
@@ -628,11 +628,18 @@
\expandafter\newcommand\csname ext@\tb@nt@type\endcsname{}%
\expandafter\let\csname ext@\tb@nt@type\endcsname\tb@nt@ext
\addtotoclist[\tb@nt@owner]{\csname ext@\tb@nt@type\endcsname}%
+ \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}{%