context-letter update (30oct08)

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

16 files changed, 720 insertions, 542 deletions

diff --git a/Master/texmf-dist/tex/context/third/letter/style/blockstyle.nls b/Master/texmf-dist/tex/context/third/letter/style/blockstyle.nls
index 165c41165b7..fcc0fb24de9 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/blockstyle.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/blockstyle.nls
@@ -1,56 +1,58 @@
-%D \module

-%D   [       file=blockstyle,

-%D        version=2008.05.28,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=Blockstyle initalization,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[default]

-

-\def\letter!order!sections

-  {\v!letter\v!head,\v!date\v!line,\v!reference\v!line,

-   \v!special\v!notation,\v!inside\v!address,\v!title,

-   \v!opening,\v!subject,\v!content,\v!closing,\v!appendices}

-

-\setupletter

-  [\c!alternative=\v!none]

-

-\setupletterstyle

-  [\v!option]

-  [\c!backaddress=\v!no,

-   \c!address=\v!no,

-   \c!reference=\v!no,

-   \c!marking=\v!no]

-

-\startsetups[letter:head]

-% sender information appear in a lettersection

-\stopsetups

-

-\startsetups[letter:\v!letter\v!head]

-\let\\\crlf

-\lettervalue\c!fromaddress

-\stopsetups

-

-\startsetups[letter:\v!date\v!line]

-\lettervalue\c!date

-\stopsetups

-

-\startsetups[letter:\v!reference\v!line]

-\lettervalue\c!reference

-\stopsetups

-

-\startsetups[letter:\v!special\v!notation]

-\lettervalue\c!dispatch

-\stopsetups

-

-\startsetups[letter:\v!inside\v!address]

-\let\\\crlf

-\doiflettervalue\c!toname   {\lettervalue\c!toname   \crlf}

-\doiflettervalue\c!toaddress{\lettervalue\c!toaddress\crlf}

-\stopsetups

-

-\protect \endinput

+%D \module
+%D   [       file=blockstyle,
+%D        version=2008.05.28,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=Blockstyle initalization,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[default]
+
+\def\letter!order!sections
+  {\v!letter\v!head,\v!date\v!line,\v!reference\v!line,
+   \v!special\v!notation,\v!inside\v!address,\v!title,
+   \v!opening,\v!subject,\v!content,\v!closing,\v!appendices}
+
+\setupletter
+  [\c!alternative=\v!none]
+
+\setupletterstyle
+  [\v!option]
+  [\c!backaddress=\v!no,
+   \c!address=\v!no,
+   \c!reference=\v!no,
+   \c!marking=\v!no]
+
+\startsetups[letter:head]
+% sender information appear in a lettersection
+\stopsetups
+
+\startsetups[letter:\v!letter\v!head]
+\let\\\crlf
+\lettervalue\c!fromaddress
+\stopsetups
+
+\startsetups[letter:\v!date\v!line]
+\lettervalue\c!date
+\stopsetups
+
+\startsetups[letter:\v!reference\v!line]
+\lettervalue\c!reference
+\stopsetups
+
+\startsetups[letter:\v!special\v!notation]
+\lettervalue\c!dispatch
+\stopsetups
+
+\startsetups[letter:\v!inside\v!address]
+\let\\\crlf
+\doiflettervalue\c!toname   {\lettervalue\c!toname   \crlf}
+\doiflettervalue\c!toaddress{\lettervalue\c!toaddress\crlf}
+\stopsetups
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/default.nls b/Master/texmf-dist/tex/context/third/letter/style/default.nls
index 4637dfec6a8..4878317b08b 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/default.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/default.nls
@@ -1,34 +1,87 @@
-%D \module

-%D   [       file=default,

-%D        version=2008.07.08,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=Blockstyle initalization,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\def\doresetletterlayer  #1{\dododefineletterlayer[#1]}

-\def\doresetlettersection#1{\dodefinelettersection[#1]}

-

-\processcommacommand[\letter!list!layers  ]\doresetletterlayer

-\processcommacommand[\letter!list!sections]\doresetlettersection

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!topspace=.08417508418\paperheight,

-   \c!top=\!!zeropoint,

-   \c!topdistance=\!!zeropoint,

-   \c!header=.06734006734\paperheight,

-   \c!headerdistance=\!!zeropoint,

-   \c!height=.84175084175\paperheight,

-   \c!footerdistance=\!!zeropoint,

-   \c!footer=.06734006734\paperheight,

-   \c!bottomdistance=\!!zeropoint,

-   \c!bottom=\!!zeropoint,

-   \c!backspace=.11904761905\paperwidth,

-   \c!width=.71428571429\paperwidth,

-   \c!bottomspace=\!!zeropoint]

-

-\protect \endinput

+%D \module
+%D   [       file=default,
+%D        version=2008.10.27,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=Blockstyle initalization,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\def\doresetletterlayer  #1{\dododefineletterlayer[#1]}
+\def\doresetlettersection#1{\dodefinelettersection[#1]}
+
+\processcommacommand[\letter!list!layers  ]\doresetletterlayer
+\processcommacommand[\letter!list!sections]\doresetlettersection
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!topspace=.08417508418\paperheight,
+   \c!top=\!!zeropoint,
+   \c!topdistance=\!!zeropoint,
+   \c!header=.06734006734\paperheight,
+   \c!headerdistance=\!!zeropoint,
+   \c!height=.84175084175\paperheight,
+   \c!footerdistance=\!!zeropoint,
+   \c!footer=.06734006734\paperheight,
+   \c!bottomdistance=\!!zeropoint,
+   \c!bottom=\!!zeropoint,
+   \c!backspace=.11904761905\paperwidth,
+   \c!width=.71428571429\paperwidth,
+   \c!bottomspace=\!!zeropoint]
+
+\setupletter
+  [\c!alternative=\v!a,
+   \c!list=\v!date,
+   \c!date=\currentdate,
+   \c!width=\zeropoint]
+
+\setupletterstyle
+  [\v!option]
+  [\c!dispatch=\v!yes,
+   \c!addressee=\v!yes]
+
+\setupletterstyle
+  [\v!nexthead,\v!nextfoot]
+  [\c!state=\v!next]
+
+\setupletterstyle
+  [\v!reference]
+  [\v!option]
+  [%\c!list=\lettervalue\c!list, % not yet
+   \c!alternative=\lettervalue\c!alternative]
+
+\setupletterstyle
+  [\v!backaddress]
+  [\v!option]
+  [\c!alternative=\v!no,
+   \c!separator=\textcomma\space]
+
+\setupletterstyle
+  [\v!dispatch,\v!addressee]
+  [\c!align=\v!right,
+   \c!width=\hsize,
+   \c!leftmargin=\zeropoint,
+   \c!rightmargin=\zeropoint,
+   \c!offset=\zeropoint,
+   \c!frame=\v!off]
+
+\setupletterstyle
+  [\v!dispatch]
+  [\c!location=\v!bottom,
+   \c!height=\dimexpr(\vsize/9)*3\relax]
+
+\setupletterstyle
+  [\v!addressee]
+  [\c!location=\v!top,
+   \c!height=\dimexpr(\vsize/9)*6\relax]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!after={\blank[\v!line]},
+   \c!inbetween={\blank[\v!endgraf,\v!nobreak,2*\v!line]}]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/dina.nls b/Master/texmf-dist/tex/context/third/letter/style/dina.nls
index 24b535b5fa4..54b87231216 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/dina.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/dina.nls
@@ -5,7 +5,9 @@
 %D       subtitle=DIN 676 A,
 %D         author=Wolfgang Schuster,
 %D           date=\currentdate,
-%D      copyright=Public Domain]
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
 
 \unprotect
 
