context-letter update (30aug10)

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

16 files changed, 241 insertions, 212 deletions

diff --git a/Master/texmf-dist/doc/context/third/letter/correspondence.pdf b/Master/texmf-dist/doc/context/third/letter/correspondence.pdf
index 91ef940aa0b..d02d7684e31 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 0f7cc03f713..584c703e9a7 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
@@ -1,13 +1,12 @@
 \startenvironment correspondence-environment
 
-%%%% Anleitung für das Correspondenz-Modul
+%%%% Manual for the ConTeXt correspondence module
 
-% Um die Anleitung Erstellen zu können muss LuaTeX benutzt werden,
-% um das gleiche Aussehen wie in der fertigen PDF-Version zu erhalten
-% müssen die Lucida- und Delicious-Schriften installiert sein.
+% To produce a pdf of this manual you have to run it with LuaTeX,
+% to get the same layout as the version shipped with the module
+% the lucida and delicious fonts are required.
 
-
-%%%% Variablen für das Dokument
+%%%% Variables
 
 \setvariables
   [correspondence]
@@ -15,11 +14,7 @@
    version=\ctxlua{tex.sprint(tex.ctxcatcodes,thirddata.correspondence.files[1]["version"])}]
 
 
-%%%% Farbe
-
-\setupcolor[hex]
-
-\setupcolors[state=start]
+%%%% Colors
 
 \definecolor[lettercolor]  [h=BBD0B4]
 \definecolor[fakerulecolor][darkgray]
@@ -27,7 +22,7 @@
 \definecolor[twhite][r=1,g=1,b=1,t=.75,a=1]
 
 
-%%%% Bilder
+%%%% Images
 
 \setupexternalfigures[directory=images]
 
@@ -43,9 +38,8 @@
    style=]
 
 
-%%%% Zusätzliche Module
+%%%% Additional modules
 
-\usemodule[simplefonts]
 \usemodule[visual]
 \usemodule[abr-01]
 \usemodule[letter]
@@ -61,36 +55,28 @@
    framecolor=lettercolor]
 
 
-%%%% Schriften
+%%%% Fonts
 
 \startmode[wolf]
 
-\setupsimplefonts[size=10pt,expansion=quality,protrusion=quality]
+\setupbodyfont[lucida,10pt]
 
-\setmainfont[Lucida Bright][regularfont={*}]
-\setsansfont[Lucida Sans][regularfont={*}]
-\setmonofont[Lucida Sans Typewriter][features=none]
-
-\definesimplefonttypeface[examplefont][Delicious][regularfont={* Roman}]
+\definetypeface[examplefont][rm][specserif][Delicious][default]
 
 \stopmode
 
 \startnotmode[wolf]
 
-\setupsimplefonts[size=10pt,expansion=quality,protrusion=quality]
-
-\setmainfont[TeX Gyre Pagella]
-\setsansfont[Latin Modern Sans]
-\setmonofont[Latin Modern Mono][features=none]
+\setupbodyfont[pagella,10pt]
 
-\definesimplefonttypeface[examplefont][Latin Modern Sans]
+\definetypeface[examplefont][rm][specserif][Latin Modern Sans][default]
 
 \stopnotmode
 
 
 %%%% Layout
 
-%% Einstellungen für die Musterbriefe
+%% Setup for the letter examples
 
 \setupletterstyle
   [option]
@@ -106,8 +92,8 @@
 
 \setupletterstyle
   [enclosure,copy,postscript]
-  [before=\nowhitespace,
-   after=\nowhitespace]
+  [before={\blank[nowhite]},
+   after={\blank[nowhite]}]
 
 \setupletterstyle
   [closing]
@@ -120,14 +106,13 @@
    before={\page[left]},
    backgroundcolor=gray]
 
-%% Absatzeinstellungen
+%% Whitespace
 
 \setupwhitespace[line]
 
-%\setupalign[stretch,hanging,hz]
 \setupalign[right,broad] % gives better results with \cs in the text
 
-%% Überschriften
+%% Headers
 
 \definestructureresetset[default][0,0][1]
 
@@ -154,14 +139,14 @@
   [subsection,subsubject]
   [style=\tfa]
 
-%% Inhaltsverzeichnis
+%% Content
 
 \setupcombinedlist
   [content]
   [interaction=all,
    color=black]
 
-%% Seitennummerierung
+%% Pagenumbering
 
 \definestructureconversionset [pagenumber] [] [numbers]
 
@@ -171,7 +156,7 @@
   [alternative=doublesided,
    location=footer]
 
-%% Kopf- und Fußzeilen
+%% Head/Foot
 
 \setupheadertexts[{\getmarking[chapter]}]
 
@@ -208,7 +193,7 @@
   {\page[yes,left]
    \bgroup
    \setupbackgrounds[page][background=color,backgroundcolor=lettercolor]
-   \startstandardmakeup % warum nicht
+   \startstandardmakeup % why not
    \stopstandardmakeup  % \page[empty]?
    \egroup}
 
@@ -216,7 +201,7 @@
   {\chapter{Command definitions}
    \placesetup}
 
-%% Beispiele für die Briefelemente
+%% Examples for the letter elements
 
 \defineframedtext
   [element]
@@ -232,7 +217,7 @@
    corner=round,
    framecolor=lettercolor]
 
-%% Test-Modus
+%% Test mode
 
 \startmode[test]
 
@@ -241,8 +226,8 @@
 
 \stopmode
 
