context-letter update (23jul09)

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

4 files changed, 35 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
index 85eb2615583..25affb32c33 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkii
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=t-correspondence,
-%D        version=2009.07.18,
+%D        version=2009.07.22,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
diff --git a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
index d1e30705a3b..1523840a5a1 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/base/t-correspondence.mkiv
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=t-correspondence,
-%D        version=2009.07.18,
+%D        version=2009.07.22,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
@@ -478,7 +478,7 @@ correspondence.files = {
         name        = "t-correspondence.tex",
         path        = "tex/context/third/letter/base/",
         type        = "base",
-        version     = "2009.07.18",
+        version     = "2009.07.22",
         description = "Core module"
     } ,
     {
@@ -500,7 +500,7 @@ correspondence.files = {
         name        = "default.nli",
         path        = "tex/context/third/letter/interface/",
         type        = "interface",
-        version     = "2009.07.18",
+        version     = "2009.07.22",
         description = "Default letter interface"
 
     } ,
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 8eafbf3fa7e..102cfc759a6 100644
--- 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=2009.07.18,
+%D        version=2009.07.22,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
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 5e220cb5803..6a61373e5e5 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=2009.07.18,
+%D        version=2009.07.22,
 %D          title=\CONTEXT\ Letter Interface,
 %D       subtitle=Default Interface,
 %D         author=Wolfgang Schuster,
@@ -250,11 +250,20 @@
 
 \newtoks\letter!local!commands
 
+\chardef\letterenvironmentmode\zerocount
+
 \def\startletter
   {\begingroup
    \dodoubleempty\dostartletter}
 
 \def\dostartletter[#1][#2]%
+  {\ifcase\letterenvironmentmode\relax
+     \@EA\dostartbufferletter
+   \else
+     \@EA\dostartcontentletter
+   \fi[#1][#2]}
+
+\long\def\dostartcontentletter[#1][#2]#3\stopletter
   {\ifsecondargument
      \getparameters[\????ld][#1]%
      \doifundefinedelse{\????ld\????ld#2}
@@ -267,18 +276,30 @@
           {\setvalue{\????ld\c!toaddress}{#1}}
           {\setvalue{\????ld\c!toaddress}{\getvalue{\????ld\????ld#1}}}}%
    \fi\fi
-   \begingroup
-   \obeylines
-   \dodostartletter}
-
-\long\def\dodostartletter#1\stopletter
-  {\endgroup
-   \scratchtoks{#1}%
-   \@EA\setbuffer\@EA[lettercontent]\the\scratchtoks\endbuffer
+   \setbuffer[lettercontent]#3\endbuffer
    \processlettervalues
    \directsetup{\v!letter:\v!place}%
    \endgroup}
 
+\def\dostartbufferletter[#1][#2]%
+  {\def\stopletter
+     {\processlettervalues
+      \directsetup{\v!letter:\v!place}%
+      \endgroup}
+   \ifsecondargument
+     \getparameters[\????ld][#1]%
+     \doifundefinedelse{\????ld\????ld#2}
+       {\setvalue{\????ld\c!toaddress}{#2}}
+       {\setvalue{\????ld\c!toaddress}{\getvalue{\????ld\????ld#2}}}%
+   \else\iffirstargument
+     \doifassignmentelse{#1}
+       {\getparameters[\????ld][#1]}
+       {\doifundefinedelse{\????ld\????ld#1}
+          {\setvalue{\????ld\c!toaddress}{#1}}
+          {\setvalue{\????ld\c!toaddress}{\getvalue{\????ld\????ld#1}}}}%
+   \fi\fi
+   \dostartbuffer[lettercontent][startletter][stopletter]}
+
 \def\processlettervalues
   {\globalletempty\letter!list!descriptions
    \global\letter!local!commands\emptytoks