context-letter update (24jun10)

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

5 files changed, 24 insertions, 24 deletions

diff --git a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
index b52d9b658c4..91ef940aa0b 100644
--- a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
+++ b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
index 1b6650875d2..0f7cc03f713 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-environment.tex
@@ -12,7 +12,7 @@
 \setvariables
   [correspondence]
   [title=Correspondence with \ConTeXt,
-   version=\modulecode{tex.sprint(tex.ctxcatcodes,correspondence.files[1]["version"])}]
+   version=\ctxlua{tex.sprint(tex.ctxcatcodes,thirddata.correspondence.files[1]["version"])}]
 
 
 %%%% Farbe
@@ -46,7 +46,6 @@
 %%%% Zusätzliche Module
 
 \usemodule[simplefonts]
-%\usemodule[selectfont]
 \usemodule[visual]
 \usemodule[abr-01]
 \usemodule[letter]
@@ -67,15 +66,12 @@
 \startmode[wolf]
 
 \setupsimplefonts[size=10pt,expansion=quality,protrusion=quality]
-%\setupselectfont[size=10pt]
 
 \setmainfont[Lucida Bright][regularfont={*}]
-%\setmainfont[Lucida Bright][boldfont={Lucida Bright Demi},bolditalicfont={Lucida Bright Demiitalic},capsfont={Lucida Bright Smallcaps}]
-\setsansfont[Lucida Sans]
-\setmonofont[Lucida Sans Typewriter]
+\setsansfont[Lucida Sans][regularfont={*}]
+\setmonofont[Lucida Sans Typewriter][features=none]
 
 \definesimplefonttypeface[examplefont][Delicious][regularfont={* Roman}]
-%\definefontfamily[examplefont][Delicious][style=sans]
 
 \stopmode
 
@@ -85,7 +81,7 @@
 
 \setmainfont[TeX Gyre Pagella]
 \setsansfont[Latin Modern Sans]
-\setmonofont[Latin Modern Mono]
+\setmonofont[Latin Modern Mono][features=none]
 
 \definesimplefonttypeface[examplefont][Latin Modern Sans]
 
@@ -189,6 +185,7 @@
 \setupmakeup
   [standard]
   [pagestate=start,
+   doublesided=empty,
    page=no]
 
 %% Cover
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex
index 380b83c0ed4..f48ca8de67f 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-revision.tex
@@ -17,24 +17,24 @@ the end of the log file.
 \NC \bf File \NC \bf Revision \NC \bf Description            \NC\NR
 \stoptabulatehead
 
-\startmodulecode
+\startluacode
 
-local pairs, context = global.pairs, global.context
+local pairs = global.pairs
 
 context.starttabulate( { "|l|l|l|" } )
-for k,v in pairs(correspondence.files) do
+for k,v in pairs(thirddata.correspondence.files) do
     context.NC()
-    context("%s",correspondence.files[k]["name"])
+    context("%s",thirddata.correspondence.files[k]["name"])
     context.NC()
-    context("%s",correspondence.files[k]["version"])
+    context("%s",thirddata.correspondence.files[k]["version"])
     context.NC()
-    context("%s",correspondence.files[k]["description"])
+    context("%s",thirddata.correspondence.files[k]["description"])
     context.NC()
     context.NR()
 end
 context.stoptabulate()
 
-\stopmodulecode
+\stopluacode
 
 \stop
 
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}