diff --git a/Master/texmf-dist/tex/context/third/letter/style/dinb.nls b/Master/texmf-dist/tex/context/third/letter/style/dinb.nls
index 2714f536e99..69da94987e0 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/dinb.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/dinb.nls
@@ -5,10 +5,14 @@
 %D       subtitle=DIN 676 B,
 %D         author=Wolfgang Schuster,
 %D           date=\currentdate,
-%D      copyright=Public Domain]
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
 
 \unprotect
 
+\useletterstyle[default] % default values
+
 \setupletterstyle
   [\v!firstpage,\v!secondpage]
   [\c!topspace=114.3mm,
@@ -29,7 +33,7 @@
 \setupletterstyle
   [\v!title,\v!subject,\v!opening,\v!appendices]
   [\c!before=,
-   \c!after={\blank[line]}]
+   \c!after={\blank[\v!line]}]
 
 \setupletterstyle
   [\v!title]
@@ -96,8 +100,7 @@
    \c!height=5mm,
    \c!voffset=\dimexpr\letterstylevalue\v!address\c!voffset-\letterstylevalue\v!backaddress\c!height\relax,
    \c!width=85mm,
-   \c!style=\c!tf\c!xx,
-   \c!bottomframe=\v!on]
+   \c!style=\c!tf\c!xx]
 
 \setupletterstyle
   [\v!reference]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/dutch.nls b/Master/texmf-dist/tex/context/third/letter/style/dutch.nls
