context-letter update (4jul09)

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

7 files changed, 85 insertions, 59 deletions

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 2d26ec7d613..860df76f26b 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,7 +39,7 @@
 \appendtoks\def\\{ }\to\simplifiedcommands
 
 \setupinteraction
-  [state=stop,
+  [state=start,
    title={Correspondence with ConTeXt},
    author={Wolfgang Schuster},
    color=black,
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 932c8b1d38c..1c7fed9ae7a 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
@@ -94,6 +94,17 @@ Thus, I came to the conclusion ...
 \stopletter
 \stoptyping
 
+\startframedtext[width=\textwidth,framecolor=red,align=flushleft,corner=00]
+The definition of the \type{\setuplettervalue} has changed in the module version from 2009.07.03,
+only braces are allowed to set values, brackets are optional and used to set the labeltext for
+the value in the current mainlanguage, the setup for both variants is:
+
+\starttyping
+\setlettervalue{key}{value}
+\setlettervalue{key}[labeltext]{value}
+\stoptyping
+\stopframedtext
+
 If you are more interested in a KOMA-Script like solution to set with every command only one value their is as last alternative the \type {\setlettervalue} command, it comes in two different versions where the keyword is either written in braces or in bracket but the content itself is written between braces.
 
 The first version with braces for two values has the following look.
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex
index 8a307320eee..8567fd992b7 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-letter-header.tex
@@ -4,18 +4,25 @@
 
 \startbuffer[firsthead]
 \switchtobodyfont[6pt]
-\setlettervalue[fromname]   {Max Mustermann}
-\setlettervalue[fromaddress]{Musterweg 12\\12345 Musterstadt}
-\setlettervalue[fromphone]  {1234/567890}
-\setlettervalue[fromfax]    {1234/567891}
-\setlettervalue[fromemail]  {max.mustermann@muster.com}
-\setlettervalue[fromurl]    {max.mustermann.com}
+\setlettervalue{fromname}   {Max Mustermann}
+\setlettervalue{fromaddress}{Musterweg 12\\12345 Musterstadt}
+\setlettervalue{fromphone}  {1234/567890}
+\setlettervalue{fromfax}    {1234/567891}
+\setlettervalue{fromemail}  {max.mustermann@muster.com}
+\setlettervalue{fromurl}    {max.mustermann.com}
 \stopbuffer
 
 \chapter{Header and Footer}
 
 \section{Header}
 
+\starttyping
+\setupletterstyle
+  [head]
+  [alternative=left|middle|right,
+   fromrule=top|bottom|no]
+\stoptyping
+
 \placefigure
   [fixed]
   {none}
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 9ac34484a9e..d7c8b668623 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
@@ -118,14 +118,14 @@ The position and layout of the layers can be changed with the \type {\setuplette
    closing={\blackrule[width=.33\hsize,height=4\lineheight,color=darkgray]},
    appendices={\blackrule[width=.33\hsize,height=3\lineheight,color=darkgray]}]
 
-\setlettervalue[title]     {\fakewords  {5} {10}}
-\setlettervalue[subject]   {\fakewords  {5} {10}}
-\setlettervalue[opening]   {\fakewords  {3}  {5}}
-\setlettervalue[content]   {\fakewords{100}{150}}
-\setlettervalue[closing]   {\fakewords  {2}  {4}}
-\setlettervalue[enclosure] {\fakewords  {3}  {6}}
-\setlettervalue[copy]      {\fakewords  {3}  {6}}
-\setlettervalue[postscript]{\fakewords  {3}  {6}}
+\setlettervalue{title}     {\fakewords  {5} {10}}
+\setlettervalue{subject}   {\fakewords  {5} {10}}
+\setlettervalue{opening}   {\fakewords  {3}  {5}}
+\setlettervalue{content}   {\fakewords{100}{150}}
+\setlettervalue{closing}   {\fakewords  {2}  {4}}
+\setlettervalue{enclosure} {\fakewords  {3}  {6}}
+\setlettervalue{copy}      {\fakewords  {3}  {6}}
+\setlettervalue{postscript}{\fakewords  {3}  {6}}
 
 \startletter
 \fakewords{100}{150}
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 e4072840d40..5e5f8e58409 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
@@ -508,11 +508,15 @@ The code results in the following result.
 \starttyping
 \setupletterstyle
   [reference]
-  [alternative=b]
+  [alternative=e]
 \stoptyping
 
 \start
 
+\getbuffer[reference]
+
+\setupletter[date][width=.25\hsize]
+
 \startelement
 \letterelement[reference][e]
 \stopelement
@@ -629,7 +633,7 @@ You choose in the same way as the other alternatives.
 
 \start\setuptyping[bodyfont=small]
 \starttyping
-\defineletterelement[reference][customized]%
+\defineletterelement[reference][customized]
   {\setupTABLE          [height=18mm,frame=off,offset=0pt]%
    \setupTABLE[c][1,2]  [width=50.8mm]%
    \setupTABLE[c][3,4,5][width=25.4mm]%
@@ -666,7 +670,7 @@ You choose in the same way as the other alternatives.
 \page[right]
 
 \starttyping
-\defineletterelement[reference][customized]%
+\defineletterelement[reference][customized]
   {\bTABLE[frame=off,offset=0pt,width=.25\hsize]
      \bTR
        \bTD \labeltext{letter:name}  \eTD
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex
index 9bc48ce12ea..2989e048b95 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-examples.tex
@@ -8,18 +8,18 @@
 
 \startbuffer[resume:short]
 
-\setresumevalue[image]     {\blackrule[width=25mm,height=25mm]}
-\setresumevalue[firstname] {John}
-\setresumevalue[familyname]{Doe}
-\setresumevalue[title]     {Resum\'e title (optional)}
-\setresumevalue[quote]     {Some quote (optional)}
-\setresumevalue[street]    {street and number}
-\setresumevalue[town]      {postcode city}
-\setresumevalue[mobile]    {mobile (optional)}
-\setresumevalue[phone]     {phone (optional)}
-\setresumevalue[fax]       {fax (optional)}
-\setresumevalue[email]     {email (optional)}
-\setresumevalue[info]      {additional information (optional)}
+\setresumevalue{image}     {\blackrule[width=25mm,height=25mm]}
+\setresumevalue{firstname} {John}
+\setresumevalue{familyname}{Doe}
+\setresumevalue{title}     {Resum\'e title (optional)}
+\setresumevalue{quote}     {Some quote (optional)}
+\setresumevalue{street}    {street and number}
+\setresumevalue{town}      {postcode city}
+\setresumevalue{mobile}    {mobile (optional)}
+\setresumevalue{phone}     {phone (optional)}
+\setresumevalue{fax}       {fax (optional)}
+\setresumevalue{email}     {email (optional)}
+\setresumevalue{info}      {additional information (optional)}
 
 \startresume
 
@@ -61,18 +61,18 @@
 
 \setupresumestyle[option][backgroundcolor=white,before=]
 
-\setresumevalue[image]     {\blackrule[width=25mm,height=25mm]}
-\setresumevalue[firstname] {John}
-\setresumevalue[familyname]{Doe}
-\setresumevalue[title]     {Resum\'e title (optional)}
-\setresumevalue[quote]     {Some quote (optional)}
-\setresumevalue[street]    {street and number}
-\setresumevalue[town]      {postcode city}
-\setresumevalue[mobile]    {mobile (optional)}
-\setresumevalue[phone]     {phone (optional)}
-\setresumevalue[fax]       {fax (optional)}
-\setresumevalue[email]     {email (optional)}
-\setresumevalue[info]      {additional information (optional)}
+\setresumevalue{image}     {\blackrule[width=25mm,height=25mm]}
+\setresumevalue{firstname} {John}
+\setresumevalue{familyname}{Doe}
+\setresumevalue{title}     {Resum\'e title (optional)}
+\setresumevalue{quote}     {Some quote (optional)}
+\setresumevalue{street}    {street and number}
+\setresumevalue{town}      {postcode city}
+\setresumevalue{mobile}    {mobile (optional)}
+\setresumevalue{phone}     {phone (optional)}
+\setresumevalue{fax}       {fax (optional)}
+\setresumevalue{email}     {email (optional)}
+\setresumevalue{info}      {additional information (optional)}
 
 \startresume
 
@@ -144,7 +144,8 @@
 
 \start
 
-\useresumestyle[classic]
+\useresumeinterface[moderncv]
+\useresumestyle    [classic]
 
 \getbuffer[resume:short]
 
@@ -152,7 +153,8 @@
 
 \startexamplecontent[resume:classic]
 
-\useresumestyle[classic]
+\useresumeinterface[moderncv]
+\useresumestyle    [classic]
 
 \getbuffer[resume:long]
 
@@ -174,7 +176,8 @@
 
 \start
 
-\useresumestyle[casual]
+\useresumeinterface[moderncv]
+\useresumestyle    [casual]
 
 \getbuffer[resume:short]
 
@@ -182,7 +185,8 @@
 
 \startexamplecontent[resume:casual]
 
-\useresumestyle[casual]
+\useresumeinterface[moderncv]
+\useresumestyle    [casual]
 
 \getbuffer[resume:long]
 
diff --git a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex
index 395821942bb..b195da5f530 100644
--- a/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex
+++ b/Master/texmf-dist/source/context/third/letter/doc/correspondence-resume-interface.tex
@@ -1,6 +1,6 @@
-\startcomponent lm-resume-interface
+\startcomponent correspondence-resume-interface
 
-\environment lm-environment
+\environment correspondence-environment
 
 \chapter{Interface}
 
@@ -19,11 +19,11 @@ and with the same elements and styles. The difference between the \LaTeX{} and t
 \ConTeXt-version is that you don't need a \type{\maketitle} command to place the
 header for each style and it is placed by default.
 
-\startframedtext[width=\textwidth,framecolor=red,align=middle,corner=00]
-The current implementation of the moderncv interface is written as resume style and
-not as interface, this means you load it with \type{\useresumestyle} or as argument
-for \type{\usemodule} with the style key.
-\stopframedtext
+%\startframedtext[width=\textwidth,framecolor=red,align=middle,corner=00]
+%The current implementation of the moderncv interface is written as resume style and
+%not as interface, this means you load it with \type{\useresumestyle} or as argument
+%for \type{\usemodule} with the style key.
+%\stopframedtext
 
 The available elements for the interface are described below.
 
@@ -53,7 +53,7 @@ results in
 
 \start
 
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
 
 \startelement
 \cvline{supervisors}{Supervisors}
@@ -88,7 +88,7 @@ result in the following output
 
 \start
 
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
 
 \startelement
 \cvlistitem{Item 1}
@@ -123,7 +123,7 @@ You can see this in the output from the example above.
 
 \start
 
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
 
 \startelement
 \cvlistdoubleitem[$\circ$]{Item 1}{Item 3}
@@ -158,7 +158,7 @@ This results in the time period in the left margin and the information in the te
 
 \start
 
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
 
 \startelement
 \cventry{year--year}{Degree}{Institution}{City}{\it Grade}{Description}
@@ -191,7 +191,7 @@ results in:
 
 \start
 
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
 
 \startelement
 \cvlanguage{language 1}{Skill level}{Comment}
@@ -225,7 +225,7 @@ This produce the following output.
 
 \start
 
-\useresumestyle[modern]
+\useresumeinterface[moderncv]
 
 \startelement
 \cvcomputer{category 1}{XXX, YYY, ZZZ}{category 3}{XXX, YYY, ZZZ}