From dd8cd465b253cee19fa61fc89383c0c61a0791e4 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 20 Jun 2016 22:41:14 +0000
Subject: koma-script (20jun16)

git-svn-id: svn://tug.org/texlive/trunk@41508 c570f23f-e606-0410-a88d-b1316a301751
---
 .../source/latex/koma-script/tocbasic.dtx          | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 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 d7cc63d857a..572059fd698 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{1499}
+% \CheckSum{1512}
 % \iffalse meta-comment
 % ======================================================================
 % tocbasic.dtx
@@ -55,7 +55,7 @@
 %   Right brace   \}     Tilde         \~}
 %
 % \iffalse
-%%% From File: $Id: tocbasic.dtx 2440 2016-04-29 15:59:32Z kohm $
+%%% From File: $Id: tocbasic.dtx 2477 2016-06-12 09:52:43Z kohm $
 %<identify>%%%            (run: identify)
 %<prepare>%%%            (run: prepare)
 %<option>%%%            (run: option)
@@ -66,7 +66,7 @@
 \ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
 \begingroup
   \def\filedate$#1: #2-#3-#4 #5${\gdef\filedate{#2/#3/#4}}
-  \filedate$Date: 2016-04-29 17:59:32 +0200 (Fri, 29 Apr 2016) $
+  \filedate$Date: 2016-06-12 11:52:43 +0200 (Sun, 12 Jun 2016) $
   \def\filerevision$#1: #2 ${\gdef\filerevision{r#2}}
   \filerevision$Revision: 1962 $
 \endgroup
@@ -1225,6 +1225,8 @@
     \DefineFamilyKey[.toc]{KOMAarg}{tocentrystyle}{\FamilyKeyStateProcessed}%
 %    \end{macrocode}
 %   \changes{v3.20}{2015/12/16}{defining toc style depending options}^^A
+%   \changes{v3.20}{2016/06/12}{using prefix \texttt{tocentry} instead of
+%     \texttt{toc}}^^A
 %   If the toc style is empty we won't define any \cs{l@\dots}. Otherwise we
 %   need to define additional options.
 %    \begin{macrocode}
@@ -1237,6 +1239,7 @@
           \l@addto@macro\do@endgroup{%
             \l@addto@macro\tb@nt@extra@relax@opts{%
               \RelaxFamilyKey[.toc]{KOMAarg}{toc##1}%
+              \RelaxFamilyKey[.toc]{KOMAarg}{tocentry##1}%
             }%
           }%
           \kernel@ifnextchar[%]
@@ -1246,6 +1249,13 @@
         \def\@donodefault##1{%
           \l@addto@macro\do@endgroup{%
             \DefineFamilyKey[.toc]{KOMAarg}{toc##1}{%
+              \PackageWarning{tocbasic}{you should use `tocentry##1'
+                instead\MessageBreak
+                of `toc##1'}%
+              \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+              \FamilyKeyStateProcessed
+            }%
+            \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1}{%
               \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
               \FamilyKeyStateProcessed
             }%
@@ -1254,6 +1264,13 @@
         \def\@dodefault##1[##2]{%
           \l@addto@macro\do@endgroup{%
             \DefineFamilyKey[.toc]{KOMAarg}{toc##1}[##2]{%
+              \PackageWarning{tocbasic}{you should use `tocentry##1'
+                instead\MessageBreak
+                of `toc##1'}%
+              \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
+              \FamilyKeyStateProcessed
+            }%
+            \DefineFamilyKey[.toc]{KOMAarg}{tocentry##1}[##2]{%
               \l@addto@macro{\tb@nt@tocstyle@options}{,##1={####1}}%
               \FamilyKeyStateProcessed
             }%
@@ -1367,7 +1384,7 @@
         \PackageWarning{tocbasic}{%
           deprecated option `hang'.\MessageBreak
           You should replace option `hang' by option\MessageBreak
-          `tocnumwidth'%
+          `tocentrynumwidth'%
         }%
         \l@addto@macro\tb@nt@tocstyle@options{,numwidth={##1}}%
       }%
@@ -1395,7 +1412,7 @@
         \PackageWarning{tocbasic}{%
           deprecated option `indent'.\MessageBreak
           You should replace option `indent' by option\MessageBreak
-          `tocindent'%
+          `tocentryindent'%
         }%
         \l@addto@macro\tb@nt@tocstyle@options{,indent={##1}}%
       }%
@@ -1416,7 +1433,7 @@
       \PackageWarning{tocbasic}{%
         deprecated option `level'.\MessageBreak
         You should replace option `level' by option\MessageBreak
-        `toclevel'
+        `tocentrylevel'
       }%
       \l@addto@macro\tb@nt@tocstyle@options{,level={##1}}%
       \FamilyKeyStateProcessed
-- 
cgit v1.2.3