-%% Notwendig for TeX Live um das Dokument auch bei einem fehlenden
-%% examplecontent Modul erstellen zu können.
+%% The examplecontent module is not included in the manual sources
+%% and will remain private therefore dummy defintions are necessary.
 
 \ifx\startexamplecontent\undefined
 
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-introduction.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-introduction.tex
index 6466e41fd1b..2603c8188ae 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-introduction.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-introduction.tex
@@ -14,15 +14,15 @@ The core for the first version was based on the letter manual from Hans Hagen
 the module.
 
 As the time past more and more parts had been added to the package and it ended up
-in a similar interface as the \LaTeX-classes but with it’s own commands to set user
-values. Because of it’s origin in Hans module the user interface and the low level
-parts are split in two different files and many more interfaces for the users are
+in a similar interface as the \LaTeX-classes but with its own commands to set user
+values. Because of its origin in Hans’ module the user interface and the low level
+parts are split in two different files and many more interfaces for users are
 possible, one of them tries to mimic the style of Hans module.
 
-As the time past the author wrote generic version of the complete setup commands
+As the time past the author wrote a generic version of the complete setup commands
 and a few other in the letter core and created the new file \filename{t-correspondence.tex}
 which holds now the low level code. As a result of this the new file
-\filename{t-resume.tex} became part of the package with it’s own setup commands
+\filename{t-resume.tex} became part of the package with its own setup commands
 and external style and interface files.
 
 \stopcomponent
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex
index 6854591f16d..ae83733517c 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-beginner.tex
@@ -2,29 +2,25 @@
 
 \environment correspondence-environment
 
-\chapter{Beginners guide}
+\chapter{Beginners’ guide}
 
-The most important in the module for the users is the interface to write the letter text and to set the values for one or more letters.
+The most important thing in the module for the users is the interface to write the letter text and to set the values for one or more letters.
 
-You will learn how to write a letter with the module step by step, beginning with just a few lines of text, following with opening and closing sentences and at the end after you know how to set every kind of information you will finally learn how to change the position of the reference line and how to change the texts for the labels and to customise their style and color.
-
-\startbuffer[interface:text]
-\startletter
-\input knuth\par
-\stopletter
-\stopbuffer
+You will learn how to write a letter with the module step by step, beginning with just a few lines of text, following with opening and closing sentences and at the end, after you know how to set every kind of information, you will finally learn how to change the position of the reference line and how to change the texts for the labels and to customise their style and color.
 
 \start
 
 \setupletter[alternative=none]
 
-\getbuffer[interface:text]
+\startletter
+\input knuth\par
+\stopletter
 
 \stop
 
 \section{Pure text}
 
-To understand how a letter is written let's study the code for the example letter on the left page.
+To understand how a letter is written let’s study the code for the example letter on the left page.
 
 \starttyping
 \usemodule[letter]
@@ -38,39 +34,35 @@ Thus, I came to the conclusion ...
 \stoptext
 \stoptyping
 
-As you could see from the first line the letter module has to be loaded before it could used because it is none of the functions \CONTEXT\ provides by default, to make the examples in the following sections a little bit shorter I will no longer add \type{\usemodule}, \type{\starttext} and \type{\stoptext} but you shouldn't forgot to add all of them in your files.
+As you can see from the first line the letter module has to be loaded before it can be used because it is none of the functions \CONTEXT\ provides by default. To make the examples in the following sections a little bit shorter I will no longer add \type{\usemodule}, \type{\starttext} and \type{\stoptext} but you shouldn’t forget to add all of them in your files.
 
-The content for your letter is written between the letter environment, it doesn't matter if you use blank lines before and after the letter text.
+The content for your letter is written between the letter environment, it doesn’t matter if you use blank lines before or after the letter text.
 
-If you take a closer look at the result on the left side you could see the paragraphs are separated by blank lines, this could be changed with the \type{\setupletterstyle} command but let us keep this for later.
+If you take a closer look at the result on the left side you can see the paragraphs are separated by blank lines. This can be changed with the \type{\setupletterstyle} command but let us keep this for later.
 
-You're not restricted to only one letter in file, it is possible to write as many as you like in a file and you could use this to write serial letters but a easier method to do this is described later in the manual.
+You’re not restricted to only one letter for a file. It is possible to write as many as you like in a file and you could use this to write serial letters. An easier method for this task is described later in this manual.
 
-\startbuffer[interface:opening]
+\start
+
+\setupletter[alternative=none]
 
 \setupletter
   [opening={Dear Reader,},
    closing={Greetings from the Author}]
 
-\getbuffer[interface:text]
-
-\stopbuffer
-
-\start
-
-\setupletter[alternative=none]
-
-\getbuffer[interface:opening]
+\startletter
+\input knuth\par
+\stopletter
 
 \stop
 
 \section{Opening and closing}\index{opening}\index{closing}
 
-You saw in the last example how to write a simple text but shouldn't it be possible to give a few opening and also closing words for the letter, because the reader should know for whom the content is.
+You saw in the last example how to write a simple text. But shouldn’t it be possible to give a few opening and also closing words for the letter, because the reader should know for whom the content is.
 
 To achieve this the module provides the two variables {\em opening} and {\em closing}. To feed them with text you could either use the optional arguments for \type{\startletter} as done in the current example or you could set them before the start of the letter with the two commands \type{\setupletter} and \type{\setlettervalue}.
 
