summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-02-20 23:31:33 +0000
committerKarl Berry <karl@freefriends.org>2012-02-20 23:31:33 +0000
commit707eb60645045d854a58c5cda9a8316879ff0db7 (patch)
tree6b52868ff1b5055727e5dd2240a0d6cdbd9c2430
parent96948f06651bb4a4bb0174bb28d9d6d443ada4e4 (diff)
context-letter (20feb12)
git-svn-id: svn://tug.org/texlive/trunk@25449 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua11
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkii38
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-00.mkvi133
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkii90
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-01.mkvi37
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkii62
-rw-r--r--Master/texmf-dist/tex/context/third/letter/base/s-cor-02.mkvi65
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkii7
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/letter-imp-default.mkiv7
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii52
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv52
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkii18
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-margin.mkiv18
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii14
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv14
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii18
-rw-r--r--Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv18
17 files changed, 455 insertions, 199 deletions
diff --git a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua
index 84f3a6fb28b..daeac45195a 100644
--- a/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua
+++ b/Master/texmf-dist/tex/context/third/letter/base/s-cor-00.lua
@@ -24,6 +24,7 @@ local c_separator = constants.separator
local v_correspondence = variables.correspondence
local v_letter = variables.letter
local v_memo = variables.memo
+local v_resume = variables.resume
local v_stop = variables.stop
local v_layer = variables.layer
local v_section = variables.section
@@ -63,8 +64,9 @@ end
-- create synonyms for the default styles
local patterns = {
- [v_letter] = { "letter-imp-%s.mkiv", "letter-imp-%s.tex", "letter-%s.mkiv", "letter-%s.tex" },
- [v_memo] = { "memo-imp-%s.mkiv", "memo-imp-%s.tex", "memo-%s.mkiv", "memo-%s.tex" },
+ [v_letter] = { "letter-imp-%s.mkiv", "letter-imp-%s.tex", "letter-%s.mkiv", "letter-%s.tex" },
+ [v_memo] = { "memo-imp-%s.mkiv", "memo-imp-%s.tex", "memo-%s.mkiv", "memo-%s.tex" },
+ [v_resume] = { "resume-imp-%s.mkiv", "resume-imp-%s.tex", "resume-%s.mkiv", "resume-%s.tex" },
}
local function action(name,foundname)
@@ -92,6 +94,7 @@ end
function correspondence.place(environment,settings)
local bodyfont = settings.bodyfont
local whitespace = settings.whitespace
+ local language = settings.language
local backgroundcolor = settings.backgroundcolor
context.unprotect()
context(toks.t_correspondence_before)
@@ -109,6 +112,10 @@ function correspondence.place(environment,settings)
if whitespace ~= "" then
context.setupwhitespace{whitespace}
end
+ -- I prefer to set this with \setup…options
+ if language ~= "" then
+ context.mainlanguage{language}
+ end
-- colored background is behind all other layers
if backgroundcolor ~= "" then
context.setupbackgrounds({ v_paper },{ background = v_color, backgroundcolor = backgroundcolor })
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 07dc48704f9..535d5a8600d 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.01.21,
+%D version=2012.02.15,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -49,6 +49,7 @@
\setinterfaceconstant {frommail} {frommail}
\setinterfaceconstant {fromurl} {fromurl}
\setinterfaceconstant {salutation} {salutation}
+ \setinterfaceconstant {language} {language}
\stopinterface
\startinterface all
@@ -118,9 +119,10 @@
\definemessageconstant {correspondence}
\startinterface all
- \setinterfacemessage{correspondence}{1}{Undefined layer '--' for the '--' environment}
- \setinterfacemessage{correspondence}{2}{Undefined section '--' for the '--' environment}
- \setinterfacemessage{correspondence}{3}{Undefined description '--' for the '--' environment}
+ \setinterfacemessage{correspondence}{title}{correspondence}
+ \setinterfacemessage{correspondence}{1} {Undefined layer '--' for the '--' environment}
+ \setinterfacemessage{correspondence}{2} {Undefined section '--' for the '--' environment}
+ \setinterfacemessage{correspondence}{3} {Undefined description '--' for the '--' environment}
\stopinterface
% Namespaces
@@ -140,6 +142,8 @@
% Environment
+\newtoks\everydefinecorrespondence
+
\unexpanded\def\startcorrespondence[#1]%
{\starttext
\begingroup
@@ -157,13 +161,24 @@
\endgroup
\stoptext}
-\newtoks\everydefinecorrespondence
-
\appendtoks
\normalprotected\expandafter\edef\csname\e!start\currentcorrespondence\endcsname{\startcorrespondence[\currentcorrespondence]}%
\normalprotected\expandafter\edef\csname\e!stop \currentcorrespondence\endcsname{\stopcorrespondence [\currentcorrespondence]}%
\to \everydefinecorrespondence
+\unexpanded\def\startcorrespondencecontent[#1]%
+ {\begingroup
+ \def\currentcorrespondence{#1}%
+ \dostartbuffer[\????correspondencebuffer\currentcorrespondence][\e!start\currentcorrespondence\v!content][\e!stop\currentcorrespondence\v!content]}
+
+\unexpanded\def\stopcorrespondencecontent[#1]%
+ {\endgroup}
+
+\appendtoks
+ \normalprotected\expandafter\edef\csname\e!start\currentcorrespondence\v!content\endcsname{\startcorrespondencecontent[\currentcorrespondence]}%
+ \normalprotected\expandafter\edef\csname\e!stop \currentcorrespondence\v!content\endcsname{\stopcorrespondencecontent [\currentcorrespondence]}%
+\to \everydefinecorrespondence
+
\unexpanded\def\correspondenceparameters#1#2#3%
{\def\currentcorrespondenceelement {#1:#2}%
\def\currentcorrespondencecontent {#1:#3:#2}%
@@ -216,6 +231,7 @@
\setupfooter[\c!state=\v!stop]%
\doifsomething{\correspondenceoptionparameter\c!bodyfont }{\setupbodyfont [\correspondenceoptionparameter\c!bodyfont ]}%
\doifsomething{\correspondenceoptionparameter\c!whitespace}{\setupwhitespace[\correspondenceoptionparameter\c!whitespace]}%
+ \doifsomething{\correspondenceoptionparameter\c!language }{\mainlanguage [\correspondenceoptionparameter\c!language ]}%
% backgroundcolor is applied to the paper background
\doifsomething{\correspondenceoptionparameter\c!backgroundcolor}%
{\setupbackgrounds[\v!paper][\c!background=\v!color,\c!backgroundcolor=\correspondenceoptionparameter\c!backgroundcolor]}
@@ -320,12 +336,12 @@
{\correspondenceparameters{#1}{#2}\v!layer
\executeifdefined{\????correspondencelayerstate\correspondencelayerparameter\c!state}{\getvalue{\????correspondencelayerstate\v!stop}}
\ifnum\correspondencepage=\plusone
- \if!!donea\@EAEAEA \doplacecorrespondencelayer\else\@EAEAEA \gobbletwoarguments\fi
+ \if!!donea\doplacecorrespondencelayer{#1}{#2}\fi
\else\ifodd\correspondencepage
- \if!!doneb\@EAEAEAEAEAEA\doplacecorrespondencelayer\else\@EAEAEAEAEAEA\gobbletwoarguments\fi
+ \if!!doneb\doplacecorrespondencelayer{#1}{#2}\fi
\else
- \if!!donec\@EAEAEAEAEAEA\doplacecorrespondencelayer\else\@EAEAEAEAEAEA\gobbletwoarguments\fi
- \fi\fi{#1}{#2}%
+ \if!!donec\doplacecorrespondencelayer{#1}{#2}\fi
+ \fi\fi
\tightlayer[\currentcorrespondencelayer]}
\unexpanded\def\doplacecorrespondencelayer#1#2%
@@ -337,7 +353,7 @@
\dostartattributes{\????correspondencelayer\currentcorrespondencelayer}\c!style\c!color
\doifsymboldefinedelse{\correspondencelayerparameter\c!symbol}%
{\symbol[\correspondencelayerparameter\c!symbol]}
- {\placecorrespondenceelement[#1][\v!layer][#2][\correspondencesectionparameter\c!alternative]}%
+ {\placecorrespondenceelement[#1][\v!layer][#2][\correspondencelayerparameter\c!alternative]}%
\dostopattributes}}}
\unexpanded\def\checkcorrespondencelayer[#1][#2]%
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 57c23508834..70d64469da1 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.01.21,
+%D version=2012.02.16,
%D title=\CONTEXT\ User Module,
%D subtitle=Correspondence,
%D author=Wolfgang Schuster,
@@ -53,12 +53,14 @@
\setinterfaceconstant {frommail} {frommail}
\setinterfaceconstant {fromurl} {fromurl}
\setinterfaceconstant {salutation} {salutation}
+ \setinterfaceconstant {language} {language}
\stopinterface
\startinterface all
\setinterfacevariable {correspondence} {correspondence}
\setinterfacevariable {letter} {letter}
\setinterfacevariable {memo} {memo}
+ \setinterfacevariable {resume} {resume}
\setinterfacevariable {nexthead} {nexthead}
\setinterfacevariable {lefthead} {lefthead}
\setinterfacevariable {righthead} {righthead}
@@ -76,6 +78,10 @@
\setinterfacevariable {usermark} {usermark}
\setinterfacevariable {lettermain} {lettermain}
\setinterfacevariable {letternext} {letternext}
+ \setinterfacevariable {memomain} {memomain}
+ \setinterfacevariable {memonext} {memonext}
+ \setinterfacevariable {resumemain} {resumemain}
+ \setinterfacevariable {resumenext} {resumenext}
\setinterfacevariable {opening} {opening}
\setinterfacevariable {closing} {closing}
\setinterfacevariable {secondpage} {secondpage}
@@ -83,8 +89,6 @@
\setinterfacevariable {enclosure} {enclosure}
\setinterfacevariable {french} {french}
\setinterfacevariable {specialnotation} {specialnotation}
- \setinterfacevariable {memomain} {memomain}
- \setinterfacevariable {memonext} {memonext}
\setinterfacevariable {e} {e}
\setinterfacevariable {attention} {attention}
\setinterfacevariable {room} {room}
@@ -122,9 +126,10 @@
\definemessageconstant {correspondence}
\startinterface all
- \setinterfacemessage{correspondence}{1}{Undefined layer '--' for the '--' environment}
- \setinterfacemessage{correspondence}{2}{Undefined section '--' for the '--' environment}
- \setinterfacemessage{correspondence}{3}{Undefined description '--' for the '--' environment}
+ \setinterfacemessage{correspondence}{title}{correspondence}
+ \setinterfacemessage{correspondence}{1} {Undefined layer '--' for the '--' environment}
+ \setinterfacemessage{correspondence}{2} {Undefined section '--' for the '--' environment}
+ \setinterfacemessage{correspondence}{3} {Undefined description '--' for the '--' environment}
\stopinterface
% Namespaces
@@ -142,6 +147,8 @@
\installnamespace {correspondencestyle}
\installnamespace {correspondenceelement}
\installnamespace {correspondencelayout}
+\installnamespace {correspondencehead}
+\installnamespace {correspondenceheadalternative}
% Environment
@@ -169,6 +176,19 @@
\setuevalue{\e!stop \currentcorrespondence}{\correspondence_end[\currentcorrespondence]}%
\to \everydefinecorrespondence
+\unexpanded\def\correspondence_beg_content[#environment]%
+ {\begingroup
+ \def\currentcorrespondence{#environment}%
+ \grabbufferdatadirect{\????correspondencebuffer\currentcorrespondence}{\e!start\currentcorrespondence\v!content}{\e!stop\currentcorrespondence\v!content}}
+
+\unexpanded\def\correspondence_end_content[#environment]%
+ {\endgroup}
+
+\appendtoks
+ \setuevalue{\e!start\currentcorrespondence\v!content}{\correspondence_beg_content[\currentcorrespondence]}%
+ \setuevalue{\e!stop \currentcorrespondence\v!content}{\correspondence_end_content[\currentcorrespondence]}%
+\to \everydefinecorrespondence
+
\unexpanded\def\correspondence_parameters#environment#element#type%
{\def\currentcorrespondenceelement {#environment:#element}%
\def\currentcorrespondencecontent {#environment:#type:#element}%
@@ -199,6 +219,7 @@
\ctxlua{thirddata.correspondence.place("\currentcorrespondence", {
bodyfont = "\correspondenceoptionparameter\c!bodyfont",
whitespace = "\correspondenceoptionparameter\c!whitespace",
+ language = "\correspondenceoptionparameter\c!language",
backgroundcolor = "\correspondenceoptionparameter\c!backgroundcolor",
} )}%
\endgroup}
@@ -214,9 +235,7 @@
\let\placecorrespondence\correspondence_place
-\appendtoks
- \global\c_correspondence_page\zerocount
-\to \t_correspondence_before
+\t_correspondence_before\expandafter{\the\t_correspondence_before\global\c_correspondence_page\zerocount}
\appendtoks
\setuevalue{\e!place\currentcorrespondence}{\correspondence_place[\currentcorrespondence]}%
@@ -269,12 +288,12 @@
{\correspondence_parameters{#environment}{#element}\v!layer
\expandcheckedcsname\????correspondencelayerstate{\correspondencelayerparameter\c!state}\v!stop
\ifnum\c_correspondence_page=\plusone
- \if!!donea\doubleexpandafter\correspondence_layer_direct\else\doubleexpandafter\gobbletwoarguments\fi
+ \if!!donea\correspondence_layer_direct{#environment}{#element}\fi
\else\ifodd\c_correspondence_page
- \if!!doneb\tripleexpandafter\correspondence_layer_direct\else\tripleexpandafter\gobbletwoarguments\fi
+ \if!!doneb\correspondence_layer_direct{#environment}{#element}\fi
\else
- \if!!donec\tripleexpandafter\correspondence_layer_direct\else\tripleexpandafter\gobbletwoarguments\fi
- \fi\fi{#environment}{#element}%
+ \if!!donec\correspondence_layer_direct{#environment}{#element}\fi
+ \fi\fi
\tightlayer[\currentcorrespondencelayer]}
\unexpanded\def\correspondence_layer_direct#environment#element%
@@ -368,7 +387,6 @@
\installsimplecommandhandler \????correspondencedescription {correspondencedescription} \????correspondencedescription
-\let\m_correspondence_description_string\empty
\let\m_correspondence_description_format\empty
\let\m_correspondence_description_items \empty
@@ -428,22 +446,99 @@
\unexpanded\def\correspondence_description_place_text
{\expandcheckedcsname\????correspondencedescriptionformat\m_correspondence_description_format\v!none}
-\setvalue{\????correspondencedescriptionformat\v!list}%
+\setvalue{\????correspondencedescriptionformat\v!list}% todo: use a simplified version of the itemize code
{\def\correspondence_description_format_item#text{\startitem#text\stopitem}%
\dontleavehmode\vtop\bgroup
\leftskip\zeropoint % prevent additional offset when “location=left” is used
- \startitemize[\v!packed,\correspondencedescriptionparameter\c!symbol]%
+ \startitemgroup[\v!itemize][\v!packed,\correspondencedescriptionparameter\c!symbol]%
\processcommacommand[\m_correspondence_description_items]\correspondence_description_format_item
- \stopitemize
+ \stopitemgroup
\egroup}
\setvalue{\????correspondencedescriptionformat\v!none}%
{\m_correspondence_description_items}
\setupcorrespondencedescription
- [\c!width=\v!fit,
+ [ \c!width=\v!fit,
\c!distance=1em,
- \c!symbol=dash]
+ \c!symbol=dash]
+
+% Heading
+
+\installsimpleframedcommandhandler \????correspondencehead {correspondencehead} \????correspondencehead
+
+\unexpanded\def\correspondence_head_define[#environment][#element]%
+ {\ifcsname#element\endcsname \else % test if there already exists a command with the same name
+ \def\currentcorrespondencehead{#environment:#element}%
+ \checkcorrespondenceheadparent
+ % heading from the this module are local to the correspondence environment
+ \t_correspondence_before\expandafter{\the\t_correspondence_before\correspondence_head_commands[#environment][#element]}%
+ \fi}
+
+\unexpanded\def\correspondence_head_setup[#environment][#elements][#parameters]%
+ {\def\correspondence_head_command#element%
+ {\edef\currentcorrespondencehead{#environment:#element}%
+ \setupcurrentcorrespondencehead[#parameters]}%
+ \processcommalist[#elements]\correspondence_head_command}
+
+\unexpanded\def\correspondence_head_commands[#environment][#element]%
+ {\setuevalue {#element}{\correspondence_head_cmd[#environment][#element]}%
+ \setuevalue{\e!start#element}{\correspondence_head_beg[#environment][#element]}%
+ \setuevalue{\e!stop #element}{\correspondence_head_end[#environment][#element]}}
+
+\unexpanded\def\correspondence_head_cmd[#environment][#element]%
+ {\begingroup
+ \def\currentcorrespondencehead{#environment:#element}%
+ \doifnextbgroupelse{\dosinglegroupempty\correspondence_head_cmd_argument}{\dosingleempty\correspondence_head_cmd_parameters}}
+
+\unexpanded\def\correspondence_head_cmd_argument#title%
+ {\setcorrespondenceheadparameter\c!title{#title}%
+ \correspondence_head_cmd_place
+ \endgroup}
+
+\unexpanded\def\correspondence_head_cmd_parameters[#parameters]%
+ {\iffirstargument
+ \setupcurrentcorrespondencehead[#parameters]%
+ \fi
+ \correspondence_head_cmd_place
+ \endgroup}
+
+\unexpanded\def\correspondence_head_beg[#environment][#element]%
+ {\begingroup
+ \def\currentcorrespondencehead{#environment:#element}%
+ \dosingleempty\correspondence_head_beg_parameters}
+
+\unexpanded\def\correspondence_head_beg_parameters[#parameters]%
+ {\iffirstargument
+ \setupcurrentcorrespondencehead[#parameters]%
+ \fi
+ \correspondence_head_cmd_place
+ \endgroup}
+
+\unexpanded\def\correspondence_head_end[#environment][#element]%
+ {}
+
+\unexpanded\def\correspondence_head_cmd_place
+ {\doifsomethingelse{\correspondenceheadparameter\c!title}\donetrue\donefalse
+ \ifdone
+ \expandcheckedcsname\????correspondenceheadalternative{\correspondenceheadparameter\c!alternative}\s!default
+ \fi}
+
+\setvalue{\????correspondenceheadalternative\s!default}%
+ {\doifsomething{\correspondenceheadparameter\c!spacebefore}{\blank[\correspondenceheadparameter\c!spacebefore]}%
+ \vbox\bgroup
+ \doifsomething{\correspondenceheadparameter\c!align}{\setupalign[\correspondenceheadparameter\c!align]}%
+ \usecorrespondenceheadstyleandcolor\c!style\c!color
+ \correspondenceheadparameter\c!title
+ \egroup
+ \doifsomething{\correspondenceheadparameter\c!spaceafter }{\blank[\correspondenceheadparameter\c!spaceafter ]}}
+
+\setupcorrespondencehead
+ [ \c!spacebefore=\v!line,
+ \c!spaceafter={\v!samepage,\v!line},
+ \c!alternative=\s!default,
+ \c!align=\v!middle,
+ \c!style=\v!bold]
% Elements
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 44d10174c21..b2b6b5454eb 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.01.15,
+%D version=2012.02.04,
%D title=\CONTEXT\ User Module,
%D subtitle=Letters,
%D author=Wolfgang Schuster,
@@ -57,8 +57,9 @@
\def\defineletterelement {\doquadrupleargument\definecorrespondenceelement [\v!letter]}
\def\letterelement {\doquadrupleargument\placecorrespondenceelement [\v!letter]}
-\def\namedletterlayerparameter#1{\namedcorrespondencelayerparameter{\v!letter:#1}}
-\def\namedletterframeparameter#1{\namedcorrespondenceframeparameter{\v!letter:#1}}
+\def\namedletterlayerparameter #1{\namedcorrespondencelayerparameter {\v!letter:#1}}
+\def\namedletterframeparameter #1{\namedcorrespondenceframeparameter {\v!letter:#1}}
+\def\namedlettersectionparameter#1{\namedcorrespondencesectionparameter{\v!letter:#1}}
% Layers
@@ -170,14 +171,14 @@
\correspondenceparameter\c!fromname\hrule}
\defineletterelement[\v!layer][\v!head][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!head}}
+ {\directsetup{\v!letter:\v!layer:\v!head}}
% layer: nexthead
\defineletterelement[\v!layer][\v!nexthead][\v!gbrief]
{\maxaligned
{\rlap{\correspondenceparameter\c!fromname}
- \midaligned{\lettertext\v!page\subpagenumber\lettertext\v!of\lastsubpagenumber}
+ \midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber}
\llap{\correspondenceparameter\c!date}}
\hairline}
@@ -216,17 +217,17 @@
\llap{\lettertext\v!page\subpagenumber}}}
\defineletterelement[\v!layer][\v!nexthead][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!nexthead}}
+ {\directsetup{\v!letter:\v!layer:\v!nexthead}}
% layer: lefthead
\defineletterelement[\v!layer][\v!lefthead][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!lefthead}}
+ {\directsetup{\v!letter:\v!layer:\v!lefthead}}
% layer: righthead
\defineletterelement[\v!layer][\v!righthead][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!righthead}}
+ {\directsetup{\v!letter:\v!layer:\v!righthead}}
% layer: foot
@@ -246,23 +247,26 @@
\eTR
\eTABLE}
+\defineletterelement[\v!layer][\v!foot][\v!pagenumber]
+ {\midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber}}
+
\defineletterelement[\v!layer][\v!foot][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!foot}}
+ {\directsetup{\v!letter:\v!layer:\v!foot}}
% layer: nextfoot
\defineletterelement[\v!layer][\v!nextfoot][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!nextfoot}}
+ {\directsetup{\v!letter:\v!layer:\v!nextfoot}}
% layer: leftfoot
\defineletterelement[\v!layer][\v!leftfoot][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!leftfoot}}
+ {\directsetup{\v!letter:\v!layer:\v!leftfoot}}
% layer: rightfoot
\defineletterelement[\v!layer][\v!rightfoot][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!rightfoot}}
+ {\directsetup{\v!letter:\v!layer:\v!rightfoot}}
% layer: address
@@ -273,7 +277,7 @@
\correspondenceparameter\c!toaddress}
\defineletterelement[\v!layer][\v!address][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!address}}
+ {\directsetup{\v!letter:\v!layer:\v!address}}
% layer: backaddress
@@ -290,7 +294,7 @@
{\letterelement[\v!layer][\v!backaddress][\s!default]}}
\defineletterelement[\v!layer][\v!backaddress][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!backaddress}}
+ {\directsetup{\v!letter:\v!layer:\v!backaddress}}
% layer: reference
@@ -407,7 +411,7 @@
\egroup}
\defineletterelement[\v!layer][\v!reference][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!reference}}
+ {\directsetup{\v!letter:\v!layer:\v!reference}}
% layer: location
@@ -417,42 +421,42 @@
\correspondenceparameter\c!date}
\defineletterelement[\v!layer][\v!location][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!location}}
+ {\directsetup{\v!letter:\v!layer:\v!location}}
% layer: topmark
\defineletterelement[\v!layer][\v!topmark][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!topmark}}
+ {\directsetup{\v!letter:\v!layer:\v!topmark}}
% layer: botmark
\defineletterelement[\v!layer][\v!botmark][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!botmark}}
+ {\directsetup{\v!letter:\v!layer:\v!botmark}}
% layer: cutmark
\defineletterelement[\v!layer][\v!cutmark][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!cutmark}}
+ {\directsetup{\v!letter:\v!layer:\v!cutmark}}
% layer: endmark
\defineletterelement[\v!layer][\v!endmark][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!endmark}}
+ {\directsetup{\v!letter:\v!layer:\v!endmark}}
% layer: usermark
\defineletterelement[\v!layer][\v!usermark][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!usermark}}
+ {\directsetup{\v!letter:\v!layer:\v!usermark}}
% layer: lettermain
\defineletterelement[\v!layer][\v!lettermain][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!lettermain}}
+ {\directsetup{\v!letter:\v!layer:\v!lettermain}}
% layer: letternext
\defineletterelement[\v!layer][\v!letternext][\v!setups]
- {\texsetup{\v!letter:\v!layer:\v!letternext}}
+ {\directsetup{\v!letter:\v!layer:\v!letternext}}
% section: head
@@ -460,7 +464,7 @@
{\correspondenceparameter\c!fromaddress}
\defineletterelement[\v!section][\v!head][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!head}}
+ {\directsetup{\v!letter:\v!section:\v!head}}
% section: date
@@ -468,7 +472,7 @@
{\correspondenceparameter\c!date}
\defineletterelement[\v!section][\v!date][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!date}}
+ {\directsetup{\v!letter:\v!section:\v!date}}
% section: reference
@@ -477,7 +481,7 @@
\correspondenceparameter\c!reference}
\defineletterelement[\v!section][\v!reference][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!reference}}
+ {\directsetup{\v!letter:\v!section:\v!reference}}
% section: specialnotation
@@ -486,7 +490,7 @@
\correspondenceparameter\c!dispatch}
\defineletterelement[\v!section][\v!specialnotation][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!specialnotation}}
+ {\directsetup{\v!letter:\v!section:\v!specialnotation}}
% section: address
@@ -500,7 +504,7 @@
{\letterelement[\v!section][\v!address][\v!blockstyle]}
\defineletterelement[\v!section][\v!address][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!address}}
+ {\directsetup{\v!letter:\v!section:\v!address}}
% section: title
@@ -511,7 +515,7 @@
{\lettertext\v!attention\correspondenceparameter\c!attention}}
\defineletterelement[\v!section][\v!title][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!title}}
+ {\directsetup{\v!letter:\v!section:\v!title}}
% section: subject
@@ -520,7 +524,7 @@
\lettertext\v!subject\correspondenceparameter\c!subject}
\defineletterelement[\v!section][\v!subject][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!subject}}
+ {\directsetup{\v!letter:\v!section:\v!subject}}
% section: opening
@@ -535,7 +539,7 @@
\letterelement[\v!section][\v!opening][\s!default]}
\defineletterelement[\v!section][\v!opening][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!opening}}
+ {\directsetup{\v!letter:\v!section:\v!opening}}
% section: content
@@ -544,7 +548,7 @@
\getbuffer [\????correspondencebuffer\v!letter]}
\defineletterelement[\v!section][\v!content][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!content}}
+ {\directsetup{\v!letter:\v!section:\v!content}}
% section: closing
@@ -573,7 +577,7 @@
\correspondenceparameter\c!signature}}
\defineletterelement[\v!section][\v!closing][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!closing}}
+ {\directsetup{\v!letter:\v!section:\v!closing}}
% section: appendices
@@ -584,7 +588,7 @@
\stoppacked}
\defineletterelement[\v!section][\v!appendices][\v!setups]
- {\texsetup{\v!letter:\v!section:\v!appendices}}
+ {\directsetup{\v!letter:\v!section:\v!appendices}}
\startsetups[\v!letter:\v!place]
\placecorrespondence[\v!letter]
@@ -883,6 +887,24 @@
\setuplettertext[\s!it][\v!street=]
\setuplettertext[\s!es][\v!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=]
+
+% 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=]
+
\stopmodule
\protect \endinput
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 eb5bfd63771..3e029e0e733 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.01.20,
+%D version=2012.02.06,
%D title=\CONTEXT\ User Module,
%D subtitle=Letters,
%D author=Wolfgang Schuster,
@@ -39,6 +39,7 @@
\def\defineletterlayer {\dodoubleargument\correspondence_layer_define [\v!letter]}
\def\definelettersection {\dodoubleargument\correspondence_section_define [\v!letter]}
\def\defineletterdescription {\dodoubleargument\correspondence_description_define [\v!letter]}
+\def\defineletterhead {\dodoubleargument\correspondence_head_define [\v!letter]}
\def\defineletterelements {\dotripleargument\correspondence_elements_define [\v!letter]}
\def\setupletterelements {\dotripleargument\correspondence_elements_define [\v!letter]}
@@ -49,6 +50,7 @@
\def\setupletterlayout {\dotripleargument\correspondence_layout_setup [\v!letter]}
\def\setuplettersection {\dotripleargument\correspondence_section_setup [\v!letter]}
\def\setupletterdescription {\dotripleargument\correspondence_description_setup [\v!letter]}
+\def\setupletterhead {\dotripleargument\correspondence_head_setup [\v!letter]}
\def\setupletteroptions {\dodoubleargument\correspondence_option_setup [\v!letter]}
\def\setupletter {\dodoubleargument\correspondence_setup [\v!letter]}
@@ -57,8 +59,14 @@
\def\defineletterelement {\doquadrupleargument\correspondence_element_define [\v!letter]}
\def\letterelement {\doquadrupleargument\correspondence_element_place [\v!letter]}
-\def\namedletterlayerparameter#element{\namedcorrespondencelayerparameter{\v!letter:#element}}
-\def\namedletterframeparameter#element{\namedcorrespondenceframeparameter{\v!letter:#element}}
+\def\namedletterlayerparameter #element{\namedcorrespondencelayerparameter {\v!letter:#element}}
+\def\namedletterframeparameter #element{\namedcorrespondenceframeparameter {\v!letter:#element}}
+\def\namedlettersectionparameter#element{\namedcorrespondencesectionparameter{\v!letter:#element}}
+
+% Heading
+
+\defineletterhead [\v!letter\v!section]
+\defineletterhead [\v!letter\v!subsection]
% Layers
@@ -183,7 +191,7 @@
\defineletterelement[\v!layer][\v!nexthead][\v!gbrief]
{\maxaligned
{\rlap{\correspondenceparameter\c!fromname}
- \midaligned{\lettertext\v!page\subpagenumber\lettertext\v!of\lastsubpagenumber}
+ \midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber}
\llap{\correspondenceparameter\c!date}}
\hairline}
@@ -252,6 +260,9 @@
\eTR
\eTABLE}
+\defineletterelement[\v!layer][\v!foot][\v!pagenumber]
+ {\midaligned{\leftlettertext\v!pagenumber\subpagenumber\rightlettertext\v!pagenumber\lastsubpagenumber}}
+
\defineletterelement[\v!layer][\v!foot][\v!setups]
{\texsetup{\v!letter:\v!layer:\v!foot}}
@@ -787,6 +798,24 @@
\setuplettertext[\s!it][\v!street=]
\setuplettertext[\s!es][\v!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=]
+
+% 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=]
+
\stopmodule
\protect \endinput
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 27097eaf362..0a1ad036cf4 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.01.15,
+%D version=2012.02.04,
%D title=\CONTEXT\ User Module,
%D subtitle=Memos,
%D author=Wolfgang Schuster,
@@ -57,6 +57,10 @@
\def\definememoelement {\doquadrupleargument\definecorrespondenceelement [\v!memo]}
\def\memoelement {\doquadrupleargument\placecorrespondenceelement [\v!memo]}
+\def\namedmemolayerparameter #1{\namedcorrespondencelayerparameter {\v!memo:#1}}
+\def\namedmemoframeparameter #1{\namedcorrespondenceframeparameter {\v!memo:#1}}
+\def\namedmemosectionparameter#1{\namedcorrespondencesectionparameter{\v!memo:#1}}
+
% Layers
\definememolayer [\v!head]
@@ -64,6 +68,11 @@
\definememolayer [\v!lefthead]
\definememolayer [\v!righthead]
+\definememolayer [\v!foot]
+\definememolayer [\v!nextfoot]
+\definememolayer [\v!leftfoot]
+\definememolayer [\v!rightfoot]
+
\definememolayer [\v!topmark]
\definememolayer [\v!botmark]
\definememolayer [\v!cutmark]
@@ -102,34 +111,6 @@
% layer: nexthead
-\definememoelement[\v!layer][\v!nexthead][\v!fullblock]
- {\maxaligned
- {\rlap{\correspondenceparameter\c!toname}%
- \midaligned{\pagenumber}%
- \llap{\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=\v!left]
- {\correspondenceparameter\c!date \\
- \correspondenceparameter\c!reference}}}}
-
-\definememoelement[\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 \\
- \memotext\c!page\pagenumber}}\hss}
-
-\definememoelement[\v!layer][\v!nexthead][\v!semiblock]
- {\maxaligned
- {\rlap{\correspondenceparameter\c!toname}%
- \midaligned{\pagenumber}%
- \llap{\correspondenceparameter\c!date}}}
-
-\definememoelement[\v!layer][\v!nexthead][\v!simplified]
- {\memoelement[\v!layer][\v!nexthead][\v!fullblock]}
-
-\definememoelement[\v!layer][\v!nexthead][\v!modified]
- {\memoelement[\v!layer][\v!nexthead][\v!hanging]}
-
\definememoelement[\v!layer][\v!nexthead][\v!setups]
{\texsetup{\v!memo:\v!layer:\v!nexthead}}
@@ -143,6 +124,11 @@
\definememoelement[\v!layer][\v!righthead][\v!setups]
{\texsetup{\v!memo:\v!layer:\v!righthead}}
+% layer: foot
+
+\definememoelement[\v!layer][\v!foot][\v!pagenumber]
+ {\centerbox{\hbox{\begstrut\leftmemotext\v!pagenumber\subpagenumber\rightmemotext\v!pagenumber\lastsubpagenumber\endstrut}}}
+
% layer: topmark
\definememoelement[\v!layer][\v!topmark][\v!setups]
@@ -379,16 +365,18 @@
\processcommalist[#1]\dodosetupmemotext
\fi}
-\def\memotext#1{\labeltext{\????memotext#1}}
+\def\memotext #1{\labeltext {\????memotext#1}}
+\def\leftmemotext #1{\leftlabeltext {\????memotext#1}}
+\def\rightmemotext#1{\rightlabeltext{\????memotext#1}}
-% page:
+% pagenumber:
-\setupmemotext[\s!en][\v!page=Page~]
-\setupmemotext[\s!nl][\v!page=]
-\setupmemotext[\s!de][\v!page=Seite~]
-\setupmemotext[\s!fr][\v!page=]
-\setupmemotext[\s!it][\v!page=]
-\setupmemotext[\s!es][\v!page=]
+\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=]
% date:
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 72c6a9af967..6071a0f420e 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.01.15,
+%D version=2012.02.06,
%D title=\CONTEXT\ User Module,
%D subtitle=Memos,
%D author=Wolfgang Schuster,
@@ -39,6 +39,7 @@
\def\definememolayer {\dodoubleargument\correspondence_layer_define [\v!memo]}
\def\definememosection {\dodoubleargument\correspondence_section_define [\v!memo]}
\def\definememodescription {\dodoubleargument\correspondence_description_define [\v!memo]}
+\def\definememohead {\dodoubleargument\correspondence_head_define [\v!memo]}
\def\definememoelements {\dotripleargument\correspondence_elements_define [\v!memo]}
\def\setupmemoelements {\dotripleargument\correspondence_elements_define [\v!memo]}
@@ -49,6 +50,7 @@
\def\setupmemolayout {\dotripleargument\correspondence_layout_setup [\v!memo]}
\def\setupmemosection {\dotripleargument\correspondence_section_setup [\v!memo]}
\def\setupmemodescription {\dotripleargument\correspondence_description_setup [\v!memo]}
+\def\setupmemohead {\dotripleargument\correspondence_head_setup [\v!memo]}
\def\setupmemooptions {\dodoubleargument\correspondence_option_setup [\v!memo]}
\def\setupmemo {\dodoubleargument\correspondence_setup [\v!memo]}
@@ -57,6 +59,15 @@
\def\definememoelement {\doquadrupleargument\correspondence_element_define [\v!memo]}
\def\memoelement {\doquadrupleargument\correspondence_element_place [\v!memo]}
+\def\namedmemolayerparameter #element{\namedcorrespondencelayerparameter {\v!memo:#element}}
+\def\namedmemoframeparameter #element{\namedcorrespondenceframeparameter {\v!memo:#element}}
+\def\namedmemosectionparameter#element{\namedcorrespondencesectionparameter{\v!memo:#element}}
+
+% Heading
+
+\definememohead [\v!memo\v!section]
+\definememohead [\v!memo\v!subsection]
+
% Layers
\definememolayer [\v!head]
@@ -64,6 +75,11 @@
\definememolayer [\v!lefthead]
\definememolayer [\v!righthead]
+\definememolayer [\v!foot]
+\definememolayer [\v!nextfoot]
+\definememolayer [\v!leftfoot]
+\definememolayer [\v!rightfoot]
+
\definememolayer [\v!topmark]
\definememolayer [\v!botmark]
\definememolayer [\v!cutmark]
@@ -102,34 +118,6 @@
% layer: nexthead
-\definememoelement[\v!layer][\v!nexthead][\v!fullblock]
- {\maxaligned
- {\rlap{\correspondenceparameter\c!toname}%
- \midaligned{\pagenumber}%
- \llap{\framed[\c!frame=\v!off,\c!location=\v!top,\c!align=\v!left]
- {\correspondenceparameter\c!date \\
- \correspondenceparameter\c!reference}}}}
-
-\definememoelement[\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 \\
- \memotext\c!page\pagenumber}}\hss}
-
-\definememoelement[\v!layer][\v!nexthead][\v!semiblock]
- {\maxaligned
- {\rlap{\correspondenceparameter\c!toname}%
- \midaligned{\pagenumber}%
- \llap{\correspondenceparameter\c!date}}}
-
-\definememoelement[\v!layer][\v!nexthead][\v!simplified]
- {\memoelement[\v!layer][\v!nexthead][\v!fullblock]}
-
-\definememoelement[\v!layer][\v!nexthead][\v!modified]
- {\memoelement[\v!layer][\v!nexthead][\v!hanging]}
-
\definememoelement[\v!layer][\v!nexthead][\v!setups]
{\texsetup{\v!memo:\v!layer:\v!nexthead}}
@@ -143,6 +131,11 @@
\definememoelement[\v!layer][\v!righthead][\v!setups]
{\texsetup{\v!memo:\v!layer:\v!righthead}}
+% layer: foot
+
+\definememoelement[\v!layer][\v!foot][\v!pagenumber]
+ {\centerbox{\hbox{\begstrut\leftmemotext\v!pagenumber\subpagenumber\rightmemotext\v!pagenumber\lastsubpagenumber\endstrut}}}
+
% layer: topmark
\definememoelement[\v!layer][\v!topmark][\v!setups]
@@ -365,14 +358,14 @@
\definelabelclass[memo]
-% page:
+% pagenumber:
-\setupmemotext[\s!en][\v!page=Page~]
-\setupmemotext[\s!nl][\v!page=]
-\setupmemotext[\s!de][\v!page=Seite~]
-\setupmemotext[\s!fr][\v!page=]
-\setupmemotext[\s!it][\v!page=]
-\setupmemotext[\s!es][\v!page=]
+\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=]
% date:
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 c74feb2fe1b..e25706b40eb 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.01.01,
+%D version=2012.02.04,
%D title=\CONTEXT\ User Module,
%D subtitle=Default letter style,
%D author=Wolfgang Schuster,
@@ -43,7 +43,8 @@
\setupletterframe
[\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
- [\c!width=\textwidth]
+ [\c!width=\textwidth,
+ \c!height=\footerheight]
%\setupletterlayer
% [\v!head]
@@ -92,6 +93,8 @@
\v!topmark,
\v!botmark,
\v!cutmark,
+ \v!endmark,
+ \v!usermark,
\v!backaddress,
\v!address,
\v!reference,
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 c74feb2fe1b..e25706b40eb 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.01.01,
+%D version=2012.02.04,
%D title=\CONTEXT\ User Module,
%D subtitle=Default letter style,
%D author=Wolfgang Schuster,
@@ -43,7 +43,8 @@
\setupletterframe
[\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
- [\c!width=\textwidth]
+ [\c!width=\textwidth,
+ \c!height=\footerheight]
%\setupletterlayer
% [\v!head]
@@ -92,6 +93,8 @@
\v!topmark,
\v!botmark,
\v!cutmark,
+ \v!endmark,
+ \v!usermark,
\v!backaddress,
\v!address,
\v!reference,
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii
index aa65a86c10e..6b36f72e487 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=memo-imp-default,
-%D version=2011.10.29,
+%D version=2012.02.04,
%D title=\CONTEXT\ User Module,
%D subtitle=Default memo style,
%D author=Wolfgang Schuster,
@@ -29,6 +29,56 @@
\setupmemooptions
[\c!marking=\v!no]
+\setupmemolayer
+ [\v!head,\v!nexthead,\v!lefthead,\v!righthead]
+ [\c!x=\backspace,
+ \c!y=\topspace]
+
+\setupmemoframe
+ [\v!head,\v!nexthead,\v!lefthead,\v!righthead]
+ [\c!width=\textwidth]
+
+\setupmemolayer
+ [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
+ [\c!preset=\v!left\v!bottom,
+ \c!x=\backspace,
+ \c!y=\bottomspace]
+
+\setupmemoframe
+ [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
+ [\c!width=\textwidth,
+ \c!height=\footerheight]
+
+\setupmemolayer
+ [\v!nexthead,\v!nextfoot]
+ [\c!state=\v!next]
+
+\setupmemolayer
+ [\v!lefthead,\v!leftfoot]
+ [\c!state=\v!left]
+
+\setupmemolayer
+ [\v!righthead,\v!rightfoot]
+ [\c!state=\v!right]
+
+\definememoelements
+ [\v!layer]
+ [\v!memomain,
+ \v!memonext,
+ \v!head,
+ \v!nexthead,
+ \v!lefthead,
+ \v!righthead,
+ \v!foot,
+ \v!nextfoot,
+ \v!leftfoot,
+ \v!rightfoot,
+ \v!topmark,
+ \v!botmark,
+ \v!cutmark,
+ \v!endmark,
+ \v!usermark]
+
\definememoelements
[\v!section]
[\v!head
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv
index aa65a86c10e..6b36f72e487 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-default.mkiv
@@ -1,6 +1,6 @@
%D \module
%D [ file=memo-imp-default,
-%D version=2011.10.29,
+%D version=2012.02.04,
%D title=\CONTEXT\ User Module,
%D subtitle=Default memo style,
%D author=Wolfgang Schuster,
@@ -29,6 +29,56 @@
\setupmemooptions
[\c!marking=\v!no]
+\setupmemolayer
+ [\v!head,\v!nexthead,\v!lefthead,\v!righthead]
+ [\c!x=\backspace,
+ \c!y=\topspace]
+
+\setupmemoframe
+ [\v!head,\v!nexthead,\v!lefthead,\v!righthead]
+ [\c!width=\textwidth]
+
+\setupmemolayer
+ [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
+ [\c!preset=\v!left\v!bottom,
+ \c!x=\backspace,
+ \c!y=\bottomspace]
+
+\setupmemoframe
+ [\v!foot,\v!nextfoot,\v!leftfoot,\v!rightfoot]
+ [\c!width=\textwidth,
+ \c!height=\footerheight]
+
+\setupmemolayer
+ [\v!nexthead,\v!nextfoot]
+ [\c!state=\v!next]
+
+\setupmemolayer
+ [\v!lefthead,\v!leftfoot]
+ [\c!state=\v!left]
+
+\setupmemolayer
+ [\v!righthead,\v!rightfoot]
+ [\c!state=\v!right]
+
+\definememoelements
+ [\v!layer]
+ [\v!memomain,
+ \v!memonext,
+ \v!head,
+ \v!nexthead,
+ \v!lefthead,
+ \v!righthead,
+ \v!foot,
+ \v!nextfoot,
+ \v!leftfoot,
+ \v!rightfoot,
+ \v!topmark,
+ \v!botmark,
+ \v!cutmark,
+ \v!endmark,
+ \v!usermark]
+
\definememoelements
[\v!section]
[\v!head
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 69cbf589459..88806d2ef68 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,8 +1,8 @@
%D \module
-%D [ file=memo-imp-memo,
-%D version=2011.11.07,
+%D [ file=memo-imp-margin,
+%D version=2012.02.04,
%D title=\CONTEXT\ Memo Style,
-%D subtitle=Memo style,
+%D subtitle=Margin style,
%D author=Wolfgang Schuster,
%D date=\currentdate,
%D copyright=Wolfgang Schuster,
@@ -27,17 +27,17 @@
\setupmemolayout
[\v!firstpage,\v!secondpage]
- [\c!backspace=1in,
- \c!width=\v!middle,
- \c!topspace=1in,
- \c!header=0in,
- \c!footer=0in,
- \c!height=\v!fit]
+ [\c!header=0in]
\setupmemosection
[\v!head]
[\c!alternative=\v!margin]
+\setupmemolayer
+ [\v!foot]
+ [\c!state=\v!repeat,
+ \c!alternative=\v!pagenumber]
+
\setupmemooptions
[\c!whitespace=\v!line]
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 69cbf589459..88806d2ef68 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,8 +1,8 @@
%D \module
-%D [ file=memo-imp-memo,
-%D version=2011.11.07,
+%D [ file=memo-imp-margin,
+%D version=2012.02.04,
%D title=\CONTEXT\ Memo Style,
-%D subtitle=Memo style,
+%D subtitle=Margin style,
%D author=Wolfgang Schuster,
%D date=\currentdate,
%D copyright=Wolfgang Schuster,
@@ -27,17 +27,17 @@
\setupmemolayout
[\v!firstpage,\v!secondpage]
- [\c!backspace=1in,
- \c!width=\v!middle,
- \c!topspace=1in,
- \c!header=0in,
- \c!footer=0in,
- \c!height=\v!fit]
+ [\c!header=0in]
\setupmemosection
[\v!head]
[\c!alternative=\v!margin]
+\setupmemolayer
+ [\v!foot]
+ [\c!state=\v!repeat,
+ \c!alternative=\v!pagenumber]
+
\setupmemooptions
[\c!whitespace=\v!line]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii
index 3fa41dc5679..133d581c47b 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkii
@@ -1,6 +1,6 @@
%D \module
%D [ file=memo-imp-memo,
-%D version=2011.11.01,
+%D version=2012.02.04,
%D title=\CONTEXT\ Memo Style,
%D subtitle=Memo style,
%D author=Wolfgang Schuster,
@@ -27,17 +27,17 @@
\setupmemolayout
[\v!firstpage,\v!secondpage]
- [\c!backspace=1in,
- \c!width=\v!middle,
- \c!topspace=1in,
- \c!header=0in,
- \c!footer=0in,
- \c!height=\v!fit]
+ [\c!header=0in]
\setupmemosection
[\v!head]
[\c!alternative=\v!memo]
+\setupmemolayer
+ [\v!foot]
+ [\c!state=\v!repeat,
+ \c!alternative=\v!pagenumber]
+
\setupmemosection
[\v!closing]
[\c!leftmargin=.5\textwidth]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv
index 3fa41dc5679..133d581c47b 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-memo.mkiv
@@ -1,6 +1,6 @@
%D \module
%D [ file=memo-imp-memo,
-%D version=2011.11.01,
+%D version=2012.02.04,
%D title=\CONTEXT\ Memo Style,
%D subtitle=Memo style,
%D author=Wolfgang Schuster,
@@ -27,17 +27,17 @@
\setupmemolayout
[\v!firstpage,\v!secondpage]
- [\c!backspace=1in,
- \c!width=\v!middle,
- \c!topspace=1in,
- \c!header=0in,
- \c!footer=0in,
- \c!height=\v!fit]
+ [\c!header=0in]
\setupmemosection
[\v!head]
[\c!alternative=\v!memo]
+\setupmemolayer
+ [\v!foot]
+ [\c!state=\v!repeat,
+ \c!alternative=\v!pagenumber]
+
\setupmemosection
[\v!closing]
[\c!leftmargin=.5\textwidth]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii
index aa5bb0ce90f..979d1810742 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkii
@@ -1,8 +1,8 @@
%D \module
-%D [ file=memo-imp-memo,
-%D version=2011.11.07,
+%D [ file=memo-imp-table,
+%D version=2012.02.04,
%D title=\CONTEXT\ Memo Style,
-%D subtitle=Memo style,
+%D subtitle=Table style,
%D author=Wolfgang Schuster,
%D date=\currentdate,
%D copyright=Wolfgang Schuster,
@@ -27,17 +27,17 @@
\setupmemolayout
[\v!firstpage,\v!secondpage]
- [\c!backspace=1in,
- \c!width=\v!middle,
- \c!topspace=1in,
- \c!header=0in,
- \c!footer=0in,
- \c!height=\v!fit]
+ [\c!header=0in]
\setupmemosection
[\v!head]
[\c!alternative=\v!table]
+\setupmemolayer
+ [\v!foot]
+ [\c!state=\v!repeat,
+ \c!alternative=\v!pagenumber]
+
\setupmemooptions
[\c!whitespace=\v!line]
diff --git a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv
index aa5bb0ce90f..979d1810742 100644
--- a/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv
+++ b/Master/texmf-dist/tex/context/third/letter/style/memo-imp-table.mkiv
@@ -1,8 +1,8 @@
%D \module
-%D [ file=memo-imp-memo,
-%D version=2011.11.07,
+%D [ file=memo-imp-table,
+%D version=2012.02.04,
%D title=\CONTEXT\ Memo Style,
-%D subtitle=Memo style,
+%D subtitle=Table style,
%D author=Wolfgang Schuster,
%D date=\currentdate,
%D copyright=Wolfgang Schuster,
@@ -27,17 +27,17 @@
\setupmemolayout
[\v!firstpage,\v!secondpage]
- [\c!backspace=1in,
- \c!width=\v!middle,
- \c!topspace=1in,
- \c!header=0in,
- \c!footer=0in,
- \c!height=\v!fit]
+ [\c!header=0in]
\setupmemosection
[\v!head]
[\c!alternative=\v!table]
+\setupmemolayer
+ [\v!foot]
+ [\c!state=\v!repeat,
+ \c!alternative=\v!pagenumber]
+
\setupmemooptions
[\c!whitespace=\v!line]