update dlbfltx

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

13 files changed, 765 insertions, 26 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: 
+
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
index 1a58f5f86a6..edc970b473d 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{dlfltxbcodetips}[2007/07/11 v0.26 by Lars 'daleif' Madsen]
+\ProvidesPackage{dlfltxbcodetips}[2008/01/17 v0.3 by Lars 'daleif' Madsen]
 
 % this pacakge collects some macros presented as code tips in my LaTeX
 % book: "Introduktion til LaTeX". As the macros might be useful for
@@ -234,3 +234,62 @@
 }
 
 
+\newcommand\ProvidePGFPagesFourOnOneWithSpaceForNotes{%
+  \@ifpackageloaded{pgfpages}{%
+    \pgfpagesdeclarelayout{4 on 1 with space for notes}
+    { \edef\pgfpageoptionheight{\the\paperwidth} % landscaped by default
+      \edef\pgfpageoptionwidth{\the\paperheight}
+      \def\pgfpageoptionborder{0pt}}
+    {  \pgfpagesphysicalpageoptions{logical pages=4,%
+        physical height=\pgfpageoptionheight,%
+        physical width=\pgfpageoptionwidth}
+      \ifdim\paperheight>\paperwidth\relax
+      % put side-by-side
+      \pgfpageslogicalpageoptions{1}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.25\pgfphysicalwidth,%
+        resized height=.5\pgfphysicalheight,%
+        center=\pgfpoint{.125\pgfphysicalwidth}{.75\pgfphysicalheight}}%
+      \pgfpageslogicalpageoptions{2}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.25\pgfphysicalwidth,%
+        resized height=.5\pgfphysicalheight,%
+        center=\pgfpoint{.625\pgfphysicalwidth}{.75\pgfphysicalheight}}%
+      \pgfpageslogicalpageoptions{3}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.25\pgfphysicalwidth,%
+        resized height=.5\pgfphysicalheight,%
+        center=\pgfpoint{.125\pgfphysicalwidth}{.25\pgfphysicalheight}}%
+      \pgfpageslogicalpageoptions{4}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.25\pgfphysicalwidth,%
+        resized height=.5\pgfphysicalheight,%
+        center=\pgfpoint{.625\pgfphysicalwidth}{.25\pgfphysicalheight}}%
+      \else % stack on top of one another
+      \pgfpageslogicalpageoptions{1}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.5\pgfphysicalwidth,%
+        resized height=.25\pgfphysicalheight,%
+        center=\pgfpoint{.25\pgfphysicalwidth}{.875\pgfphysicalheight}}%
+      \pgfpageslogicalpageoptions{2}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.5\pgfphysicalwidth,%
+        resized height=.25\pgfphysicalheight,%
+        center=\pgfpoint{.25\pgfphysicalwidth}{.625\pgfphysicalheight}}%
+      \pgfpageslogicalpageoptions{3}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.5\pgfphysicalwidth,%
+        resized height=.25\pgfphysicalheight,%
+        center=\pgfpoint{.25\pgfphysicalwidth}{.375\pgfphysicalheight}}%
+      \pgfpageslogicalpageoptions{4}{%
+        border shrink=\pgfpageoptionborder,%
+        resized width=.5\pgfphysicalwidth,%
+        resized height=.25\pgfphysicalheight,%
+        center=\pgfpoint{.25\pgfphysicalwidth}{.125\pgfphysicalheight}}%
+      \fi    
+    }
+  }{%
+    \PackageError{dlfltxbcodetips}{\string\ProvidePGFPagesFourOnOneWithSpaceForNotes^^J
+      can only be used after the pgfpages package have been loaded}{}
+}}
+
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
index ba40ef465e8..32f4652c10a 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
@@ -1,4 +1,19 @@
-\ProvidesPackage{dlfltxbmarkup}[2007/05/16 v0.6 by daleif]
+\ProvidesPackage{dlfltxbmarkup}[2008/01/10 v0.65 by daleif]
+
+% This package be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is Lars Madsen (daleif@imf.au.dk).
+%%
+
+
 
 \@ifclassloaded{memoir}{}{%
   \PackageError{felinemarkup}{This package depends on several internal
@@ -45,7 +60,7 @@
 %            is given
 % 2007/05/15 \feline@index@cmd renamed to \felineIndexCmd
 % 2007/05/16 package renamed to dlfltxbmarkup
-
+% 2008/01/10 added a strut inside the macro that writes in the margin, 
 
 % this boolean is meant to be used for example inside constructions
 % that will not permit the use of \marginpar, for example the
@@ -75,7 +90,7 @@
                             % leaves a whatsit
 %    \ifoddpage\RaggedRight\else\RaggedLeft\fi%
     \felineMarginAdjustment%
-    {\slshape\footnotesize\hspace{0pt}\color{black}#1\par}}}
+    {\slshape\footnotesize\strut\hspace{0pt}\color{black} #1\strut\par}}}
 
 % this might not belong here, but we will leave it for now
 \strictpagechecktrue%
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty
index 367c9e57669..ae7cd5ce1b7 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmisc.sty
@@ -1,4 +1,19 @@
-\ProvidesPackage{dlfltxbmisc}[2007/05/15 v0.1 by Lars Madsen]
+\ProvidesPackage{dlfltxbmisc}[2008/01/01 v0.2 by Lars Madsen]
+
+% This package be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is Lars Madsen (daleif@imf.au.dk).
+%%
+
+
 
 % if memoir is not loaded we will need the chngpage to get adjustwidth
 \@ifclassloaded{memoir}{}{
@@ -9,6 +24,11 @@
 \RequirePackage{url}
 \RequirePackage{calc}
 
+\@ifundefined{marg}{\newcommand\marg{}}{}
+\@ifundefined{oarg}{\newcommand\oarg{}}{}
+\@ifundefined{parg}{\newcommand\parg{}}{}
+
+
 \newcommand*\Arg@s[1]{\textnormal{\texttt{#1}}}%
 \newcommand*\Arg@n[1]{\textnormal{$\langle$\textit{#1}$\rangle$}}%
 \newcommand*\Arg{\@ifstar{\Arg@s}{\Arg@n}}%
@@ -17,19 +37,19 @@
 \newcommand*\marg@n[1]{%
   \textnormal{\texttt{\{}$\langle$\textit{#1}$\rangle$\texttt{\}}}%
 }
-\newcommand*\marg{\@ifstar{\marg@s}{\marg@n}}
+\renewcommand*\marg{\@ifstar{\marg@s}{\marg@n}}
 
 \newcommand*\oarg@s[1]{\textnormal{\texttt{[#1]}}}
 \newcommand*\oarg@n[1]{%
   \textnormal{\texttt{[}$\langle$\textit{#1}$\rangle$\texttt{]}}%
 }
-\newcommand*\oarg{\@ifstar{\oarg@s}{\oarg@n}}
+\renewcommand*\oarg{\@ifstar{\oarg@s}{\oarg@n}}
 
 \newcommand*\parg@s[1]{\textnormal{\texttt{(#1)}}}
 \newcommand*\parg@n[1]{%
   \textnormal{\texttt{(}$\langle$\textit{#1}$\rangle$\texttt{)}}%
 }
-\newcommand*\parg{\@ifstar{\parg@s}{\parg@n}}
+\renewcommand*\parg{\@ifstar{\parg@s}{\parg@n}}
 
 \newcommand\malign[2][2pt]{%
   \makebox[0pt][l]{\kern#1\smash{\rule[-1.5mm-#2\baselineskip]{0.01pt}{5mm+#2\baselineskip}}}%
@@ -90,6 +110,7 @@
   \def\UrlNoBreaks{\do\(\do\[\do\{\do\<\do\:\do\.}%\]
   \RaggedLeft%
   \fussy%
+  \hbadness=10000% cheating
   \addtolength\lastlinedim{-\bibhang}%
   \fboxsep=0pt%
   \fboxrule=0pt%
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
new file mode 100644
index 00000000000..3f4168bc030
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbtocconfig.sty
@@ -0,0 +1,379 @@
+\ProvidesPackage{dlfltxbtocconfig}[2007/12/27 v0.5 by Lars Madsen]
+
+% This package be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is Lars Madsen (daleif@imf.au.dk).
+%%
+
+
+% HISTORY
+%
+% 20071227 a few internal macros changed to reflect changes in
+%          mempatch 4.9
+
+% we need to be running under the memoir class
+\@ifclassloaded{memoir}{}{%
+  \PackageError{dlfltxbtoconfig}{This package is build to run under
+    the memoir class, no other class will work}{}}
+
+% test for features present in mempatch 4.9
+\@ifundefined{cftinsertcode}{
+  \PackageError{dlfltxbtoconfig}{Macro \string\cftinsertcode is missing.
+    We need features from mempatch version 4.9 or newer, please
+    upgrade memoir and mempatch.}{}
+}{}
+
+
+% add a \par to the end of the TOC
+\AtEndDocument{\addtocontents{toc}{\par}}
+
+% we will use a special spart in the short ToC only the short ToC uses
+% this so we define it to do nothing
+\providecommand\l@spart[2]{}
+% similar to \part but only adds something to the ToC
+\newcommand\spart[1]{\cleartorecto\phantomsection\addcontentsline{toc}{spart}{\protect\partnumberline{}#1}}
+
+
+% this is now directly included in memoir
+% % the command inserted into the ToC holding the hook
+% \newcommand\cftdlfinsert[1]{\@nameuse{cftdlfinsert#1}}
+% % creates a hook to be executed in the ToC, since we use \@nameuse it
+% % does not matter if the hook does not exist
+% \newcommand\cftdlfinsertcode[2]{\@namedef{cftdlfinsert#1}{#2}}
+% % inserts a hook into the ToC file
+% \newcommand\cftdlfinserthook[1]{\addtocontents{toc}{\protect\cftdlfinsert\protect{#1\protect}}}
+
+
+
+% used for calculating the widest section and sunsection numbers
+% we reset them back to zero in the ToC preprocessor
+\newlength\secwidest
+\settowidth\secwidest{99.99}
+\newlength\subsecwidest
+\settowidth\subsecwidest{99.99}
+
+% the name of the ToC file, just such that one can use it on sample
+% data by just redefining this macro
+\def\feline@includetocfile{\@starttoc{toc}}
+
+%\PackageWarning{dlfltxbtocconfig}{ToCfile: \feline@tocfile}
+
+% LoT and LoF handling
+\cftsetindents{figure}       {0em}   {3.0em}
+\cftsetindents{table}        {0em}   {3.0em}
+\renewcommand{\cftfiguredotsep}       {\cftnodots}
+\renewcommand{\cfttabledotsep}        {\cftnodots}
+
+
+%%%%%%%%%%%%%%%%%%%%
+%%                %%
+%%  MakeShortToC  %%
+%%                %%
+%%%%%%%%%%%%%%%%%%%%
+
+
+
+% This macro is used to print the two ToCs
+\newcommand\MakeShortToC{
+  \begingroup
+  \renewcommand{\contentsname}{Kort oversigt}
+  \setcounter{tocdepth}{0}
+  % no precis'
+  \renewcommand\precistoctext[1]{}
+  % mess with internal command
+  \renewcommand\changetocdepth[1]{}
+  \renewcommand\cftchapterfont{\normalfont\itshape}
+  \renewcommand\cftchapterpagefont{\normalfont\itshape}
+  \renewcommand\cftchapterleader{\enspace\textperiodcentered\enspace}
+  % no part numbers
+  \renewcommand\partnumberline[1]{}
+  % no parts
+  \renewcommand\l@part[2]{}
+  % we will use spart ToC entries and ignore parts
+  \renewcommand\l@spart[2]{%
+    \noindent
+    \qquad\qquad\hrulefill\par%
+    \noindent%
+    \raisebox{-3pt}[0pt][0pt]{\qquad\qquad\parbox[t]{0.35\textwidth}{\itshape\bfseries ##1}}%
+    \vskip-\baselineskip
+    \par
+  }
+  % no chapternumbers
+  \renewcommand\chapternumberline[1]{}
+  % reconfigure the way chapters and appendices are presented
+  \renewcommand*{\l@chapapp}[3]{%
+    \ifnum \c@tocdepth >\m@ne
+    \cftchapterbreak
+    \vskip \cftbeforechapterskip
+    {
+%      \leftskip -10pt%\cftchapterindent\relax
+%      \rightskip 0\textwidth%\@tocrmarg
+      \leftskip \fill
+      \rightskip 0pt
+      \parfillskip 0pt%-\rightskip
+      \parindent 0pt
+     \@afterindenttrue
+      \interlinepenalty\@M
+      \leavevmode
+     \def\@chapapp@head{##3}%
+     {\cftchapterpagefont ##2}\nobreak%
+     \cftchapterfillnum%
+     {##1}%
+   }%
+   \fi}
+ % it is best not have have long chapter title, but in case  they are
+ % long, we will put them into a box
+ \renewcommand*\cftchapterfillnum[1]{%
+    {\cftchapterleader}\nobreak
+    {\parbox[t]{0.5\textwidth}{\raggedright\cftchapterfont ##1}}\par
+  }    
+  % set the distance between chapters
+  \setlength\cftbeforechapterskip{4pt}
+  % set the title of the short ToC
+  \@nameuse{@tocmaketitle}
+  % add the short ToC to the ToC
+  \phantomsection
+  \addcontentsline{toc}{chapter}{\contentsname}
+  % reag in the ToC
+  \makeatletter
+%  \input\feline@tocfile
+\feline@includetocfile
+  \endgroup
+  \cleartorecto
+}
+
+
+
+%%%%%%%%%%%%%%%%%%%%%
+%%                 %%
+%%  MakeNormalToC  %%
+%%                 %%
+%%%%%%%%%%%%%%%%%%%%%
+
+
+
+\newcommand\cftdlfsubsubseccomma{%
+  \@ifundefined{aldinesmall}{%
+    , \hskip .5em plus 3pt minus 3pt%
+  }{%
+  \hskip .5em plus 3pt minus 3pt\aldinesmall\nolinebreak%
+  \hskip .5em plus 3pt minus 3pt\nopagebreak%
+  }}
+
+
+% This macro is used to print the two ToCs
+\newcommand\MakeNormalToC{
+  \begingroup
+
+  \newcommand\feline@partToCtext[1]{%
+    \begingroup%
+    \fboxsep=2pt%
+    {\parbox{\linewidth-2\fboxsep-2\fboxrule}%
+      {\itshape\LARGE \strut\hfill {##1} \hfill\strut}}%
+    \endgroup%
+  }
+
+
+  % no pagenumbers for part
+  \cftpagenumbersoff{part}
+
+  \DeclareRobustCommand\precistoctext[1]{%
+    {\nopagebreak\leftskip0pt\relax
+      % \advance\leftskip\cftchapternumwidth\relax
+      \rightskip\@tocrmarg plus 4em \relax
+      \noindent\parbox{\linewidth-2em-\@tocrmarg}%
+      {\precistocfont\raggedright\footnotesize ##1}\par}\vskip5pt}
+
+  % reconfiguring the way parts will appear
+  \renewcommand*{\l@part}[2]{%
+    \ifnum \c@tocdepth >-2\relax
+    \cftpartbreak%
+    \vskip\cftbeforepartskip
+    \begingroup
+      {
+        \leftskip 0pt%\cftpartindent\relax
+        \rightskip 0pt%\@tocrmarg
+        \parfillskip -0pt%\rightskip
+        \parindent 0pt\relax\@afterindenttrue
+        \interlinepenalty\@M
+        \leavevmode
+        \feline@partToCtext{##1}
+        \par
+      }\nopagebreak
+      \global\@nobreaktrue
+        \everypar{\global\@nobreakfalse\everypar{}}%
+    \endgroup
+    \fi}
+  % it is good to break begore a part instead of having a part at the
+  % bottom of a page
+  \renewcommand\cftpartbreak{\par\addpenalty{-\@highpenalty}
+    \if@nobreak\else
+    \vskip\z@\@plus\bottomsectionskip
+    \penalty\z@
+    \vskip\z@\@plus -\bottomsectionskip
+    \fi
+  }
+  % no part numbers
+  \renewcommand\partnumberline[1]{}
+
+
+  % need more space for ToC page numbers
+  \setpnumwidth{2.55em}
+  \setrmarg{3.55em}
+  % need more space for ToC section numbers, we will use calculated numbers
+  \cftsetindents{section}      {0em}                         {\secwidest+0.5em}
+  \cftsetindents{subsection}   {\secwidest+0.5em}            {\subsecwidest+0.5em}
+  \cftsetindents{subsubsection}{\secwidest+\subsecwidest+1em}{0em}
+%   % need more space for LoF & LoT numbers
+  %remove the dotted leaders
+  \renewcommand{\cftsectiondotsep}      {\cftnodots}
+  \renewcommand{\cftsubsectiondotsep}   {\cftnodots}
+  \renewcommand{\cftsubsubsectiondotsep}{\cftnodots}
+  \renewcommand{\cftparagraphdotsep}    {\cftnodots}
+  \renewcommand{\cftsubparagraphdotsep} {\cftnodots}
+
+  % if someone wrote \bfseries or similar in the title of a
+  % subsubsection, we will remove it
+  \let\feline@oldnumberline\numberline
+  \let\oldbfseries=\bfseries
+  \let\oldem=\em
+  \let\oldttfamily=\ttfamily
+  \renewcommand{\cftsubsubsectionfont}{\small\itshape}
+  \renewcommand{\cftsubsubsectionpagefont}{\footnotesize\itshape\scshape}
+  % reconfigure the way subsubsectins are displayed
+  \renewcommand{\l@subsubsection}[2]{%
+    \ifnum \c@tocdepth > 2\relax%
+    \let\bfseries\relax%
+    \let\em\relax%
+    \let\ttfamily\relax%
+    % \def\numberline##1{\textit{##1}~}% % numbers
+    \def\numberline####1{}% % no numbers
+    \leftskip=\cftsubsubsectionindent%
+    \settowidth\@tempdima{\textbf{999999}}%
+    \rightskip=\@tempdima plus 4em
+%    \parfillskip=\fill%
+    \parfillskip=2em plus 1fil
+    \nopagebreak% added 20060713
+    % instead of using a comma to separate entries we will use a leaf
+    % (requires the fourier package
+    \ifhmode \cftdlfsubsubseccomma\else\noindent\fi%
+%    \noindent
+    \ignorespaces%
+   {\cftsubsubsectionfont ##1}~~{\cftsubsubsectionpagefont ##2}% 
+    \let\numberline\feline@oldnumberline\ignorespaces%
+     \let\bfseries\oldbfseries\ignorespaces%
+     \let\em\oldem\ignorespaces%
+     \let\ttfamily\oldttfamily\ignorespaces%
+    \fi%
+  }
+  
+  % getting chapternames and appendix names into the ToC
+  \renewcommand\cftchaptername{\chaptername~~}
+  \renewcommand\cftappendixname{\appendixname~~}
+
+  \renewcommand{\contentsname}{Indholdsfortegnelse}
+  \setcounter{tocdepth}{3} % subsections
+  \addtodef{\cftchapterbreak}{\par}{}
+  \renewcommand{\cftchapterleader}{\cftdotfill{\cftchapterdotsep}}
+
+%  \setlength\cftbeforechapterskip{2.5em  plus 1em minus 0.5em}
+  \setlength\cftbeforepartskip{2.5em plus 1em minus 1.5em}
+
+  % handle some added hooks
+  \cftinsertcode{A}{
+    \renewcommand\cftchapterfont{\normalfont} 
+    \renewcommand\cftchapterpagefont{\normalfont}
+    \setlength\cftbeforechapterskip{0pt} 
+  }
+
+  \cftinsertcode{B}{
+    \renewcommand\cftchapterfont{\bfseries}
+    \renewcommand\cftchapterpagefont{\bfseries}
+    \addtolength\cftbeforechapterskip{1.25em plus 0.7em minus 1em} 
+  }
+
+  \cftinsertcode{C}{\setlength\cftbeforechapterskip{0pt}}
+
+
+  % set the title of the short ToC
+  \@nameuse{@tocmaketitle}
+  % add the short ToC to the ToC
+  \phantomsection
+  \addcontentsline{toc}{chapter}{\contentsname}
+  % reag in the ToC
+  \makeatletter
+%  \input\feline@tocfile
+\feline@includetocfile
+  \endgroup
+  \cleartorecto
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%
+%%                    %%
+%%  ToC preprocessor  %%
+%%                    %%
+%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+% this macro preprocesses the ToC and figures out which section and
+% subsection numbers are the widest, these will be saved into 
+%\secwidest and \subsecwidest
+\newcommand\preprocessToC{
+  \begingroup
+%  \newif\ifshortToC
+  \makeatletter
+  \let\l@part=\@gobbletwo
+  \let\l@chapapp=\@gobbletwo
+  \let\l@subsubsection=\@gobbletwo
+
+  \setlength{\global\secwidest}{0pt}
+  \setlength{\global\subsecwidest}{0pt}
+
+  \def\PARSER##1##2##3##4\END{%\typeout{##2}
+    \settowidth\unitlength{##3}%
+    \ifdim\unitlength>##1%
+    \settowidth{\global##1}{##3}%
+    \fi%
+  }
+  \renewcommand\l@section[2]{%
+    \PARSER\secwidest##1\END%
+  }
+  \renewcommand\l@subsection[2]{%
+    \PARSER\subsecwidest##1\END%
+  }
+  \let\precistoctext\@gobble
+
+%  \input\feline@tocfile
+  \feline@includetocfile
+  \typeout{widest section: \the\secwidest}
+  \typeout{widest subsection: \the\subsecwidest}
+  \endgroup
+}
+
+
+% the internal macros tha lives inside the ToC file
+\def\cftSubsectionIndentsBackToNormal{%
+  \cftsetindents{subsubsection}{\secwidest+\subsecwidest+1em}{0em}%
+}
+\def\cftSubsectionIndentsPullBack{%
+  \cftsetindents{subsubsection}{\secwidest+0.5em}{0em}%
+}
+
+\newcommand\ToCSubsectionIndentsPullBack{%
+  \addtocontents{toc}{\protect\cftSubsectionIndentsPullBack}}
+\newcommand\ToCSubsectionIndentsBackToNormal{%
+  \addtocontents{toc}{\protect\cftSubsectionIndentsBackToNormal}}
+
+% preserving some old syntax
+\let\RedofelineEmulSubSubSec\ToCSubsectionIndentsBackToNormal
+\let\felineEmulSubSubSec\ToCSubsectionIndentsPullBack
+