dlfltxb update

git-svn-id: svn://tug.org/texlive/trunk@6392 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 17 insertions, 10 deletions

diff --git a/Master/texmf-dist/doc/latex/dlfltxb/README b/Master/texmf-dist/doc/latex/dlfltxb/README
index 990226f20ed..77518029351 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/README
+++ b/Master/texmf-dist/doc/latex/dlfltxb/README
@@ -32,6 +32,7 @@ HISTORY
 
  * 20080117 added the dlfltxbtocconfig package
 
+ * 20080122 small changes to dlfltxbtocconfig
 
 Current file contents for the dlfltxb bundle:
 =============================================
@@ -127,7 +128,7 @@ Changes
  2008/01/01 fixed to accommodate changes in mempatch version 4.9
 
 
-dlfltxbtocconfig (0.5)
+dlfltxbtocconfig (0.6)
 ----------------------
 
   * dlfltxbtocconfig.sty
@@ -145,7 +146,8 @@ Changes
 -------
 
  2008/01/17 Initial release
-
+ 2008/01/22 Made the ToC titles configurable using \contentsname and a 
+            provided \shortcontentsname 
 
 package_doc.bib:
 ----------------
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf
index ac7cdd7bfea..8a8103ed37b 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex
index 7f0969c4320..e25c8e41624 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex
@@ -134,8 +134,8 @@
 
 This package takes care of configuring the two ToCs used in
 \textit{Introduktion til \LaTeX}. The package is build for this book
-only and does not contain much room for configuration. Use it for
-inspiration for your own code.
+only and does not contain much room for configuration. % Use it for
+% inspiration for your own code.
 
 \chapter{Macros}
 \label{cha:macros}
@@ -148,8 +148,10 @@ into the ToC that does not necessarily has to be present in both.
 
 \markup{MakeShortToC} prints a short ToC displaying only yhe chapters
 (without chapter numbers) and the text inserted using
-\markup[nomk]{spart}. \markup{MakeNormalToC} creates a sort of normal
-ToC. Note that each subsubesction entry is typeset like a runin list,
+\markup[nomk]{spart}, the title is typeset using \markup{shortcontentsname}.
+\markup{MakeNormalToC} creates a sort of normal
+ToC, the title is typeset using \markup[nomk]{contentsname}. 
+Note that each subsubesction entry is typeset like a runin list,
 each separated by
 \markup{cftdlfsubsubseccomma}. \markup{preprocessToC} will preprocess
 the entire ToC, and calculates the indents for section and subsection
@@ -162,6 +164,8 @@ subsection. \markup{ToCSubsectionIndentsBackToNormal} sets the
 indentation back to normal.
 
 
+
+
 \end{document}
 
 %%% Local Variables: 
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
index 3f4168bc030..8c34150d82a 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{dlfltxbtocconfig}[2007/12/27 v0.5 by Lars Madsen]
+\ProvidesPackage{dlfltxbtocconfig}[2008/01/22 v0.6 by Lars Madsen]
 
 % This package be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,6 +18,7 @@
 %
 % 20071227 a few internal macros changed to reflect changes in
 %          mempatch 4.9
+% 20080122 made the toc titlenames configurable (\contentsname and \shortcontentsname)
 
 % we need to be running under the memoir class
 \@ifclassloaded{memoir}{}{%
@@ -79,12 +80,12 @@
 %%                %%
 %%%%%%%%%%%%%%%%%%%%
 
-
+\providecommand\shortcontentsname{Kort oversigt}
 
 % This macro is used to print the two ToCs
 \newcommand\MakeShortToC{
   \begingroup
-  \renewcommand{\contentsname}{Kort oversigt}
+  \renewcommand{\contentsname}{\shortcontentsname}
   \setcounter{tocdepth}{0}
   % no precis'
   \renewcommand\precistoctext[1]{}
@@ -279,7 +280,7 @@
   \renewcommand\cftchaptername{\chaptername~~}
   \renewcommand\cftappendixname{\appendixname~~}
 
-  \renewcommand{\contentsname}{Indholdsfortegnelse}
+%  \renewcommand{\contentsname}{Indholdsfortegnelse}
   \setcounter{tocdepth}{3} % subsections
   \addtodef{\cftchapterbreak}{\par}{}
   \renewcommand{\cftchapterleader}{\cftdotfill{\cftchapterdotsep}}