summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-19 23:43:25 +0000
committerKarl Berry <karl@freefriends.org>2015-01-19 23:43:25 +0000
commit83b4f07dfc662cf6c2632a34e88a1aad0009e35a (patch)
treed6c61dbd9ba41e2c7353bdcf23acb151b52601ff /Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
parent3fef13606c698d4e277aaad8662b082f8f5c6fab (diff)
koma-script (19jan15)
git-svn-id: svn://tug.org/texlive/trunk@36095 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/koma-script/tocbasic.dtx')
-rw-r--r--Master/texmf-dist/source/latex/koma-script/tocbasic.dtx52
1 files changed, 42 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 00d3a86df5b..baf0f5cb0a8 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{1340}
+% \CheckSum{1368}
% \iffalse meta-comment
% ======================================================================
% tocbasic.dtx
@@ -57,7 +57,7 @@
% Right brace \} Tilde \~}
%
% \iffalse
-%%% From File: $Id: tocbasic.dtx 1782 2014-08-18 10:48:22Z kohm $
+%%% From File: $Id: tocbasic.dtx 1871 2014-12-10 09:06:20Z kohm $
%<*dtx>
\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
\ProvidesFile{tocbasic.dtx}[%
@@ -2460,6 +2460,9 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}.
% \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
% Setting the headings of a list of something. The heading is the only
% argument.
% \begin{macrocode}
@@ -2473,20 +2476,26 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}.
\subsection[##1]{##1}%
}{%
\subsection*{##1}%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
\iftocfeature{\@currext}{totoc}{%
\addxcontentsline{toc}{subsection}{##1}%
}{}%
+ \begingroup
+ \@ifundefined{@mkright}{%
+ \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{##1}}%
+ }%
+ \endgroup
}%
}{%
\iftocfeature{\@currext}{numbered}{%
\section[##1]{##1}%
}{%
\section*{##1}%
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
\iftocfeature{\@currext}{totoc}{%
\addxcontentsline{toc}{section}{##1}%
}{}%
+ \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
}%
}%
}%
@@ -2496,18 +2505,41 @@ may be found in \autoref{tab:tocbasic.DeclareNewTOC-options}.
\iftocfeature{\@currext}{numbered}{%
\section{##1}%
}{%
- \section*{##1}%
\iftocfeature{\@currext}{totoc}{%
- \addxcontentsline{toc}{section}{##1}%
- }{}%
- \ifx\@mkboth\@gobbletwo\else\markright{\MakeMarkcase{##1}}\fi
+ \begingroup
+ \@ifundefined{addsec}{%
+ \section*{##1}%
+ \begingroup
+ \@ifundefined{@mkright}{%
+ \ifx\@mkboth\@gobbletwo
+ \else\markright{\MakeMarkcase{##1}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{##1}}%
+ }%
+ \endgroup
+ \addxcontentsline{toc}{section}{##1}%
+ }{%
+ \addsec{##1}%
+ }%
+ \endgroup
+ }{%
+ \section*{##1}%
+ \begingroup
+ \@ifundefined{@mkright}{%
+ \ifx\@mkboth\@gobbletwo
+ \else\markright{\MakeMarkcase{##1}}\fi
+ }{%
+ \@mkright{\MakeMarkcase{##1}}%
+ }%
+ \endgroup
+ }%
}%
}{%
\iftocfeature{\@currext}{numbered}{%
\chapter[##1]{##1}%
}{%
- \chapter*{##1}%
- \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}%
+ \chapter*{##1\unskip
+ \@mkboth{\MakeMarkcase{##1}}{\MakeMarkcase{##1}}}%
\iftocfeature{\@currext}{totoc}{%
\addxcontentsline{toc}{chapter}{##1}%
}{}%