summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-07-29 17:04:29 +0000
committerKarl Berry <karl@freefriends.org>2012-07-29 17:04:29 +0000
commit0b5536b5784d88c5802337d39bc12585aba6cfd8 (patch)
tree76eb78a571f54027a46bcc56de2e6f571adaa056 /Master/texmf-dist
parent5fb40700513ffc68f292daa91d2deabb2fa29f2d (diff)
context-letter (21jun12)
git-svn-id: svn://tug.org/texlive/trunk@27229 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii60
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi67
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii370
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi379
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii115
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi112
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii4
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv4
10 files changed, 575 insertions, 544 deletions
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii
index a30f8195ccc..9a2874c8f81 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=s-cor-00,
-%D version=2012.02.19,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -50,12 +50,31 @@
\setinterfaceconstant {fromurl} {fromurl}
\setinterfaceconstant {salutation} {salutation}
\setinterfaceconstant {language} {language}
+ \setinterfaceconstant {street} {street}
+ \setinterfaceconstant {city} {city}
+ \setinterfaceconstant {phone} {phone}
+ \setinterfaceconstant {email} {email}
+ \setinterfaceconstant {bankname} {bankname}
+ \setinterfaceconstant {banknumber} {banknumber}
+ \setinterfaceconstant {accountnumber} {accountnumber}
+ \setinterfaceconstant {room} {room}
+ \setinterfaceconstant {yourref} {yourref}
+ \setinterfaceconstant {yourmail} {yourmail}
+ \setinterfaceconstant {myref} {myref}
+ \setinterfaceconstant {mymail} {mymail}
+ \setinterfaceconstant {customer} {customer}
+ \setinterfaceconstant {invoice} {invoice}
+ \setinterfaceconstant {fax} {fax}
+ \setinterfaceconstant {url} {url}
+ \setinterfaceconstant {bank} {bank}
+ \setinterfaceconstant {organization} {organization}
+ \setinterfaceconstant {zip} {zip}
+ \setinterfaceconstant {country} {country}
\stopinterface
\startinterface all
+ % all
\setinterfacevariable {correspondence} {correspondence}
- \setinterfacevariable {letter} {letter}
- \setinterfacevariable {memo} {memo}
\setinterfacevariable {nexthead} {nexthead}
\setinterfacevariable {lefthead} {lefthead}
\setinterfacevariable {righthead} {righthead}
@@ -63,16 +82,18 @@
\setinterfacevariable {nextfoot} {nextfoot}
\setinterfacevariable {leftfoot} {leftfoot}
\setinterfacevariable {rightfoot} {rightfoot}
- \setinterfacevariable {address} {address}
- \setinterfacevariable {backaddress} {backaddress}
- \setinterfacevariable {location} {location}
\setinterfacevariable {topmark} {topmark}
\setinterfacevariable {botmark} {botmark}
\setinterfacevariable {cutmark} {cutmark}
\setinterfacevariable {endmark} {endmark}
\setinterfacevariable {usermark} {usermark}
+ % letter
\setinterfacevariable {lettermain} {lettermain}
\setinterfacevariable {letternext} {letternext}
+ \setinterfacevariable {letter} {letter}
+ \setinterfacevariable {address} {address}
+ \setinterfacevariable {backaddress} {backaddress}
+ \setinterfacevariable {location} {location}
\setinterfacevariable {opening} {opening}
\setinterfacevariable {closing} {closing}
\setinterfacevariable {secondpage} {secondpage}
@@ -80,30 +101,7 @@
\setinterfacevariable {enclosure} {enclosure}
\setinterfacevariable {french} {french}
\setinterfacevariable {specialnotation} {specialnotation}
- \setinterfacevariable {memomain} {memomain}
- \setinterfacevariable {memonext} {memonext}
\setinterfacevariable {e} {e}
- \setinterfacevariable {attention} {attention}
- \setinterfacevariable {room} {room}
- \setinterfacevariable {yourref} {yourref}
- \setinterfacevariable {yourmail} {yourmail}
- \setinterfacevariable {myref} {myref}
- \setinterfacevariable {mymail} {mymail}
- \setinterfacevariable {customer} {customer}
- \setinterfacevariable {invoice} {invoice}
- \setinterfacevariable {to} {to}
- \setinterfacevariable {toname} {toname}
- \setinterfacevariable {from} {from}
- \setinterfacevariable {fromname} {fromname}
- \setinterfacevariable {phone} {phone}
- \setinterfacevariable {fax} {fax}
- \setinterfacevariable {email} {email}
- \setinterfacevariable {bank} {bank}
- \setinterfacevariable {organization} {organization}
- \setinterfacevariable {city} {city}
- \setinterfacevariable {zip} {zip}
- \setinterfacevariable {country} {country}
- \setinterfacevariable {street} {street}
\setinterfacevariable {place} {place}
\setinterfacevariable {gbrief} {gbrief}
\setinterfacevariable {fullblock} {fullblock}
@@ -112,6 +110,10 @@
\setinterfacevariable {modified} {modified}
\setinterfacevariable {blockstyle} {blockstyle}
\setinterfacevariable {knuth} {knuth}
+ % memo
+ \setinterfacevariable {memo} {memo}
+ \setinterfacevariable {memomain} {memomain}
+ \setinterfacevariable {memonext} {memonext}
\stopinterface
% Messages
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi
index c643cee0f8c..d3506bf7eef 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi
@@ -1,6 +1,6 @@
%D \module
%D [ file=s-cor-00,
-%D version=2012.05.30,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -60,6 +60,26 @@
\setinterfaceconstant {datecolor} {datecolor}
\setinterfaceconstant {subtitlestyle} {subtitlestyle}
\setinterfaceconstant {subtitlecolor} {subtitlecolor}
+ \setinterfaceconstant {street} {street}
+ \setinterfaceconstant {city} {city}
+ \setinterfaceconstant {phone} {phone}
+ \setinterfaceconstant {email} {email}
+ \setinterfaceconstant {bankname} {bankname}
+ \setinterfaceconstant {banknumber} {banknumber}
+ \setinterfaceconstant {accountnumber} {accountnumber}
+ \setinterfaceconstant {room} {room}
+ \setinterfaceconstant {yourref} {yourref}
+ \setinterfaceconstant {yourmail} {yourmail}
+ \setinterfaceconstant {myref} {myref}
+ \setinterfaceconstant {mymail} {mymail}
+ \setinterfaceconstant {customer} {customer}
+ \setinterfaceconstant {invoice} {invoice}
+ \setinterfaceconstant {fax} {fax}
+ \setinterfaceconstant {url} {url}
+ \setinterfaceconstant {bank} {bank}
+ \setinterfaceconstant {organization} {organization}
+ \setinterfaceconstant {zip} {zip}
+ \setinterfaceconstant {country} {country}
\stopinterface
\startinterface all
@@ -72,6 +92,11 @@
\setinterfacevariable {nextfoot} {nextfoot}
\setinterfacevariable {leftfoot} {leftfoot}
\setinterfacevariable {rightfoot} {rightfoot}
+ \setinterfacevariable {topmark} {topmark}
+ \setinterfacevariable {botmark} {botmark}
+ \setinterfacevariable {cutmark} {cutmark}
+ \setinterfacevariable {endmark} {endmark}
+ \setinterfacevariable {usermark} {usermark}
% letter
\setinterfacevariable {letter} {letter}
\setinterfacevariable {lettermain} {lettermain}
@@ -79,11 +104,6 @@
\setinterfacevariable {address} {address}
\setinterfacevariable {backaddress} {backaddress}
\setinterfacevariable {location} {location}
- \setinterfacevariable {topmark} {topmark}
- \setinterfacevariable {botmark} {botmark}
- \setinterfacevariable {cutmark} {cutmark}
- \setinterfacevariable {endmark} {endmark}
- \setinterfacevariable {usermark} {usermark}
\setinterfacevariable {opening} {opening}
\setinterfacevariable {closing} {closing}
\setinterfacevariable {secondpage} {secondpage}
@@ -92,27 +112,6 @@
\setinterfacevariable {french} {french}
\setinterfacevariable {specialnotation} {specialnotation}
\setinterfacevariable {e} {e}
- \setinterfacevariable {attention} {attention}
- \setinterfacevariable {room} {room}
- \setinterfacevariable {yourref} {yourref}
- \setinterfacevariable {yourmail} {yourmail}
- \setinterfacevariable {myref} {myref}
- \setinterfacevariable {mymail} {mymail}
- \setinterfacevariable {customer} {customer}
- \setinterfacevariable {invoice} {invoice}
- \setinterfacevariable {to} {to}
- \setinterfacevariable {toname} {toname}
- \setinterfacevariable {from} {from}
- \setinterfacevariable {fromname} {fromname}
- \setinterfacevariable {phone} {phone}
- \setinterfacevariable {fax} {fax}
- \setinterfacevariable {email} {email}
- \setinterfacevariable {bank} {bank}
- \setinterfacevariable {organization} {organization}
- \setinterfacevariable {city} {city}
- \setinterfacevariable {zip} {zip}
- \setinterfacevariable {country} {country}
- \setinterfacevariable {street} {street}
\setinterfacevariable {place} {place}
\setinterfacevariable {gbrief} {gbrief}
\setinterfacevariable {fullblock} {fullblock}
@@ -125,8 +124,6 @@
\setinterfacevariable {memo} {memo}
\setinterfacevariable {memomain} {memomain}
\setinterfacevariable {memonext} {memonext}
- \setinterfacevariable {casual} {casual}
- \setinterfacevariable {classic} {classic}
% resume
\setinterfacevariable {resume} {resume}
\setinterfacevariable {resumemain} {resumemain}
@@ -533,6 +530,18 @@
\setvalue{\????correspondencedescriptionformat\v!none}%
{\m_correspondence_description_items}
+%\def\correspondence_description_item#text%
+% {\begingroup
+% \setbox\scratchbox\hbox
+% {\usecorrespondencedescriptionstyleandcolor\c!symbolstyle\c!symbolcolor
+% \symbol{\correspondencedescriptionparameter\c!symbol}}%
+% \assignwidth
+% {\correspondencedescriptionparameter\c!symbolwidth}
+% {\scratchdimen}
+% {\unhcopy\scratchbox}
+% {\correspondencedescriptionparameter\c!symboldistance}%
+% \endgroup}
+
\setupcorrespondencedescription
[ \c!width=\v!fit,
\c!distance=1em,
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii
index f0ab1593f61..6e3652ac1e5 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=s-cor-01,
-%D version=2012.05.25,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Letters,
%D author=Wolfgang Schuster,
@@ -196,7 +196,7 @@
{\correspondenceparameter\c!toname \\
\correspondenceparameter\c!date \\
\correspondenceparameter\c!reference \\
- \lettertext\v!page\subpagenumber}}}
+ \lettertext\c!page\subpagenumber}}}
\defineletterelement[\v!layer][\v!nexthead][\v!semiblock]
{\maxaligned
@@ -214,7 +214,7 @@
{\maxaligned
{\rlap{\correspondenceparameter\c!toname}%
\midaligned{\currentdate}%
- \llap{\lettertext\v!page\subpagenumber}}}
+ \llap{\lettertext\c!page\subpagenumber}}}
\defineletterelement[\v!layer][\v!nexthead][\v!setups]
{\directsetup{\v!letter:\v!layer:\v!nexthead}}
@@ -234,10 +234,10 @@
\defineletterelement[\v!layer][\v!foot][\v!gbrief]
{\bTABLE[\c!frame=\v!off,\c!width=.25\hsize,\c!offset=\zeropoint]
\bTR[\c!style=\bfxx,\c!topframe=\v!on]
- \bTD \lettertext\v!address \eTD
- \bTD \lettertext\v!phone \eTD
- \bTD \lettertext\v!email \eTD
- \bTD \lettertext\v!bank \eTD
+ \bTD \lettertext\c!address \eTD
+ \bTD \lettertext\c!phone \eTD
+ \bTD \lettertext\c!email \eTD
+ \bTD \lettertext\c!bank \eTD
\eTR
\bTR
\bTD \correspondenceparameter\c!street \\\correspondenceparameter\c!city \eTD
@@ -512,7 +512,7 @@
{\def\\{\correspondencesectionparameter\c!separator}%
\doifsomethingelse{\correspondenceparameter\c!title}
{\correspondenceparameter\c!title}
- {\lettertext\v!attention\correspondenceparameter\c!attention}}
+ {\lettertext\c!attention\correspondenceparameter\c!attention}}
\defineletterelement[\v!section][\v!title][\v!setups]
{\directsetup{\v!letter:\v!section:\v!title}}
@@ -521,7 +521,7 @@
\defineletterelement[\v!section][\v!subject][\s!default]
{\def\\{\correspondencesectionparameter\c!separator}%
- \lettertext\v!subject\correspondenceparameter\c!subject}
+ \lettertext\c!subject\correspondenceparameter\c!subject}
\defineletterelement[\v!section][\v!subject][\v!setups]
{\directsetup{\v!letter:\v!section:\v!subject}}
@@ -638,268 +638,270 @@
\processcommalist[#1]\dodosetuplettertext
\fi}
-\def\lettertext#1{\labeltext{\????lettertext#1}}
+\def\lettertext #1{\labeltext {\????lettertext#1}}
+\def\leftlettertext #1{\leftlabeltext {\????lettertext#1}}
+\def\rightlettertext#1{\rightlabeltext{\????lettertext#1}}
% name:
-\setuplettertext[\s!en][\v!name=Name]
-\setuplettertext[\s!nl][\v!name=]
-\setuplettertext[\s!de][\v!name=Name]
-\setuplettertext[\s!fr][\v!name=Nom]
-\setuplettertext[\s!it][\v!name=]
-\setuplettertext[\s!es][\v!name=]
+\setuplettertext[\s!en][\c!name=Name]
+\setuplettertext[\s!nl][\c!name=]
+\setuplettertext[\s!de][\c!name=Name]
+\setuplettertext[\s!fr][\c!name=Nom]
+\setuplettertext[\s!it][\c!name=]
+\setuplettertext[\s!es][\c!name=]
% room:
-\setuplettertext[\s!en][\v!room=Room]
-\setuplettertext[\s!nl][\v!room=]
-\setuplettertext[\s!de][\v!room=Zimmer]
-\setuplettertext[\s!fr][\v!room=Salle] % Salle or Pièce
-\setuplettertext[\s!it][\v!room=]
-\setuplettertext[\s!es][\v!room=]
+\setuplettertext[\s!en][\c!room=Room]
+\setuplettertext[\s!nl][\c!room=]
+\setuplettertext[\s!de][\c!room=Zimmer]
+\setuplettertext[\s!fr][\c!room=Salle] % Salle or Pièce
+\setuplettertext[\s!it][\c!room=]
+\setuplettertext[\s!es][\c!room=]
% yourref:
-\setuplettertext[\s!en][\v!yourref=Your ref.]
-\setuplettertext[\s!nl][\v!yourref=Uw kenmerk]
-\setuplettertext[\s!de][\v!yourref=Ihr Zeichen]
-\setuplettertext[\s!fr][\v!yourref=Vos r\eacute f\eacute rences]
-\setuplettertext[\s!it][\v!yourref=Vs./Rif.]
-\setuplettertext[\s!es][\v!yourref=Su ref.]
+\setuplettertext[\s!en][\c!yourref=Your ref.]
+\setuplettertext[\s!nl][\c!yourref=Uw kenmerk]
+\setuplettertext[\s!de][\c!yourref=Ihr Zeichen]
+\setuplettertext[\s!fr][\c!yourref=Vos r\eacute f\eacute rences]
+\setuplettertext[\s!it][\c!yourref=Vs./Rif.]
+\setuplettertext[\s!es][\c!yourref=Su ref.]
% yourmail:
-\setuplettertext[\s!en][\v!yourmail=Your letter of]
-\setuplettertext[\s!nl][\v!yourmail=Uw brief van]
-\setuplettertext[\s!de][\v!yourmail=Ihre Nachricht vom]
-\setuplettertext[\s!fr][\v!yourmail=Votre lettre du]
-\setuplettertext[\s!it][\v!yourmail=Vs.~lettera del]
-\setuplettertext[\s!es][\v!yourmail=Su carta de]
+\setuplettertext[\s!en][\c!yourmail=Your letter of]
+\setuplettertext[\s!nl][\c!yourmail=Uw brief van]
+\setuplettertext[\s!de][\c!yourmail=Ihre Nachricht vom]
+\setuplettertext[\s!fr][\c!yourmail=Votre lettre du]
+\setuplettertext[\s!it][\c!yourmail=Vs.~lettera del]
+\setuplettertext[\s!es][\c!yourmail=Su carta de]
% myref:
-\setuplettertext[\s!en][\v!myref=Our ref.]
-\setuplettertext[\s!nl][\v!myref=Ons kenmerk]
-\setuplettertext[\s!de][\v!myref=Unser Zeichen]
-\setuplettertext[\s!fr][\v!myref=Nos r\eacute f\eacute rences]
-\setuplettertext[\s!it][\v!myref=Ns./Rif.]
-\setuplettertext[\s!es][\v!myref=Nuestra ref.]
+\setuplettertext[\s!en][\c!myref=Our ref.]
+\setuplettertext[\s!nl][\c!myref=Ons kenmerk]
+\setuplettertext[\s!de][\c!myref=Unser Zeichen]
+\setuplettertext[\s!fr][\c!myref=Nos r\eacute f\eacute rences]
+\setuplettertext[\s!it][\c!myref=Ns./Rif.]
+\setuplettertext[\s!es][\c!myref=Nuestra ref.]
% mymail:
-\setuplettertext[\s!en][\v!mymail=Our letter of]
-\setuplettertext[\s!nl][\v!mymail=Ons brief van]
-\setuplettertext[\s!de][\v!mymail=Unsere Nachricht vom]
-\setuplettertext[\s!fr][\v!mymail=Notre lettre du]
-\setuplettertext[\s!it][\v!mymail=]
-\setuplettertext[\s!es][\v!mymail=]
+\setuplettertext[\s!en][\c!mymail=Our letter of]
+\setuplettertext[\s!nl][\c!mymail=Ons brief van]
+\setuplettertext[\s!de][\c!mymail=Unsere Nachricht vom]
+\setuplettertext[\s!fr][\c!mymail=Notre lettre du]
+\setuplettertext[\s!it][\c!mymail=]
+\setuplettertext[\s!es][\c!mymail=]
% customer:
-\setuplettertext[\s!en][\v!customer=Customer no.]
-\setuplettertext[\s!nl][\v!customer=Klant No.]
-\setuplettertext[\s!de][\v!customer=Kundennummer]
-\setuplettertext[\s!fr][\v!customer=Num\eacute ro de client]
-\setuplettertext[\s!it][\v!customer=Nr.~cliente]
-\setuplettertext[\s!es][\v!customer=No. de cliente]
+\setuplettertext[\s!en][\c!customer=Customer no.]
+\setuplettertext[\s!nl][\c!customer=Klant No.]
+\setuplettertext[\s!de][\c!customer=Kundennummer]
+\setuplettertext[\s!fr][\c!customer=Num\eacute ro de client]
+\setuplettertext[\s!it][\c!customer=Nr.~cliente]
+\setuplettertext[\s!es][\c!customer=No. de cliente]
% invoice:
-\setuplettertext[\s!en][\v!invoice=Invoice no.]
-\setuplettertext[\s!nl][\v!invoice=Rekening No.]
-\setuplettertext[\s!de][\v!invoice=Rechnungsnummer]
-\setuplettertext[\s!fr][\v!invoice=Num\eacute ro de facture]
-\setuplettertext[\s!it][\v!invoice=Nr.~fattura]
-\setuplettertext[\s!es][\v!invoice=No. de factura]
+\setuplettertext[\s!en][\c!invoice=Invoice no.]
+\setuplettertext[\s!nl][\c!invoice=Rekening No.]
+\setuplettertext[\s!de][\c!invoice=Rechnungsnummer]
+\setuplettertext[\s!fr][\c!invoice=Num\eacute ro de facture]
+\setuplettertext[\s!it][\c!invoice=Nr.~fattura]
+\setuplettertext[\s!es][\c!invoice=No. de factura]
% attention:
-\setuplettertext[\s!en][\v!attention=] % Attention
-\setuplettertext[\s!nl][\v!attention=]
-\setuplettertext[\s!de][\v!attention=]
-\setuplettertext[\s!fr][\v!attention=]
-\setuplettertext[\s!it][\v!attention=]
-\setuplettertext[\s!es][\v!attention=]
+\setuplettertext[\s!en][\c!attention=] % Attention
+\setuplettertext[\s!nl][\c!attention=]
+\setuplettertext[\s!de][\c!attention=]
+\setuplettertext[\s!fr][\c!attention=]
+\setuplettertext[\s!it][\c!attention=]
+\setuplettertext[\s!es][\c!attention=]
% subject:
-\setuplettertext[\s!en][\v!subject=] % Subject
-\setuplettertext[\s!nl][\v!subject=] % Onderwerp
-\setuplettertext[\s!de][\v!subject=] % Betrifft
-\setuplettertext[\s!fr][\v!subject=] % Concernant or Sujet
-\setuplettertext[\s!it][\v!subject=] % Oggetto
-\setuplettertext[\s!es][\v!subject=] % Asunto
+\setuplettertext[\s!en][\c!subject=] % Subject
+\setuplettertext[\s!nl][\c!subject=] % Onderwerp
+\setuplettertext[\s!de][\c!subject=] % Betrifft
+\setuplettertext[\s!fr][\c!subject=] % Concernant or Sujet
+\setuplettertext[\s!it][\c!subject=] % Oggetto
+\setuplettertext[\s!es][\c!subject=] % Asunto
% cc:
-\setuplettertext[\s!en][\v!copy=cc]
-\setuplettertext[\s!nl][\v!copy=Kopie aan]
-\setuplettertext[\s!de][\v!copy=Kopien an]
-\setuplettertext[\s!fr][\v!copy=Copie\agrave]
-\setuplettertext[\s!it][\v!copy=Per conoscenza]
-\setuplettertext[\s!es][\v!copy=Copias]
+\setuplettertext[\s!en][\c!copy=cc]
+\setuplettertext[\s!nl][\c!copy=Kopie aan]
+\setuplettertext[\s!de][\c!copy=Kopien an]
+\setuplettertext[\s!fr][\c!copy=Copie\agrave]
+\setuplettertext[\s!it][\c!copy=Per conoscenza]
+\setuplettertext[\s!es][\c!copy=Copias]
% enclosure:
-\setuplettertext[\s!en][\v!enclosure=encl]
-\setuplettertext[\s!nl][\v!enclosure=Bijlage(n)]
-\setuplettertext[\s!de][\v!enclosure=Anlagen]
-\setuplettertext[\s!fr][\v!enclosure=Annexes]
-\setuplettertext[\s!it][\v!enclosure=Allegato]
-\setuplettertext[\s!es][\v!enclosure=Adjunto]
+\setuplettertext[\s!en][\c!enclosure=encl]
+\setuplettertext[\s!nl][\c!enclosure=Bijlage(n)]
+\setuplettertext[\s!de][\c!enclosure=Anlagen]
+\setuplettertext[\s!fr][\c!enclosure=Annexes]
+\setuplettertext[\s!it][\c!enclosure=Allegato]
+\setuplettertext[\s!es][\c!enclosure=Adjunto]
% to:
-\setuplettertext[\s!en][\v!to=To]
-\setuplettertext[\s!nl][\v!to=Aan]
-\setuplettertext[\s!de][\v!to=An]
-\setuplettertext[\s!fr][\v!to=\Agrave]
-\setuplettertext[\s!it][\v!to=A]
-\setuplettertext[\s!es][\v!to=A]
+\setuplettertext[\s!en][\c!to=To]
+\setuplettertext[\s!nl][\c!to=Aan]
+\setuplettertext[\s!de][\c!to=An]
+\setuplettertext[\s!fr][\c!to=\Agrave]
+\setuplettertext[\s!it][\c!to=A]
+\setuplettertext[\s!es][\c!to=A]
% toname:
-\setuplettertext[\s!en][\v!toname=To]
-\setuplettertext[\s!nl][\v!toname=Aan]
-\setuplettertext[\s!de][\v!toname=An]
-\setuplettertext[\s!fr][\v!toname=\Agrave]
-\setuplettertext[\s!it][\v!toname=A]
-\setuplettertext[\s!es][\v!toname=A]
+\setuplettertext[\s!en][\c!toname=To]
+\setuplettertext[\s!nl][\c!toname=Aan]
+\setuplettertext[\s!de][\c!toname=An]
+\setuplettertext[\s!fr][\c!toname=\Agrave]
+\setuplettertext[\s!it][\c!toname=A]
+\setuplettertext[\s!es][\c!toname=A]
% from:
-\setuplettertext[\s!en][\v!from=From]
-\setuplettertext[\s!nl][\v!from=Van]
-\setuplettertext[\s!de][\v!from=Von]
-\setuplettertext[\s!fr][\v!from=De]
-\setuplettertext[\s!it][\v!from=Da]
-\setuplettertext[\s!es][\v!from=De]
+\setuplettertext[\s!en][\c!from=From]
+\setuplettertext[\s!nl][\c!from=Van]
+\setuplettertext[\s!de][\c!from=Von]
+\setuplettertext[\s!fr][\c!from=De]
+\setuplettertext[\s!it][\c!from=Da]
+\setuplettertext[\s!es][\c!from=De]
% fromname:
-\setuplettertext[\s!en][\v!fromname=From]
-\setuplettertext[\s!nl][\v!fromname=Van]
-\setuplettertext[\s!de][\v!fromname=Von]
-\setuplettertext[\s!fr][\v!fromname=De]
-\setuplettertext[\s!it][\v!fromname=Da]
-\setuplettertext[\s!es][\v!fromname=De]
+\setuplettertext[\s!en][\c!fromname=From]
+\setuplettertext[\s!nl][\c!fromname=Van]
+\setuplettertext[\s!de][\c!fromname=Von]
+\setuplettertext[\s!fr][\c!fromname=De]
+\setuplettertext[\s!it][\c!fromname=Da]
+\setuplettertext[\s!es][\c!fromname=De]
% date:
-\setuplettertext[\s!en][\v!date=Date]
-\setuplettertext[\s!nl][\v!date=Datum]
-\setuplettertext[\s!de][\v!date=Datum]
-\setuplettertext[\s!fr][\v!date=Date]
-\setuplettertext[\s!it][\v!date=Data]
-\setuplettertext[\s!es][\v!date=Fecha]
+\setuplettertext[\s!en][\c!date=Date]
+\setuplettertext[\s!nl][\c!date=Datum]
+\setuplettertext[\s!de][\c!date=Datum]
+\setuplettertext[\s!fr][\c!date=Date]
+\setuplettertext[\s!it][\c!date=Data]
+\setuplettertext[\s!es][\c!date=Fecha]
% phone:
-\setuplettertext[\s!en][\v!phone=Phone]
-\setuplettertext[\s!nl][\v!phone=Telefoon]
-\setuplettertext[\s!de][\v!phone=Telefon]
-\setuplettertext[\s!fr][\v!phone=T\eacute l\eacute phone]
-\setuplettertext[\s!it][\v!phone=Telefono]
-\setuplettertext[\s!es][\v!phone=Tel\eacute fono]
+\setuplettertext[\s!en][\c!phone=Phone]
+\setuplettertext[\s!nl][\c!phone=Telefoon]
+\setuplettertext[\s!de][\c!phone=Telefon]
+\setuplettertext[\s!fr][\c!phone=T\eacute l\eacute phone]
+\setuplettertext[\s!it][\c!phone=Telefono]
+\setuplettertext[\s!es][\c!phone=Tel\eacute fono]
% fax:
-\setuplettertext[\s!en][\v!fax=Fax]
-\setuplettertext[\s!nl][\v!fax=Fax]
-\setuplettertext[\s!de][\v!fax=Fax]
-\setuplettertext[\s!fr][\v!fax=T\eacute l\eacute fax] % or Fax
-\setuplettertext[\s!it][\v!fax=Fax]
-\setuplettertext[\s!es][\v!fax=Fax]
+\setuplettertext[\s!en][\c!fax=Fax]
+\setuplettertext[\s!nl][\c!fax=Fax]
+\setuplettertext[\s!de][\c!fax=Fax]
+\setuplettertext[\s!fr][\c!fax=T\eacute l\eacute fax] % or Fax
+\setuplettertext[\s!it][\c!fax=Fax]
+\setuplettertext[\s!es][\c!fax=Fax]
% email:
-\setuplettertext[\s!en][\v!email=Email]
-\setuplettertext[\s!nl][\v!email=E–mail]
-\setuplettertext[\s!de][\v!email=E-Mail]
-\setuplettertext[\s!fr][\v!email=Courriel] % Adresse électronique
-\setuplettertext[\s!it][\v!email=Email]
-\setuplettertext[\s!es][\v!email=Email]
+\setuplettertext[\s!en][\c!email=Email]
+\setuplettertext[\s!nl][\c!email=E–mail]
+\setuplettertext[\s!de][\c!email=E-Mail]
+\setuplettertext[\s!fr][\c!email=Courriel] % Adresse électronique
+\setuplettertext[\s!it][\c!email=Email]
+\setuplettertext[\s!es][\c!email=Email]
% url:
-\setuplettertext[\s!en][\v!url=Url]
-\setuplettertext[\s!nl][\v!url=URL]
-\setuplettertext[\s!de][\v!url=URL]
-\setuplettertext[\s!fr][\v!url=Site web]
-\setuplettertext[\s!it][\v!url=Sito Web]
-\setuplettertext[\s!es][\v!url=URL]
+\setuplettertext[\s!en][\c!url=Url]
+\setuplettertext[\s!nl][\c!url=URL]
+\setuplettertext[\s!de][\c!url=URL]
+\setuplettertext[\s!fr][\c!url=Site web]
+\setuplettertext[\s!it][\c!url=Sito Web]
+\setuplettertext[\s!es][\c!url=URL]
% bank:
-\setuplettertext[\s!en][\v!bank=Bank account]
-\setuplettertext[\s!nl][\v!bank=Bankrekening]
-\setuplettertext[\s!de][\v!bank=Bankverbindung]
-\setuplettertext[\s!fr][\v!bank=Compte en banque]
-\setuplettertext[\s!it][\v!bank=Conto bancario]
-\setuplettertext[\s!es][\v!bank=Cuenta bancaria]
+\setuplettertext[\s!en][\c!bank=Bank account]
+\setuplettertext[\s!nl][\c!bank=Bankrekening]
+\setuplettertext[\s!de][\c!bank=Bankverbindung]
+\setuplettertext[\s!fr][\c!bank=Compte en banque]
+\setuplettertext[\s!it][\c!bank=Conto bancario]
+\setuplettertext[\s!es][\c!bank=Cuenta bancaria]
% organization:
-\setuplettertext[\s!en][\v!organization=Organization]
-\setuplettertext[\s!nl][\v!organization=]
-\setuplettertext[\s!de][\v!organization=Organisation]
-\setuplettertext[\s!fr][\v!organization=]
-\setuplettertext[\s!it][\v!organization=]
-\setuplettertext[\s!es][\v!organization=]
+\setuplettertext[\s!en][\c!organization=Organization]
+\setuplettertext[\s!nl][\c!organization=]
+\setuplettertext[\s!de][\c!organization=Organisation]
+\setuplettertext[\s!fr][\c!organization=]
+\setuplettertext[\s!it][\c!organization=]
+\setuplettertext[\s!es][\c!organization=]
% city:
-\setuplettertext[\s!en][\v!city=City]
-\setuplettertext[\s!nl][\v!city=]
-\setuplettertext[\s!de][\v!city=Stadt]
-\setuplettertext[\s!fr][\v!city=]
-\setuplettertext[\s!it][\v!city=]
-\setuplettertext[\s!es][\v!city=]
+\setuplettertext[\s!en][\c!city=City]
+\setuplettertext[\s!nl][\c!city=]
+\setuplettertext[\s!de][\c!city=Stadt]
+\setuplettertext[\s!fr][\c!city=]
+\setuplettertext[\s!it][\c!city=]
+\setuplettertext[\s!es][\c!city=]
% zip:
-\setuplettertext[\s!en][\v!zip=Zip]
-\setuplettertext[\s!nl][\v!zip=]
-\setuplettertext[\s!de][\v!zip=PLZ]
-\setuplettertext[\s!fr][\v!zip=]
-\setuplettertext[\s!it][\v!zip=]
-\setuplettertext[\s!es][\v!zip=]
+\setuplettertext[\s!en][\c!zip=Zip]
+\setuplettertext[\s!nl][\c!zip=]
+\setuplettertext[\s!de][\c!zip=PLZ]
+\setuplettertext[\s!fr][\c!zip=]
+\setuplettertext[\s!it][\c!zip=]
+\setuplettertext[\s!es][\c!zip=]
% country:
-\setuplettertext[\s!en][\v!country=Country]
-\setuplettertext[\s!nl][\v!country=]
-\setuplettertext[\s!de][\v!country=Land]
-\setuplettertext[\s!fr][\v!country=]
-\setuplettertext[\s!it][\v!country=]
-\setuplettertext[\s!es][\v!country=]
+\setuplettertext[\s!en][\c!country=Country]
+\setuplettertext[\s!nl][\c!country=]
+\setuplettertext[\s!de][\c!country=Land]
+\setuplettertext[\s!fr][\c!country=]
+\setuplettertext[\s!it][\c!country=]
+\setuplettertext[\s!es][\c!country=]
% street:
-\setuplettertext[\s!en][\v!street=Street]
-\setuplettertext[\s!nl][\v!street=]
-\setuplettertext[\s!de][\v!street=Stra\ssharp e]
-\setuplettertext[\s!fr][\v!street=]
-\setuplettertext[\s!it][\v!street=]
-\setuplettertext[\s!es][\v!street=]
+\setuplettertext[\s!en][\c!street=Street]
+\setuplettertext[\s!nl][\c!street=]
+\setuplettertext[\s!de][\c!street=Stra\ssharp e]
+\setuplettertext[\s!fr][\c!street=]
+\setuplettertext[\s!it][\c!street=]
+\setuplettertext[\s!es][\c!street=]
% page:
-\setuplettertext[\s!en][\v!page=Page~]
-\setuplettertext[\s!nl][\v!page=]
-\setuplettertext[\s!de][\v!page=Seite~]
-\setuplettertext[\s!fr][\v!page=]
-\setuplettertext[\s!it][\v!page=]
-\setuplettertext[\s!es][\v!page=]
+\setuplettertext[\s!en][\c!page=Page~]
+\setuplettertext[\s!nl][\c!page=]
+\setuplettertext[\s!de][\c!page=Seite~]
+\setuplettertext[\s!fr][\c!page=]
+\setuplettertext[\s!it][\c!page=]
+\setuplettertext[\s!es][\c!page=]
% pagenumber:
-\setuplettertext[\s!en][\v!pagenumber={Page , of }]
-\setuplettertext[\s!nl][\v!pagenumber=]
-\setuplettertext[\s!de][\v!pagenumber={Seite , von }]
-\setuplettertext[\s!fr][\v!pagenumber=]
-\setuplettertext[\s!it][\v!pagenumber=]
-\setuplettertext[\s!es][\v!pagenumber=]
+\setuplettertext[\s!en][\c!pagenumber={Page , of }]
+\setuplettertext[\s!nl][\c!pagenumber=]
+\setuplettertext[\s!de][\c!pagenumber={Seite , von }]
+\setuplettertext[\s!fr][\c!pagenumber=]
+\setuplettertext[\s!it][\c!pagenumber=]
+\setuplettertext[\s!es][\c!pagenumber=]
% Files
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi
index f52f8e89828..f557f385621 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi
@@ -1,6 +1,6 @@
%D \module
%D [ file=s-cor-01,
-%D version=2012.05.30,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Letters,
%D author=Wolfgang Schuster,
@@ -191,7 +191,7 @@
\defineletterelement[\v!layer][\v!nexthead][\v!gbrief]
{\maxaligned
{\rlap{\correspondenceparameter\c!fromname}
- \midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber}
+ \midaligned{\leftlettertext\c!pagenumber\subpagenumber\rightlettertext\c!pagenumber\lastsubpagenumber}
\llap{\correspondenceparameter\c!date}}
\hairline}
@@ -209,7 +209,7 @@
{\correspondenceparameter\c!toname \\
\correspondenceparameter\c!date \\
\correspondenceparameter\c!reference \\
- \lettertext\v!page\subpagenumber}}}
+ \lettertext\c!page\subpagenumber}}}
\defineletterelement[\v!layer][\v!nexthead][\v!semiblock]
{\maxaligned
@@ -227,7 +227,7 @@
{\maxaligned
{\rlap{\correspondenceparameter\c!toname}%
\midaligned{\currentdate}%
- \llap{\lettertext\v!page\subpagenumber}}}
+ \llap{\lettertext\c!page\subpagenumber}}}
\defineletterelement[\v!layer][\v!nexthead][\v!setups]
{\texsetup{\v!letter:\v!layer:\v!nexthead}}
@@ -247,10 +247,10 @@
\defineletterelement[\v!layer][\v!foot][\v!gbrief]
{\bTABLE[\c!frame=\v!off,\c!width=.25\hsize,\c!offset=\zeropoint]
\bTR[\c!style=\bfxx,\c!topframe=\v!on]
- \bTD \lettertext\v!address \eTD
- \bTD \lettertext\v!phone \eTD
- \bTD \lettertext\v!email \eTD
- \bTD \lettertext\v!bank \eTD
+ \bTD \lettertext\c!address \eTD
+ \bTD \lettertext\c!phone \eTD
+ \bTD \lettertext\c!email \eTD
+ \bTD \lettertext\c!bank \eTD
\eTR
\bTR
\bTD \correspondenceparameter\c!street \\\correspondenceparameter\c!city \eTD
@@ -261,7 +261,7 @@
\eTABLE}
\defineletterelement[\v!layer][\v!foot][\v!pagenumber]
- {\midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber}}
+ {\midaligned{\leftlettertext\c!pagenumber\subpagenumber\rightlettertext\c!pagenumber\lastsubpagenumber}}
\defineletterelement[\v!layer][\v!foot][\v!setups]
{\texsetup{\v!letter:\v!layer:\v!foot}}
@@ -433,7 +433,7 @@
{\def\\{\correspondencesectionparameter\c!separator}%
\doifsomethingelse{\correspondenceparameter\c!title}
{\correspondenceparameter\c!title}
- {\lettertext\v!attention\correspondenceparameter\c!attention}}
+ {\lettertext\c!attention\correspondenceparameter\c!attention}}
\defineletterelement[\v!section][\v!title][\v!setups]
{\texsetup{\v!letter:\v!section:\v!title}}
@@ -442,7 +442,7 @@
\defineletterelement[\v!section][\v!subject][\s!default]
{\def\\{\correspondencesectionparameter\c!separator}%
- \lettertext\v!subject\correspondenceparameter\c!subject}
+ \lettertext\c!subject\correspondenceparameter\c!subject}
\defineletterelement[\v!section][\v!subject][\v!setups]
{\texsetup{\v!letter:\v!section:\v!subject}}
@@ -553,264 +553,273 @@
% name:
-\setuplettertext[\s!en][\v!name=Name]
-\setuplettertext[\s!nl][\v!name=]
-\setuplettertext[\s!de][\v!name=Name]
-\setuplettertext[\s!fr][\v!name=Nom]
-\setuplettertext[\s!it][\v!name=]
-\setuplettertext[\s!es][\v!name=]
+\setuplettertext[\s!en][\c!name=Name]
+\setuplettertext[\s!nl][\c!name=]
+\setuplettertext[\s!de][\c!name=Name]
+\setuplettertext[\s!fr][\c!name=Nom]
+\setuplettertext[\s!it][\c!name=]
+\setuplettertext[\s!es][\c!name=]
% room:
-\setuplettertext[\s!en][\v!room=Room]
-\setuplettertext[\s!nl][\v!room=]
-\setuplettertext[\s!de][\v!room=Zimmer]
-\setuplettertext[\s!fr][\v!room=Salle] % Salle or Pièce
-\setuplettertext[\s!it][\v!room=]
-\setuplettertext[\s!es][\v!room=]
+\setuplettertext[\s!en][\c!room=Room]
+\setuplettertext[\s!nl][\c!room=]
+\setuplettertext[\s!de][\c!room=Zimmer]
+\setuplettertext[\s!fr][\c!room=Salle] % Salle or Pièce
+\setuplettertext[\s!it][\c!room=]
+\setuplettertext[\s!es][\c!room=]
% yourref:
-\setuplettertext[\s!en][\v!yourref=Your ref.]
-\setuplettertext[\s!nl][\v!yourref=Uw kenmerk]
-\setuplettertext[\s!de][\v!yourref=Ihr Zeichen]
-\setuplettertext[\s!fr][\v!yourref=Vos références]
-\setuplettertext[\s!it][\v!yourref=Vs./Rif.]
-\setuplettertext[\s!es][\v!yourref=Su ref.]
+\setuplettertext[\s!en][\c!yourref=Your ref.]
+\setuplettertext[\s!nl][\c!yourref=Uw kenmerk]
+\setuplettertext[\s!de][\c!yourref=Ihr Zeichen]
+\setuplettertext[\s!fr][\c!yourref=Vos références]
+\setuplettertext[\s!it][\c!yourref=Vs./Rif.]
+\setuplettertext[\s!es][\c!yourref=Su ref.]
% yourmail:
-\setuplettertext[\s!en][\v!yourmail=Your letter of]
-\setuplettertext[\s!nl][\v!yourmail=Uw brief van]
-\setuplettertext[\s!de][\v!yourmail=Ihre Nachricht vom]
-\setuplettertext[\s!fr][\v!yourmail=Votre lettre du]
-\setuplettertext[\s!it][\v!yourmail=Vs.~lettera del]
-\setuplettertext[\s!es][\v!yourmail=Su carta de]
+\setuplettertext[\s!en][\c!yourmail=Your letter of]
+\setuplettertext[\s!nl][\c!yourmail=Uw brief van]
+\setuplettertext[\s!de][\c!yourmail=Ihre Nachricht vom]
+\setuplettertext[\s!fr][\c!yourmail=Votre lettre du]
+\setuplettertext[\s!it][\c!yourmail=Vs.~lettera del]
+\setuplettertext[\s!es][\c!yourmail=Su carta de]
% myref:
-\setuplettertext[\s!en][\v!myref=Our ref.]
-\setuplettertext[\s!nl][\v!myref=Ons kenmerk]
-\setuplettertext[\s!de][\v!myref=Unser Zeichen]
-\setuplettertext[\s!fr][\v!myref=Nos références]
-\setuplettertext[\s!it][\v!myref=Ns./Rif.]
-\setuplettertext[\s!es][\v!myref=Nuestra ref.]
+\setuplettertext[\s!en][\c!myref=Our ref.]
+\setuplettertext[\s!nl][\c!myref=Ons kenmerk]
+\setuplettertext[\s!de][\c!myref=Unser Zeichen]
+\setuplettertext[\s!fr][\c!myref=Nos références]
+\setuplettertext[\s!it][\c!myref=Ns./Rif.]
+\setuplettertext[\s!es][\c!myref=Nuestra ref.]
% mymail:
-\setuplettertext[\s!en][\v!mymail=Our letter of]
-\setuplettertext[\s!nl][\v!mymail=Ons brief van]
-\setuplettertext[\s!de][\v!mymail=Unsere Nachricht vom]
-\setuplettertext[\s!fr][\v!mymail=Notre lettre du]
-\setuplettertext[\s!it][\v!mymail=]
-\setuplettertext[\s!es][\v!mymail=]
+\setuplettertext[\s!en][\c!mymail=Our letter of]
+\setuplettertext[\s!nl][\c!mymail=Ons brief van]
+\setuplettertext[\s!de][\c!mymail=Unsere Nachricht vom]
+\setuplettertext[\s!fr][\c!mymail=Notre lettre du]
+\setuplettertext[\s!it][\c!mymail=]
+\setuplettertext[\s!es][\c!mymail=]
% customer:
-\setuplettertext[\s!en][\v!customer=Customer no.]
-\setuplettertext[\s!nl][\v!customer=Klant No.]
-\setuplettertext[\s!de][\v!customer=Kundennummer]
-\setuplettertext[\s!fr][\v!customer=Numéro de client]
-\setuplettertext[\s!it][\v!customer=Nr.~cliente]
-\setuplettertext[\s!es][\v!customer=No. de cliente]
+\setuplettertext[\s!en][\c!customer=Customer no.]
+\setuplettertext[\s!nl][\c!customer=Klant No.]
+\setuplettertext[\s!de][\c!customer=Kundennummer]
+\setuplettertext[\s!fr][\c!customer=Numéro de client]
+\setuplettertext[\s!it][\c!customer=Nr.~cliente]
+\setuplettertext[\s!es][\c!customer=No. de cliente]
% invoice:
-\setuplettertext[\s!en][\v!invoice=Invoice no.]
-\setuplettertext[\s!nl][\v!invoice=Rekening No.]
-\setuplettertext[\s!de][\v!invoice=Rechnungsnummer]
-\setuplettertext[\s!fr][\v!invoice=Numéro de facture]
-\setuplettertext[\s!it][\v!invoice=Nr.~fattura]
-\setuplettertext[\s!es][\v!invoice=No. de factura]
+\setuplettertext[\s!en][\c!invoice=Invoice no.]
+\setuplettertext[\s!nl][\c!invoice=Rekening No.]
+\setuplettertext[\s!de][\c!invoice=Rechnungsnummer]
+\setuplettertext[\s!fr][\c!invoice=Numéro de facture]
+\setuplettertext[\s!it][\c!invoice=Nr.~fattura]
+\setuplettertext[\s!es][\c!invoice=No. de factura]
% attention:
-\setuplettertext[\s!en][\v!attention=] % Attention
-\setuplettertext[\s!nl][\v!attention=]
-\setuplettertext[\s!de][\v!attention=]
-\setuplettertext[\s!fr][\v!attention=]
-\setuplettertext[\s!it][\v!attention=]
-\setuplettertext[\s!es][\v!attention=]
+\setuplettertext[\s!en][\c!attention=] % Attention
+\setuplettertext[\s!nl][\c!attention=]
+\setuplettertext[\s!de][\c!attention=]
+\setuplettertext[\s!fr][\c!attention=]
+\setuplettertext[\s!it][\c!attention=]
+\setuplettertext[\s!es][\c!attention=]
% subject:
-\setuplettertext[\s!en][\v!subject=] % Subject
-\setuplettertext[\s!nl][\v!subject=] % Onderwerp
-\setuplettertext[\s!de][\v!subject=] % Betrifft
-\setuplettertext[\s!fr][\v!subject=] % Concernant or Sujet
-\setuplettertext[\s!it][\v!subject=] % Oggetto
-\setuplettertext[\s!es][\v!subject=] % Asunto
+\setuplettertext[\s!en][\c!subject=] % Subject
+\setuplettertext[\s!nl][\c!subject=] % Onderwerp
+\setuplettertext[\s!de][\c!subject=] % Betrifft
+\setuplettertext[\s!fr][\c!subject=] % Concernant or Sujet
+\setuplettertext[\s!it][\c!subject=] % Oggetto
+\setuplettertext[\s!es][\c!subject=] % Asunto
% copy:
-\setuplettertext[\s!en][\v!copy=cc: ]
-\setuplettertext[\s!nl][\v!copy=Kopie aan: ]
-\setuplettertext[\s!de][\v!copy=Kopien an: ]
-\setuplettertext[\s!fr][\v!copy=Copieà: ]
-\setuplettertext[\s!it][\v!copy=Per conoscenza: ]
-\setuplettertext[\s!es][\v!copy=Copias: ]
+\setuplettertext[\s!en][\c!copy=cc: ]
+\setuplettertext[\s!nl][\c!copy=Kopie aan: ]
+\setuplettertext[\s!de][\c!copy=Kopien an: ]
+\setuplettertext[\s!fr][\c!copy=Copieà: ]
+\setuplettertext[\s!it][\c!copy=Per conoscenza: ]
+\setuplettertext[\s!es][\c!copy=Copias: ]
% enclosure:
-\setuplettertext[\s!en][\v!enclosure=encl: ]
-\setuplettertext[\s!nl][\v!enclosure=Bijlage(n): ]
-\setuplettertext[\s!de][\v!enclosure=Anlagen: ]
-\setuplettertext[\s!fr][\v!enclosure=Annexes: ]
-\setuplettertext[\s!it][\v!enclosure=Allegato: ]
-\setuplettertext[\s!es][\v!enclosure=Adjunto: ]
+\setuplettertext[\s!en][\c!enclosure=encl: ]
+\setuplettertext[\s!nl][\c!enclosure=Bijlage(n): ]
+\setuplettertext[\s!de][\c!enclosure=Anlagen: ]
+\setuplettertext[\s!fr][\c!enclosure=Annexes: ]
+\setuplettertext[\s!it][\c!enclosure=Allegato: ]
+\setuplettertext[\s!es][\c!enclosure=Adjunto: ]
% to:
-\setuplettertext[\s!en][\v!to=To]
-\setuplettertext[\s!nl][\v!to=Aan]
-\setuplettertext[\s!de][\v!to=An]
-\setuplettertext[\s!fr][\v!to=À]
-\setuplettertext[\s!it][\v!to=A]
-\setuplettertext[\s!es][\v!to=A]
+\setuplettertext[\s!en][\c!to=To]
+\setuplettertext[\s!nl][\c!to=Aan]
+\setuplettertext[\s!de][\c!to=An]
+\setuplettertext[\s!fr][\c!to=À]
+\setuplettertext[\s!it][\c!to=A]
+\setuplettertext[\s!es][\c!to=A]
% toname:
-\setuplettertext[\s!en][\v!toname=To]
-\setuplettertext[\s!nl][\v!toname=Aan]
-\setuplettertext[\s!de][\v!toname=An]
-\setuplettertext[\s!fr][\v!toname=À]
-\setuplettertext[\s!it][\v!toname=A]
-\setuplettertext[\s!es][\v!toname=A]
+\setuplettertext[\s!en][\c!toname=To]
+\setuplettertext[\s!nl][\c!toname=Aan]
+\setuplettertext[\s!de][\c!toname=An]
+\setuplettertext[\s!fr][\c!toname=À]
+\setuplettertext[\s!it][\c!toname=A]
+\setuplettertext[\s!es][\c!toname=A]
% from:
-\setuplettertext[\s!en][\v!from=From]
-\setuplettertext[\s!nl][\v!from=Van]
-\setuplettertext[\s!de][\v!from=Von]
-\setuplettertext[\s!fr][\v!from=De]
-\setuplettertext[\s!it][\v!from=Da]
-\setuplettertext[\s!es][\v!from=De]
+\setuplettertext[\s!en][\c!from=From]
+\setuplettertext[\s!nl][\c!from=Van]
+\setuplettertext[\s!de][\c!from=Von]
+\setuplettertext[\s!fr][\c!from=De]
+\setuplettertext[\s!it][\c!from=Da]
+\setuplettertext[\s!es][\c!from=De]
% fromname:
-\setuplettertext[\s!en][\v!fromname=From]
-\setuplettertext[\s!nl][\v!fromname=Van]
-\setuplettertext[\s!de][\v!fromname=Von]
-\setuplettertext[\s!fr][\v!fromname=De]
-\setuplettertext[\s!it][\v!fromname=Da]
-\setuplettertext[\s!es][\v!fromname=De]
+\setuplettertext[\s!en][\c!fromname=From]
+\setuplettertext[\s!nl][\c!fromname=Van]
+\setuplettertext[\s!de][\c!fromname=Von]
+\setuplettertext[\s!fr][\c!fromname=De]
+\setuplettertext[\s!it][\c!fromname=Da]
+\setuplettertext[\s!es][\c!fromname=De]
% date:
-\setuplettertext[\s!en][\v!date=Date]
-\setuplettertext[\s!nl][\v!date=Datum]
-\setuplettertext[\s!de][\v!date=Datum]
-\setuplettertext[\s!fr][\v!date=Date]
-\setuplettertext[\s!it][\v!date=Data]
-\setuplettertext[\s!es][\v!date=Fecha]
+\setuplettertext[\s!en][\c!date=Date]
+\setuplettertext[\s!nl][\c!date=Datum]
+\setuplettertext[\s!de][\c!date=Datum]
+\setuplettertext[\s!fr][\c!date=Date]
+\setuplettertext[\s!it][\c!date=Data]
+\setuplettertext[\s!es][\c!date=Fecha]
% phone:
-\setuplettertext[\s!en][\v!phone=Phone]
-\setuplettertext[\s!nl][\v!phone=Telefoon]
-\setuplettertext[\s!de][\v!phone=Telefon]
-\setuplettertext[\s!fr][\v!phone=Téléphone]
-\setuplettertext[\s!it][\v!phone=Telefono]
-\setuplettertext[\s!es][\v!phone=Teléfono]
+\setuplettertext[\s!en][\c!phone=Phone]
+\setuplettertext[\s!nl][\c!phone=Telefoon]
+\setuplettertext[\s!de][\c!phone=Telefon]
+\setuplettertext[\s!fr][\c!phone=Téléphone]
+\setuplettertext[\s!it][\c!phone=Telefono]
+\setuplettertext[\s!es][\c!phone=Teléfono]
% fax:
-\setuplettertext[\s!en][\v!fax=Fax]
-\setuplettertext[\s!nl][\v!fax=Fax]
-\setuplettertext[\s!de][\v!fax=Fax]
-\setuplettertext[\s!fr][\v!fax=Téléfax] % or Fax
-\setuplettertext[\s!it][\v!fax=Fax]
-\setuplettertext[\s!es][\v!fax=Fax]
+\setuplettertext[\s!en][\c!fax=Fax]
+\setuplettertext[\s!nl][\c!fax=Fax]
+\setuplettertext[\s!de][\c!fax=Fax]
+\setuplettertext[\s!fr][\c!fax=Téléfax] % or Fax
+\setuplettertext[\s!it][\c!fax=Fax]
+\setuplettertext[\s!es][\c!fax=Fax]
% email:
-\setuplettertext[\s!en][\v!email=Email]
-\setuplettertext[\s!nl][\v!email=E–mail]
-\setuplettertext[\s!de][\v!email=E-Mail]
-\setuplettertext[\s!fr][\v!email=Courriel] % Adresse électronique
-\setuplettertext[\s!it][\v!email=Email]
-\setuplettertext[\s!es][\v!email=Email]
+\setuplettertext[\s!en][\c!email=Email]
+\setuplettertext[\s!nl][\c!email=E–mail]
+\setuplettertext[\s!de][\c!email=E-Mail]
+\setuplettertext[\s!fr][\c!email=Courriel] % Adresse électronique
+\setuplettertext[\s!it][\c!email=Email]
+\setuplettertext[\s!es][\c!email=Email]
% url:
-\setuplettertext[\s!en][\v!url=Url]
-\setuplettertext[\s!nl][\v!url=URL]
-\setuplettertext[\s!de][\v!url=URL]
-\setuplettertext[\s!fr][\v!url=Site web]
-\setuplettertext[\s!it][\v!url=Sito Web]
-\setuplettertext[\s!es][\v!url=URL]
+\setuplettertext[\s!en][\c!url=Url]
+\setuplettertext[\s!nl][\c!url=URL]
+\setuplettertext[\s!de][\c!url=URL]
+\setuplettertext[\s!fr][\c!url=Site web]
+\setuplettertext[\s!it][\c!url=Sito Web]
+\setuplettertext[\s!es][\c!url=URL]
% bank:
-\setuplettertext[\s!en][\v!bank=Bank account]
-\setuplettertext[\s!nl][\v!bank=Bankrekening]
-\setuplettertext[\s!de][\v!bank=Bankverbindung]
-\setuplettertext[\s!fr][\v!bank=Compte en banque]
-\setuplettertext[\s!it][\v!bank=Conto bancario]
-\setuplettertext[\s!es][\v!bank=Cuenta bancaria]
+\setuplettertext[\s!en][\c!bank=Bank account]
+\setuplettertext[\s!nl][\c!bank=Bankrekening]
+\setuplettertext[\s!de][\c!bank=Bankverbindung]
+\setuplettertext[\s!fr][\c!bank=Compte en banque]
+\setuplettertext[\s!it][\c!bank=Conto bancario]
+\setuplettertext[\s!es][\c!bank=Cuenta bancaria]
% organization:
-\setuplettertext[\s!en][\v!organization=Organization]
-\setuplettertext[\s!nl][\v!organization=]
-\setuplettertext[\s!de][\v!organization=Organisation]
-\setuplettertext[\s!fr][\v!organization=]
-\setuplettertext[\s!it][\v!organization=]
-\setuplettertext[\s!es][\v!organization=]
+\setuplettertext[\s!en][\c!organization=Organization]
+\setuplettertext[\s!nl][\c!organization=]
+\setuplettertext[\s!de][\c!organization=Organisation]
+\setuplettertext[\s!fr][\c!organization=]
+\setuplettertext[\s!it][\c!organization=]
+\setuplettertext[\s!es][\c!organization=]
% city:
-\setuplettertext[\s!en][\v!city=City]
-\setuplettertext[\s!nl][\v!city=]
-\setuplettertext[\s!de][\v!city=Stadt]
-\setuplettertext[\s!fr][\v!city=]
-\setuplettertext[\s!it][\v!city=]
-\setuplettertext[\s!es][\v!city=]
+\setuplettertext[\s!en][\c!city=City]
+\setuplettertext[\s!nl][\c!city=]
+\setuplettertext[\s!de][\c!city=Stadt]
+\setuplettertext[\s!fr][\c!city=]
+\setuplettertext[\s!it][\c!city=]
+\setuplettertext[\s!es][\c!city=]
% zip:
-\setuplettertext[\s!en][\v!zip=Zip]
-\setuplettertext[\s!nl][\v!zip=]
-\setuplettertext[\s!de][\v!zip=PLZ]
-\setuplettertext[\s!fr][\v!zip=]
-\setuplettertext[\s!it][\v!zip=]
-\setuplettertext[\s!es][\v!zip=]
+\setuplettertext[\s!en][\c!zip=Zip]
+\setuplettertext[\s!nl][\c!zip=]
+\setuplettertext[\s!de][\c!zip=PLZ]
+\setuplettertext[\s!fr][\c!zip=]
+\setuplettertext[\s!it][\c!zip=]
+\setuplettertext[\s!es][\c!zip=]
% country:
-\setuplettertext[\s!en][\v!country=Country]
-\setuplettertext[\s!nl][\v!country=]
-\setuplettertext[\s!de][\v!country=Land]
-\setuplettertext[\s!fr][\v!country=]
-\setuplettertext[\s!it][\v!country=]
-\setuplettertext[\s!es][\v!country=]
+\setuplettertext[\s!en][\c!country=Country]
+\setuplettertext[\s!nl][\c!country=]
+\setuplettertext[\s!de][\c!country=Land]
+\setuplettertext[\s!fr][\c!country=]
+\setuplettertext[\s!it][\c!country=]
+\setuplettertext[\s!es][\c!country=]
% street:
-\setuplettertext[\s!en][\v!street=Street]
-\setuplettertext[\s!nl][\v!street=]
-\setuplettertext[\s!de][\v!street=Straße]
-\setuplettertext[\s!fr][\v!street=]
-\setuplettertext[\s!it][\v!street=]
-\setuplettertext[\s!es][\v!street=]
+\setuplettertext[\s!en][\c!street=Street]
+\setuplettertext[\s!nl][\c!street=]
+\setuplettertext[\s!de][\c!street=Straße]
+\setuplettertext[\s!fr][\c!street=]
+\setuplettertext[\s!it][\c!street=]
+\setuplettertext[\s!es][\c!street=]
% page:
-\setuplettertext[\s!en][\v!page=Page~]
-\setuplettertext[\s!nl][\v!page=]
-\setuplettertext[\s!de][\v!page=Seite~]
-\setuplettertext[\s!fr][\v!page=]
-\setuplettertext[\s!it][\v!page=]
-\setuplettertext[\s!es][\v!page=]
+\setuplettertext[\s!en][\c!page=Page~]
+\setuplettertext[\s!nl][\c!page=]
+\setuplettertext[\s!de][\c!page=Seite~]
+\setuplettertext[\s!fr][\c!page=]
+\setuplettertext[\s!it][\c!page=]
+\setuplettertext[\s!es][\c!page=]
% pagenumber:
-\setuplettertext[\s!en][\v!pagenumber={Page , of }]
-\setuplettertext[\s!nl][\v!pagenumber=]
-\setuplettertext[\s!de][\v!pagenumber={Seite , von }]
-\setuplettertext[\s!fr][\v!pagenumber=]
-\setuplettertext[\s!it][\v!pagenumber=]
-\setuplettertext[\s!es][\v!pagenumber=]
+\setuplettertext[\s!en][\c!pagenumber={Page , of }]
+\setuplettertext[\s!nl][\c!pagenumber=]
+\setuplettertext[\s!de][\c!pagenumber={Seite , von }]
+\setuplettertext[\s!fr][\c!pagenumber=]
+\setuplettertext[\s!it][\c!pagenumber=]
+\setuplettertext[\s!es][\c!pagenumber=]
+
+% address:
+
+\setuplettertext[\s!en][\c!address=Address]
+\setuplettertext[\s!nl][\c!address=]
+\setuplettertext[\s!de][\c!address=Adresse]
+\setuplettertext[\s!fr][\c!address=]
+\setuplettertext[\s!it][\c!address=]
+\setuplettertext[\s!es][\c!address=]
% Files
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii
index 4edc8c70155..0c1cf19d6b0 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=s-cor-02,
-%D version=2012.05.25,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Memos,
%D author=Wolfgang Schuster,
@@ -127,7 +127,7 @@
% layer: foot
\definememoelement[\v!layer][\v!foot][\v!pagenumber]
- {\centerbox{\hbox{\begstrut\leftmemotext\v!pagenumber\subpagenumber\rightmemotext\v!pagenumber\lastsubpagenumber\endstrut}}}
+ {\centerbox{\hbox{\begstrut\leftmemotext\c!pagenumber\subpagenumber\rightmemotext\c!pagenumber\lastsubpagenumber\endstrut}}}
% layer: topmark
@@ -173,54 +173,54 @@
\definememoelement[\v!section][\v!head][\v!memo]
{\def\\{\correspondencesectionparameter\c!separator}%
\startpacked
- \doifsomething{\correspondenceparameter\c!fromname}{\memotext\v!fromname \correspondenceparameter\c!fromname \par}
- \doifsomething{\correspondenceparameter\c!date }{\memotext\v!date \correspondenceparameter\c!date \par}
- \doifsomething{\correspondenceparameter\c!toname }{\memotext\v!toname \correspondenceparameter\c!toname \par}
- \doifsomething{\correspondenceparameter\c!subject }{\memotext\v!subject \correspondenceparameter\c!subject \par}
+ \doifsomething{\correspondenceparameter\c!fromname}{\memotext\c!fromname \correspondenceparameter\c!fromname \par}
+ \doifsomething{\correspondenceparameter\c!date }{\memotext\c!date \correspondenceparameter\c!date \par}
+ \doifsomething{\correspondenceparameter\c!toname }{\memotext\c!toname \correspondenceparameter\c!toname \par}
+ \doifsomething{\correspondenceparameter\c!subject }{\memotext\c!subject \correspondenceparameter\c!subject \par}
\stoppacked}
-\unexpanded\def\doformatmemoheadTABLE#1#2%
- {\doifsomething{\correspondenceparameter{#2}}
+\unexpanded\def\doformatmemoheadTABLE#1%
+ {\doifsomething{\correspondenceparameter#1}
{\NC % label
\def\currentcorrespondencestyle{\v!memo:#1}%
\usecorrespondencestylestyleandcolor\c!titlestyle\c!titlecolor
- \memotext{#1}%
+ \memotext#1
\EQ % text
\def\currentcorrespondencestyle{\v!memo:#1}%
\usecorrespondencestylestyleandcolor\c!textstyle\c!textcolor
- \correspondenceparameter{#2}%
+ \correspondenceparameter#1
\NC\NR}}
\definememoelement[\v!section][\v!head][\v!table]
{\def\\{\correspondencesectionparameter\c!separator}%
\starttabulate[|l|p|]
- \doformatmemoheadTABLE\v!fromname\c!fromname
- \doformatmemoheadTABLE\v!date \c!date
- \doformatmemoheadTABLE\v!toname \c!toname
- \doformatmemoheadTABLE\v!subject \c!subject
+ \doformatmemoheadTABLE\v!fromname
+ \doformatmemoheadTABLE\v!date
+ \doformatmemoheadTABLE\v!toname
+ \doformatmemoheadTABLE\v!subject
\stoptabulate}
-\unexpanded\def\doformatmemoheadMARGIN#1#2%
- {\doifsomething{\correspondenceparameter{#2}}
+\unexpanded\def\doformatmemoheadMARGIN#1%
+ {\doifsomething{\correspondenceparameter#1}
{\def\currentcorrespondencestyle{\v!memo:#1}%
\dontleavehmode\llap\bgroup % label
\usecorrespondencestylestyleandcolor\c!titlestyle\c!titlecolor
- \memotext{#1}%
+ \memotext#1
\hskip\leftmargindistance
\egroup
\bgroup
\usecorrespondencestylestyleandcolor\c!textstyle\c!textcolor
- \correspondenceparameter{#2}%
+ \correspondenceparameter#1
\egroup
\par}}
\definememoelement[\v!section][\v!head][\v!margin]
{\def\\{\correspondencesectionparameter\c!separator}%
\startpacked
- \doformatmemoheadMARGIN\v!fromname\c!fromname
- \doformatmemoheadMARGIN\v!date \c!date
- \doformatmemoheadMARGIN\v!toname \c!toname
- \doformatmemoheadMARGIN\v!subject \c!subject
+ \doformatmemoheadMARGIN\c!fromname
+ \doformatmemoheadMARGIN\c!date
+ \doformatmemoheadMARGIN\c!toname
+ \doformatmemoheadMARGIN\c!subject
\stoppacked}
\definememoelement[\v!section][\v!head][\v!setups]
@@ -285,7 +285,7 @@
\definememoelement[\v!section][\v!subject][\s!default]
{\def\\{\correspondencesectionparameter\c!separator}%
- \memotext\v!subject\correspondenceparameter\c!subject}
+ \memotext\c!subject\correspondenceparameter\c!subject}
\definememoelement[\v!section][\v!subject][\v!setups]
{\texsetup{\v!memo:\v!section:\v!subject}}
@@ -367,48 +367,57 @@
% pagenumber:
-\setupmemotext[\s!en][\v!pagenumber={Page , of }]
-\setupmemotext[\s!nl][\v!pagenumber=]
-\setupmemotext[\s!de][\v!pagenumber={Seite , von }]
-\setupmemotext[\s!fr][\v!pagenumber=]
-\setupmemotext[\s!it][\v!pagenumber=]
-\setupmemotext[\s!es][\v!pagenumber=]
+\setupmemotext[\s!en][\c!pagenumber={Page , of }]
+\setupmemotext[\s!nl][\c!pagenumber=]
+\setupmemotext[\s!de][\c!pagenumber={Seite , von }]
+\setupmemotext[\s!fr][\c!pagenumber=]
+\setupmemotext[\s!it][\c!pagenumber=]
+\setupmemotext[\s!es][\c!pagenumber=]
% date:
-\setupmemotext[\s!en][\v!date=Date: ]
-\setupmemotext[\s!nl][\v!date=Datum: ]
-\setupmemotext[\s!de][\v!date=Datum: ]
-\setupmemotext[\s!fr][\v!date=Date\thinspace: ]
-\setupmemotext[\s!it][\v!date=Data: ]
-\setupmemotext[\s!es][\v!date=Fecha: ]
+\setupmemotext[\s!en][\c!date=Date: ]
+\setupmemotext[\s!nl][\c!date=Datum: ]
+\setupmemotext[\s!de][\c!date=Datum: ]
+\setupmemotext[\s!fr][\c!date=Date\thinspace: ]
+\setupmemotext[\s!it][\c!date=Data: ]
+\setupmemotext[\s!es][\c!date=Fecha: ]
% fromname:
-\setupmemotext[\s!en][\v!fromname=From: ]
-\setupmemotext[\s!nl][\v!fromname=Van: ]
-\setupmemotext[\s!de][\v!fromname=Von: ]
-\setupmemotext[\s!fr][\v!fromname=De\thinspace: ]
-\setupmemotext[\s!it][\v!fromname=Da: ]
-\setupmemotext[\s!es][\v!fromname=De: ]
+\setupmemotext[\s!en][\c!fromname=From: ]
+\setupmemotext[\s!nl][\c!fromname=Van: ]
+\setupmemotext[\s!de][\c!fromname=Von: ]
+\setupmemotext[\s!fr][\c!fromname=De\thinspace: ]
+\setupmemotext[\s!it][\c!fromname=Da: ]
+\setupmemotext[\s!es][\c!fromname=De: ]
% toname:
-\setupmemotext[\s!en][\v!toname=To: ]
-\setupmemotext[\s!nl][\v!toname=Aan: ]
-\setupmemotext[\s!de][\v!toname=An: ]
-\setupmemotext[\s!fr][\v!toname=\Agrave\thinspace: ]
-\setupmemotext[\s!it][\v!toname=A: ]
-\setupmemotext[\s!es][\v!toname=A: ]
+\setupmemotext[\s!en][\c!toname=To: ]
+\setupmemotext[\s!nl][\c!toname=Aan: ]
+\setupmemotext[\s!de][\c!toname=An: ]
+\setupmemotext[\s!fr][\c!toname=\Agrave\thinspace: ]
+\setupmemotext[\s!it][\c!toname=A: ]
+\setupmemotext[\s!es][\c!toname=A: ]
% subject:
-\setupmemotext[\s!en][\v!subject=Subject: ]
-\setupmemotext[\s!nl][\v!subject=Onderwerp: ]
-\setupmemotext[\s!de][\v!subject=Betrifft: ]
-\setupmemotext[\s!fr][\v!subject=Concernant\thinspace: ]
-\setupmemotext[\s!it][\v!subject=Oggetto: ]
-\setupmemotext[\s!es][\v!subject=Asunto: ]
+\setupmemotext[\s!en][\c!subject=Subject: ]
+\setupmemotext[\s!nl][\c!subject=Onderwerp: ]
+\setupmemotext[\s!de][\c!subject=Betrifft: ]
+\setupmemotext[\s!fr][\c!subject=Concernant\thinspace: ]
+\setupmemotext[\s!it][\c!subject=Oggetto: ]
+\setupmemotext[\s!es][\c!subject=Asunto: ]
+
+% address:
+
+\setupmemotext[\s!en][\c!address=Address]
+\setupmemotext[\s!nl][\c!address=]
+\setupmemotext[\s!de][\c!address=Adresse]
+\setupmemotext[\s!fr][\c!address=]
+\setupmemotext[\s!it][\c!address=]
+\setupmemotext[\s!es][\c!address=]
% Files
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi
index de3c4298b86..20b033cb4ba 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi
@@ -1,6 +1,6 @@
%D \module
%D [ file=s-cor-02,
-%D version=2012.05.25,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Memos,
%D author=Wolfgang Schuster,
@@ -134,7 +134,7 @@
% layer: foot
\definememoelement[\v!layer][\v!foot][\v!pagenumber]
- {\centerbox{\hbox{\begstrut\leftmemotext\v!pagenumber\subpagenumber\rightmemotext\v!pagenumber\lastsubpagenumber\endstrut}}}
+ {\centerbox{\hbox{\begstrut\leftmemotext\c!pagenumber\subpagenumber\rightmemotext\c!pagenumber\lastsubpagenumber\endstrut}}}
% layer: topmark
@@ -180,54 +180,54 @@
\definememoelement[\v!section][\v!head][\v!memo]
{\def\\{\correspondencesectionparameter\c!separator}%
\startpacked
- \doifsomething{\correspondenceparameter\c!fromname}{\memotext\v!fromname \correspondenceparameter\c!fromname \par}
- \doifsomething{\correspondenceparameter\c!date }{\memotext\v!date \correspondenceparameter\c!date \par}
- \doifsomething{\correspondenceparameter\c!toname }{\memotext\v!toname \correspondenceparameter\c!toname \par}
- \doifsomething{\correspondenceparameter\c!subject }{\memotext\v!subject \correspondenceparameter\c!subject \par}
+ \doifsomething{\correspondenceparameter\c!fromname}{\memotext\c!fromname \correspondenceparameter\c!fromname \par}
+ \doifsomething{\correspondenceparameter\c!date }{\memotext\c!date \correspondenceparameter\c!date \par}
+ \doifsomething{\correspondenceparameter\c!toname }{\memotext\c!toname \correspondenceparameter\c!toname \par}
+ \doifsomething{\correspondenceparameter\c!subject }{\memotext\c!subject \correspondenceparameter\c!subject \par}
\stoppacked}
-\unexpanded\def\correspondence_memo_head_table#label#text%
- {\doifsomething{\correspondenceparameter{#text}}
+\unexpanded\def\correspondence_memo_head_table#element%
+ {\doifsomething{\correspondenceparameter#element}
{\NC % label
- \def\currentcorrespondencestyle{\v!memo:#label}%
+ \def\currentcorrespondencestyle{\v!memo:#element}%
\usecorrespondencestylestyleandcolor\c!titlestyle\c!titlecolor
- \memotext{#label}%
+ \memotext#element
\EQ % text
- \def\currentcorrespondencestyle{\v!memo:#label}%
+ \def\currentcorrespondencestyle{\v!memo:#element}%
\usecorrespondencestylestyleandcolor\c!textstyle\c!textcolor
- \correspondenceparameter{#text}%
+ \correspondenceparameter#element
\NC\NR}}
\definememoelement[\v!section][\v!head][\v!table]
{\def\\{\correspondencesectionparameter\c!separator}%
\starttabulate[|l|p|]
- \correspondence_memo_head_table\v!fromname\c!fromname
- \correspondence_memo_head_table\v!date \c!date
- \correspondence_memo_head_table\v!toname \c!toname
- \correspondence_memo_head_table\v!subject \c!subject
+ \correspondence_memo_head_table\c!fromname
+ \correspondence_memo_head_table\c!date
+ \correspondence_memo_head_table\c!toname
+ \correspondence_memo_head_table\c!subject
\stoptabulate}
-\unexpanded\def\correspondence_memo_head_margin#label#text%
- {\doifsomething{\correspondenceparameter{#text}}
- {\def\currentcorrespondencestyle{\v!memo:#label}%
+\unexpanded\def\correspondence_memo_head_margin#element%
+ {\doifsomething{\correspondenceparameter#element}
+ {\def\currentcorrespondencestyle{\v!memo:#element}%
\dontleavehmode\llap\bgroup % label
\usecorrespondencestylestyleandcolor\c!titlestyle\c!titlecolor
- \memotext{#label}%
+ \memotext#element
\hskip\leftmargindistance
\egroup
\bgroup
\usecorrespondencestylestyleandcolor\c!textstyle\c!textcolor
- \correspondenceparameter{#text}%
+ \correspondenceparameter#element
\egroup
\par}}
\definememoelement[\v!section][\v!head][\v!margin]
{\def\\{\correspondencesectionparameter\c!separator}%
\startpacked
- \correspondence_memo_head_margin\v!fromname\c!fromname
- \correspondence_memo_head_margin\v!date \c!date
- \correspondence_memo_head_margin\v!toname \c!toname
- \correspondence_memo_head_margin\v!subject \c!subject
+ \correspondence_memo_head_margin\c!fromname
+ \correspondence_memo_head_margin\c!date
+ \correspondence_memo_head_margin\c!toname
+ \correspondence_memo_head_margin\c!subject
\stoppacked}
\definememoelement[\v!section][\v!head][\v!setups]
@@ -293,7 +293,7 @@
\definememoelement[\v!section][\v!subject][\s!default]
{\def\\{\correspondencesectionparameter\c!separator}%
- \memotext\v!subject\correspondenceparameter\c!subject}
+ \memotext\c!subject\correspondenceparameter\c!subject}
\definememoelement[\v!section][\v!subject][\v!setups]
{\texsetup{\v!memo:\v!section:\v!subject}}
@@ -356,48 +356,48 @@
% pagenumber:
-\setupmemotext[\s!en][\v!pagenumber={Page , of }]
-\setupmemotext[\s!nl][\v!pagenumber=]
-\setupmemotext[\s!de][\v!pagenumber={Seite , von }]
-\setupmemotext[\s!fr][\v!pagenumber=]
-\setupmemotext[\s!it][\v!pagenumber=]
-\setupmemotext[\s!es][\v!pagenumber=]
+\setupmemotext[\s!en][\c!pagenumber={Page , of }]
+\setupmemotext[\s!nl][\c!pagenumber=]
+\setupmemotext[\s!de][\c!pagenumber={Seite , von }]
+\setupmemotext[\s!fr][\c!pagenumber=]
+\setupmemotext[\s!it][\c!pagenumber=]
+\setupmemotext[\s!es][\c!pagenumber=]
% date:
-\setupmemotext[\s!en][\v!date=Date: ]
-\setupmemotext[\s!nl][\v!date=Datum: ]
-\setupmemotext[\s!de][\v!date=Datum: ]
-\setupmemotext[\s!fr][\v!date=Date\thinspace: ]
-\setupmemotext[\s!it][\v!date=Data: ]
-\setupmemotext[\s!es][\v!date=Fecha: ]
+\setupmemotext[\s!en][\c!date=Date: ]
+\setupmemotext[\s!nl][\c!date=Datum: ]
+\setupmemotext[\s!de][\c!date=Datum: ]
+\setupmemotext[\s!fr][\c!date=Date\thinspace: ]
+\setupmemotext[\s!it][\c!date=Data: ]
+\setupmemotext[\s!es][\c!date=Fecha: ]
% fromname:
-\setupmemotext[\s!en][\v!fromname=From: ]
-\setupmemotext[\s!nl][\v!fromname=Van: ]
-\setupmemotext[\s!de][\v!fromname=Von: ]
-\setupmemotext[\s!fr][\v!fromname=De\thinspace: ]
-\setupmemotext[\s!it][\v!fromname=Da: ]
-\setupmemotext[\s!es][\v!fromname=De: ]
+\setupmemotext[\s!en][\c!fromname=From: ]
+\setupmemotext[\s!nl][\c!fromname=Van: ]
+\setupmemotext[\s!de][\c!fromname=Von: ]
+\setupmemotext[\s!fr][\c!fromname=De\thinspace: ]
+\setupmemotext[\s!it][\c!fromname=Da: ]
+\setupmemotext[\s!es][\c!fromname=De: ]
% toname:
-\setupmemotext[\s!en][\v!toname=To: ]
-\setupmemotext[\s!nl][\v!toname=Aan: ]
-\setupmemotext[\s!de][\v!toname=An: ]
-\setupmemotext[\s!fr][\v!toname=À\thinspace: ]
-\setupmemotext[\s!it][\v!toname=A: ]
-\setupmemotext[\s!es][\v!toname=A: ]
+\setupmemotext[\s!en][\c!toname=To: ]
+\setupmemotext[\s!nl][\c!toname=Aan: ]
+\setupmemotext[\s!de][\c!toname=An: ]
+\setupmemotext[\s!fr][\c!toname=À\thinspace: ]
+\setupmemotext[\s!it][\c!toname=A: ]
+\setupmemotext[\s!es][\c!toname=A: ]
% subject:
-\setupmemotext[\s!en][\v!subject=Subject: ]
-\setupmemotext[\s!nl][\v!subject=Onderwerp: ]
-\setupmemotext[\s!de][\v!subject=Betrifft: ]
-\setupmemotext[\s!fr][\v!subject=Concernant\thinspace: ]
-\setupmemotext[\s!it][\v!subject=Oggetto: ]
-\setupmemotext[\s!es][\v!subject=Asunto: ]
+\setupmemotext[\s!en][\c!subject=Subject: ]
+\setupmemotext[\s!nl][\c!subject=Onderwerp: ]
+\setupmemotext[\s!de][\c!subject=Betrifft: ]
+\setupmemotext[\s!fr][\c!subject=Concernant\thinspace: ]
+\setupmemotext[\s!it][\c!subject=Oggetto: ]
+\setupmemotext[\s!es][\c!subject=Asunto: ]
% Files
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii
index e25706b40eb..745ba2f56d5 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=letter-imp-default,
-%D version=2012.02.04,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Default letter style,
%D author=Wolfgang Schuster,
@@ -73,7 +73,7 @@
\setupletterlayer
[\v!reference]
[\c!alternative=\v!a,
- \c!list=\v!date]
+ \c!list=\c!date]
\setuplettersection
[\v!closing]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv
index e25706b40eb..745ba2f56d5 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv
@@ -1,6 +1,6 @@
%D \module
%D [ file=letter-imp-default,
-%D version=2012.02.04,
+%D version=2012.06.10,
%D title=\CONTEXT\ User Module,
%D subtitle=Default letter style,
%D author=Wolfgang Schuster,
@@ -73,7 +73,7 @@
\setupletterlayer
[\v!reference]
[\c!alternative=\v!a,
- \c!list=\v!date]
+ \c!list=\c!date]
\setuplettersection
[\v!closing]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii
index 88806d2ef68..b8eb9873036 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=memo-imp-margin,
-%D version=2012.02.04,
+%D version=2012.06.10,
%D title=\CONTEXT\ Memo Style,
%D subtitle=Margin style,
%D author=Wolfgang Schuster,
@@ -42,7 +42,7 @@
[\c!whitespace=\v!line]
\setupmemostyle
- [\v!fromname,\v!date,\v!toname,\v!subject]
+ [\c!fromname,\c!date,\c!toname,\c!subject]
[\c!titlestyle=\tx]
\definememoelements
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv
index 88806d2ef68..b8eb9873036 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv
@@ -1,6 +1,6 @@
%D \module
%D [ file=memo-imp-margin,
-%D version=2012.02.04,
+%D version=2012.06.10,
%D title=\CONTEXT\ Memo Style,
%D subtitle=Margin style,
%D author=Wolfgang Schuster,
@@ -42,7 +42,7 @@
[\c!whitespace=\v!line]
\setupmemostyle
- [\v!fromname,\v!date,\v!toname,\v!subject]
+ [\c!fromname,\c!date,\c!toname,\c!subject]
[\c!titlestyle=\tx]
\definememoelements