-Let us begin with first alternative and set them as argument with \type{\startletter}:
+Let us begin with first alternative and set them as arguments for \type{\startletter}:
 
 \starttyping
 \startletter
@@ -80,7 +72,7 @@ Thus, I came to the conclusion ...
 \stopletter
 \stoptyping
 
-If you don't like this method you could set the two value before the letter environment with the \type{\setupletter} command, the text in your file should now look like:
+If you don’t like this method you could set the two values before the letter environment with the \type{\setupletter} command. The text in your file should now look like:
 
 \starttyping
 \setupletter
@@ -100,36 +92,34 @@ The first version with braces for two values has the following look.
 \setlettervalue{closing}{Greetings from the Author}
 \stoptyping
 
-The values itself had to be given before the letter environment because values in the letter text are ignored and will never be shown in the output.
+The values itself have to be given before the letter environment because values in the letter text are ignored and will never be shown in the output.
 
-You have also to be careful with the content for the values because commas are interpreted as end of the value if you write it as argument for \type{\startletter} or with \type{\setupletter} and the text has to be protected with braces in this case but you don't need them when there is no comma in the argument.
+You have also to be careful with the content for the values because commas are interpreted as end of the value if you write it as argument for \type{\startletter} or with \type{\setupletter} and the text has to be protected with braces in this case but you don’t need them when there is no comma in the argument.
 
-This could not happen if you set the values with the \type{\setlettervalue} command because the content is delimited by the braces and commas are just normal text.
+This cannot happen if you set the values with the \type{\setlettervalue} command, because the content is delimited by the braces and commas are just normal text.
 
 \page[left]
 
-\startbuffer[interface:subject]
-
-\setupletter
-  [subject={Step by step guide to write a letter}]
-
-\getbuffer[interface:opening]
-
-\stopbuffer
-
 \start
 
 \setupletter[alternative=none]
 
-\getbuffer[interface:subject]
+\setupletter
+  [opening={Dear Reader,},
+   closing={Greetings from the Author},
+   subject={Step by step guide to write a letter}]
+
+\startletter
+\input knuth\par
+\stopletter
 
 \stop
 
 \section{Subject}\index{subject}
 
-After you read how to write the text and set values for the opening and closing we mention now how we could write a subject.
+After you read how to write the text and set values for the opening and closing we mention now how we can write a subject.
 
-Instead of integrating this point in the last section I wrote a new to let you understand the system. Before I will tell more let's take a look at the code.
+Instead of integrating this point in the last section I wrote a new one to let you understand the system. Before I will tell more let’s take a look at the code.
 
 \starttyping
 \startletter
@@ -142,29 +132,30 @@ Thus, I came to the conclusion ...
 
 The text for the subject is written as argument for {\em subject} as argument for \type{\startletter}, as you already guess you could have set it also with \type{\setupletter} or \type{\setlettervalue} and this is also possible and true for the values in the following sections.
 
-Besides the {\em subject} you have also the option to set a {\em title} for the letter, the is no big difference between them but the title is normally written before the subject and has and use a slightly bigger size or is emphasized in another way.
+Besides the {\em subject} you have also the option to set a {\em title} for the letter. There is no big difference between them, but the title is normally written before the subject and has a slightly bigger size or is emphasized in another way.
 
-\startbuffer[interface:address]
+\start
+
+\setupletterstyle[whitespace=line]
 
 \setupletter
   [toname={Mike Wilson},
    toaddress={Linden street 12\\78569 TeX City}]
 
-\getbuffer[interface:subject]
-
-\stopbuffer
-
-\start
-
-\setupletterstyle[whitespace=line]
+\setupletter
+  [opening={Dear Reader,},
+   closing={Greetings from the Author},
+   subject={Step by step guide to write a letter}]
 
-\getbuffer[interface:address]
+\startletter
+\input knuth\par
+\stopletter
 
 \stop
 
 \section{Address}\flushatnextpar{\index{toname}\index{toaddress}}
 
-Letter are normally meant to be send by post and to prevent you from writing the address by hand on the envelope you could buy envelopes with windows. To use these envelopes the address has to be written on the letter and to do this you have to set the {\em name} and the {\em address} for the addressee with the two values {\em toname} and {\em toaddress}.
+Letters are normally meant to be sent by mail. To prevent you from writing the address by hand on the envelope you could buy envelopes with windows. To use these envelopes the address has to be written on the letter and to do this you have to set the {\em name} and the {\em address} for the addressee with the two values {\em toname} and {\em toaddress}.
 
 The input for the example on the left page looks like:
 
@@ -181,31 +172,36 @@ Thus, I came to the conclusion ...
 \stopletter
 \stoptyping
 
-The author prefer to set the values for the addressee not with \type{\startletter} but with \type{\setupletter} but this is just a matter of style and you could select what fits best to your own working style.
+The author prefers to set the values for the addressee not with \type{\startletter} but with \type{\setupletter} but this is just a matter of taste and you can select what fits your own working style best.
 
-\startbuffer[interface:sender]
+\start
 
 \setupletter
   [fromname={The Author},
    fromaddress={Hidden Street 2\\57895 Mystery town}]
 
-\getbuffer[interface:address]
-
-\stopbuffer
+\setupletter
+  [toname={Mike Wilson},
+   toaddress={Linden street 12\\78569 TeX City}]
 
-\start
+\setupletter
+  [opening={Dear Reader,},
+   closing={Greetings from the Author},
+   subject={Step by step guide to write a letter}]
 
