summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
diff options
context:
space:
mode:
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, 16 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
index cb4c3c93e70..fa009f9d22d 100644
--- a/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
+++ b/Master/texmf-dist/tex/latex/koma-script/tocbasic.sty
@@ -39,7 +39,7 @@
%% standard classes created by The LaTeX3 Project 1994-1996.
%%
%%% From File: tocbasic.dtx
-\def\tocbasicversion{2011/03/23 v3.09}
+\def\tocbasicversion{2011/05/30 v3.09a}
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{tocbasic}
[\tocbasicversion\space KOMA-Script package
@@ -331,7 +331,7 @@
}%
}{%
\iftocfeature{\@currext}{numbered}{%
- \section[##1]{##1\@mkboth{##1}{##1}}%
+ \section[##1]{##1}%
}{%
\section*{##1}%
\@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
@@ -355,7 +355,7 @@
}%
}{%
\iftocfeature{\@currext}{numbered}{%
- \chapter[##1]{##1\@mkboth{##1}{##1}}%
+ \chapter[##1]{##1}%
}{%
\chapter*{##1}%
\@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
@@ -564,15 +564,19 @@
\edef\@tempa{%
\noexpand\endgroup
\noexpand\newenvironment{\tb@nt@type}{%
- \noexpand\@float{\tb@nt@type}%
- \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname
+ \noexpand\@ifnextchar[%]
+ {\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}}%
+ {\noexpand\tb@atbegin@after\noexpand\@float{\tb@nt@type}%
+ [\expandafter\noexpand\csname fps@\tb@nt@type\endcsname]}%
}{%
\noexpand\csname \tb@nt@type @atend\noexpand\endcsname
\noexpand\end@float
}%
\noexpand\newenvironment{\tb@nt@type*}{%
- \noexpand\@dblfloat{\tb@nt@type}%
- \noexpand\csname \tb@nt@type @atbegin\noexpand\endcsname
+ \noexpand\@ifnextchar[%]
+ {\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}}%
+ {\noexpand\tb@atbegin@after\noexpand\@dblfloat{\tb@nt@type}%
+ [\expandafter\noexpand\csname fps@\tb@nt@type\endcsname]}%
}{%
\noexpand\csname \tb@nt@type @atend\noexpand\endcsname
\noexpand\end@dblfloat
@@ -637,6 +641,11 @@
\endcsname\expandafter{\tb@nt@atend}%
\fi
}
+\newcommand*{\tb@atbegin@after}[3]{}
+\def\tb@atbegin@after#1#2[#3]{%
+ #1{#2}[#3]%
+ \csname #2@atbegin\endcsname
+}
\newcommand*{\tb@ifvalueisnotempty}[2]{%
\begingroup
\edef\@tempa{#2}\ifx\@tempa\@empty