context-letter update (24jun10)

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

2 files changed, 12 insertions, 9 deletions

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 a228b5088ca..d805c566b5e 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
@@ -485,23 +485,26 @@
 \def\registercorrespondencefile#1%
   {\doifundefined{@@@@#1@@@@}
     {\letgvalueempty{@@@@#1@@@@}%
-     \modulecode{correspondence.checkfile("#1")}}}
+     \ctxlua{thirddata.correspondence.checkfile("#1")}}}
 
 %D Lua table with all macro files and their current version, it is used
 %D to build the revision table in the manual. The Lua alternative is easier
 %D to maintain (same folder as the other files) and allows me to store more
 %D information as I can do with the TeX solution.
 
-\startmodulecode
+\startluacode
 
-correspondence = correspondence or { }
+thirddata                = thirddata or { }
+thirddata.correspondence = thirddata.correspondence or { }
+
+local correspondence = thirddata.correspondence
 
 correspondence.files = {
     {
         name        = "t-correspondence.tex",
         path        = "tex/context/third/letter/base/",
         type        = "base",
-        version     = "2010.04.04",
+        version     = "2010.06.23",
         description = "Core module"
     } ,
     {
@@ -523,7 +526,7 @@ correspondence.files = {
         name        = "default.nli",
         path        = "tex/context/third/letter/interface/",
         type        = "interface",
-        version     = "2010.04.04",
+        version     = "2010.06.17",
         description = "Default letter interface"
 
     } ,
@@ -754,7 +757,7 @@ function correspondence.checkfile(filename)
     end
 end
 
-\stopmodulecode
+\stopluacode
 
 \registercorrespondencefile{t-correspondence.tex}
 
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 2b3e7639982..ea78050e625 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=2010.04.04,
+%D        version=2010.06.17,
 %D          title=\CONTEXT\ Letter Interface,
 %D       subtitle=Default Interface,
 %D         author=Wolfgang Schuster,
@@ -15,7 +15,7 @@
 %D 
 %D Dimen value to save the height of the reference line.
 
-\newdimen\letter!height!reference
+\ifdefined\letter!height!reference \else \newdimen\letter!height!reference \fi
 
 %D We come now to the new macros defined in this file, they are meant to place the
 %D information about date, phone number and more information. You could select on of
@@ -318,7 +318,7 @@
    \def\ps     ##1{\doglobal\appendtoks\setvalue{\????ld\c!postscript}{##1}\to\letter!local!commands\doglobal\appendtocommalist\c!postscript\letter!list!descriptions}%
    \def\cc     ##1{\doglobal\appendtoks\setvalue{\????ld\c!copy      }{##1}\to\letter!local!commands\doglobal\appendtocommalist\c!copy      \letter!list!descriptions}%
    \def\encl   ##1{\doglobal\appendtoks\setvalue{\????ld\c!enclosure }{##1}\to\letter!local!commands\doglobal\appendtocommalist\c!enclosure \letter!list!descriptions}%
-   \setbox\scratchbox\vbox{\getbuffer[lettercontent]}%
+   \setbox\scratchbox\vbox{\trialtypesettingtrue\getbuffer[lettercontent]}%
    \doifmode{mkiv}{\processassignmentcommand[\dotoks\letter!local!setups]\processlettersetups}% only available in mkiv
    \flushtoks\letter!local!commands}