-\getbuffer[interface:sender]
+\startletter
+\input knuth\par
+\stopletter
 
 \stop
 
 \section{Sender}\index{fromname}\index{fromaddress}
 
-It is not often enough to have just the addressee information on the letter, you're looking also for way to put the {\em name} and {\em address} for the sender into the header.
+It is not often enough to have just the addressee information on the letter. You’re also looking for a way to put the {\em name} and {\em address} of the sender into the header.
 
-If you have wondered why the author hasn't just used {\em name} and {\em address} as keys for the addressee values you will now find the solution. To make the system consistent to set the values for addressee and the sender both needed key names to prevent confusions which value should use the the simpler and which one a more verbose one both got e prefix to the key to differentiate them, so got addressee information the prefix {\em to} and sender information the prefix {\em from}.
+If you have wondered why the author hasn’t just used {\em name} and {\em address} as keys for the addressee values you will now find the solution. To make the system consistent to set the values for addressee and the sender both needed unique key names to prevent confusion. Which value should use the simpler and which one a more verbose one both got a prefix to the key to differentiate them. So addressee information got the prefix {\em to} and sender information the prefix {\em from}.
 
-The additional input for the example on the left page to the one from the previous examples is:
+The additional lines for the example on the left page compared to the previous one are:
 
 \starttyping
 \setupletter
@@ -213,9 +209,9 @@ The additional input for the example on the left page to the one from the previo
    fromaddress={Hidden Street 2\\57895 Mystery town}]
 \stoptyping
 
-The manual will describe in a later section how to write a own header with a personal look and feel but this is outside of the user interface and requires knowledge about the layout.
+This manual describes in a later section how to write an own header with a personal look and feel. But this is outside of the user interface and requires knowledge about the layout.
 