index 43d69a381b7..841daf4e005 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/dutch.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/dutch.nls
@@ -5,7 +5,9 @@
 %D       subtitle=Dutch NEN Style,
 %D         author=Wolfgang Schuster,
 %D           date=\currentdate,
-%D      copyright=Public Domain]
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
 
 \unprotect
 
@@ -51,7 +53,8 @@
   [\v!backaddress]
   [\c!voffset=50mm,
    \c!height=5mm,
-   \c!width=80mm]
+   \c!width=80mm,
+   \c!bottomframe=\v!yes]
 
 \setupletterstyle
   [\v!address]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/english.nls b/Master/texmf-dist/tex/context/third/letter/style/english.nls
index bcbfcdea3ff..64000adb8d3 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/english.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/english.nls
@@ -1,23 +1,25 @@
-%D \module

-%D   [       file=english,

-%D        version=2008.03.13,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=English style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-%D This is the second letter style for my letter module. The first

-%D style was \mono{dina.nls} with its slightly different alternative

-%D \mono{dinb.nls} but both count only as one style.

-

-\def\letter!order!sections

-  {\v!title,\v!opening,\v!subject,\v!content,\v!closing,\v!appendices}

-

-\setupletterstyle

-  [\v!subject]

-  [\c!style=]

-

-\protect \endinput

+%D \module
+%D   [       file=english,
+%D        version=2008.03.13,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=English style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+%D This is the second letter style for my letter module. The first
+%D style was \mono{dina.nls} with its slightly different alternative
+%D \mono{dinb.nls} but both count only as one style.
+
+\def\letter!order!sections
+  {\v!title,\v!opening,\v!subject,\v!content,\v!closing,\v!appendices}
+
+\setupletterstyle
+  [\v!subject]
+  [\c!style=]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/french.nls b/Master/texmf-dist/tex/context/third/letter/style/french.nls
index b2c93696af8..b2cc80c14c3 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/french.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/french.nls
@@ -1,52 +1,87 @@
-%D \module

-%D   [       file=french,

-%D        version=2008.04.28,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=French Style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[dinb]

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!backspace=26mm,

-   \c!width=\v!middle,

-   \c!topspace=105mm,

-   \c!bottomspace=22mm,

-   \c!height=\v!fit]

-

-\setupletterstyle

-  [\v!secondpage]

-  [\c!topspace=27mm,

-   \c!header=12mm]

-

-\setupletterstyle

-  [\v!head]

-  [\c!hoffset=16mm,

-   \c!voffset=23mm]

-

-\setupletterstyle

-  [\v!address]

-  [\c!hoffset=115mm,

-   \c!voffset=53mm]

-

-\setupletterstyle

-  [\v!location]

-  [\c!hoffset=115mm,

-   \c!voffset=28mm]

-

-\setupletterstyle

-  [\v!title,\v!subject,\v!opening,\v!content,\v!closing,\v!appendices]

-  [\c!leftmargin=15mm]

-

-\setupletterstyle

-  [\v!option]

-  [\c!cutmark=\v!no,

-   \c!botmark=\v!no,

-   \c!usermark=\v!yes]

-

-\protect \endinput

+%D \module
+%D   [       file=french,
+%D        version=2008.08.07,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=French Style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[dinb]
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!backspace=25mm,
+   \c!width=\v!middle,
+   \c!topspace=95mm,
+   \c!bottomspace=25mm,
+   \c!height=\v!fit]
+
+\setupletterstyle
+  [\v!secondpage]
+  [\c!topspace=15mm,
+   \c!header=10mm]
+
+\setupletterstyle
+  [\v!head]
+  [\c!hoffset=\backspace,
+   \c!voffset=25mm]
+
+\setupletterstyle
+  [\v!backaddress]
+  [\c!alternative=\v!no]
+
+\setupletterstyle
+  [\v!address]
+  [\c!hoffset=107mm,
+   \c!voffset=55mm]
+
+\setupletterstyle
+  [\v!addressee]
+  [\c!height=\vsize,
+   \c!location=\v!normal,
+   \c!align=\v!right]
+
+\setupletterstyle
+  [\v!location]
+  [\c!hoffset=107mm,
+   \c!voffset=30mm]
+
+\setupletterstyle
+  [\v!reference]
+  [\c!alternative=\v!none]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!inbetween={\blank[\v!endgraf,\v!nobreak,2*\v!line]}]
+
+\setupletterstyle
+  [\v!enclosure]
+  [\c!location=\v!left,
+   \c!width=\v!fit,
+   \c!headstyle=\c!tf]
+
+\setupletterstyle
+  [\v!opening]
+  [\c!after={\blank[2*\v!line]}]
+
+\setupletterstyle
+  [\v!content]
+  [\c!after={\blank[\v!nobreak,2*\v!line]}]
+
+\setupletterstyle
+  [\v!location,\v!opening,\v!closing]
+  [\c!alternative=\v!french]
+
+\setupletterstyle
+  [\v!option]
+  [\c!whitespace=\v!line,
+   \c!cutmark=\v!no,
+   \c!botmark=\v!no,
+   \c!dispatch=\v!no]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls b/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls
index db5505b0cf6..e449e6f5e9a 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/fullblock.nls
@@ -1,57 +1,59 @@
-%D \module

-%D   [       file=fullblock,

-%D        version=2008.05.28,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=full-block/complete block style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[blockstyle]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,

-   \v!inside\v!address,\v!title,\v!opening,\v!subject,\v!content]

-  [\c!after={\blank[\v!line]}]

-

-\setupletterstyle

-  [\v!closing]

-  [\c!after={\blank[2*\v!line]}]

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!backspace=1in,

-   \c!width=\v!middle,

-   \c!topspace=1in,

-   \c!header=0in,

-   \c!footer=0in,

-   \c!height=\v!fit]

