context-letter update (22dec08)

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

13 files changed, 238 insertions, 279 deletions

diff --git a/Master/texmf-dist/doc/context/third/letter/letter-doc.pdf b/Master/texmf-dist/doc/context/third/letter/letter-doc.pdf
deleted file mode 100644
index b81f212bee5..00000000000
--- a/Master/texmf-dist/doc/context/third/letter/letter-doc.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/context/third/letter/lm.pdf b/Master/texmf-dist/doc/context/third/letter/lm.pdf
new file mode 100644
index 00000000000..a833e1703c3
--- /dev/null
+++ b/Master/texmf-dist/doc/context/third/letter/lm.pdf
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
index 259fdde782f..ffb080da59b 100755
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=t-correspondence,
-%D        version=2008.11.30,
+%D        version=2008.12.21,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
@@ -29,7 +29,12 @@
   \setinterfaceconstant {backgroundimage} {backgroundimage}
   \setinterfaceconstant {whitespace}      {whitespace}
   \setinterfaceconstant {nexthead}        {nexthead}
+  \setinterfaceconstant {lefthead}        {lefthead}
+  \setinterfaceconstant {righthead}       {righthead}
   \setinterfaceconstant {nextfoot}        {nextfoot}
+  \setinterfaceconstant {leftfoot}        {leftfoot}
+  \setinterfaceconstant {rightfoot}       {rightfoot}
+  \setinterfaceconstant {content}         {content}
 \stopinterface
 
 \startinterface all
@@ -43,8 +48,14 @@
   \setinterfacevariable {foldmark}    {foldmark}
   \setinterfacevariable {usermark}    {usermark}
   \setinterfacevariable {layer}       {layer}
+  \setinterfacevariable {firsthead}   {firsthead}
   \setinterfacevariable {nexthead}    {nexthead}
+  \setinterfacevariable {lefthead}    {lefthead}
+  \setinterfacevariable {righthead}   {righthead}
+  \setinterfacevariable {firstfoot}   {firstfoot}
   \setinterfacevariable {nextfoot}    {nextfoot}
+  \setinterfacevariable {leftfoot}    {leftfoot}
+  \setinterfacevariable {rightfoot}   {rightfoot}
   \setinterfacevariable {layout}      {layout}
   \setinterfacevariable {place}       {place}
   \setinterfacevariable {initialize}  {initialize}