-\startbuffer[interface:reference]
+\start
 
 \setupletter
   [name={Ben Johnson},
@@ -225,21 +221,30 @@ The manual will describe in a later section how to write a own header with a per
 \setupletter
   [list={name,phone,fax,date}]
 
-\getbuffer[interface:sender]
+\setupletter
+  [fromname={The Author},
+   fromaddress={Hidden Street 2\\57895 Mystery town}]
 
-\stopbuffer
+\setupletter
+  [toname={Mike Wilson},
+   toaddress={Linden street 12\\78569 TeX City}]
 
-\start
+\setupletter
+  [opening={Dear Reader,},
+   closing={Greetings from the Author},
+   subject={Step by step guide to write a letter}]
 
-\getbuffer[interface:reference]
+\startletter
+\input knuth\par
+\stopletter
 
 \stop
 
 \section{Reference line}
 
-If you're in a company or a organisation you need sometimes a few extra information on your letter. The reference line or block is the right place where you can place these information.
+If you’re in a company or an organisation you sometimes need a few extra information on your letter. The reference line or block is the right place to put these information to.
 
-Our old example from the last section was now extended by a reference line between the information from our addressee and the subject line, the information for the four fields were set with the following code.
+Our old example from the last section is now extended by a reference line between the information of our addressee and the subject line. The information for the four fields are set with the following code.
 
 \starttyping
 \setupletter
@@ -252,46 +257,61 @@ Our old example from the last section was now extended by a reference line betwe
   [list={name,phone,fax,date}]
 \stoptyping
 
-The first \type{\setupletter} set the content for the four fields {\em name}, {\em phone}, {\em fax} and {\em date}. Although the values are set none of them will appear in the output but we have to declare the fields for the reference line first, this is done in the second \type{\setupletter} command with the key {\em list}, the entries will appear in the in the same order as you write them in the list, if one or more of the keys in the list have no values they will still appear in the output but no content is shown.
+The first \type{\setupletter} set the content for the four fields {\em name}, {\em phone}, {\em fax} and {\em date}. Although the values are set none of them will appear in the output. We have to declare the fields for the reference line first, this is done in the second \type{\setupletter} command with the key {\em list}, the entries appear in the same order as you write them in the list. If one or more of the keys in the list have no values they will still appear in the output but no content is shown.
 
-If you change the content for the {\em list} key in your file the module will show by default the date of the current date at the right side of the reference line, this will normally always happen and you could say the result in the examples of the two preceding sections.
+If you do not change the {\em list} key in your file, by default the module will show the current date at the right side of the reference line. This will normally always happen and you could see the result in the examples of the two preceding sections.
 
-\startbuffer[interface:signature]
+\start
 
 \setupletter
-  [signature={Arthur Thor}]
+  [name={Ben Johnson},
+   phone={4922-89564},
+   fax={4922-89564}]
 
-\getbuffer[interface:reference]
+\setupletter
+  [list={name,phone,fax,date}]
 
-\stopbuffer
+\setupletter
+  [fromname={The Author},
+   fromaddress={Hidden Street 2\\57895 Mystery town}]
 
-\start
+\setupletter
+  [toname={Mike Wilson},
+   toaddress={Linden street 12\\78569 TeX City}]
 
-\getbuffer[interface:signature]
+\setupletter
+  [opening={Dear Reader,},
+   closing={Greetings from the Author},
+   subject={Step by step guide to write a letter},
+   signature={Arthur Thor}]
+
+\startletter
+\input knuth\par
+\stopletter
 
 \stop
 
 \section{Signature}\index{signature}
 
-You know now ho to set the letter text, the opening and closing lines, the values for the addressee and the sender and also how define your own values for the reference line.
+You know now how to set the letter text, the opening and closing lines, the values for the addressee and the sender and also how define your own values for the reference line.
 
-Most of the things need for a letter are already told but a few fields at the end of the letter remains untold, the first line you will add to our example letter is the signature. It is set with the {\em signature} in se same way as the other values in the former examples. What the author did in the left example was:
+Most of the things needed for a letter are already told but a few fields at the end of the letter remain untold. The first line you want to add to our example letter is the signature. It is set with the {\em signature} in the same way as the other values in the former examples. What the author did in the left example was:
 
 \starttyping
 \setupletter
   [signature={Arthur Thor}]
 \stoptyping
 
-There is some space between the closing and the signature to give you the possibility to sign the letter also by hand after you have printed the letter.
+There is some space between the closing and the signature to give you the possibility to sign the letter after having printed it out.
 
-You're not limited to simple text for the signature, it is also possible to use a graphic if you won't sign the letter by hand after you printed it, such a solution would have been for the author the next code.
+You’re not limited to simple text for the signature. It is also possible to use a graphic if you won’t sign the letter by hand after you printed it. This solution is used in the following code.
 
 \starttyping
 \setupletter
   [signature={\externalfigure[autograph][height=2\lineheight]}]
 \stoptyping
 
-How to adjust the space between the closing line and the signature for this way will be shown in the letter style section.
+How to adjust the space between the closing line and the signature for this way is shown in the letter style section.
 
 \start
 
@@ -332,7 +352,7 @@ How to adjust the space between the closing line and the signature for this way
 
 ...
 
-\ps{...}
+\ps{Postscript}
 
 \stopletter
 \stoptyping
@@ -378,8 +398,8 @@ How to adjust the space between the closing line and the signature for this way
 
 ...
 
-\ps{...}
-\encl{...}
+\ps{Postscript}
+\encl{Appendices}
 
 \stopletter
 \stoptyping
@@ -427,9 +447,9 @@ How to adjust the space between the closing line and the signature for this way
 
 ...
 
-\ps{...}
-\encl{...}
-\cc{...}
+\ps{Postscript}
+\encl{Appendices}
+\cc{List of recipients}
 
 \stopletter
 \stoptyping
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-examples.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-examples.tex
index 39cf98d07c0..e0bb15d0e0b 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-examples.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-examples.tex
@@ -82,7 +82,7 @@ This section will give you a overview of all included styles you could use with
 
 \section[letter:example:dinb]{DIN 676 B}\index{DIN 676 B}
 
-The letter style \filename{dinb} is the defualt style for the module and is used if nothing else is specified by the user.
+The letter style \filename{dinb} is the default style for the module and is used if nothing else is specified by the user.
 
 \placefigure
   [force,none]
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 5e539875ccd..96567e9cfad 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
@@ -6,19 +6,19 @@
 
 The letter module provides a special type of files, called extensions.
 They provide functions that could be used by different files like the
-labels for each language (\filename{label.nle}) or extra features for
-one purpose like the page optimation (\filename{optimize.nle}).
+labels for each language (\filename{label.nle}) or extra features
+like page optimization (\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
+their names as arguments to the \type{extension} key or afterwards in
 your file with the \type{\useletterextension} command.
 
 \setup[useletterextension]
 
-The module comes itself with the following extensions:
+The module itself comes with the following extensions:
 
 \starttabulate[|Bl|p|]
-\NC label    \NC Labeltexts for different languages           \NC\NR
+\NC label    \NC Label texts 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
                  paragraphs to fill a page with at least 25\%
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex
index e71a1a3d807..a59efb44731 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-layout.tex
@@ -4,11 +4,11 @@
 
 \chapter{Layout}
 
-The components for the letter can be divided in to groups, the first are letter layers, you can position them on the page wherever you want and it is also possible to put one layer bevor or behind another layer.
+The components for the layout of a letter can be divided into {\em letter layers} and {\em letter sections}. You can position letter layers on the page wherever you want and it is also possible to put one layer in front of or behind another layer.
 
-The underliying machanism behind letter layers are \CONTEXT's normal layer mechanism in combination with localframed environments, this is a very powerful combination and you could create complicated layouts with them.
+The underlying mechanism behind letter layers is \CONTEXT’s normal layer mechanism in combination with local framed environments. This is a very powerful combination and you can create complicated layouts with them.
 
-The second group of components for the layout are letter sections, they are not as powerfule as letter layers and you have only a limited number of elements to control their layout.
+Letter sections, the second group of components, are not as powerful as letter layers and you only have a limited number of elements to control their layout.
 
 \setup[setupletterstyle:layout]
 
@@ -42,9 +42,9 @@ The second group of components for the layout are letter sections, they are not
 
 \section{Letter layers}
 
-Layer are used to position elements one page independant of the page layout.
+Layers are used to position elements on a page independent of the page layout.
 They are used for the header and footer, address block\footnote{The block styles
-use a different structure and use a letter section for the address block.} etc.
+use a different structure and use a letter section for the address block.}, etc..
 
 The complete list of all available layers is:
 
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex
index 5e5f8e58409..5f6e5141553 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-reference.tex
@@ -36,7 +36,7 @@
 
 \chapter{Reference line}
 
-The reference lines is used to show information like the date and other information.
+The reference line is used to show information like the date and other information.
 
 A few styles are predefined and you can select them with:
 
@@ -107,8 +107,8 @@ on the bottom line.
 
 \stop
 
-You could also show more elements in the reference line when you write them
-as argument the list key.
+You can also show more elements in the reference line by writing them as arguments
+to the list key.
 
 \starttyping
 \setupletterstyle
@@ -118,7 +118,7 @@ as argument the list key.
 
 The values are shown in the given order and spread across the line like below.
 To get this effect you need a list with at least two elements, otherwise it
-is moved to the right side lie you can see in the first example.
+is moved to the right side as you can see in the first example.
 
 \start
 
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-values.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-values.tex
index 73a2a40fd50..aa04ff6b7e9 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-values.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-values.tex
@@ -7,7 +7,7 @@
 \section{Values}
 
 When you write a letter you have to set some values for the reference line like the date
-and other ones like the name and address of the addressee for the address block, these can
+and other ones like the name and address of the addressee for the address block. This can
 be done with the two commands \type{\setlettervalue} and \type{\setupletter}.
 
 \setup[setlettervalue]\flushatnextpar{\index{\tex{setlettervalue}}}
@@ -15,18 +15,18 @@ be done with the two commands \type{\setlettervalue} and \type{\setupletter}.
 \setup[setupletter:value]\flushatnextpar{\index{\tex{setupletter}}}
 
 The first command \type{\setlettervalue} takes two commands like \type{\setvalue} or
-\type{\setvariable} and could be used like:
+\type{\setvariable}.
 
 \starttyping
 \setlettervalue{firstname} {Mike}
 \setlettervalue{familyname}{Johnson}
 \stoptyping
 
-There is also a optional argument between the name and the content of the value
+There is also an optional argument between the name and the content of the value,
 which is explained in the next section.
 
-With the second command \type{\setupletter} you can set multiple values separated
-by commas, it's similar to \type{\setvariables}, the above setting will look then:
+Using the second command \type{\setupletter} you can set multiple values separated
+by commas. It’s similar to \type{\setvariables}. The previous example will look like:
 
 \starttyping
 \setupletter
@@ -35,7 +35,7 @@ by commas, it's similar to \type{\setvariables}, the above setting will look the
 \stoptyping
 
 As you can seen in the following command overview for \type{\setupletter} the command has
-two arguments while we used in the last example only one, the two argument form is used
+two arguments while we only used one in the last example. The two argument form is used
 to change the layout for the values in the reference (and others) line like:
 
 \starttyping
@@ -45,7 +45,7 @@ to change the layout for the values in the reference (and others) line like:
    titlecolor=gray]
 \stoptyping
 