-

-\setupletterstyle

-  [\v!secondpage]

-  [\c!header=.5in]

-

-\startsetups[letter:header:fullblock]

-

-  \framed

-    [\c!frame=\v!off,

-     \c!location=\v!top,

-     \c!align=\v!left]

-    {\lettervalue\c!date   \\

-     \lettervalue\c!reference}

-

-\stopsetups

-

-\setupletterstyle

-  [\v!header]

-  [\c!lefttext=\lettervalue\c!toname,

-   \c!middletext=\pagenumber,

-   \c!righttext=\setups{letter:header:fullblock}]

-

-\setupletterstyle

-  [\v!option]

-  [\c!whitespace=\v!line]

-

-\protect \endinput

+%D \module
+%D   [       file=fullblock,
+%D        version=2008.05.28,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=full-block/complete block style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[blockstyle]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,
+   \v!inside\v!address,\v!title,\v!opening,\v!subject,\v!content]
+  [\c!after={\blank[\v!line]}]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!after={\blank[2*\v!line]}]
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!backspace=1in,
+   \c!width=\v!middle,
+   \c!topspace=1in,
+   \c!header=0in,
+   \c!footer=0in,
+   \c!height=\v!fit]
+
+\setupletterstyle
+  [\v!secondpage]
+  [\c!header=.5in]
+
+\startsetups[letter:header:fullblock]
+
+  \framed
+    [\c!frame=\v!off,
+     \c!location=\v!top,
+     \c!align=\v!left]
+    {\lettervalue\c!date   \\
+     \lettervalue\c!reference}
+
+\stopsetups
+
+\setupletterstyle
+  [\v!header]
+  [\c!lefttext=\lettervalue\c!toname,
+   \c!middletext=\pagenumber,
+   \c!righttext=\setups{letter:header:fullblock}]
+
+\setupletterstyle
+  [\v!option]
+  [\c!whitespace=\v!line]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/hanging.nls b/Master/texmf-dist/tex/context/third/letter/style/hanging.nls
index 0257a5c7cb0..a78231235b0 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/hanging.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/hanging.nls
@@ -1,67 +1,69 @@
-%D \module

-%D   [       file=hanging,

-%D        version=2008.05.28,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=Hanging indented style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[blockstyle]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,

-   \v!inside\v!address,\v!title,\v!opening,\v!content]

-  [\c!after={\blank[\v!line]}]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,

-   \v!date\v!line,\v!special\v!notation,\v!closing]

-  [\c!leftmargin=.5\textwidth]

-

-\setupletterstyle

-  [\v!content]

-  [\c!before=\everypar{\hangindent1.5em\relax}]

-

-\setupletterstyle

-  [\v!closing]

-  [\c!after={\blank[2*\v!line]}]

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!backspace=1in,

-   \c!width=\v!middle,

-   \c!topspace=1in,

-   \c!header=0in,

-   \c!footer=0in,

-   \c!height=\v!fit]

-

-\setupletterstyle

-  [\v!secondpage]

-  [\c!header=1in]

