9 files changed, 283 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/dlfltxb/README b/Master/texmf-dist/doc/latex/dlfltxb/README
index 05ca81ecd61..990226f20ed 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/README
+++ b/Master/texmf-dist/doc/latex/dlfltxb/README
@@ -1,18 +1,18 @@
-% (C) Lars Madsen, daleif@imf.au.dk, 2007/05/18
+% (C) Lars Madsen, daleif@imf.au.dk, 2008/01/17
 % This material is subject to the LaTeX Project Public License. 
 % See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html 
 % for the details of that license.
 
-The dlfltxb bundle consists of (currently) three packages used for my
+The dlfltxb bundle consists of (currently) four packages used for my
 book "Introduktion til LaTeX" (in Danish, available from
 http://www.imf.au.dk/system/latex/bog/). 
 
 One package consists of various home made macros (in the book
 presented as code tips), which are also useful for other users. The
-last two packages are used internally for writing the book.
+remaining three  packages are used internally for writing the book.
 
 At least one more package (dlfltxbsc) will be added to the bundle
-later (presumably Fall 2007). This is the package used for all the
+later (presumably sometime in 2008). This is the package used for all the
 examples in the book.
 
 
@@ -30,6 +30,8 @@ HISTORY
 
  * 20070711 bugfix in dlfltxbcodetips (coding error in \ArrowBetweenLines)
 
+ * 20080117 added the dlfltxbtocconfig package
+
 
 Current file contents for the dlfltxb bundle:
 =============================================
@@ -54,7 +56,9 @@ dlfltxbcodetips (v0.26):
    * \SwapDeadSpace to be placed at the beginning of for example an align
      to switch the spacing above from \abovedisplayskip to
      \abovedisplayshortskip 
-
+   * \ProvidePGFPagesFourOnOneWithSpaceForNotes provides a 
+     '4 on 1 with space for notes' layout for pgfpages, based on the
+      standard '8 on 1'
 
 Changes
 -------
@@ -66,8 +70,9 @@ Changes
  v0.23 Made the autoloading of amssymb optional.
  v0.25 Bugfix.
  v0.26 Bugfix.
+ v0.30 added \ProvidePGFPagesFourOnOneWithSpaceForNotes
 
-dlfltxbmarkup (v0.6):
+dlfltxbmarkup (v0.65):
 ---------------------
 
  * dlfltxbmarkup.sty
@@ -98,10 +103,10 @@ Changes
 -------
 
  20070601 new version of dlfltxbmarkup-sample.cfg
+ 20080117 new version of dlfltxbmarkup-sample.cfg plus a bug fix
 
 
-
-dlfltxbmisc (v0.1):
+dlfltxbmisc (v0.2):
 -------------------
 
  * dlfltxbmisc.sty
@@ -116,6 +121,32 @@ dlfltxbmisc (v0.1):
      the bibliography
 
 
+Changes
+-------
+
+ 2008/01/01 fixed to accommodate changes in mempatch version 4.9
+
+
+dlfltxbtocconfig (0.5)
+----------------------
+
+  * dlfltxbtocconfig.sty
+  * dlfltxbtocconfig.pdf (very short manual)
+  * dlfltxbtocconfig.tex (source for manual)
+
+    The dlfltxbtocconfig package provides
+
+    * macros for creating the short and long TOC for my LaTeX book
+    * macros to 'dynamically' change the TOC indentation for subsubsection items
+    * feature for setting auto-generated numwidths for section and
+      subsection based on the contents of the .toc file.  
+
+Changes
+-------
+
+ 2008/01/17 Initial release
+
+
 package_doc.bib:
 ----------------
 
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf
index bd6bfcb3e8b..7074fd3aeb9 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
index bc06cfe65fd..076b35305bb 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
@@ -147,10 +147,11 @@ contain most of the home made packages that I use to create my book
 
 Some of the macros might be better of included in the
 \markup[nomk,sty]{mathtools} package by Morten Høgholm, but he is quite busy
-elsewhere at the moment. over time some of the macros might be
-imcluded in 
+elsewhere at the moment. 
 
-\newpage
+\bigskip
+
+%\newpage
 \noindent
 \emph{Note:} The macro \verb+\dbx+ will often be used to simulate some
 text or mathematical material. 
@@ -476,6 +477,16 @@ return to the indentation set by the >>\texttt{\{}<<.
 Of course, non-balanced \markup[nomk]{left}--\markup[nomk]{right}
 constructions may not be used.
 
+
+\chapter{Additional layout for the \textsf{pfgpages} package}
+\label{sec:addit-layo-textsfpfg}
+
+The macro \markup{ProvidePGFPagesFourOnOneWithSpaceForNotes} will
+activate a \linebreak >>\verb*+4 on 1 with space for notes+<< layout to be used
+with the \markup[sty,nomk]{pgfpages} package. It is basically the same
+as the >>\verb*+8 on 1+<< layout but leaving the second column empty
+for reader to fill in their own notes.
+
 \bibliographystyle{plainnat}
 \bibliography{package_doc}
 
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg
index 5721263da41..7f8b2b69c24 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg
@@ -21,7 +21,8 @@
 % 
 % <2007/05/25 added various stuff
 %  2007/05/25 added the mltbib, bbtpc and bbtpcenv keys
-
+%  2007/??/?? added sistyle key
+%  2007/06/20 added acronym key
 
 % default key
 \def\felineStandardKey{macro}
@@ -149,7 +150,7 @@
 % ntheorem makroer
 \felineKeyGenerator{nthm}%
   {ntheorem macros}
-  {\felineWriteInMargin{\cs{#1}}}%
+  {\felineWriteInMargin{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}%
   {\felineIndexCmd{ntheorem (pakke)@ntheorem (pakke)!\protect\css{#1}}%
     \felineIndexCmd{#1 (ntheorem)@\protect\css{#1}
       (ntheorem)}}%
@@ -168,7 +169,7 @@
 % XY pic makroer
 \felineKeyGenerator{xym}%
   {Xy-pic macros}
-  {\felineWriteInMargin{\cs{#1}}}%
+  {\felineWriteInMargin{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}%
   {\felineIndexCmd{#1@\protect\css{#1}}\felineIndexCmd{XY-pic@\protect\Xy-pic!#1@\protect\css{#1}}}%
   {\cs{#1}}
 
@@ -252,7 +253,7 @@
   {memoir specific environments}
   {\felineWriteInMargin{#1}}%
   {\felineIndexCmd{#1 (env,  memoir)@#1 (env,  memoir)}%
-    \felineIndexCmd{environments!#1}\felineIndexCmd{memoir@memoir (klasse)!#1}}%
+    \felineIndexCmd{environments!#1}\felineIndexCmd{memoir (klasse)@memoir (klasse)!#1}}%
   {\textit{\textbf{#1}}}
 
 % memoir chapterstyle
@@ -424,7 +425,7 @@
 % længde options
 \felineKeyGenerator{length}%
   {name of lengths}
-  {\felineWriteInMargin{#1}}% 
+  {\felineWriteInMargin{\cs{#1}}}% 
   {\felineIndexCmd{længde!#1@\protect\css{#1}}%
     \felineIndexCmd{#1 (længde)@\protect\css{#1} (længde)}}%
   {\cs{#1}}
@@ -447,14 +448,14 @@
   {macros related to the multibib pacakge}
   {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
   {\felineIndexCmd{#1@\protect\css{#1}}%
-    \felineIndexCmd{multibib (pakke)!\protect\css{#1}}}%
+    \felineIndexCmd{multibib (pakke)!#1@\protect\css{#1}}}%
   {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
 
 \felineKeyGenerator{bbtpc}%
   {macros related to the bibtopic package}
   {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
   {\felineIndexCmd{#1@\protect\css{#1}}%
-    \felineIndexCmd{bibtopic (pakke)!\protect\css{#1}}}%
+    \felineIndexCmd{bibtopic (pakke)!#1@\protect\css{#1}}}%
   {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
 
 \felineKeyGenerator{bbtpcenv}%
@@ -464,3 +465,52 @@
    \felineIndexCmd{bibtopic (pakke)!#1}%
    \felineIndexCmd{environments!#1 (bibtopic)}}%
   {\foreignlanguage{english}{\textit{\textbf{#1}}}}
+
+\felineKeyGenerator{sistyle}%
+  {macros from the sistye package}%
+  {\felineWriteInMargin{\cs{#1}}}%
+  {\felineIndexCmd{#1 (sistyle)@\protect\css{#1} (sistyle)}%
+    \felineIndexCmd{sistyle (pakke)!#1@\protect\css{#1}}}%
+  {\cs{#1}}
+
+\felineKeyGenerator{acronym}%
+  {macros from the acronym package}%
+  {\felineWriteInMargin{\cs{#1}}}%
+  {\felineIndexCmd{#1 (acronym)@\protect\css{#1} (acronym)}%
+    \felineIndexCmd{acronym (pakke)!#1@\protect\css{#1}}}%
+  {\cs{#1}}
+
+\felineKeyGenerator{beamerenv}
+  {environment related to the beamer class}
+  {\felineWriteInMargin{#1}}%
+  {\felineIndexCmd{#1 (environment)}%
+   \felineIndexCmd{beamer (klasse)!#1}%
+   \felineIndexCmd{environments!#1 (beamer)}}%
+  {\foreignlanguage{english}{\textit{\textbf{#1}}}}
+
+\felineKeyGenerator{beamer}%
+  {macros related to the beamer class}
+  {\felineWriteInMargin{{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}}%
+  {\felineIndexCmd{#1@\protect\css{#1} (beamer)}%
+    \felineIndexCmd{beamer (klasse)!#1@\protect\css{#1}}}%
+  {{\foreignlanguage{english}{\cs{\hyphenchar\font=`\-#1}}}}
+
+\felineKeyGenerator{beamerclsopt}%
+  {class options for beamer related to the beamer class}
+  {\felineWriteInMargin{#1}}%
+  {\felineIndexCmd{#1 (beamer)}%
+    \felineIndexCmd{beamer (klasse)!#1}}%
+  {\texttt{#1}}
+
+\felineKeyGenerator{beamertheme}%
+  {beamertheme}
+  {\felineWriteInMargin{#1}}%
+  {\felineIndexCmd{#1 (beamer)}%
+    \felineIndexCmd{beamer (klasse)!#1}}%
+  {\texttt{#1}}
+
+
+
+
+
+
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf
index 3a70627a6ec..636ccda8624 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf
index 82098befebb..321eef76a95 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup.pdf
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf
index decdb2eb687..e1fbd0111cc 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmisc.pdf
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.pdf
new file mode 100644
index 00000000000..ac7cdd7bfea
--- /dev/null
+++ 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
new file mode 100644
index 00000000000..7f0969c4320
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbtocconfig.tex
@@ -0,0 +1,173 @@
+\RequirePackage{etex}
+\documentclass[11pt,oneside,a4paper,oldfontcommands,danish,english,article]{memoir}
+\usepackage[latin1]{inputenc}
+\usepackage{babel}
+\usepackage[T1]{fontenc}
+\usepackage[widespace]{fourier}
+
+\setlxvchars[\normalfont]
+
+\settypeblocksize{*}{1.3\lxvchars}{1.618}
+
+\setlrmargins{*}{*}{0.7}
+\setulmargins{*}{*}{1}
+\setlength\marginparwidth{4cm}
+
+\checkandfixthelayout
+
+
+\hfuzz=30pt
+
+\setfootnoterule[\vfill]{3pt}{0.4\columnwidth}{\normalrulethickness}
+
+\usepackage{color}
+\usepackage[colorlinks,breaklinks]{hyperref}
+\definecolor{linkcolour}{rgb}{0,0.2,0.6}
+\definecolor{citecolour}{rgb}{0,0.6,0.2}
+\definecolor{urlcolour} {rgb}{0.8,0,0.8}
+  
+\hypersetup{
+  pdftitle={The dlfltxbtocconfig package},
+  pdfauthor={Copyright \textcopyright\ \number\year\ Lars Madsen},
+  linkcolor=linkcolour,citecolor=citecolour,
+  filecolor=urlcolour,urlcolor=urlcolour,
+  plainpages=false,
+}
+  
+\ifpdf\else\usepackage{breakurl}\fi
+\usepackage{memhfixc}
+
+\clubpenalty=300
+\widowpenalty=300
+
+\usepackage{microtype}
+
+\usepackage{amsmath,amssymb}
+\usepackage[amsmath,thmmarks,framed]{ntheorem}
+\usepackage[round]{natbib}
+
+\usepackage{dlfltxbcodetips}
+\usepackage[loadsampleconfig]{dlfltxbmarkup}
+\renewcommand\felineMarginAdjustment{\RaggedLeft}
+
+
+
+\usepackage{dlfltxbmisc}
+\usepackage{graphicx}
+
+\chapterstyle{article}
+
+\setsecheadstyle{\normalfont\large\bfseries\raggedright}
+
+
+\reversemarginpar
+\reversesidepartrue
+
+\definecolor{shadecolor}{gray}{0.8}
+\theorembodyfont{\normalfont}
+\theoremseparator{.}
+\def\theoremframecommand{\colorbox{shadecolor}}
+
+\theoremstyle{nonumberplain}
+
+\NewShadedTheorem{caveat}{Caveat}
+
+\NewShadedTheorem{remark}{Remark}
+
+% until dlfltxbsd is released we will have to use the following
+% construction
+
+\usepackage{fancyvrb}
+\fvset{fontsize=\footnotesize}
+
+\newcommand\verbfile{\jobname.vrb}
+\newenvironment{sourcedisplay}{%
+\par\vskip0.5\baselineskip\noindent
+\VerbatimOut{\verbfile}}{%
+\endVerbatimOut%
+\noindent
+\begin{minipage}{0.48\linewidth}
+\VerbatimInput{\verbfile}
+\end{minipage}
+\hfill
+\begingroup%
+\begin{minipage}{0.48\linewidth}
+\begin{framed}
+\input{\verbfile}
+\end{framed}
+\end{minipage}
+\endgroup\vskip0.5\baselineskip}
+
+
+\newenvironment{Sourcedisplay}{%
+\par\vskip0.5\baselineskip\noindent
+\VerbatimOut{\verbfile}}{%
+\endVerbatimOut%
+\noindent
+\begin{minipage}{\linewidth}
+\VerbatimInput{\verbfile}
+\end{minipage}
+\par\bigskip\noindent
+\begin{minipage}{\linewidth}
+\begin{framed}
+\input{\verbfile}
+\end{framed}
+\end{minipage}
+\vskip0.5\baselineskip}
+
+
+\pagestyle{plain}
+
+\begin{document}
+
+\title{The \textsf{\jobname} package}
+\author{Lars Madsen\thanks{Web:
+    \url{http://home.imf.au.dk/daleif}\qquad Email: \url{daleif@imf.au.dk}}}
+\maketitle
+
+\tableofcontents*
+
+\setsecnumdepth{part}
+
+\chapter{Introduction}
+\label{cha:introduction}
+
+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.
+
+\chapter{Macros}
+\label{cha:macros}
+
+\markup{spart}\marg{text} this inserts \Arg{text} into the the
+\texttt{.toc} file using a special \texttt{spart} style which is used
+in the short ToC. This does mean that \markup[nomk]{part} entries has
+to be entered twice, but it also enables us to insert special features
+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,
+each separated by
+\markup{cftdlfsubsubseccomma}. \markup{preprocessToC} will preprocess
+the entire ToC, and calculates the indents for section and subsection
+entries. It should be inserted before \markup{MakeNormalToC}.
+
+\markup{ToCSubsectionIndentsPullBack} this will change the indent in
+the ToC for the subsubsection entries, this is very useful if one
+wants to have unnumbered entries under a section instead of a
+subsection. \markup{ToCSubsectionIndentsBackToNormal} sets the
+indentation back to normal.
+
+
+\end{document}
+
+%%% Local Variables: 
+%%% mode: latex
+%%% TeX-master: t
+%%% TeX-source-specials-mode: t
+%%% TeX-PDF-mode: nil
+%%% End: 
+