context-letter (27dec11)

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

4 files changed, 72 insertions, 12 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 436e031a91b..f0c91104643 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=2011.12.22,
+%D      version=2011.12.26,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Correspondence,
 %D       author=Wolfgang Schuster,
@@ -111,6 +111,7 @@
   \setinterfacevariable {simplified}      {simplified}
   \setinterfacevariable {modified}        {modified}
   \setinterfacevariable {blockstyle}      {blockstyle}
+  \setinterfacevariable {knuth}           {knuth}
 \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 a7648dfae17..714c0bbe941 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=2011.12.24,
+%D      version=2011.12.26,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Correspondence,
 %D       author=Wolfgang Schuster,
@@ -115,6 +115,7 @@
   \setinterfacevariable {simplified}      {simplified}
   \setinterfacevariable {modified}        {modified}
   \setinterfacevariable {blockstyle}      {blockstyle}
+  \setinterfacevariable {knuth}           {knuth}
 \stopinterface
 
 % Messages
@@ -439,11 +440,9 @@
    \processcommalist[#elements]\correspondence_style_command}
 
 \unexpanded\def\correspondence_style_width#environment#element#content%
-  {\def\currentcorrespondencestyle{#environment:#element}%
-   \hbox \ifzeropt\correspondencestyleparameter\c!width \else to \correspondencestyleparameter\c!width \fi{#content\hss}}
-
-\setupcorrespondencestyle
-  [\c!width=\zeropoint]
+  {\edef\currentcorrespondencestyle  {#environment:#element}%
+   \edef\p_correspondence_style_width{\correspondencestyleparameter\c!width}%
+   \hbox \ifx\p_correspondence_style_width\empty \else to \p_correspondence_style_width \fi{#content\hss}}
 
 %D \section{Layout}
 %D
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 50a11e5b475..42dd26f596d 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=2011.12.24,
+%D      version=2011.12.26,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Letters,
 %D       author=Wolfgang Schuster,
@@ -177,6 +177,40 @@
       \llap{\correspondenceparameter\c!date}}
    \hairline}
 
+\defineletterelement[\v!layer][\v!nexthead][\v!fullblock]
+  {\maxaligned
+     {\rlap{\correspondenceparameter\c!toname}%
+      \midaligned{\subpagenumber}%
+      \llap{\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=\v!left]
+        {\correspondenceparameter\c!date   \\
+         \correspondenceparameter\c!reference}}}}
+
+\defineletterelement[\v!layer][\v!nexthead][\v!hanging]
+  {\maxaligned
+     {\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=v!right]
+       {\correspondenceparameter\c!toname    \\
+        \correspondenceparameter\c!date      \\
+        \correspondenceparameter\c!reference \\
+        \lettertext\v!page\subpagenumber}}}
+
+\defineletterelement[\v!layer][\v!nexthead][\v!semiblock]
+  {\maxaligned
+     {\rlap{\correspondenceparameter\c!toname}%
+      \midaligned{\subpagenumber}%
+      \llap{\correspondenceparameter\c!date}}}
+
+\defineletterelement[\v!layer][\v!nexthead][\v!simplified]
+  {\letterelement[\v!layer][\v!nexthead][\v!fullblock]}
+
+\defineletterelement[\v!layer][\v!nexthead][\v!modified]
+  {\letterelement[\v!layer][\v!nexthead][\v!hanging]}
+
+\defineletterelement[\v!layer][\v!nexthead][\v!knuth]
+  {\maxaligned
+     {\rlap{\correspondenceparameter\c!toname}%
+      \midaligned{\currentdate}%
+      \llap{\lettertext\v!page\subpagenumber}}}
+
 \startsetups[\v!letter:\v!layer:\v!nexthead]
 \def\\{\correspondencelayerparameter\c!separator}
 \letterelement[\v!layer][\v!nexthead][\correspondencelayerparameter\c!alternative]
@@ -452,6 +486,9 @@
    \doifsomething{\correspondenceparameter\c!toname}\\
    \correspondenceparameter\c!toaddress}
 
+\defineletterelement[\v!section][\v!address][\v!knuth]
+  {\letterelement[\v!section][\v!address][\v!blockstyle]}
+
 \startsetups[\v!letter:\v!section:\v!address]
 \def\\{\correspondencesectionparameter\c!separator}
 \letterelement[\v!section][\v!address][\correspondencesectionparameter\c!alternative]
@@ -510,6 +547,13 @@
       \raggedcenter\doadaptleftskip{.5\textwidth}%
       \correspondenceparameter\c!signature\endgraf}}
 