-

-\setuplabeltext[en][page=Page~]

-

-\startsetups[letter:header:hanging]

-

-  \framed

-    [\c!frame=\v!off,

-     \c!align=v!right]

-    {\lettervalue\c!toname    \\

-     \lettervalue\c!date      \\

-     \lettervalue\c!reference \\

-     \labeltext{page}\pagenumber}

-

-\stopsetups

-

-\setupletterstyle

-  [\v!header]

-  [\c!lefttext=\setups{letter:header:hanging}]

-

-\setupletterstyle

-  [\v!option]

-  [\c!whitespace=\v!line]

-

-\protect \endinput

+%D \module
+%D   [       file=hanging,
+%D        version=2008.05.28,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=Hanging indented style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[blockstyle]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,
+   \v!inside\v!address,\v!title,\v!opening,\v!content]
+  [\c!after={\blank[\v!line]}]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,
+   \v!date\v!line,\v!special\v!notation,\v!closing]
+  [\c!leftmargin=.5\textwidth]
+
+\setupletterstyle
+  [\v!content]
+  [\c!before=\everypar{\hangindent1.5em\relax}]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!after={\blank[2*\v!line]}]
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!backspace=1in,
+   \c!width=\v!middle,
+   \c!topspace=1in,
+   \c!header=0in,
+   \c!footer=0in,
+   \c!height=\v!fit]
+
+\setupletterstyle
+  [\v!secondpage]
+  [\c!header=1in]
+
+\setuplabeltext[en][page=Page~]
+
+\startsetups[letter:header:hanging]
+
+  \framed
+    [\c!frame=\v!off,
+     \c!align=v!right]
+    {\lettervalue\c!toname    \\
+     \lettervalue\c!date      \\
+     \lettervalue\c!reference \\
+     \labeltext{page}\pagenumber}
+
+\stopsetups
+
+\setupletterstyle
+  [\v!header]
+  [\c!lefttext=\setups{letter:header:hanging}]
+
+\setupletterstyle
+  [\v!option]
+  [\c!whitespace=\v!line]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/knuth.nls b/Master/texmf-dist/tex/context/third/letter/style/knuth.nls
index 4f06d76bcb8..ae34f0208ca 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/knuth.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/knuth.nls
@@ -5,7 +5,9 @@
 %D       subtitle=Letterformat Style,
 %D         author=Wolfgang Schuster,
 %D           date=\currentdate,
-%D      copyright=Public Domain]
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
 
 \unprotect
 
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo.nls b/Master/texmf-dist/tex/context/third/letter/style/memo.nls
index 34c4ba4eac4..d25d1398c89 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo.nls
@@ -1,70 +1,72 @@
-%D \module

-%D   [       file=memo,

-%D        version=2008.07.03,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=Memo style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[blockstyle]

-

-\def\letter!order!sections

-  {\v!date\v!line,\v!reference\v!line,\v!inside\v!address,

-   \v!letter\v!head,\v!special\v!notation,\v!title,

-   \v!opening,\v!subject,\v!content,\v!closing,\v!appendices}

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,

-   \v!special\v!notation,\v!inside\v!address,

-   \v!title,\v!subject]

-  [\c!before=\nowhitespace,

-   \c!after=\nowhitespace]

-

-\setupletterstyle

-  [\v!subject,\v!content,\v!closing]

-  [\c!after={\blank[\v!line]}]

-

-\setupletterstyle

-  [\v!closing]

-  [\c!leftmargin=.5\textwidth]

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!backspace=1in,

-   \c!width=\v!middle,

-   \c!topspace=1in,

-   \c!header=0in,

-   \c!footer=0in,

-   \c!height=\v!fit]

-

-\setupletterstyle

-  [\v!option]

-  [\c!whitespace=\v!line,

-   \c!opening=\v!no,

-   \c!reference\c!line=\v!no,

-   \v!special\v!notation=\v!no,

-   \c!title=\v!no]

-

-\startsetups[letter:\v!date\v!line]

-\labeltext{\v!memo:\c!date}\lettervalue\c!date

-\stopsetups

-

-\startsetups[letter:\v!letter\v!head]

-\let\\\crlf

-\labeltext{\v!memo:\c!fromname}\lettervalue\c!fromname

-\stopsetups

-

-\startsetups[letter:\v!inside\v!address]

-\let\\\crlf

-\labeltext{\v!memo:\c!toname}\lettervalue\c!toname

-\stopsetups

-

-\startsetups[letter:subject]

-\let\\\crlf

