10 files changed, 61 insertions, 20 deletions
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/README b/Master/texmf-dist/doc/latex/dlfltxb/README
index 368fb7ec4ff..795d3d62b9a 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/README
+++ b/Master/texmf-dist/doc/latex/dlfltxb/README
@@ -12,7 +12,7 @@ presented as code tips), which are also useful for other users. The
 remaining three  packages are used internally for writing the book.
 
 At least one more package (dlfltxbsc) will be added to the bundle
-later (presumably sometime in 2008). This is the package used for all the
+later. This is the package used for all the
 examples in the book.
 
 
@@ -36,6 +36,8 @@ HISTORY
 
  * 20080805 changes to several packages	
 
+ * 20081030 renamed a file because of confusion
+
 
 Current file contents for the dlfltxb bundle:
 =============================================
@@ -126,6 +128,10 @@ Changes
  20080117 new version of dlfltxbmarkup-sample.cfg plus a bug fix
  20080805 use \scriptsize instead of \footnotesize when writing in the
           margins. Major cleanup in dlfltxbmarkup-sample.cfg 
+ 20081030 The sample key dlfltxbmarkup-sample.cfg has been renamed to
+          dlfltxbmarkupbookkeys.sty as to remove confusion
+ 
+
 
 dlfltxbmisc (v0.2):
 -------------------
@@ -180,7 +186,7 @@ package_doc.bib:
 INSTALLATION:
 =============
 
-Place all *.sty and *.cfg files in 
+Place all *.sty files in 
 
 tex/latex/dlfltxb
 
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.pdf
index eeead6a6cf1..18bec25ced4 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 0f584e617e1..258b6571d62 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
+++ b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbcodetips.tex
@@ -510,8 +510,8 @@ To help with this we provide
 \end{syntax}
 By default it can be used as
 \begin{Sourcedisplay}