+\defineletterelement[\v!section][\v!closing][\v!knuth]
+  {\doadaptleftskip{\dimexpr\textwidth/13*8\relax}%
+   \correspondenceparameter\c!closing
+   \doifsomething{\correspondenceparameter\c!signature}
+     {\blank[\correspondencesectionparameter\c!spaceinbetween]%
+      \correspondenceparameter\c!signature}}
+
 \startsetups[\v!letter:\v!section:\v!closing]
 \def\\{\correspondencesectionparameter\c!separator}
 \letterelement[\v!section][\v!closing][\correspondencesectionparameter\c!alternative]
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 770a3636445..39e968391b3 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=2011.11.24,
+%D      version=2011.11.26,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Letters,
 %D       author=Wolfgang Schuster,
@@ -186,7 +186,7 @@
 \defineletterelement[\v!layer][\v!nexthead][\v!fullblock]
   {\maxaligned
      {\rlap{\correspondenceparameter\c!toname}%
-      \midaligned{\pagenumber}%
+      \midaligned{\subpagenumber}%
       \llap{\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=\v!left]
         {\correspondenceparameter\c!date   \\
          \correspondenceparameter\c!reference}}}}
@@ -197,12 +197,12 @@
        {\correspondenceparameter\c!toname    \\
         \correspondenceparameter\c!date      \\
         \correspondenceparameter\c!reference \\
-        \lettertext\c!page\pagenumber}}\hss}
+        \lettertext\v!page\subpagenumber}}}
 
 \defineletterelement[\v!layer][\v!nexthead][\v!semiblock]
   {\maxaligned
      {\rlap{\correspondenceparameter\c!toname}%
-      \midaligned{\pagenumber}%
+      \midaligned{\subpagenumber}%
       \llap{\correspondenceparameter\c!date}}}
 
 \defineletterelement[\v!layer][\v!nexthead][\v!simplified]
@@ -211,6 +211,12 @@
 \defineletterelement[\v!layer][\v!nexthead][\v!modified]
   {\letterelement[\v!layer][\v!nexthead][\v!hanging]}
 
+\defineletterelement[\v!layer][\v!nexthead][\v!knuth]
+  {\maxaligned
+     {\rlap{\correspondenceparameter\c!toname}%
+      \midaligned{\currentdate}%
+      \llap{\lettertext\v!page\subpagenumber}}}
+
 \startsetups[\v!letter:\v!layer:\v!nexthead]
 \def\\{\correspondencelayerparameter\c!separator}
 \letterelement[\v!layer][\v!nexthead][\correspondencelayerparameter\c!alternative]
@@ -391,6 +397,9 @@
    \doifsomething{\correspondenceparameter\c!toname}\\
    \correspondenceparameter\c!toaddress}
 
+\defineletterelement[\v!section][\v!address][\v!knuth]
+  {\letterelement[\v!section][\v!address][\v!blockstyle]}
+
 \startsetups[\v!letter:\v!section:\v!address]
 \def\\{\correspondencesectionparameter\c!separator}
 \letterelement[\v!section][\v!address][\correspondencesectionparameter\c!alternative]
@@ -453,6 +462,13 @@
   {\doifsomething{\correspondenceparameter\c!signature}{\blank[\correspondencesectionparameter\c!spaceinbetween]}%
    \correspondenceparameter\c!signature}
 
+\defineletterelement[\v!section][\v!closing][\v!knuth]
+  {\doadaptleftskip{\dimexpr\textwidth/13*8\relax}%
+   \correspondenceparameter\c!closing
+   \doifsomething{\correspondenceparameter\c!signature}
+     {\blank[\correspondencesectionparameter\c!spaceinbetween]%
+      \correspondenceparameter\c!signature}}
+
 \startsetups[\v!letter:\v!section:\v!closing]
 \def\\{\correspondencesectionparameter\c!separator}
 \letterelement[\v!section][\v!closing][\correspondencesectionparameter\c!alternative]