-\labeltext{\v!memo:\c!subject}\lettervalue\c!subject

-\stopsetups

-

-\protect \endinput

+%D \module
+%D   [       file=memo,
+%D        version=2008.07.03,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=Memo style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[blockstyle]
+
+\def\letter!order!sections
+  {\v!date\v!line,\v!reference\v!line,\v!inside\v!address,
+   \v!letter\v!head,\v!special\v!notation,\v!title,
+   \v!opening,\v!subject,\v!content,\v!closing,\v!appendices}
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,
+   \v!special\v!notation,\v!inside\v!address,
+   \v!title,\v!subject]
+  [\c!before=\nowhitespace,
+   \c!after=\nowhitespace]
+
+\setupletterstyle
+  [\v!subject,\v!content,\v!closing]
+  [\c!after={\blank[\v!line]}]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!leftmargin=.5\textwidth]
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!backspace=1in,
+   \c!width=\v!middle,
+   \c!topspace=1in,
+   \c!header=0in,
+   \c!footer=0in,
+   \c!height=\v!fit]
+
+\setupletterstyle
+  [\v!option]
+  [\c!whitespace=\v!line,
+   \c!opening=\v!no,
+   \c!reference\c!line=\v!no,
+   \v!special\v!notation=\v!no,
+   \c!title=\v!no]
+
+\startsetups[letter:\v!date\v!line]
+\labeltext{\v!memo:\c!date}\lettervalue\c!date
+\stopsetups
+
+\startsetups[letter:\v!letter\v!head]
+\let\\\crlf
+\labeltext{\v!memo:\c!fromname}\lettervalue\c!fromname
+\stopsetups
+
+\startsetups[letter:\v!inside\v!address]
+\let\\\crlf
+\labeltext{\v!memo:\c!toname}\lettervalue\c!toname
+\stopsetups
+
+\startsetups[letter:subject]
+\let\\\crlf
+\labeltext{\v!memo:\c!subject}\lettervalue\c!subject
+\stopsetups
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/modified.nls b/Master/texmf-dist/tex/context/third/letter/style/modified.nls
index de8f65110f1..df661ba7f9b 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/modified.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/modified.nls
@@ -1,63 +1,65 @@
-%D \module

-%D   [       file=modified,

-%D        version=2008.05.28,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=Block/Modified block style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[blockstyle]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,

-   \v!inside\v!address,\v!title,\v!opening,\v!content]

-  [\c!after={\blank[\v!line]}]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,

-   \v!date\v!line,\v!special\v!notation,\v!closing]

-  [\c!leftmargin=.5\textwidth]

-

-\setupletterstyle

-  [\v!closing]

-  [\c!after={\blank[2*\v!line]}]

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!backspace=1in,

-   \c!width=\v!middle,

-   \c!topspace=1in,

-   \c!header=0in,

-   \c!footer=0in,

-   \c!height=\v!fit]

-

-\setupletterstyle

-  [\v!secondpage]

-  [\c!header=1in]

-

-\setuplabeltext[en][page=Page~]

-

-\startsetups[letter:header:modified]

-

-  \framed

-    [\c!frame=\v!off,

-     \c!align=v!right]

-    {\lettervalue\c!toname    \\

-     \lettervalue\c!date      \\

-     \lettervalue\c!reference \\

-     \labeltext{page}\pagenumber}

-

-\stopsetups

-

-\setupletterstyle

-  [\v!header]

-  [\c!lefttext=\setups{letter:header:modified}]

-

-\setupletterstyle

-  [\v!option]

-  [\c!whitespace=\v!line]

-

-\protect \endinput

+%D \module
+%D   [       file=modified,
+%D        version=2008.05.28,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=Block/Modified block style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[blockstyle]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,
+   \v!inside\v!address,\v!title,\v!opening,\v!content]
+  [\c!after={\blank[\v!line]}]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,
+   \v!date\v!line,\v!special\v!notation,\v!closing]
+  [\c!leftmargin=.5\textwidth]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!after={\blank[2*\v!line]}]
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!backspace=1in,
+   \c!width=\v!middle,
+   \c!topspace=1in,
+   \c!header=0in,
+   \c!footer=0in,
+   \c!height=\v!fit]
+
+\setupletterstyle
+  [\v!secondpage]
+  [\c!header=1in]
+
+\setuplabeltext[en][page=Page~]
+
+\startsetups[letter:header:modified]
+
+  \framed
+    [\c!frame=\v!off,
+     \c!align=v!right]
+    {\lettervalue\c!toname    \\
+     \lettervalue\c!date      \\
+     \lettervalue\c!reference \\
+     \labeltext{page}\pagenumber}
+
+\stopsetups
+
+\setupletterstyle
+  [\v!header]
+  [\c!lefttext=\setups{letter:header:modified}]
+
+\setupletterstyle
+  [\v!option]
+  [\c!whitespace=\v!line]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/pragma.nls b/Master/texmf-dist/tex/context/third/letter/style/pragma.nls
index a806947df8b..72ecdc87451 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/pragma.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/pragma.nls
@@ -5,7 +5,9 @@
 %D       subtitle=Pragma Style,
 %D         author=Wolfgang Schuster,
 %D           date=\currentdate,