@@ -114,15 +125,15 @@
 \def\dosetupcorrespondencelayout[#1][#2][#3][#4]%
   {\definelayout[#1#3][#4]}
 
-\def\dosetupcorrespondencelayer[#1][#2][#3][#4]%
-  {\dodosetupcorrespondencelayer[#1][#2][#3][\v!layer,\v!frame,\v!option][#4]}
-
 \def\dosetupcorrespondencesection[#1][#2][#3][#4]%
   {\getparameters[#2#3][#4]}
 
 \def\dosetupcorrespondencedescription[#1][#2][#3][#4]%
   {\setupdescriptions[#2#3][#4]}
 
+\def\dosetupcorrespondencelayer[#1][#2][#3][#4]%
+  {\dodosetupcorrespondencelayer[#1][#2][#3][\v!layer,\v!frame,\v!option][#4]}
+
 \def\dodosetupcorrespondencelayer[#1][#2][#3][#4][#5]%
   {\def\dododosetupcorrespondencelayer##1%
      {\ifcsname dosetupcorrespondencelayer##1\endcsname
@@ -225,18 +236,18 @@
 
 %D Layers
 
-\def\letter!list!marking
-  {\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark}
-
 \def\definecorrespondencelayer[#1][#2]%
   {\setvalue{\s!do\e!define#1\v!layer}{\dodefinecorrespondencelayer[#1][#2]}%
    \setvalue{\s!do\e!set   #1\v!layer}{\dosetcorrespondencelayer   [#1][#2]}}
 
 \def\dodefinecorrespondencelayer[#1][#2][#3]%
-  {\ExpandSecondAfter\doifelse{#3}\v!foldmark
-     {\def\dodododefinecorrespondencelayer##1{\dododefinecorrespondencelayer[#1][#2][##1]}%
-      \processcommacommand[\csname#1!list!marking\endcsname]\dodododefinecorrespondencelayer}
-     {\dododefinecorrespondencelayer[#1][#2][#3]}}
+  {\def\dodododefinecorrespondencelayer##1{\dododefinecorrespondencelayer[#1][#2][##1]}%
+   \processaction
+     [#3]
+     [\v!foldmark=>{\processcommacommand[\csname#1!list!marking\endcsname]\dodododefinecorrespondencelayer},
+        \v!header=>{\processcommacommand[\csname#1!list!header\endcsname]\dodododefinecorrespondencelayer},
+        \v!footer=>{\processcommacommand[\csname#1!list!footer\endcsname]\dodododefinecorrespondencelayer},
+       \s!unknown=>{\dododefinecorrespondencelayer[#1][#2][#3]}]}
 
 \def\dododefinecorrespondencelayer[#1][#2][#3]%
   {\setvalue{#2\v!option#3}{\v!yes}%
@@ -282,6 +293,15 @@
          \doadaptrightskip{\correspondencestylevalue{#2}{#3}\c!rightmargin}%
          \doattributes{#2#3}\c!style\c!color{#4}}}}
 
+\def\dosetheaderfooterlayer[#1]%
+  {\processaction
+     [#1]
+     [   v!yes=>\chardef\headerfooter\plusone,
+      \v!first=>\chardef\headerfooter\plustwo,
+       \v!next=>\chardef\headerfooter\plusthree,
+       \v!left=>\chardef\headerfooter\plusfour,
+      \v!right=>\chardef\headerfooter\plusfive]}
+
 %D Sections
 
 \def\definecorrespondencesection[#1][#2]%
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex b/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
index 7a9d83f8726..5df88487264 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-letter.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=t-letter,
-%D        version=2008.11.29,
+%D        version=2008.12.16,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Framework for Letters,
 %D         author=Wolfgang Schuster,
@@ -74,45 +74,12 @@
 %D for odd and even pages (if you really want this in a letter) but you could
 %D solve this with the macro \tex{doifoddpageelse}, I will give you a short
 %D example below.
-%D 
-%D \showsetup{setupletterstyle:text}
-%D 
-%D This setups could produce somtimes a unwanted result is you use a doublesided
-%D layout, because the values for \mono{lefttext} and \mono{righttext} change on
-%D odd and even pages their position, e.g. \mono{righttext} will always go to the
-%D outer margin and \mono{lefttext} to the inner margin. Let's you want the
-%D pagenumber always on the right side you could use the following code, you could
-%D adapt it to your own needs without problems.
-%D 
-%D \starttyping
-%D \setupletterstyle
-%D   [header]
-%D   [lefttext=\doifoddpageelse\donothing\pagenumber,
-%D    righttext=\doifoddpageelse\pagenumber\donothing]
-%D \stoptyping
 
 \setvalue{\v!letter:\????ls:\v!firstpage }{\v!layout}
 \setvalue{\v!letter:\????ls:\v!secondpage}{\v!layout}
 
 \definecorrespondencesetup[\v!letter\v!style][\v!letter][\????ls]
 
-%D Setup for the header and footer texts.
-
-\newtoks\letter!toks!header
-\newtoks\letter!toks!footer
-
-\def\dosetupletterheader[#1][#2]%
-  {\letter!toks!header\emptytoks
-   \doifelsenothing{#2}
-     {\letter!toks!header{\setupheader[\v!text][#1]}}
-     {\letter!toks!header{\setupheader[#1][#2]}}}
-
-\def\dosetupletterfooter[#1][#2]%
-  {\letter!toks!footer\emptytoks
-   \doifelsenothing{#1}
-     {\letter!toks!footer{\setupfooter[\v!text][#1]}}
-     {\letter!toks!footer{\setupfooter[#1][#2]}}}
-
 %D \macros
 %D   {setupletter}
 
@@ -277,6 +244,12 @@
 \def\letter!list!marking
   {\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark}
 
+\def\letter!list!header
+  {\v!head,\v!nexthead,\v!lefthead,\v!righthead}
+
+\def\letter!list!footer
+  {\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot}
+
 \definecorrespondencelayer      [\v!letter][\????ls]
 \definecorrespondencesection    [\v!letter][\????ls]
 \definecorrespondencedescription[\v!letter][\????ls]
@@ -296,11 +269,50 @@
 %D Header for the first page, you could use it to place the logo from your
 %D company or your own address and name.
 
-\dodefineletterlayer[\v!head]
+\dodefineletterlayer[\v!header]
 
 \startsetups[\v!letter:\v!place:\v!head]
 
-  \dosetletterlayer[\v!head]
+  % First page
+
+  \startlocalsetups[\v!letter:\v!place:\v!firsthead]
+
+    \ifnum\subpagenumber=\plusone\relax\dosetletterlayer[\v!head]\fi
+
+  \stoplocalsetups
+
+  % Following pages
+
+  \startlocalsetups[\v!letter:\v!place:\v!nexthead]
+
+    \ifnum\subpagenumber>\plusone\relax\dosetletterlayer[\v!nexthead]\fi
+
+  \stoplocalsetups
+
+  % Left pages
+
+  \startlocalsetups[\v!letter:\v!place:\v!lefthead]
+
+    \ifnum\subpagenumber>\plusone
+      \ifodd\subpagenumber\else\dosetletterlayer[\v!lefthead]\fi
+    \fi
+
+  \stoplocalsetups
+
+  % Right pages
+
+  \startlocalsetups[\v!letter:\v!place:\v!righthead]
+
+    \ifnum\subpagenumber>\plusone
+      \ifodd\subpagenumber\relax\dosetletterlayer[\v!righthead]\fi
+    \fi
+
+  \stoplocalsetups
+
+  \doif\@@@@lsoptionhead     \v!yes{\directsetup{\v!letter:\v!place:\v!firsthead}}
+  \doif\@@@@lsoptionnexthead \v!yes{\directsetup{\v!letter:\v!place:\v!nexthead }}
+  \doif\@@@@lsoptionlefthead \v!yes{\directsetup{\v!letter:\v!place:\v!lefthead }}
+  \doif\@@@@lsoptionrighthead\v!yes{\directsetup{\v!letter:\v!place:\v!righthead}}
 
 \stopsetups
 
@@ -349,11 +361,50 @@
 %D you should disable the footer for the second and following pages inb this
 %D case.
 
-\dodefineletterlayer[\v!foot]
+\dodefineletterlayer[\v!footer]
 
 \startsetups[\v!letter:\v!place:\v!foot]
 
-  \dosetletterlayer[\v!foot]
+  % First page
+
+  \startlocalsetups[\v!letter:\v!place:\v!foot]
+
+    \ifnum\subpagenumber=\plusone\relax\dosetletterlayer[\v!foot]\fi
+
+  \stoplocalsetups
+
+  % Following pages
+
+  \startlocalsetups[\v!letter:\v!place:\v!nextfoot]
+
+    \ifnum\subpagenumber>\plusone\relax\dosetletterlayer[\v!nextfoot]\fi
+
+  \stoplocalsetups
+
+  % Left pages
+
+  \startlocalsetups[\v!letter:\v!place:\v!leftfoot]
+
+    \ifnum\subpagenumber>\plusone
+      \ifodd\subpagenumber\else\dosetletterlayer[\v!leftfoot]\fi
+    \fi
+
+  \stoplocalsetups
+
+  % Right pages
+
+  \startlocalsetups[\v!letter:\v!place:\v!rightfoot]
+
+    \ifnum\subpagenumber>\plusone
+      \ifodd\subpagenumber\relax\dosetletterlayer[\v!rightfoot]\fi
+    \fi
+
+  \stoplocalsetups
+
+  \doif\@@@@lsoptionfoot     \v!yes{\directsetup{\v!letter:\v!place:\v!firstfoot}}
+  \doif\@@@@lsoptionnextfoot \v!yes{\directsetup{\v!letter:\v!place:\v!nextfoot }}
+  \doif\@@@@lsoptionleftfoot \v!yes{\directsetup{\v!letter:\v!place:\v!leftfoot }}
+  \doif\@@@@lsoptionrightfoot\v!yes{\directsetup{\v!letter:\v!place:\v!rightfoot}}
 
 \stopsetups
 
@@ -378,24 +429,6 @@
 
 \stopsetups
 
-%D Layer to set head and foot blocks at the second and all following pages.
-
-\dodefineletterlayer[\v!nexthead]
-
-\startsetups[\v!letter:\v!place:\v!nexthead]
-
-  \dosetletterlayer[\v!nexthead]
-
-\stopsetups
-
-\dodefineletterlayer[\v!nextfoot]
-
-\startsetups[\v!letter:\v!place:\v!nextfoot]
-
-  \dosetletterlayer[\v!nextfoot]
-
-\stopsetups
-
 %D Letterhead, american only
 
 \dodefinelettersection[\v!letter\v!head]
@@ -579,12 +612,13 @@
   [\@@@@lsoptionbackground]
 
 \def\letter!list!backgrounds
-  {\v!letter:\c!backgroundimage,\v!letter:\c!background,%
-   \v!letter:\v!letternext,\v!letter:\v!lettermain,\v!letter:\v!head,%
-   \v!letter:\v!foot,\v!letter:\v!backaddress,\v!letter:\v!address,%
-   \v!letter:\v!reference,\v!letter:\v!location,\v!letter:\v!nexthead,%
-   \v!letter:\v!nextfoot,\v!letter:\v!topmark,\v!letter:\v!botmark,%
-   \v!letter:\v!cutmark,\v!letter:\v!endmark,\v!letter:\v!usermark}
+  {\v!letter:\c!backgroundimage,\v!letter:\c!background,\v!letter:\v!head,%
+   \v!letter:\v!letternext,\v!letter:\v!lettermain,\v!letter:\v!foot,%
+   \v!letter:\v!address,\v!letter:\v!reference,\v!letter:\v!location,%
+   \v!letter:\v!nexthead,\v!letter:\v!lefthead,\v!letter:\v!righthead,%
+   \v!letter:\v!nextfoot,\v!letter:\v!leftfoot,\v!letter:\v!rightfoot,%
+   \v!letter:\v!topmark,\v!letter:\v!botmark,\v!letter:\v!cutmark,%
+   \v!letter:\v!endmark,\v!letter:\v!usermark,\v!letter:\v!backaddress}
 
 %D Settings at the begin of every letter.
 
@@ -592,24 +626,19 @@
 
   \@@@@lsoptionbefore
 
+  \begingroup
+
+  \page[\@@@@lsoptionpage]
+
   \setupsubpagenumber
     [\c!number=\@@@@lsoptionpagenumber,
      \c!way=\v!by\v!text,
-     \c!state=\@@@@lsoptionstate]
-
-  \resetsubpagenumber
-
-  \begingroup
-
-  \page
+     \c!state=\v!start]
 
   \setuppagenumbering
     [\c!alternative=\@@@@lsoptionalternative,
      \c!location=] % use the header and footer option instead
 
-  \the\letter!toks!header
-  \the\letter!toks!footer
-
   \setupbackgrounds
     [\v!paper]
     [\c!background=\v!color,
@@ -617,7 +646,8 @@
 
   \setupbackgrounds
     [\v!page]
-    [\c!background=\letter!list!backgrounds,
+    [\c!setups={\v!letter:\v!place:\v!head,\v!letter:\v!place:\v!foot},
+     \c!background=\letter!list!backgrounds,
      \c!backgroundcolor=\@@@@lsoptionbackgroundcolor]
 
   \doifletterstylevalue\v!option\c!bodyfont  {\switchtobodyfont[\@@@@lsoptionbodyfont  ]}
@@ -629,14 +659,14 @@
 
 \startsetups[\v!letter:\v!finish]
 
-  \page
+  \page[\@@@@lsoptionpage]
 
   \setuplayout[\v!reset]
 
-  \endgroup
-
   \resetsubpagenumber
 
+  \endgroup
+
   \@@@@lsoptionafter
 
 \stopsetups
@@ -661,29 +691,25 @@
   {\v!topmark,\v!botmark,\v!cutmark,\v!endmark,\v!usermark,\v!letternext,\v!lettermain}
 
 \def\dodoresetletterlayer#1%
-  {\resetlayer[#1]}
+  {\resetlayer[\v!letter:#1]}
 
 \startsetups[\v!letter:\v!reset]
 
   \processcommacommand[\letter!list!resetlayers]\dodoresetletterlayer
   
-  \setuplayer[\v!letternext][\c!state=\v!continue]
+  \setuplayer[\v!letter:\v!letternext][\c!state=\v!continue]
 
 \stopsetups
 
 \startsetups[\v!letter:\v!layer]
 
   \doif\@@@@lsoptionmarking    \v!yes{\directsetup{\v!letter:\v!place:\v!foldmark   }}
-  \doif\@@@@lsoptionhead       \v!yes{\directsetup{\v!letter:\v!place:\v!head       }}
   \doif\@@@@lsoptionbackaddress\v!yes{\directsetup{\v!letter:\v!place:\v!backaddress}}
   \doif\@@@@lsoptionaddress    \v!yes{\directsetup{\v!letter:\v!place:\v!address    }}
   \doif\@@@@lsoptionreference  \v!yes{\directsetup{\v!letter:\v!place:\v!reference  }}
   \doif\@@@@lsoptionlocation   \v!yes{\directsetup{\v!letter:\v!place:\v!location   }}
-  \doif\@@@@lsoptionfoot       \v!yes{\directsetup{\v!letter:\v!place:\v!foot       }}
   \doif\@@@@lsoptionlettermain \v!yes{\directsetup{\v!letter:\v!place:\v!lettermain }}
   \doif\@@@@lsoptionletternext \v!yes{\directsetup{\v!letter:\v!place:\v!letternext }}
-  \doif\@@@@lsoptionnexthead   \v!yes{\directsetup{\v!letter:\v!place:\v!nexthead   }}
-  \doif\@@@@lsoptionnextfoot   \v!yes{\directsetup{\v!letter:\v!place:\v!nextfoot   }}
 
 \stopsetups
 
@@ -694,7 +720,7 @@
 \def\doflushlettersection#1%
   {\doif{\letterstylevalue\v!option{#1}}\v!yes{\directsetup{\v!letter:\v!place:#1}}}
 
-\startsetups[letter:sequence]
+\startsetups[\v!letter:\v!sequence]
 
   \executeifdefined{\v!letter\s!start\c!optimize\@@@@lsoptionoptimize}\donothing
   \processcommacommand[\letter!order!sections]\doflushlettersection
@@ -706,6 +732,8 @@
 %D 
 %D Default settings for the option values of the letter.
 
+\setvalue{\v!letter:\????ls:\v!option}{\v!option}
+
 \setupletterstyle
   [\v!option]
   [\c!marking=\v!yes,
@@ -719,13 +747,11 @@
    \c!backgroundimage=,
    \c!before=,
    \c!after=,
-   \c!header=\v!reset,
-   \c!footer=\v!reset,
-   \c!pagenumber=1,
+   \c!page=\v!yes,
+   \c!pagenumber=\plusone,
    \c!bodyfont=,
    \c!optimize=\v!no,
-   \c!alternative=\v!singlesided,
-   \c!state=\v!stop]
+   \c!alternative=\v!singlesided]
 
 % interface always before styles and extension because users should
 % start with a clean interface without predefined and unwanted values.
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex b/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
index 52b9268cbae..df948ae2ca0 100755
--- a/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-resume.tex
@@ -1,15 +1,15 @@
 %D \module
 %D   [       file=t-resume,
-%D        version=2008.11.27,
+%D        version=2008.12.21,
 %D          title=\CONTEXT\ User Module,
-%D       subtitle=Framework for Letters,
+%D       subtitle=Resumes,
 %D         author=Wolfgang Schuster,
 %D           date=\currentdate,
 %D      copyright=Wolfgang Schuster,
 %D          email=schuster.wolfgang@googlemail.com,
 %D        license=Public Domain]
 
-\writestatus{loading}{Context User Module / Framework for Letters}
+\writestatus{loading}{Context User Module / Framework for Resumes}
 
 \unprotect
 
@@ -18,7 +18,7 @@
 %D I use a few extra constants and variables in my module.
 
 \startinterface all
-  \setinterfacevariable {resume}     {resume}
+  \setinterfacevariable {resume} {resume}
 \stopinterface
 
 \def\????rd{@@@@rd} % ResumeData
@@ -36,53 +36,21 @@
 
 \definecorrespondencesetup[\v!resume\v!style][\v!resume][\????rs]
 
-%D Setup for the header and footer texts.
-
-\newtoks\resume!toks!header
-\newtoks\resume!toks!footer
-
-\def\dosetupresumeheader[#1][#2]%
-  {\resume!toks!header\emptytoks
-   \doifelsenothing{#2}
-     {\resume!toks!header{\setupheader[\v!text][#1]}}
-     {\resume!toks!header{\setupheader[#1][#2]}}}
-
-\def\dosetupresumefooter[#1][#2]%
-  {\resume!toks!footer\emptytoks
-   \doifelsenothing{#1}
-     {\resume!toks!footer{\setupfooter[\v!text][#1]}}
-     {\resume!toks!footer{\setupfooter[#1][#2]}}}
-
 %D \macros
 %D   {setupresume}
 
-\definecorrespondencevalue[\v!resume][\????ld]
+\definecorrespondencevalue[\v!resume][\????rd]
 
-%D A few extra macros to test for content of the letter values, don't rely
-%D on them at the moment because they could change or I will remove, rename,
-%D rewrite etc. them.
-%D 
-%D With the change of the \tex{setupletter} command it was also necessary
-%D to change the definition for lettervalue tests.
+%D \macros
+%D   {doifresumevalue,doifelseresumevalue,doifresumestylevalue,doifelseresumestylevalue}
 
 \def\doifresumevalue         {\doifcorrespondencevalue         \????rd}
 \def\doifelseresumevalue     {\doifelsecorrespondencevalue     \????rd}
 \def\doifresumestylevalue    {\doifcorrespondencestylevalue    \????rs}
 \def\doifelseresumestylevalue{\doifelsecorrespondencestylevalue\????rs}
 
-%D \subject{Interface, Style and Extension files}
-%D 
 %D \macros
-%D   {useletterextension,useletterstyle,useletterinterface}
-%D
-%D This module provides different types of files beside the main module.
-%D 
-%D Two of them could be used by the user while the third is only used in
-%D this file but you're free to use but you should really now what you do.
-%D 
-%D Each of the files has it's own file extension, you have to use if you
-%D want to create such a file, this has the advantage to use the same name
-%D for a collection of macros.
+%D   {useresumeextension,useresumestyle,useresumeinterface}
 
 \def\resume!suffix!style    {nrs}
 \def\resume!suffix!extension{nre}
@@ -93,7 +61,7 @@
 \definecorrespondencefile[\v!resume\v!style    ][\resume!suffix!style    ]
 
 %D \macros
-%D   {letterstylevalue,lettervalue}
+%D   {resumestylevalue,resumevalue}
 
 \def\resumestylevalue#1#2%
   {\csname\????rs#1#2\endcsname}
@@ -124,8 +92,7 @@
 
 \stopsetups
 
-%D Header for the first page, you could use it to place the logo from your
-%D company or your own address and name.
+%D Header for the first page
 
 \dodefineresumelayer[\v!head]
 
@@ -135,10 +102,7 @@
 
 \stopsetups
 
-%D Footer block, you could use it to place information about your company
-%D but take care set \mono{repeat=yes} if you want to place it on every page,
-%D you should disable the footer for the second and following pages inb this
-%D case.
+%D Footer block
 
 \dodefineresumelayer[\v!foot]
 
@@ -176,7 +140,7 @@
 
 \stopsetups
 
-%D Letter content
+%D Resume content
 
 \dodefineresumesection[\v!content]
 
@@ -192,7 +156,7 @@
 
 \stopsetups
 
-%D Apendices
+%D Appendices
 
 \dodefineresumesection[\v!appendices]
 
@@ -241,14 +205,14 @@
 
   \stoplocalsetups
 
-  \doif\@@@@rsoptiontopmark \v!yes{\setups[\v!resume:\v!place:\v!topmark]}
-  \doif\@@@@rsoptionbotmark \v!yes{\setups[\v!resume:\v!place:\v!botmark]}
-  \doif\@@@@rsoptioncutmark \v!yes{\setups[\v!resume:\v!place:\v!cutmark]}
-  \doif\@@@@rsoptionusermark\v!yes{\setups[\v!resume:\v!place:\v!usermark]}
+  \doif\@@@@rsoptiontopmark \v!yes{\directsetup{\v!resume:\v!place:\v!topmark }}
+  \doif\@@@@rsoptionbotmark \v!yes{\directsetup{\v!resume:\v!place:\v!botmark }}
+  \doif\@@@@rsoptioncutmark \v!yes{\directsetup{\v!resume:\v!place:\v!cutmark }}
+  \doif\@@@@rsoptionusermark\v!yes{\directsetup{\v!resume:\v!place:\v!usermark}}
 
 \stopsetups
 
-%D Background graphic:
+%D Background graphic
 
 \defineoverlay
   [\v!resume:\c!backgroundimage]
@@ -265,30 +229,25 @@
    \v!resume:\v!nextfoot,\v!resume:\v!topmark,\v!resume:\v!botmark,%
    \v!resume:\v!cutmark,\v!resume:\v!usermark}
 
-%D Settings at the begin of every letter.
+%D Settings at the begin of every resume.
 
 \startsetups[\v!resume:\v!initialize]
 
   \@@@@rsoptionbefore
 
+  \begingroup
+
+  \page[\@@@@rsoptionpage]
+
   \setupsubpagenumber
     [\c!number=\@@@@rsoptionpagenumber,
      \c!way=\v!by\v!text,
-     \c!state=\@@@@rsoptionstate]
-
-  \resetsubpagenumber
-
-  \begingroup
-
-  \page
+     \c!state=\v!start]
 
   \setuppagenumbering
     [\c!alternative=\@@@@rsoptionalternative,
      \c!location=] % use the header and footer option instead
 
-  \the\resume!toks!header
-  \the\resume!toks!footer
-
   \setupbackgrounds
     [\v!paper]
     [\c!background=\v!color,
@@ -299,38 +258,37 @@
     [\c!background=\resume!list!backgrounds,
      \c!backgroundcolor=\@@@@rsoptionbackgroundcolor]
 
-  \doifresumestylevalue\v!option\c!bodyfont  {\switchtobodyfont[\@@@@rsoptionbodyfont]}
-
-  \doifresumestylevalue\v!option\c!whitespace{\setupwhitespace[\@@@@rsoptionwhitespace]}
+  \doifresumestylevalue\v!option\c!bodyfont  {\switchtobodyfont[\@@@@rsoptionbodyfont  ]}
+  \doifresumestylevalue\v!option\c!whitespace{\setupwhitespace [\@@@@rsoptionwhitespace]}
 
 \stopsetups
 
-%D Settings at the end of every letter.
+%D Settings at the end of every resume.
 
 \startsetups[\v!resume:\v!finish]
 
-  \page
+  \page[\@@@@rsoptionpage]
 
   \setuplayout[\v!reset]
 
-  \endgroup
-
   \resetsubpagenumber
 
+  \endgroup
+
   \@@@@rsoptionafter
 
 \stopsetups
 
-%D Place the letter.
+%D Place the resume.
 
 \startsetups[\v!resume:\v!place]
 
-  \setups[\v!resume:\v!initialize] % Settings at the begin
-  \setups[\v!resume:\v!layout]     % Page layout
-  \setups[\v!resume:\v!reset]      % Reset layers
-  \setups[\v!resume:\v!layer]      % Place layers
-  \setups[\v!resume:\v!sequence]   % Place content
-  \setups[\v!resume:\v!finish]     % Settings at the end
+  \directsetup{\v!resume:\v!initialize} % Settings at the begin
+  \directsetup{\v!resume:\v!layout    } % Page layout
+  \directsetup{\v!resume:\v!reset     } % Reset layers
+  \directsetup{\v!resume:\v!layer     } % Place layers
+  \directsetup{\v!resume:\v!sequence  } % Place content
+  \directsetup{\v!resume:\v!finish    } % Settings at the end
 
 \stopsetups
 
@@ -350,20 +308,20 @@
 
 \startsetups[\v!resume:\v!layer]
 
-  \doif\@@@@rsoptionmarking \v!yes{\setups[\v!resume:\v!place:\v!foldmark]}
-  \doif\@@@@rsoptionhead    \v!yes{\setups[\v!resume:\v!place:\v!head    ]}
-  \doif\@@@@rsoptionfoot    \v!yes{\setups[\v!resume:\v!place:\v!foot    ]}
-  \doif\@@@@rsoptionnexthead\v!yes{\setups[\v!resume:\v!place:\v!nexthead]}
-  \doif\@@@@rsoptionnextfoot\v!yes{\setups[\v!resume:\v!place:\v!nextfoot]}
+  \doif\@@@@rsoptionmarking \v!yes{\directsetup{\v!resume:\v!place:\v!foldmark}}
+  \doif\@@@@rsoptionhead    \v!yes{\directsetup{\v!resume:\v!place:\v!head    }}
+  \doif\@@@@rsoptionfoot    \v!yes{\directsetup{\v!resume:\v!place:\v!foot    }}
+  \doif\@@@@rsoptionnexthead\v!yes{\directsetup{\v!resume:\v!place:\v!nexthead}}
+  \doif\@@@@rsoptionnextfoot\v!yes{\directsetup{\v!resume:\v!place:\v!nextfoot}}
 
 \stopsetups
 
-%D Place the letter content.
+%D Place the resume content.
 
 \let\resume!order!sections\resume!list!sections
 
 \def\doflushresumesection#1%
-  {\doif{\resumestylevalue\v!option{#1}}\v!yes{\setups[\v!resume:\v!place:#1]}}
+  {\doif{\resumestylevalue\v!option{#1}}\v!yes{\directsetup{\v!resume:\v!place:#1}}}
 
 \startsetups[\v!resume:\v!sequence]
 
@@ -384,12 +342,10 @@
    \c!backgroundimage=,
    \c!before=,
    \c!after=,
-   \c!header=\v!reset,
-   \c!footer=\v!reset,
-   \c!pagenumber=1,
+   \c!page=\v!yes,
+   \c!pagenumber=\plusone,
    \c!bodyfont=,
-   \c!alternative=\v!singlesided,
-   \c!state=\v!stop]
+   \c!alternative=\v!singlesided]
 
 %D Default style
 
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/default.nli b/Master/texmf-dist/tex/context/third/letter/interface/default.nli
index 29ef703181d..138205a92aa 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/default.nli
+++ b/Master/texmf-dist/tex/context/third/letter/interface/default.nli
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=default,
-%D        version=2008.11.29,
+%D        version=2008.12.16,
 %D          title=\CONTEXT\ Letter Interface,
 %D       subtitle=Default Interface,
 %D         author=Wolfgang Schuster,
@@ -60,6 +60,7 @@
   \setinterfacevariable {fullblock}  {fullblock}
   \setinterfacevariable {hanging}    {hanging}
   \setinterfacevariable {modified}   {modified}
+  \setinterfacevariable {semiblock}  {semiblock}
 \stopinterface
 
 %D \subject{Reference line}
@@ -99,7 +100,7 @@
      {\getcommacommandsize[\@@@@lsreferencelist]% \@@@@ldreference?
       \ifnum\commalistsize<\plustwo\hfill\fi
       \processcommacommand[\@@@@lsreferencelist]\formatreferencelista\unskip}%
-   \global\letter!height!reference\dimexpr\ht\scratchbox+\dp\scratchbox\relax
+   \global\letter!height!reference\htdp\scratchbox
    \box\scratchbox}
 
 \startsetups[\v!letter:\v!reference:\v!a]
@@ -182,7 +183,7 @@
 
 \long\def\doformatreferencelistd#1%
   {\doifelse{#1}\v!line
-     {\NC\NC\NC\NR} % ugly but working
+     {\TB[\v!line]}
      {\NC \doattributes{\????ld#1}\c!titlestyle\c!titlecolor
             {\labeltext{\v!letter:#1}\lettervalue{#1\c!separator}}%
       \NC\doattributes{\????ld#1}\c!textstyle\c!textcolor{\lettervalue{#1}}
@@ -228,7 +229,7 @@
    \convertargument#1\to\ascii
    \doifelselettervalue{\ascii\c!width}
      {\hbox\!!to\lettervalue{\ascii\c!width}}
-     {\hbox}%
+     {\hbox}
      {\vbox
         {\vbox{\doattributes{\????ld\ascii}\c!titlestyle\c!titlecolor
            {\doformatreferenceliste{\labeltext{\v!letter:\ascii}}}}
@@ -256,7 +257,7 @@
 
 \startsetups[\v!letter:\v!reference:\v!none]
 
-  % Use the topspace value from the style
+  % Use the topspace value from the style file
 
 \stopsetups
 
@@ -290,8 +291,7 @@
           {\setvalue{\????ld\c!toaddress}{\getvalue{\????ld\????ld#1}}}}%
    \fi\fi
    \def\stopletter
-     {\directsetup{\v!letter:\v!place}\egroup
-      \setupsubpagenumber[\c!state=\@@@@lsoptionstate]}%
+     {\directsetup{\v!letter:\v!place}\egroup}%
    \dostartbuffer[lettercontent][startletter][stopletter]}
 
 %D Patched version of the \tex{flushbufferline} macro for \MKII,
@@ -356,7 +356,7 @@
 \executeifdefined{\v!letter:\v!nextfoot:\@@@@lsnextfootalternative}\donothing
 \stopsetups
 
-\setvalue{\v!letter:\v!header:\v!fullblock}%
+\setvalue{\v!letter:\v!nexthead:\v!fullblock}%
   {\hbox\!!to\hsize
      {\rlap{\lettervalue\c!toname}%
       \midaligned{\pagenumber}%
@@ -364,23 +364,22 @@
         {\lettervalue\c!date   \\
          \lettervalue\c!reference}}}}
 
-\setvalue{\v!letter:\v!header:\v!hanging}%
+\setvalue{\v!letter:\v!nexthead:\v!hanging}%
   {\hbox\!!to\hsize
      {\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=v!right]
        {\lettervalue\c!toname    \\
         \lettervalue\c!date      \\
         \lettervalue\c!reference \\
-        \labeltext{page}\pagenumber}}\hss}
+        \labeltext\c!page\pagenumber}}\hss}
 
-\copycsname\v!letter:\v!header:\v!modified\endcsname\csname\v!letter:\v!header:\v!hanging\endcsname
-
-\startsetups[\v!letter:\v!header]
-\executeifdefined{\v!letter:\v!header:\@@@@lsheaderalternative}\donothing
-\stopsetups
+\setvalue{\v!letter:\v!nexthead:\v!semiblock}%
+  {\hbox\!!to\hsize
+     {\rlap{\lettervalue\c!toname}%
+      \midaligned{\pagenumber}%
+      \llap{\lettervalue\c!date}}}
 
-\startsetups[\v!letter:\v!footer]
-\executeifdefined{\v!letter:\v!footer:\@@@@lsfooteralternative}\donothing
-\stopsetups
+\copycsname\v!letter:\v!nexthead:\v!simplified\endcsname\csname\v!letter:\v!nexthead:\v!fullblock\endcsname
+\copycsname\v!letter:\v!nexthead:\v!modified  \endcsname\csname\v!letter:\v!nexthead:\v!hanging  \endcsname
 
 %D \subject{Addressee field}
 %D 
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/default.nri b/Master/texmf-dist/tex/context/third/letter/interface/default.nri
index 3c53c6bf429..5746a7f7b92 100755
--- a/Master/texmf-dist/tex/context/third/letter/interface/default.nri
+++ b/Master/texmf-dist/tex/context/third/letter/interface/default.nri
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=default,
-%D        version=2008.10.29,
+%D        version=2008.12.21,
 %D          title=\CONTEXT\ Resume Interface,
 %D       subtitle=Default Interface,
 %D         author=Wolfgang Schuster,
@@ -18,7 +18,7 @@
   {\iffirstargument
      \getparameters[\????rd][#1]%
    \fi
-   \def\stopresume{\directsetup{\v!resume:\v!place}}%
+   \def\stopresume{\directsetup{\v!resume:\v!place}\egroup}%
    \dostartbuffer[resumecontent][startresume][stopresume]}
 
 
@@ -26,4 +26,12 @@
   {\dostartbuffer[resumecontent][startresumecontent][stopresumecontent]}
 
 
+\setupresume
+  [\c!content={\getbuffer[resumecontent]}]
+
+\startsetups[\v!resume:\v!content]
+\resumevalue\c!content
+\stopsetups
+
+
 \protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/default.nls b/Master/texmf-dist/tex/context/third/letter/style/default.nls
index f05dd28b0e1..cf6726bc184 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/default.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/default.nls
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=default,
-%D        version=2008.11.29,
+%D        version=2008.12.16,
 %D          title=\CONTEXT\ Letter Style,
 %D       subtitle=Blockstyle initalization,
 %D         author=Wolfgang Schuster,
@@ -46,7 +46,9 @@
 
 \setupletterstyle
   [\v!nexthead,\v!nextfoot]
-  [\c!state=\v!next]
+  [\c!state=\v!start,
+   \c!hoffset=\backspace,
+   \c!voffset=\topspace]
 
 \setupletterstyle
   [\v!reference]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls b/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls
index eb5e15fa5f8..b7b094037ae 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=fullblock,
-%D        version=2008.11.29,
+%D        version=2008.12.16
 %D          title=\CONTEXT\ Letter Style,
 %D       subtitle=full-block/complete block style,
 %D         author=Wolfgang Schuster,
@@ -35,22 +35,9 @@
   [\v!secondpage]
   [\c!header=.5in]
 
-\startsetups[\v!letter:\v!header:\v!fullblock]
-
-  \framed
-    [\c!frame=\v!off,
-     \c!location=\v!top,
-     \c!align=\v!left]
-    {\lettervalue\c!date   \\
-     \lettervalue\c!reference}
-
-\stopsetups
-
 \setupletterstyle
-  [\v!header]
-  [\c!lefttext=\lettervalue\c!toname,
-   \c!middletext=\pagenumber,
-   \c!righttext=\setups{\v!letter:\v!header:\v!fullblock}]
+  [\v!nexthead]
+  [\c!alternative=\v!fullblock]
 
 \setupletterstyle
   [\v!option]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/hanging.nls b/Master/texmf-dist/tex/context/third/letter/style/hanging.nls
index 75a161acc7f..bde244d7c0d 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/hanging.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/hanging.nls
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=hanging,
-%D        version=2008.11.29,
+%D        version=2008.12.16,
 %D          title=\CONTEXT\ Letter Style,
 %D       subtitle=Hanging indented style,
 %D         author=Wolfgang Schuster,
@@ -46,21 +46,9 @@
 
 \setuplabeltext[\s!en][\c!page=Page~]
 
-\startsetups[\v!letter:\v!header:\v!hanging]
-
-  \framed
-    [\c!frame=\v!off,
-     \c!align=v!right]
-    {\lettervalue\c!toname    \\
-     \lettervalue\c!date      \\
-     \lettervalue\c!reference \\
-     \labeltext\c!page\pagenumber}
-
-\stopsetups
-
 \setupletterstyle
-  [\v!header]
-  [\c!lefttext=\setups{\v!letter:\v!header:\v!hanging}]
+  [\v!nexthead]
+  [\c!alternative=\v!hanging]
 
 \setupletterstyle
   [\v!option]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/modified.nls b/Master/texmf-dist/tex/context/third/letter/style/modified.nls
index 1b536033617..013f346cf86 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/modified.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/modified.nls
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=modified,
-%D        version=2008.11.29,
+%D        version=2008.12.16,
 %D          title=\CONTEXT\ Letter Style,
 %D       subtitle=Block/Modified block style,
 %D         author=Wolfgang Schuster,
@@ -42,21 +42,9 @@
 
 \setuplabeltext[\s!en][\c!page=Page~]
 
-\startsetups[\v!letter:\v!header:\v!modified]
-
-  \framed
-    [\c!frame=\v!off,
-     \c!align=v!right]
-    {\lettervalue\c!toname    \\
-     \lettervalue\c!date      \\
-     \lettervalue\c!reference \\
-     \labeltext\c!page\pagenumber}
-
-\stopsetups
-
 \setupletterstyle
-  [\v!header]
-  [\c!lefttext=\setups{\v!letter:\v!header:\v!modified}]
+  [\v!nexthead]
+  [\c!alternative=\v!hanging]
 
 \setupletterstyle
   [\v!option]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls b/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls
index 1455fef1c29..b4820f252fc 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=semiblock,
-%D        version=2008.05.28,
+%D        version=2008.12.16,
 %D          title=\CONTEXT\ Letter Style,
 %D       subtitle=Semiblock style,
 %D         author=Wolfgang Schuster,
@@ -41,10 +41,8 @@
   [\c!header=.5in]
 
 \setupletterstyle
-  [\v!header]
-  [\c!lefttext=\lettervalue\c!toname,
-   \c!middletext=\pagenumber,
-   \c!righttext=\lettervalue\c!date]
+  [\v!nexthead]
+  [\c!alternative=\v!semiblock]
 
 \setupletterstyle
   [\v!option]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/simplified.nls b/Master/texmf-dist/tex/context/third/letter/style/simplified.nls
index 504556ca409..eb25062e024 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/simplified.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/simplified.nls
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=simplified,
-%D        version=2008.05.28,
+%D        version=2008.12.16,
 %D          title=\CONTEXT\ Letter Style,
 %D       subtitle=Simplified style,
 %D         author=Wolfgang Schuster,
@@ -35,22 +35,9 @@
   [\v!secondpage]
   [\c!header=.5in]
 
-\startsetups[letter:header:simplified]
-
-  \framed
-    [\c!frame=\v!off,
-     \c!location=\v!top,
-     \c!align=\v!left]
-    {\lettervalue\c!date   \\
-     \lettervalue\c!reference}
-
-\stopsetups
-
 \setupletterstyle
-  [\v!header]
-  [\c!lefttext=\lettervalue\c!toname,
-   \c!middletext=\pagenumber,
-   \c!righttext=\setups{letter:header:simplified}]
+  [\v!nexthead]
+  [\c!alternative=\v!simplified]
 
 \setupletterstyle
   [\v!closing]