-\DeclareMathSet{R}% => \setR = \mathbb{R}
-$ \setR $  
+\DeclareMathSet{R}% => \numbersR = \mathbb{R}
+$ \numbersR $  
 \end{Sourcedisplay}
 But we have several options to change things. Options
 (\Arg{key}=\Arg{value} style, note that \Arg{identifier} is what is
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf b/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-showkeys.pdf
index 0dd7b16d0a3..bc7f3e8ce77 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 9ca7ca87ef4..a11eb666ded 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 7dcfac11f4a..279a9ba8c20 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
index 11f81e89aa0..c60eb9a98a6 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/tex/latex/dlfltxb/dlfltxbcodetips.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
index 20fabc43215..e8f143c468a 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbcodetips.sty
@@ -36,6 +36,7 @@
 %          inside the \noalign, not outside.
 % 20080617 added \DeclareMathSymbolShorthand and \DeclareMathSet
 % 20080618 redesigned and renamed \PullBack to \MoveEqLeft
+% 20080828 added better implementation of \MakeDeclareMathSetCommand
 
 
 \newif\ifdlf@do@load@amssymb
@@ -315,28 +316,35 @@
      \expandafter\@ifdefinable\csname \DMSS@prefix\DMSS@name\endcsname{%
        \def\DMSS@overwrite{00}% okay to redefine.
      }%
-   \fi\if\DMSS@overwrite % Do definition or not.
-     \expandafter\@firstofone
-   \else\expandafter\@gobble\fi
-   {\protected\expandafter\xdef\csname \DMSS@prefix\DMSS@name \endcsname{%
-       \unexpanded\expandafter{\DMSS@format{#2}}%
-     }}\endgroup}
-\define@key{DMSS}{format}{\def\DMSS@format{#1}}
+   \fi%
+   \if\DMSS@overwrite % Do definition or not.
+     \expandafter\@firstofone%
+   \else\expandafter\@gobble\fi%
+   {\protected\expandafter%
+     \xdef\csname \DMSS@prefix\DMSS@name \endcsname{%
+       \unexpanded\expandafter{\DMSS@format{#2}}}}%
+   \endgroup}
+\define@key{DMSS}{format}{\let\DMSS@format#1}
+\define@key{DMSS}{format*}{\def\DMSS@format{\expandafter#1\@firstofone}}
 \define@key{DMSS}{name}{\def\DMSS@name{#1}}
 \define@key{DMSS}{prefix}{\def\DMSS@prefix{#1}}
 \define@key{DMSS}{overwrite}[true]{%
    \edef\DMSS@overwrite{\csname if#1\endcsname 00\else 01\fi}}
 \setkeys{DMSS}{overwrite=false}
-\newcommand\MakeDeclareShorthandCommand[3]{%
+\setkeys{DMSS}{format*=}
+\newcommand\MakeDeclareMathSetCommand[3]{%
   % #1 = command name 
   % #2 = default prefix name
   % #3 = default format
   % make format macro for eacy reference
-  \expandafter\@ifdefinable\csname math#2format\endcsname{\@namedef{math#2format}{#3}}
-  \newcommand#1[2][]{%
-  \expandafter\DeclareMathSymbolShorthand
-   \expandafter{format=\csname math#2format\endcsname,prefix=#2,##1}{##2}}}
-\MakeDeclareShorthandCommand{\DeclareMathSet}{set}{\mathbb}
+   \expandafter\MakeDeclareShorthandCommandAux\csname math#2format\endcsname
+   {#1}{#2}{#3}}
+\def\MakeDeclareShorthandCommandAux#1#2#3#4{%
+   \newcommand*#1{#4}%
+   \newcommand*#2[2][]{%
+     \DeclareMathSymbolShorthand{format=#1,prefix=#3,##1}{##2}%
+   }}
+\MakeDeclareMathSetCommand{\DeclareMathSet}{numbers}{\mathbb}
 }{} % is defined already so do nothing
 
 
diff --git a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
index 8c83baffaa2..3b41a420677 100644
--- a/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkup.sty
@@ -27,7 +27,16 @@
 \RequirePackage{ragged2e}
 
 
-\DeclareOption{loadsampleconfig}{\AtEndOfPackage{\InputIfFileExists{dlfltxbmarkup-sample.cfg}{}{}}}
+\DeclareOption{loadsampleconfig}{\AtEndOfPackage{
+    %\InputIfFileExists{dlfltxbmarkup-sample.cfg}{}{}
+    \IfFileExists{dlfltxbmarkupbookkeys.sty}{
+      \RequirePackage{dlfltxbmarkupbookkeys}
+    }{
+      \PackageError{dlfltxbmarkup}{Sample configuration package
+        'dlfltxbmarkupbookkeys' not found, option 'loadsampleconfig'
+        is useless.}{}
+    }
+}}
 
 \ProcessOptions\relax
 
@@ -61,6 +70,9 @@
 % 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, 
+% 2008/10/30 'sample configuration' has been renamed
+
+
 
 % this boolean is meant to be used for example inside constructions
 % that will not permit the use of \marginpar, for example the
@@ -264,7 +276,7 @@
 % test key
 \felineKeyGenerator{test}
   {test key, does not do anything useful}%
-  {\MarkWMargin{#1}}%
+  {\felineWriteInMargin{#1}}%
   {\felineIndexCmd{#1}}%
   {\emph{#1}}
 
diff --git a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkupbookkeys.sty
index 708e51cd738..9b09a2765fc 100644
--- a/Master/texmf-dist/doc/latex/dlfltxb/dlfltxbmarkup-sample.cfg
+++ b/Master/texmf-dist/tex/latex/dlfltxb/dlfltxbmarkupbookkeys.sty
@@ -1,4 +1,4 @@
-\ProvidesFile{felinemarkup.cfg}[2008/08/05 by Lars madsen]
+\ProvidesPackage{dlfltxbmarkupbookkeys}[2008/10/30 by Lars madsen]
 
 % the original name for the dlfltxbmarkup package was 'felinemarkup',
 % and in my book I use the following generated keys
@@ -24,6 +24,15 @@
 %  2007/??/?? added sistyle key
 %  2007/06/20 added acronym key
 %  2008/06/27 fixed some settings 
+%  2008/20/30 file renamed because of problems regarding TeXLive
+
+
+\@ifpackageloaded{dlfltxbmarkup}{}{
+  \PackpageError{dlfltxbmarkupbookkeys}{This package depends on the
+    'dlfltxbmarkup' package and can thus only be used if loaded AFTER
+    that package}{}}
+
+
 
 % default key
 \def\felineStandardKey{macro}
@@ -520,6 +529,12 @@
     \felineIndexCmd{beamer (klasse)!#1}}%
   {\texttt{#1}}
 
+\felineKeyGenerator{xiftst}%
+  {Test from the xifthen package}
+  {\felineWriteInMargin{\ENcs{#1}}}%
+  {\felineIndexCmd{#1 (xifthen)@\protect\css{#1} (xifthen)}%
+    \felineIndexCmd{xifthen (pakke)!#1@\protect\css{#1}}}%
+  {\ENcs{#1}}