context-letter update (24feb10)

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

10 files changed, 46 insertions, 38 deletions

diff --git a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
index 3d3998a93f2..3b67eb37fe7 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 bc7faf1087f..fb9d0dc656d 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
@@ -39,13 +39,16 @@
    title={Correspondence with ConTeXt},
    author={Wolfgang Schuster},
    color=black,
+   contrastcolor=black,
    style=]
 
 
 %%%% Zusätzliche Module
 
 \usemodule[simplefonts]
+%\usemodule[selectfont]
 \usemodule[visual]
+\usemodule[abr-01]
 \usemodule[letter]
 \usemodule[resume]
 \usemodule[set-11]\loadsetups[cont-en.xml]\loadsetups[t-letter.xml]\loadsetups[t-resume.xml]
@@ -63,21 +66,22 @@
 
 \startmode[wolf]
 
-\setupsimplefonts[size=11pt,expansion=quality,protrusion=quality]
+\setupsimplefonts[size=10pt,expansion=quality,protrusion=quality]
+%\setupselectfont[size=10pt]
 
-\setmainfont[Lucida Bright]
+\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]
 
-\setupbodyfontenvironment[default][em=italic]
-
-\definesimplefonttypeface[examplefont][Delicious]
+\definesimplefonttypeface[examplefont][Delicious][regularfont={* Roman}]
+%\definefontfamily[examplefont][Delicious][style=sans]
 
 \stopmode
 
 \startnotmode[wolf]
 
-\setupsimplefonts[size=11pt,expansion=quality,protrusion=quality]
+\setupsimplefonts[size=10pt,expansion=quality,protrusion=quality]
 
 \setmainfont[TeX Gyre Pagella]
 \setsansfont[Latin Modern Sans]
@@ -124,9 +128,8 @@
 
 \setupwhitespace[line]
 
-\setupalign[stretch,hanging,hz]
-%\setupalign[stretch,hanging]
-%\setupalign[right,broad]
+%\setupalign[stretch,hanging,hz]
+\setupalign[right,broad] % gives better results with \cs in the text
 
 %% Überschriften
 
@@ -178,8 +181,6 @@
 
 %% Verbatim
 
-\doifmode{wolf}{\setuptyping[bodyfont=10pt]}
-
 \setuptyping
   [before={\blank\testpage[2]}]
 
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-labeltext.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-labeltext.tex
index 92d3be3ae1d..048b2c69c97 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-labeltext.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-labeltext.tex
@@ -11,10 +11,10 @@ only the labels for the {\em memo} style are not included.
 
 \start
 
-\setuplinetable      [nx=2,stretch=no,width=.125\textwidth]
+\setuplinetable      [nx=2,stretch=yes,width=.125\textwidth]
 \setuplinetable[r][1][style=bold]
 
-\startlinetable
+\startbuffer[labeltext]
 \NC label \NC english \NC dutch \NC german \NC french \NC italian \NC spanish \NC\NR
 \startprocesscommalist
   [name,room,yourref,yourmail,myref,mymail,customer,invoice,
@@ -29,7 +29,9 @@ only the labels for the {\em memo} style are not included.
   \NC \mainlanguage[es]\labeltext{letter:#1}
   \NC\NR
 \stopprocesscommalist
-\stoplinetable
+\stopbuffer
+
+\processlinetablebuffer[labeltext]
 
 \stop
 
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-extension.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-extension.tex
index a6fb1a71405..5e539875ccd 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-extension.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-extension.tex
@@ -11,13 +11,13 @@ one purpose like the page optimation (\filename{optimize.nle}).
 
 You can load extension files either with the letter module and write
 their names as argument to the \type{extension} key or afterwards in
-your file with the \type{useletterextension} command.
+your file with the \type{\useletterextension} command.
 
 \setup[useletterextension]
 
 The module comes itself with the following extensions:
 
-\starttabulate[|f{\bf}l|p|]
+\starttabulate[|Bl|p|]
 \NC label    \NC Labeltexts for different languages           \NC\NR
 \NC pragma   \NC Example content for Hans own letter module   \NC\NR
 \NC optimize \NC Increase or decrease the distance between
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 5420e02f79e..380b83c0ed4 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
@@ -4,9 +4,10 @@
 
 \chapter{File versions}
 
-The letter module comes as a package with many different files
-and each of them has their own version tag, you could read this
-version tag at the bottom of each file in the field date.
+The correspondence module comes as a package with many different files and each of them
+has their own version tag, you can get this information from the information block at the
+top of the file, \MKIV\ users  get also a overview of the used files with the version at
+the end of the log file.
 
 \start
 
@@ -17,18 +18,22 @@ version tag at the bottom of each file in the field date.
 \stoptabulatehead
 
 \startmodulecode
-global.context.starttabulate( { "|l|l|l|" } )
-for k,v in global.pairs(correspondence.files) do
-    global.context.NC()
-    global.context("%s",correspondence.files[k]["name"])
-    global.context.NC()
-    global.context("%s",correspondence.files[k]["version"])
-    global.context.NC()
-    global.context("%s",correspondence.files[k]["description"])
-    global.context.NC()
-    global.context.NR()
+
+local pairs, context = global.pairs, global.context
+
+context.starttabulate( { "|l|l|l|" } )
+for k,v in pairs(correspondence.files) do
+    context.NC()
+    context("%s",correspondence.files[k]["name"])
+    context.NC()
+    context("%s",correspondence.files[k]["version"])
+    context.NC()
+    context("%s",correspondence.files[k]["description"])
+    context.NC()
+    context.NR()
 end
-global.context.stoptabulate()
+context.stoptabulate()
+
 \stopmodulecode
 
 \stop
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence.tex
index d061285d6ae..5a91ce3cb7c 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence.tex
@@ -17,7 +17,7 @@
 \part{Letters}
 
 \component correspondence-letter-beginner
-%\component correspondence-letter-interface
+\component correspondence-letter-interface
 \component correspondence-letter-layout
 \component correspondence-letter-extension
 \component correspondence-letter-values
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 0011f58684a..9e636fc5ffc 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.10.10,
+%D        version=2010.02.23,
 %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 262b24052e6..8e631115c13 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.10.10,
+%D        version=2010.02.23,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
@@ -505,7 +505,7 @@ correspondence.files = {
         name        = "t-correspondence.tex",
         path        = "tex/context/third/letter/base/",
         type        = "base",
-        version     = "2009.10.10",
+        version     = "2010.02.23",
         description = "Core module"
     } ,
     {
@@ -527,7 +527,7 @@ correspondence.files = {
         name        = "default.nli",
         path        = "tex/context/third/letter/interface/",
         type        = "interface",
-        version     = "2009.07.23",
+        version     = "2010.02.23",
         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 5582ba68173..15c2901f607 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.10.10,
+%D        version=2010.02.23,
 %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 eeaeb3224ae..18760bcb09f 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.09.20,
+%D        version=2010.02.23,
 %D          title=\CONTEXT\ Letter Interface,
 %D       subtitle=Default Interface,
 %D         author=Wolfgang Schuster,
@@ -304,7 +304,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\hbox{\getbuffer[lettercontent]}%
+   \setbox\scratchbox\vbox{\getbuffer[lettercontent]}%
    \flushtoks\letter!local!commands}
 
 \def\gobblelettervalues