-The complete list of argument are:
+The complete list of arguments is:
 
 \setup[setupletter:setup]\flushatnextpar{\index{\tex{setupletter}}}
 
@@ -58,12 +58,12 @@ The complete list of argument are:
 
 \section{Labels}
 
-When you take a look at the examples in the reference section you can see all of them
-have a label above or on the left or the content but this did only happen because the
+When you take a look at the reference section of the examples you can see all of them
+having a label above or on the left or the content. But this did only happen because the
 module provides preset texts for them.
 
-When you try to use a non defined label like e.g. {\em skype} you the content of the value
-as seen below but no label above.
+Trying to use a nondefined label like e.g. {\em skype} you will see the content of the value
+as below but no label above.
 
 The following code
 
@@ -89,23 +89,23 @@ result in this reference line:
 
 \stop
 
-The module use ConTeXt’s labeltext mechanism to define text for various languages
+The module uses \ConTeXt’s label text mechanism to define text for various languages
 which can be found in the file \filename{default.nle}. To define your own text use
-the \type{\setuplabeltext} command, to prevent problems with other macros the names
+the \type{\setuplabeltext} command. To prevent problems with other macros the names
 of the labels are prefixed with {\em letter:}.\footnote{The {\em memo} style makes
-a exception to this concept and use {\em memo:} as prefix for the label names.}
+an exception to this concept and uses {\em memo:} as prefix for the label names.}
 
 \setup[setuplabeltext]\flushatnextpar{\index{\tex{setuplabeltext}}}
 
-To add now a label for our currently used {\em skype} value put the following
-line in your document and change the language tag to the mainlanguage you use
+To add a label for our currently used {\em skype} value put the following
+line in your document and change the language tag to the main language you use
 in your document.
 
 \starttyping
 \setuplabeltext[en][letter:skype=Skype]
 \stoptyping
 
-The reference looks now like:
+The reference line now looks like:
 
 \start
 
@@ -124,7 +124,7 @@ The reference looks now like:
 
 When you use \type{\setlettervalue} to set the content of the values the optional
 argument can be used instead of \type{\setuplabeltext} to define a text for the label
-in the current mainlanguage, a empty argument results in a empty labeltext.
+in the current main language. An empty argument results in an empty label text.
 
 The two step setting for the value {\em skype} can the be done with this setting.
 
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 05e999bb1f9..2ab3835f4ea 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=2010.04.04,
+%D        version=2010.08.27,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
@@ -28,7 +28,7 @@
   \setinterfacemessage{correspondence}{2}    {-- -- -- not found}
   \setinterfacemessage{correspondence}{3}    {correspage set -- processed (size --)}
   \setinterfacemessage{correspondence}{4}    {--: --}
-  \setinterfacemessage{correspondence}{5}    {your context is too old, you use you need at last version '--'} % not used in mkii
+  \setinterfacemessage{correspondence}{5}    {your context is too old, you need at last version '--'} % not used in mkii
 \stopinterface
 
 %D Page numbering