-%D      copyright=Public Domain]
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
 
 \unprotect
 
diff --git a/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls b/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls
index c61ac22b279..1455fef1c29 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/semiblock.nls
@@ -1,52 +1,54 @@
-%D \module

-%D   [       file=semiblock,

-%D        version=2008.05.28,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=Semiblock style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[blockstyle]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,

-   \v!inside\v!address,\v!title,\v!opening,\v!subject,\v!content]

-  [\c!after={\blank[\v!line]}]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,

-   \v!date\v!line,\v!special\v!notation,\v!closing]

-  [\c!leftmargin=.5\textwidth]

-

-\setupletterstyle

-  [\v!closing]

-  [\c!after={\blank[2*\v!line]}]

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!backspace=1in,

-   \c!width=\v!middle,

-   \c!topspace=1in,

-   \c!header=0in,

-   \c!footer=0in,

-   \c!height=\v!fit]

-

-\setupletterstyle

-  [\v!secondpage]

-  [\c!header=.5in]

-

-\setupletterstyle

-  [\v!header]

-  [\c!lefttext=\lettervalue\c!toname,

-   \c!middletext=\pagenumber,

-   \c!righttext=\lettervalue\c!date]

-

-\setupletterstyle

-  [\v!option]

-  [\c!whitespace=\v!line,

-   \c!indenting={\v!yes,\v!medium,\v!first}]

-

-\protect \endinput

+%D \module
+%D   [       file=semiblock,
+%D        version=2008.05.28,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=Semiblock style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[blockstyle]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,
+   \v!inside\v!address,\v!title,\v!opening,\v!subject,\v!content]
+  [\c!after={\blank[\v!line]}]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,
+   \v!date\v!line,\v!special\v!notation,\v!closing]
+  [\c!leftmargin=.5\textwidth]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!after={\blank[2*\v!line]}]
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!backspace=1in,
+   \c!width=\v!middle,
+   \c!topspace=1in,
+   \c!header=0in,
+   \c!footer=0in,
+   \c!height=\v!fit]
+
+\setupletterstyle
+  [\v!secondpage]
+  [\c!header=.5in]
+
+\setupletterstyle
+  [\v!header]
+  [\c!lefttext=\lettervalue\c!toname,
+   \c!middletext=\pagenumber,
+   \c!righttext=\lettervalue\c!date]
+
+\setupletterstyle
+  [\v!option]
+  [\c!whitespace=\v!line,
+   \c!indenting={\v!yes,\v!medium,\v!first}]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/simplified.nls b/Master/texmf-dist/tex/context/third/letter/style/simplified.nls
index 90d1cccc188..504556ca409 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/simplified.nls
+++ b/Master/texmf-dist/tex/context/third/letter/style/simplified.nls
@@ -1,59 +1,64 @@
-%D \module

-%D   [       file=simplified,

-%D        version=2008.05.28,

-%D          title=\CONTEXT\ Letter Style,

-%D       subtitle=Simplified style,

-%D         author=Wolfgang Schuster,

-%D           date=\currentdate,

-%D      copyright=Public Domain]

-

-\unprotect

-

-\useletterstyle[blockstyle]

-

-\setupletterstyle

-  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,

-   \v!inside\v!address,\v!title,\v!opening,\v!subject,\v!content]

-  [\c!after={\blank[\v!line]}]

-

-\setupletterstyle

-  [\v!closing]

-  [\c!after={\blank[2*\v!line]}]

-

-\setupletterstyle

-  [\v!firstpage,\v!secondpage]

-  [\c!backspace=1in,

-   \c!width=\v!middle,

-   \c!topspace=1in,

-   \c!header=0in,

-   \c!footer=0in,

-   \c!height=\v!fit]

-

-\setupletterstyle

-  [\v!secondpage]

-  [\c!header=.5in]

-

-\startsetups[letter:header:simplified]

