From d169595175488e9e35570df5f4b22214627896e0 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Wed, 19 Nov 2008 02:08:50 +0000
Subject: koma-script update

git-svn-id: svn://tug.org/texlive/trunk@11355 c570f23f-e606-0410-a88d-b1316a301751
---
 .../source/latex/koma-script/tocbasic.dtx          | 44 ++++++++++++++++------
 1 file changed, 33 insertions(+), 11 deletions(-)

(limited to 'Master/texmf-dist/source/latex/koma-script/tocbasic.dtx')

diff --git a/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx b/Master/texmf-dist/source/latex/koma-script/tocbasic.dtx
index b75ceb7e0e2..c6e97a3eef2 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{645}
+% \CheckSum{649}
 % \iffalse meta-comment
 % ======================================================================
 % tocbasic.dtx
@@ -66,7 +66,7 @@
 %%% From File: tocbasic.dtx
 %<*dtx|package|driver|doc|load>
 % \fi
-\def\tocbasicversion{2008/10/06 v1.0}
+\def\tocbasicversion{2008/11/13 v3.01}
 % \iffalse
 %</dtx|package|driver|doc|load>
 %<*dtx>
@@ -925,6 +925,8 @@ features. \Package{tocbasic} does know following features:
 \item[\texttt{numbered}] uses a numbered headings for the list of
 \item[\texttt{leveldown}] uses not the top level heading (e.g., \Macro{chapter}
   with book) but the first sub level (e.g., \Macro{section} with book).
+\item[\texttt{onecolumn}] switch to internal one column mode, if the toc
+  is set in internal two column mode and no \texttt{leveldown} was used.
 \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.
@@ -1186,6 +1188,10 @@ be defined and used in \Macro{tocbasic@listhead}.
 % \end{macro}
 %
 % \begin{macro}{\addtotoclist}
+%   \changes{v1.0a}{2008/11/11}{internal \cs{@addtotoclist} renamed to
+%     \cs{scr@addtotoclist} because of package \textsf{floatfram}}.%
+%   \changes{v1.0a}{2008/11/11}{internal \cs{@@addtotoclist} renamed to
+%     \cs{scr@@addtotoclist} because of package \textsf{floatfram}}.%
 %   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
@@ -1197,17 +1203,17 @@ be defined and used in \Macro{tocbasic@listhead}.
 %    \begin{macrocode}
 \newcommand*{\addtotoclist}{%
   \@ifnextchar [%]
-    \@@addtotoclist\@addtotoclist
+    \scr@@addtotoclist\scr@addtotoclist
 }
-\newcommand*{\@addtotoclist}{%
+\newcommand*{\scr@addtotoclist}{%
   \ifx\@currname\@empty
-    \def\reserved@a{\@@addtotoclist[]}%
+    \def\reserved@a{\scr@@addtotoclist[]}%
   \else
-    \edef\reserved@a{\noexpand\@@addtotoclist[\@currname.\@currext]}%
+    \edef\reserved@a{\noexpand\scr@@addtotoclist[\@currname.\@currext]}%
   \fi
   \reserved@a
 }
-\newcommand*{\@@addtotoclist}[2][]{%
+\newcommand*{\scr@@addtotoclist}[2][]{%
   \ifattoclist{#2}{%
     \PackageError{tocbasic}{%
       file extension `#2' cannot be used twice
@@ -1491,6 +1497,8 @@ be defined and used in \Macro{tocbasic@listhead}.
 %
 % \begin{macro}{\listoftoc}
 % \begin{macro}{\listoftoc*}
+%   \changes{1.0a}{2008/11/12}{\cs{twocolumn} fixed}%
+%   \changes{1.01}{2008/11/13}{new feature \texttt{onecolumn}}
 %   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
@@ -1512,10 +1520,14 @@ be defined and used in \Macro{tocbasic@listhead}.
     }{%
       \expandafter\let\expandafter\list@fname\csname listof#2name\endcsname
     }%
-    \if@twocolumn
-      \aftergroup\twocolumne\onecolumn
-    \fi
     \def\@currext{#2}%
+    \iftocfeature{\@currext}{onecolumn}{%
+      \iftocfeature{\@currext}{leveldown}{}{%
+        \if@twocolumn
+          \aftergroup\twocolumn\onecolumn
+        \fi
+      }%
+    }{}%
     \tocbasic@listhead{#1}%
     \tocbasic@starttoc{#2}%
   \endgroup
@@ -1724,6 +1736,7 @@ be defined and used in \Macro{tocbasic@listhead}.
 % \end{macro}
 %
 % \begin{macro}{\tocbasicautomode}
+%   \changes{v1.0a}{2008/11/11}{use of \cs{addtotoclist} instead of internal}
 %   \Package{tocbasic} can overtake \Macro{@starttoc} to automaticly add all
 %   used extensions to the list of known extensions and use
 %   \Macro{tocbasic@starttoc} instead of \Macro{@starttoc} from \LaTeX{}
@@ -1734,7 +1747,7 @@ be defined and used in \Macro{tocbasic@listhead}.
   \BeforeStartingTOC{%
     \let\@starttoc\tb@saved@starttoc
     \expandafter\ifattoclist\expandafter{\@currext}{}{%
-      \@addtotoclist[tocbasicautomode]{\@currext}%
+      \addtotoclist[tocbasicautomode]{\@currext}%
     }%
   }%
 }
@@ -1749,6 +1762,15 @@ be defined and used in \Macro{tocbasic@listhead}.
 \edef\@tempa{\noexpand\RequirePackage{tocbasic}[\tocbasicversion]}
 \@tempa
 %    \end{macrocode}
+% \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:
 %    \begin{macrocode}
 \addtotoclist{toc}
-- 
cgit v1.2.3