@@ -151,7 +151,7 @@
    \getparameters[#2#3\v!layer][#4]}
 
 \def\dosetupcorrespondencelayerframe[#1][#2][#3][#4]%
-  {\setuplocalframed[#2#3\v!frame][#4]}
+  {\getparameters[#2#3\v!frame][#4]}
 
 \def\dosetupcorrespondencelayeroption[#1][#2][#3][#4]%
   {\getparameters[#2#3][#4]}
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 d805c566b5e..500deb86c96 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=2010.04.04,
+%D        version=2010.08.27,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
@@ -28,7 +28,7 @@
   \setinterfacemessage{correspondence}{2}    {-- -- -- not found}
   \setinterfacemessage{correspondence}{3}    {correspage set -- processed (size --)}
   \setinterfacemessage{correspondence}{4}    {--: --}
-  \setinterfacemessage{correspondence}{5}    {your context is too old, you use you need at last version '--'}
+  \setinterfacemessage{correspondence}{5}    {your context is too old, you need at last version '--'}
 \stopinterface
 
 %D Module setup
@@ -161,7 +161,7 @@
    \getparameters[#2#3\v!layer][#4]}
 
 \def\dosetupcorrespondencelayerframe[#1][#2][#3][#4]%
-  {\setuplocalframed[#2#3\v!frame][#4]}
+  {\getparameters[#2#3\v!frame][#4]}
 
 \def\dosetupcorrespondencelayeroption[#1][#2][#3][#4]%
   {\getcheckedparameters[#1\v!layer\v!option:#3][#2#3][#4]}
@@ -504,14 +504,14 @@ correspondence.files = {
         name        = "t-correspondence.tex",
         path        = "tex/context/third/letter/base/",
         type        = "base",
-        version     = "2010.06.23",
+        version     = "2010.08.27",
         description = "Core module"
     } ,
     {
         name        = "t-letter.tex",
         path        = "tex/context/third/letter/base/",
         type        = "base",
-        version     = "2009.10.10",
+        version     = "2010.08.27",
         description = "Letter Module"
 
     } ,
@@ -555,7 +555,7 @@ correspondence.files = {
         name        = "moderncv.nri",
         path        = "tex/context/third/letter/interface/",
         type        = "interface",
-        version     = "2009.09.20",
+        version     = "2010.08.21",
         description = "moderncv resume interface"
     } ,
     {
@@ -723,14 +723,14 @@ correspondence.files = {
         name        = "classic.nrs",
         path        = "tex/context/third/letter/style/",
         type        = "style",
-        version     = "2010.03.02",
+        version     = "2010.08.11",
         description = "modercv classic style"
     } ,
     {
         name        = "casual.nrs",
         path        = "tex/context/third/letter/style/",
         type        = "style",
-        version     = "2010.03.02",
+        version     = "2010.08.11",
         description = "modercv casual style"
     } ,
     {
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 a8036179235..c3a830cbdf2 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=2010.04.04,
+%D        version=2010.08.27,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Correspondence,
 %D         author=Wolfgang Schuster,
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 34cad56378f..0ce207e77bc 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=2009.10.10,
+%D        version=2010.08.27,
 %D          title=\CONTEXT\ User Module,
 %D       subtitle=Framework for Letters,
 %D         author=Wolfgang Schuster,
@@ -59,6 +59,13 @@
 
 \definecorrespondencesetup[\v!letter\v!style][\v!letter][\????ls]
 
+\def\setupletterlayout     [#1]{\setupletterstyle[#1]}
+\def\setupletterlayer      [#1]{\setupletterstyle[#1]}
+\def\setupletterframe      [#1]{\setupletterstyle[#1]}
+\def\setuplettersection    [#1]{\setupletterstyle[#1][\v!layer]}
+\def\setupletterdescription[#1]{\setupletterstyle[#1][\v!frame]}
+\def\setupletteroptions    [#1]{\setupletterstyle[#1]}
+
 %D \macros
 %D   {setupletter}
 
diff --git a/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri b/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
index f58e886cca5..5d8df614888 100644
--- a/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
+++ b/Master/texmf-dist/tex/context/third/letter/interface/moderncv.nri
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=moderncv,
-%D        version=2009.09.20,
+%D        version=2010.08.21,
 %D          title=\CONTEXT\ Resume Interface,
 %D       subtitle=moderncv Interface,
 %D         author=Wolfgang Schuster,
@@ -66,17 +66,22 @@
 
 \def\ModerncvSectionCommand#1#2%
   {\hbox to \hsize
-     {\blackrule[\c!width=\measure{hintscolumnwidth},\c!height=1ex,\c!depth=-.5ex,\c!color=resume:6]%
-      \hskip\measure{separatorcolumnwidth}%
+     {\hskip\dimexpr\measure{hintscolumnwidth}+\measure{separatorcolumnwidth}\relax
       \vtop{\hsize\measure{maincolumnwidth}#2}}}
 
+\def\ModerncvSectionTextcommand
+  {\llap
+     {\blackrule[\c!width=\measure{hintscolumnwidth},\c!height=1ex,\c!depth=-.5ex,\c!color=resume:6]%
+      \hskip\measure{separatorcolumnwidth}}}
+
 \setuphead
   [\v!section]
   [\c!color=resume:7,
    \c!incrementnumber=\v!no,
    \c!before={\blank[2*\v!medium]},
    \c!after={\blank[\v!medium]},
-   \c!command=\ModerncvSectionCommand]
+   \c!command=\ModerncvSectionCommand,
+   \c!deeptextcommand=\ModerncvSectionTextcommand]
 
 \def\ModerncvSubsectionCommand#1#2%
   {\hbox to \hsize
@@ -104,14 +109,19 @@
    \egroup
    \doifelsenothing{#1}{\blank[.25em]}{\blank[#1]}}
 
-\def\cvdoubleitem#1#2#3#4%
-  {\cvline{#1}
+\def\cvdoubleitem
+  {\dosingleempty\docvdoubleitem}
+
+\def\docvdoubleitem[#1]#2#3#4#5%
+  {\cvline
+     [#1]
+     {#2}
      {\hbox\bgroup
-        \vtop{\hsize\measure{doubleitemmaincolumnwidth}#2}%
+        \vtop{\hsize\measure{doubleitemmaincolumnwidth}#3}%
         \hfill
-        \vtop{\hsize\measure{hintscolumnwidth}\raggedleft#3}%
+        \vtop{\hsize\measure{hintscolumnwidth}\raggedleft#4}%
         \hskip\measure{separatorcolumnwidth}%
-        \vtop{\hsize\measure{doubleitemmaincolumnwidth}#4}%
+        \vtop{\hsize\measure{doubleitemmaincolumnwidth}#5}%
       \egroup}}
 
 \def\cvlistitem
@@ -131,25 +141,38 @@
         \doifsomething{#3}{\doifelsenothing{#1}{--}{#1}~\vtop{\hsize\measure{listdoubleitemmaincolumnwidth}#3}}%
       \egroup}}
 
-\def\cventry#1#2#3#4#5#6%
-  {\cvline{#1}
-     {{\bf#2}%
-      \doifsomething{#3}{, {\it#3}}%
-      \doifsomething{#4}{, {#4}}%
+\def\cventry
+  {\dosingleempty\docventry}
+
+\def\docventry[#1]#2#3#4#5#6#7%
+  {\cvline
+     [#1]
+     {#2}
+     {{\bf#3}%
+      \doifsomething{#4}{, {\it#4}}%
       \doifsomething{#5}{, {#5}}%
+      \doifsomething{#6}{, {#6}}%
       .%
-      \doifsomething{#6}{\crlf\tx#6}}}
+      \doifsomething{#7}{\crlf\tx#7}}}
 
-\def\cvlanguage#1#2#3%
-  {\cvline{#1}
+\def\cvlanguage
+  {\dosingleempty\docvlanguage}
+
+\def\docvlanguage[#1]#2#3#4%
+  {\cvline
+     [#1]
+     {#2}
      {\hbox\bgroup
-        \vtop{\hsize\dimexpr.225\measure{maincolumnwidth}\relax\bf#2}%
+        \vtop{\hsize\dimexpr.225\measure{maincolumnwidth}\relax\bf#3}%
         \hfill
-        \vtop{\hsize\dimexpr.725\measure{maincolumnwidth}\relax\raggedleft\itx#3}%
+        \vtop{\hsize\dimexpr.725\measure{maincolumnwidth}\relax\raggedleft\itx#4}%
       \egroup}}
 
-\def\cvcomputer#1#2#3#4%
-  {\cvdoubleitem{#1}{\tx#2}{#3}{\tx#4}}
+\def\cvcomputer
+  {\dosingleempty\docvcomputer}
+
+\def\docvcomputer[#1]#2#3#4#5%
+  {\cvdoubleitem[#1]{#2}{\tx#3}{#4}{\tx#5}}
 
 %D Page optimation, change the topspace to produce a distance of 2.5em
 %D between the bottom of the header and the first line of text.
diff --git a/Master/texmf-dist/tex/context/third/letter/style/casual.nrs b/Master/texmf-dist/tex/context/third/letter/style/casual.nrs
index a0185265f17..7991188e168 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/casual.nrs
+++ b/Master/texmf-dist/tex/context/third/letter/style/casual.nrs
@@ -1,6 +1,6 @@
 %D \module
 %D   [       file=casual,
-%D        version=2009.03.31,
+%D        version=2010.08.11,
 %D          title=\CONTEXT\ Resume Style,
 %D       subtitle=Casual Style,
 %D         author=Wolfgang Schuster,
@@ -11,10 +11,6 @@
 
 \unprotect
 
-%D I take the layout from the default style.
-
-\useresumestyle[modern]
-
 %D You can select between different color styles for the elements.
 
 %D Colors (moderncv name)
@@ -135,7 +131,7 @@
    \blackrule[\c!height=2\linewidth,\c!width=\hsize,\c!color=resume:1]
    \doifresumevalue\v!quote{\blank[\v!line]\attributedresumevalue\v!quote}}
 
-% see beow for a better version
+% see below for a better version
 %
 % \setvalue{\v!resume:\v!foot:\v!casual}%
 %   {\attributedresumevalue\v!street\space -- \attributedresumevalue\v!town\par
diff --git a/Master/texmf-dist/tex/context/third/letter/style/classic.nrs b/Master/texmf-dist/tex/context/third/letter/style/classic.nrs
index c386fe1b770..4e04e39e2a4 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/classic.nrs
+++ b/Master/texmf-dist/tex/context/third/letter/style/classic.nrs
@@ -11,8 +11,6 @@
 
 \unprotect
 
-\useresumestyle[modern]
-
 %D Colors (moderncv names)
 %D
 %D \startlines