-

-  \framed

-    [\c!frame=\v!off,

-     \c!location=\v!top,

-     \c!align=\v!left]

-    {\lettervalue\c!date   \\

-     \lettervalue\c!reference}

-

-\stopsetups

-

-\setupletterstyle

-  [\v!header]

-  [\c!lefttext=\lettervalue\c!toname,

-   \c!middletext=\pagenumber,

-   \c!righttext=\setups{letter:header:simplified}]

-

-\setupletterstyle

-  [\v!option]

-  [\c!whitespace=\v!line,

-   %\c!closing=\v!no, % not possible at the moment because it disables the signature

-   \c!opening=\v!no]

-

-\protect \endinput

+%D \module
+%D   [       file=simplified,
+%D        version=2008.05.28,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=Simplified style,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+\useletterstyle[blockstyle]
+
+\setupletterstyle
+  [\v!letter\v!head,\v!reference\v!line,\v!special\v!notation,
+   \v!inside\v!address,\v!title,\v!opening,\v!subject,\v!content]
+  [\c!after={\blank[\v!line]}]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!after={\blank[2*\v!line]}]
+
+\setupletterstyle
+  [\v!firstpage,\v!secondpage]
+  [\c!backspace=1in,
+   \c!width=\v!middle,
+   \c!topspace=1in,
+   \c!header=0in,
+   \c!footer=0in,
+   \c!height=\v!fit]
+
+\setupletterstyle
+  [\v!secondpage]
+  [\c!header=.5in]
+
+\startsetups[letter:header:simplified]
+
+  \framed
+    [\c!frame=\v!off,
+     \c!location=\v!top,
+     \c!align=\v!left]
+    {\lettervalue\c!date   \\
+     \lettervalue\c!reference}
+
+\stopsetups
+
+\setupletterstyle
+  [\v!header]
+  [\c!lefttext=\lettervalue\c!toname,
+   \c!middletext=\pagenumber,
+   \c!righttext=\setups{letter:header:simplified}]
+
+\setupletterstyle
+  [\v!closing]
+  [\c!alternative=\v!simplified]
+
+\setupletterstyle
+  [\v!option]
+  [\c!whitespace=\v!line,
+   \c!opening=\v!no]
+
+\protect \endinput
diff --git a/Master/texmf-dist/tex/context/third/letter/style/user.ori b/Master/texmf-dist/tex/context/third/letter/style/user.ori
new file mode 100644
index 00000000000..beaaf4e9405
--- /dev/null
+++ b/Master/texmf-dist/tex/context/third/letter/style/user.ori
@@ -0,0 +1,59 @@
+%D \module
+%D   [       file=user,
+%D        version=2008.07.08,
+%D          title=\CONTEXT\ Letter Style,
+%D       subtitle=User Settings,
+%D         author=Wolfgang Schuster,
+%D           date=\currentdate,
+%D      copyright=Wolfgang Schuster,
+%D          email=schuster.wolfgang@googlemail.com,
+%D        license=Public Domain]
+
+\unprotect
+
+%D You could use this file to set default values for your own letters.
+%D To enable the values rename the file to \mono{user.nls} and place in
+%D a directory in your local TeX tree where ConTeXt is able to find it.
+%D 
+%D This style file is loaded together with the main module and the default
+%D interface but after the default styles and after every style loaded
+%D with the optional argument for \tex{usemodule} but additional styles
+%D which you load after \tex{usemodule} could overwrite the values in this
+%D style, to take care of this you could either load this module again
+%D in your document or set the values directly in your files after
+%D the styles are loaded.
+
+%D Change the interface.
+
+% \useletterinterface[pragma]
+% \useletterinterface[knuth]
+
+%D Load your default styles.
+
+% \useletterstyle[default]
+% \useletterstyle[dina]
+% \useletterstyle[dinb]
+% \useletterstyle[dutch]
+% \useletterstyle[memo]
+% \useletterstyle[hanging]
+% \useletterstyle[modified]
+% \useletterstyle[fullblock]
+% \useletterstyle[semiblock]
+% \useletterstyle[blockstyle]
+% \useletterstyle[simplified]
+
+% \useletterstyle[simplified]
+
+%D You could preload extension files you normally use in your documents.
+
+% \useletterextension[corres]
+% \useletterextension[optimize]
+% \useletterextension[addrentry]
+
+%D You can change the default to your own preferences.
+
+% \setupletterstyle
+%   [\v!option]
+%   [\c!backaddress=\v!yes]
+
+\protect \endinput